ignite-1016 excludeNeighbors flag default value is false
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/08e14ed0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/08e14ed0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/08e14ed0 Branch: refs/heads/pull-80-head Commit: 08e14ed07e2197e150a03548a29179fda5ced745 Parents: 7a317c7 Author: agura <[email protected]> Authored: Tue Sep 15 22:18:03 2015 +0300 Committer: agura <[email protected]> Committed: Tue Sep 15 22:18:03 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/affinity/fair/FairAffinityFunction.java | 4 ++-- .../cache/affinity/rendezvous/RendezvousAffinityFunction.java | 2 +- .../ignite/internal/processors/cache/GridCacheProcessor.java | 1 - ...atedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java | 2 +- ...ndezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/08e14ed0/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 648adf0..b42b683 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 @@ -106,7 +106,7 @@ public class FairAffinityFunction implements AffinityFunction { * Empty constructor with all defaults. */ public FairAffinityFunction() { - this(true); + this(false); } /** @@ -126,7 +126,7 @@ public class FairAffinityFunction implements AffinityFunction { * @param parts Number of partitions. */ public FairAffinityFunction(int parts) { - this(true, parts); + this(false, parts); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/08e14ed0/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java index cfc7d06..61a21d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java @@ -126,7 +126,7 @@ public class RendezvousAffinityFunction implements AffinityFunction, Externaliza * Empty constructor with all defaults. */ public RendezvousAffinityFunction() { - this(true); + this(false); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/08e14ed0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 4c1529d..92358f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -52,7 +52,6 @@ import org.apache.ignite.cache.CacheRebalanceMode; import org.apache.ignite.cache.affinity.AffinityFunction; import org.apache.ignite.cache.affinity.AffinityFunctionContext; import org.apache.ignite.cache.affinity.AffinityNodeAddressHashResolver; -import org.apache.ignite.cache.affinity.fair.FairAffinityFunction; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.cache.store.CacheStore; import org.apache.ignite.cache.store.CacheStoreSessionListener; http://git-wip-us.apache.org/repos/asf/ignite/blob/08e14ed0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java index 8fdbb4a..418449a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java @@ -29,7 +29,7 @@ public class CacheReplicatedFairAffinityExcludeNeighborsMultiNodeFullApiSelfTest @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setAffinity(new FairAffinityFunction()); + cfg.setAffinity(new FairAffinityFunction(true)); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/08e14ed0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java index 8cd962f..66aeefe 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSelfTest.java @@ -29,7 +29,7 @@ public class CacheReplicatedRendezvousAffinityExcludeNeighborsMultiNodeFullApiSe @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { CacheConfiguration cfg = super.cacheConfiguration(gridName); - cfg.setAffinity(new RendezvousAffinityFunction()); + cfg.setAffinity(new RendezvousAffinityFunction(true)); return cfg; }
