ISPN-2074 - The consistent hash in the java Hotrod client is buggy

infinispan · May 29, 2012 · 8ade99c · 8ade99c
1 parent 5437f34
commit 8ade99c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/...ient/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java b/...ient/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java
@@ -102,7 +102,7 @@ public SocketAddress getServer(byte[] key) {
 
    private int getHashIndex(int normalisedHashForKey) {
       int result = Arrays.binarySearch(hashes, normalisedHashForKey);
-      if (result > 0) {//the normalisedHashForKey has an exact match in the hashes array
+      if (result >= 0) {//the normalisedHashForKey has an exact match in the hashes array
          return result;
       } else {
          //see javadoc for Arrays.binarySearch, @return tag in particular

diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1Test.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ConsistentHashV1Test.java
@@ -72,6 +72,8 @@ private void setUp(int numOwners) {
 
    public void simpleTest() {
       setUp(1);
+      hash.value = 0;
+      assert v1.getServer(new byte[0]).equals(a1);
       hash.value = 1;
       assert v1.getServer(new byte[0]).equals(a2);
       hash.value = 1001;
@@ -84,6 +86,9 @@ public void simpleTest() {
 
    public void numOwners2Test() {
       setUp(2);
+      hash.value = 0;
+      assert list(a1, a2).contains(v1.getServer(new byte[0]));
+
       hash.value = 1;
       assert list(a2, a3).contains(v1.getServer(new byte[0]));
 
@@ -99,6 +104,9 @@ public void numOwners2Test() {
 
    public void numOwners3Test() {
       setUp(3);
+      hash.value = 0;
+      assert list(a1, a2, a3).contains(v1.getServer(new byte[0]));
+
       hash.value = 1;
       assert list(a2, a3, a4).contains(v1.getServer(new byte[0]));
 
@@ -115,8 +123,13 @@ public void numOwners3Test() {
    //now a bit more extreme...
    public void numOwners4Test() {
       setUp(4);
-      hash.value = 1;
+
       List<InetSocketAddress> list = list(a1, a2, a3, a4);
+
+      hash.value = 0;
+      assert list.contains(v1.getServer(new byte[0]));
+
+      hash.value = 1;
       assert list.contains(v1.getServer(new byte[0]));
 
       hash.value = 1001;