#ignite-237: change affinity function in tests.

apache · Feb 26, 2015 · f358766 · f358766
1 parent 7d8b54f
commit f358766
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 27 deletions.
diff --git a/...ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/...ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@ -20,7 +20,7 @@
 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);
 

diff --git a/...internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java b/...internal/processors/cache/distributed/dht/GridCachePartitionedTopologyChangeSelfTest.java
@@ -19,7 +19,7 @@
 
 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 @@ private void checkTxNodeLeft(int nodeType) throws Exception {
                 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");
 

diff --git a/...e/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java b/...e/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 @@ protected CacheConfiguration cacheConfiguration() {
         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;
     }

diff --git a/...gnite/internal/processors/cache/distributed/near/GridCachePartitionedNodeRestartTest.java b/...gnite/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);

diff --git a/...al/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/...al/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);

diff --git a/...ite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java b/...ite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
@@ -19,7 +19,7 @@
 
 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);
 

diff --git a/...ite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java b/...ite/internal/processors/cache/eviction/GridCacheSynchronousEvictionsFailoverSelfTest.java
@@ -20,7 +20,7 @@
 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;
     }

diff --git a/...va/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/...va/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
@@ -19,7 +19,7 @@
 
 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 void testPointerAfterRehash() throws Exception {
     public void testPutRandomKeys() throws Exception {
         map = newMap();
 
-        CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction(parts, null);
+        CacheAffinityFunction aff = new CacheRendezvousAffinityFunction(parts, null);
 
         getTestResources().inject(aff);
 

diff --git a/...apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/...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 @@ protected GridOffHeapPartitionedMapPerformanceAbstractTest() {
             keys = new T3[LOAD_CNT];
             wrappers = new GridByteArrayWrapper[LOAD_CNT];
 
-            CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction();
+            CacheAffinityFunction aff = new CacheRendezvousAffinityFunction();
 
             Random rnd = new Random();
 

diff --git a/...va/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java b/...va/org/apache/ignite/loadtests/datastructures/GridCachePartitionedAtomicLongLoadTest.java
@@ -19,7 +19,7 @@
 
 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);
 

diff --git a/...org/apache/ignite/loadtests/offheap/GridOffHeapPartitionedMapPerformanceAbstractTest.java b/...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 @@ protected GridOffHeapPartitionedMapPerformanceAbstractTest() {
             keys = new T3[LOAD_CNT];
             wrappers = new GridByteArrayWrapper[LOAD_CNT];
 
-            CacheAffinityFunction aff = new CacheConsistentHashAffinityFunction();
+            CacheAffinityFunction aff = new CacheRendezvousAffinityFunction();
 
             Random rnd = new Random();
 

diff --git a/...a/org/apache/ignite/loadtests/offheap/unsafe/GridUnsafePartitionedMapPerformanceTest.java b/...a/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 @@
 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);
     }
 }