#ignite-237: change affinity function in tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f358766f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f358766f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f358766f Branch: refs/heads/ignite-349 Commit: f358766f944714acb29a9df313db70dd4ff01f8e Parents: 7d8b54f Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Feb 26 16:09:03 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Feb 26 16:09:03 2015 +0300 ---------------------------------------------------------------------- .../distributed/GridCachePreloadRestartAbstractSelfTest.java | 4 ++-- .../dht/GridCachePartitionedTopologyChangeSelfTest.java | 7 +++---- .../dht/GridCachePartitionedUnloadEventsSelfTest.java | 5 ++--- .../distributed/near/GridCachePartitionedNodeRestartTest.java | 4 ++-- .../near/GridCachePartitionedOptimisticTxNodeRestartTest.java | 4 ++-- .../near/GridCachePartitionedTxSalvageSelfTest.java | 4 ++-- .../GridCacheSynchronousEvictionsFailoverSelfTest.java | 4 ++-- .../offheap/GridOffHeapPartitionedMapAbstractSelfTest.java | 4 ++-- .../GridOffHeapPartitionedMapPerformanceAbstractTest.java | 4 ++-- .../GridCachePartitionedAtomicLongLoadTest.java | 4 ++-- .../GridOffHeapPartitionedMapPerformanceAbstractTest.java | 4 ++-- .../unsafe/GridUnsafePartitionedMapPerformanceTest.java | 4 ++-- 12 files changed, 25 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java index da111a6..f3ba5c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -114,7 +114,7 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); - cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions)); cc.setBackups(backups); cc.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java index c64f9a5..8a2cfa0 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -75,7 +75,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(PARTITIONED); - cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18)); + cc.setAffinity(new CacheRendezvousAffinityFunction(false, 18)); cc.setBackups(1); cc.setPreloadMode(SYNC); cc.setDistributionMode(PARTITIONED_ONLY); @@ -498,8 +498,7 @@ public class GridCachePartitionedTopologyChangeSelfTest extends GridCommonAbstra txFut.get(1000); for (int i = 0; i < 3; i++) { - CacheConsistentHashAffinityFunction affinity = (CacheConsistentHashAffinityFunction)((IgniteKernal)grid(i)) - .internalCache().context().config().getAffinity(); + CacheAffinity affinity = grid(i).affinity(null); ConcurrentMap addedNodes = U.field(affinity, "addedNodes"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java index f8c41f0..f451a34 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java @@ -18,8 +18,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; @@ -62,7 +61,7 @@ public class GridCachePartitionedUnloadEventsSelfTest extends GridCommonAbstract CacheConfiguration cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setPreloadMode(SYNC); - cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 10)); + cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, 10)); cacheCfg.setBackups(0); return cacheCfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java index 30f4a28..40acefb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -45,7 +45,7 @@ public class GridCachePartitionedNodeRestartTest extends GridCacheAbstractNodeRe cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); - cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions)); cc.setBackups(backups); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index e2fd6a5..0d71336 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.transactions.*; @@ -44,7 +44,7 @@ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAb cc.setStartSize(20); cc.setPreloadMode(preloadMode); cc.setPreloadBatchSize(preloadBatchSize); - cc.setAffinity(new CacheConsistentHashAffinityFunction(false, partitions)); + cc.setAffinity(new CacheRendezvousAffinityFunction(false, partitions)); cc.setBackups(backups); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java index 685f9d2..b8a3cc9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; @@ -76,7 +76,7 @@ public class GridCachePartitionedTxSalvageSelfTest extends GridCommonAbstractTes CacheConfiguration cc = defaultCacheConfiguration(); cc.setCacheMode(CacheMode.PARTITIONED); - cc.setAffinity(new CacheConsistentHashAffinityFunction(false, 18)); + cc.setAffinity(new CacheRendezvousAffinityFunction(false, 18)); cc.setBackups(1); cc.setPreloadMode(CachePreloadMode.SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java index f348d7c..4e32166 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.eviction; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -64,7 +64,7 @@ public class GridCacheSynchronousEvictionsFailoverSelfTest extends GridCacheAbst ccfg.setBackups(2); - ccfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 500)); + ccfg.setAffinity(new CacheRendezvousAffinityFunction(false, 500)); return ccfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java index 2369749..482b672 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.util.offheap; import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.lang.*; @@ -245,7 +245,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm public void testPutRandomKeys() throws Exception { map = newMap(); - CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(parts, null); + CacheAffinityFunction aff = new CacheRendezvousAffinityFunction(parts, null); getTestResources().inject(aff); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index 1f1f806..dd01a66 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.util.offheap; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -76,7 +76,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G keys = new T3[LOAD_CNT]; wrappers = new GridByteArrayWrapper[LOAD_CNT]; - CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(); + CacheAffinityFunction aff = new CacheRendezvousAffinityFunction(); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java index 1055102..41abf7c 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.loadtests.datastructures; import org.apache.ignite.*; import org.apache.ignite.cache.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.eviction.lru.*; import org.apache.ignite.configuration.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -72,7 +72,7 @@ public class GridCachePartitionedAtomicLongLoadTest extends GridCommonAbstractTe cc.setWriteSynchronizationMode(FULL_SYNC); cc.setEvictionPolicy(new CacheLruEvictionPolicy<>(1000)); cc.setBackups(1); - cc.setAffinity(new CacheConsistentHashAffinityFunction(true)); + cc.setAffinity(new CacheRendezvousAffinityFunction(true)); cc.setEvictSynchronized(true); cc.setEvictNearSynchronized(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java index ab45210..c29c3ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.loadtests.offheap; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.offheap.*; import org.apache.ignite.internal.util.typedef.*; @@ -77,7 +77,7 @@ public abstract class GridOffHeapPartitionedMapPerformanceAbstractTest extends G keys = new T3[LOAD_CNT]; wrappers = new GridByteArrayWrapper[LOAD_CNT]; - CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(); + CacheAffinityFunction aff = new CacheRendezvousAffinityFunction(); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f358766f/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java index 5ba7182..a9a7b5b 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.loadtests.offheap.unsafe; -import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.internal.util.offheap.*; /** @@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.offheap.*; public class GridUnsafePartitionedMapPerformanceTest extends GridOffHeapPartitionedMapPerformanceAbstractTest { /** {@inheritDoc} */ @Override protected GridOffHeapPartitionedMap newMap() { - return GridOffHeapMapFactory.unsafePartitionedMap(CacheConsistentHashAffinityFunction.DFLT_PARTITION_COUNT, + return GridOffHeapMapFactory.unsafePartitionedMap(CacheRendezvousAffinityFunction.DFLT_PARTITION_COUNT, Runtime.getRuntime().availableProcessors(), load, LOAD_CNT, mem, lruStripes, null); } }
