#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/81fb145d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/81fb145d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/81fb145d Branch: refs/heads/ignite-141 Commit: 81fb145dfbe02268d7cba49915fae5861752838a Parents: 262aba5 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Feb 26 16:16:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Feb 26 16:16:57 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java | 2 +- .../cache/distributed/GridCacheClientModesAbstractSelfTest.java | 3 ++- .../cache/distributed/dht/GridCacheColocatedDebugTest.java | 3 ++- .../apache/ignite/loadtests/capacity/spring-capacity-cache.xml | 2 +- .../org/apache/ignite/loadtests/colocation/spring-colocation.xml | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java index 581f22a..6e34229 100644 --- a/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/GridCacheAffinityBackupsSelfTest.java @@ -61,7 +61,7 @@ public class GridCacheAffinityBackupsSelfTest extends GridCommonAbstractTest { */ public void testConsistentHashBackups() throws Exception { for (int i = 0; i < nodesCnt; i++) - checkBackups(i, new CacheConsistentHashAffinityFunction()); + checkBackups(i, new CacheRendezvousAffinityFunction()); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java index 7cb50b8..170c3d5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java @@ -20,6 +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.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -71,7 +72,7 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst cfg.setCacheStoreFactory(null); cfg.setReadThrough(false); cfg.setWriteThrough(false); - cfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 32)); + cfg.setAffinity(new CacheRendezvousAffinityFunction(false, 32)); cfg.setBackups(1); return cfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java index 21f2c52..9cd036f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; import org.apache.ignite.cache.affinity.consistenthash.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -71,7 +72,7 @@ public class GridCacheColocatedDebugTest extends GridCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(PARTITIONED_ONLY); - cacheCfg.setAffinity(new CacheConsistentHashAffinityFunction(false, 30)); + cacheCfg.setAffinity(new CacheRendezvousAffinityFunction(false, 30)); cacheCfg.setBackups(1); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setSwapEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml index 00f4361..514d90f 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/capacity/spring-capacity-cache.xml @@ -77,7 +77,7 @@ sets the number of backups to 0 to ensure maximum capacity.. --> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction"> <property name="keyBackups" value="0"/> <!-- No backups. --> </bean> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81fb145d/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml index 01bd44f..8d68a73 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/colocation/spring-colocation.xml @@ -105,7 +105,7 @@ sets the number of backups to 1 (which is default). --> <property name="affinity"> - <bean class="org.apache.ignite.cache.affinity.consistenthash.CacheConsistentHashAffinityFunction"> + <bean class="org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction"> <property name="keyBackups" value="0"/> <!-- Disable backups. --> </bean> </property>
