ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/3] incubator-ignite git commit: #ignite-237: remove consistent hash from IgniteClientAffinityAssignmentSelfTest.
Date Thu, 26 Feb 2015 12:51:40 GMT
#ignite-237: remove consistent hash from IgniteClientAffinityAssignmentSelfTest.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fecb680d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fecb680d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fecb680d

Branch: refs/heads/ignite-237
Commit: fecb680da583d27fc8feb292da7176f7ec8304ae
Parents: 6a5b42f
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Feb 26 15:51:33 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Feb 26 15:51:33 2015 +0300

----------------------------------------------------------------------
 .../IgniteClientAffinityAssignmentSelfTest.java     | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fecb680d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
index 719a8aa..0f1a049 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientAffinityAssignmentSelfTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
 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.fair.*;
 import org.apache.ignite.cache.affinity.rendezvous.*;
 import org.apache.ignite.configuration.*;
@@ -58,8 +57,6 @@ public class IgniteClientAffinityAssignmentSelfTest extends GridCommonAbstractTe
             ccfg.setDistributionMode(client ? CLIENT_ONLY : PARTITIONED_ONLY);
 
             if (aff == 0)
-                ccfg.setAffinity(new CacheConsistentHashAffinityFunction(false, PARTS));
-            else if (aff == 1)
                 ccfg.setAffinity(new CacheRendezvousAffinityFunction(false, PARTS));
             else
                 ccfg.setAffinity(new CachePartitionFairAffinity(PARTS));
@@ -73,17 +70,8 @@ public class IgniteClientAffinityAssignmentSelfTest extends GridCommonAbstractTe
     /**
      * @throws Exception If failed.
      */
-    public void testConsistentHashAssignment() throws Exception {
-        aff = 0;
-
-        checkAffinityFunction();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
     public void testRendezvousAssignment() throws Exception {
-        aff = 1;
+        aff = 0;
 
         checkAffinityFunction();
     }
@@ -92,7 +80,7 @@ public class IgniteClientAffinityAssignmentSelfTest extends GridCommonAbstractTe
      * @throws Exception If failed.
      */
     public void testFairAssignment() throws Exception {
-        aff = 2;
+        aff = 1;
 
         checkAffinityFunction();
     }


Mime
View raw message