Merge pull request #9 from phufool/master

- removed BasicCommands

Author: phufool

src/main/java/redis/clients/jedis/BinaryJedisCluster.java

@@ -6,7 +6,9 @@
 import java.util.Map;
 import java.util.Set;
 
-public class BinaryJedisCluster implements BinaryJedisCommands, BasicCommands,
+import redis.clients.util.SafeEncoder;
+
+public class BinaryJedisCluster implements BinaryJedisCommands,
         JedisClusterBinaryScriptingCommands {
 
     public static final short HASHSLOTS = 16384;
@@ -1042,7 +1044,7 @@ public List<byte[]> blpop(final byte[] arg) {
              public List<byte[]> execute(Jedis connection) {
              return connection.blpop(arg);
              }
-         }.runBinary(null);
+         }.runBinary(arg);
     }
 
     @Override
@@ -1053,7 +1055,7 @@ public List<byte[]> brpop(final byte[] arg) {
              public List<byte[]> execute(Jedis connection) {
              return connection.brpop(arg);
              }
-         }.runBinary(null);
+         }.runBinary(arg);
     }
 
     @Override
@@ -1086,7 +1088,7 @@ public Long move(final byte[] key, final int dbIndex) {
              public Long execute(Jedis connection) {
              return connection.move(key, dbIndex);
              }
-         }.runBinary(key);
+         }.runBinary(null);
     }
 
     @Override
@@ -1111,225 +1113,6 @@ public Long execute(Jedis connection) {
          }.runBinary(key);
     }
 
-    @Override
-    public String ping() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.ping();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String quit() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.quit();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String flushDB() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.flushDB();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public Long dbSize() {
-    return new JedisClusterCommand<Long>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public Long execute(Jedis connection) {
-        return connection.dbSize();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String select(final int index) {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.select(index);
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String flushAll() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.flushAll();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String auth(final String password) {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.auth(password);
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String save() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.save();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String bgsave() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.bgsave();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String bgrewriteaof() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.bgrewriteaof();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public Long lastsave() {
-    return new JedisClusterCommand<Long>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public Long execute(Jedis connection) {
-        return connection.lastsave();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String shutdown() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.shutdown();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String info() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.info();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String info(final String section) {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.info(section);
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String slaveof(final String host, final int port) {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.slaveof(host, port);
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String slaveofNoOne() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.slaveofNoOne();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public Long getDB() {
-    return new JedisClusterCommand<Long>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public Long execute(Jedis connection) {
-        return connection.getDB();
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String debug(final DebugParams params) {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.debug(params);
-        }
-    }.run(null);
-    }
-
-    @Override
-    public String configResetStat() {
-    return new JedisClusterCommand<String>(connectionHandler, timeout,
-        maxRedirections) {
-        @Override
-        public String execute(Jedis connection) {
-        return connection.configResetStat();
-        }
-    }.run(null);
-    }
-
-    public Map<String, JedisPool> getClusterNodes() {
-    return connectionHandler.getNodes();
-    }
-
-    @Override
-    public Long waitReplicas(int replicas, long timeout) {
-    // TODO Auto-generated method stub
-    return null;
-    }
-    
     @Override
     public Object eval(final byte[] script, final byte[] keyCount, final byte[]... params) {
         return new JedisClusterCommand<Object>(connectionHandler, timeout,
@@ -1338,7 +1121,7 @@ public Object eval(final byte[] script, final byte[] keyCount, final byte[]... p
                 public Object execute(Jedis connection) {
                 return connection.eval(script, keyCount, params);
                 }
-            }.runBinary(ByteBuffer.wrap(keyCount).getInt(), params);
+            }.runBinary(Integer.parseInt(SafeEncoder.encode(keyCount)), params);
     }
 
     @Override

src/main/java/redis/clients/jedis/JedisCluster.java

@@ -1273,7 +1273,7 @@ public Object eval(final String script, final String key) {
         public Object execute(Jedis connection) {
         return connection.eval(script);
         }
-    }.run(1, key);
+    }.run(key);
     }
 
     @Override
@@ -1317,7 +1317,7 @@ public Object evalsha(final String script, final String key) {
         public Object execute(Jedis connection) {
         return connection.evalsha(script);
         }
-    }.run(1, key);
+    }.run(key);
     }
 
     @Override
@@ -1328,7 +1328,7 @@ public Boolean scriptExists(final String sha1, final String key) {
         public Boolean execute(Jedis connection) {
         return connection.scriptExists(sha1);
         }
-    }.run(1,key);
+    }.run(key);
     }
 
     @Override
@@ -1339,7 +1339,7 @@ public List<Boolean> scriptExists(final String key, final String... sha1) {
         public List<Boolean> execute(Jedis connection) {
         return connection.scriptExists(sha1);
         }
-    }.run(1, key);
+    }.run(key);
     }
 
     @Override
@@ -1350,7 +1350,7 @@ public String scriptLoad(final String script, final String key) {
         public String execute(Jedis connection) {
         return connection.scriptLoad(script);
         }
-    }.run(1, key);
+    }.run(key);
     }
 }
 

src/main/java/redis/clients/util/JedisClusterCRC16.java

@@ -30,7 +30,7 @@ public static int getSlot(byte[] key) {
             }
         }
         if (s > -1 && e > -1 && e != s + 1) {
-            return getCRC16(key, s, e) % 16384;
+            return getCRC16(key, s+1, e) % 16384;
         }
         return getCRC16(key, 0, key.length) % 16384;
     }

src/test/java/redis/clients/jedis/tests/commands/ClusterBinaryJedisCommandsTest.java

@@ -164,6 +164,14 @@ public void testRpush() {
         assertEquals(2, (long)jedisCluster.llen(key));
     }
 
+    @Test
+    public void testGetSlot() {
+    assertEquals(JedisClusterCRC16.getSlot("{bar".getBytes()), JedisClusterCRC16.getSlot("{bar"));
+    assertEquals(JedisClusterCRC16.getSlot("{user1000}.following".getBytes()), JedisClusterCRC16.getSlot("{user1000}.followers".getBytes()));
+    assertNotEquals(JedisClusterCRC16.getSlot("foo{}{bar}".getBytes()), JedisClusterCRC16.getSlot("bar".getBytes()));
+    assertEquals(JedisClusterCRC16.getSlot("foo{bar}{zap}".getBytes()), JedisClusterCRC16.getSlot("bar".getBytes()));
+    }
+    
     private static String getNodeId(String infoOutput) {
         for (String infoLine : infoOutput.split("\n")) {
             if (infoLine.contains("myself")) {