IGNITE-575 - Renaimings
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25b4703c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25b4703c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25b4703c Branch: refs/heads/ignite-573 Commit: 25b4703c22557c613783d14d9ceda1cd2d8a7658 Parents: 4ba0b01 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Mar 24 23:33:28 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Mar 24 23:33:28 2015 -0700 ---------------------------------------------------------------------- .../affinity/AffinityCentralizedFunction.java | 31 ++++++++++++++++++++ .../affinity/CentralizedAffinityFunction.java | 31 -------------------- .../affinity/fair/FairAffinityFunction.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 2 +- 4 files changed, 33 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25b4703c/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java new file mode 100644 index 0000000..7e76aa8 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/AffinityCentralizedFunction.java @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.cache.affinity; + +import java.lang.annotation.*; + +/** + * Annotation marker which identifies affinity function that must be calculated on one centralized node + * instead of independently on each node. In many cases it happens because it requires previous affinity state + * in order to calculate new one. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface AffinityCentralizedFunction { + +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25b4703c/modules/core/src/main/java/org/apache/ignite/cache/affinity/CentralizedAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/CentralizedAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/CentralizedAffinityFunction.java deleted file mode 100644 index 54e3cf6..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/CentralizedAffinityFunction.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.affinity; - -import java.lang.annotation.*; - -/** - * Annotation marker which identifies affinity function that must be calculated on one centralized node - * instead of independently on each node. In many cases it happens because it requires previous affinity state - * in order to calculate new one. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface CentralizedAffinityFunction { - -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25b4703c/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java index 0b9e33b..0253e62 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/fair/FairAffinityFunction.java @@ -33,7 +33,7 @@ import java.util.*; * <p> * Cache affinity can be configured for individual caches via {@link CacheConfiguration#getAffinity()} method. */ -@CentralizedAffinityFunction +@AffinityCentralizedFunction public class FairAffinityFunction implements AffinityFunction { /** Default partition count. */ public static final int DFLT_PART_CNT = 256; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25b4703c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 73fb265..ddf0df1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -346,7 +346,7 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT AffinityFunction affFunc = cacheCtx.config().getAffinity(); // Do not request affinity from remote nodes if affinity function is not centralized. - if (!U.hasAnnotation(affFunc, CentralizedAffinityFunction.class)) + if (!U.hasAnnotation(affFunc, AffinityCentralizedFunction.class)) return true; // If local node did not initiate exchange or local node is the only cache node in grid.
