Add support for COUNTKEYSINSLOT #107

redis · Jul 30, 2015 · 6079e58 · 6079e58
1 parent a4bce12
commit 6079e58
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 7 deletions.
diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisAsyncCommands.java
@@ -1528,6 +1528,11 @@ public RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count) {
         return dispatch(commandBuilder.clusterGetKeysInSlot(slot, count));
     }
 
+    @Override
+    public RedisFuture<Long> clusterCountKeysInSlot(int slot) {
+        return dispatch(commandBuilder.clusterCountKeysInSlot(slot));
+    }
+
     @Override
     public RedisFuture<List<Object>> clusterSlots() {
         return dispatch(commandBuilder.clusterSlots());

diff --git a/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java b/src/main/java/com/lambdaworks/redis/AbstractRedisReactiveCommands.java
@@ -1491,6 +1491,11 @@ public Observable<K> clusterGetKeysInSlot(int slot, int count) {
         return createDissolvingObservable(() -> commandBuilder.clusterGetKeysInSlot(slot, count));
     }
 
+    @Override
+    public Observable<Long> clusterCountKeysInSlot(int slot) {
+       return createObservable(() -> commandBuilder.clusterCountKeysInSlot(slot));
+    }
+
     @Override
     public Observable<Object> clusterSlots() {
         return createDissolvingObservable(commandBuilder::clusterSlots);

diff --git a/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java b/src/main/java/com/lambdaworks/redis/RedisClusterAsyncConnection.java
@@ -126,7 +126,7 @@ public interface RedisClusterAsyncConnection<K, V> extends RedisHashesAsyncConne
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List of slaves
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
      */
     RedisFuture<List<String>> clusterSlaves(String nodeId);
 
@@ -139,6 +139,14 @@ public interface RedisClusterAsyncConnection<K, V> extends RedisHashesAsyncConne
      */
     RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count);
 
+    /**
+     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
+     *
+     * @param slot the slot
+     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
+     */
+    RedisFuture<Long> clusterCountKeysInSlot(int slot);
+
     /**
      * Get array of cluster slots to node mappings.
      *

diff --git a/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java b/src/main/java/com/lambdaworks/redis/RedisClusterConnection.java
@@ -125,7 +125,7 @@ public interface RedisClusterConnection<K, V> extends RedisHashesConnection<K, V
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List of slaves
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
      */
     List<String> clusterSlaves(String nodeId);
 
@@ -138,6 +138,14 @@ public interface RedisClusterConnection<K, V> extends RedisHashesConnection<K, V
      */
     List<K> clusterGetKeysInSlot(int slot, int count);
 
+    /**
+     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
+     *
+     * @param slot the slot
+     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
+     */
+    Long clusterCountKeysInSlot(int slot);
+
     /**
      * Get array of cluster slots to node mappings.
      *

diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1659,6 +1659,11 @@ public Command<K, V, List<K>> clusterGetKeysInSlot(int slot, int count) {
         return createCommand(CLUSTER, new KeyListOutput<K, V>(codec), args);
     }
 
+    public Command<K, V, Long> clusterCountKeysInSlot(int slot) {
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(COUNTKEYSINSLOT).add(slot);
+        return createCommand(CLUSTER, new IntegerOutput<K, V>(codec), args);
+    }
+
     public Command<K, V, List<Object>> clusterSlots() {
         CommandArgs<K, V> args = new CommandArgs<K, V>(codec).add(SLOTS);
         return createCommand(CLUSTER, new ArrayOutput<K, V>(codec), args);

diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/async/RedisClusterAsyncCommands.java
@@ -127,7 +127,7 @@ public interface RedisClusterAsyncCommands<K, V> extends RedisHashAsyncCommands<
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List of slaves
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
      */
     RedisFuture<List<String>> clusterSlaves(String nodeId);
 
@@ -140,6 +140,14 @@ public interface RedisClusterAsyncCommands<K, V> extends RedisHashAsyncCommands<
      */
     RedisFuture<List<K>> clusterGetKeysInSlot(int slot, int count);
 
+    /**
+     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
+     *
+     * @param slot the slot
+     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
+     */
+    RedisFuture<Long> clusterCountKeysInSlot(int slot);
+
     /**
      * Get array of cluster slots to node mappings.
      * 

diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/rx/RedisClusterReactiveCommands.java
@@ -136,7 +136,7 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List of slaves
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
      */
     Observable<String> clusterSlaves(String nodeId);
 
@@ -149,6 +149,14 @@ public interface RedisClusterReactiveCommands<K, V> extends RedisHashReactiveCom
      */
     Observable<K> clusterGetKeysInSlot(int slot, int count);
 
+    /**
+     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
+     *
+     * @param slot the slot
+     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
+     */
+    Observable<Long> clusterCountKeysInSlot(int slot);
+
     /**
      * Get array of cluster slots to node mappings.
      *

diff --git a/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java b/src/main/java/com/lambdaworks/redis/cluster/api/sync/RedisClusterCommands.java
@@ -132,7 +132,7 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
      * {@link com.lambdaworks.redis.cluster.models.partitions.ClusterPartitionParser#parse}
      *
      * @param nodeId node id of the master node
-     * @return List of slaves
+     * @return List&lt;String&gt; array-reply list of slaves. The command returns data in the same format as {@link #clusterNodes()} but one line per slave.
      */
     List<String> clusterSlaves(String nodeId);
 
@@ -145,6 +145,14 @@ public interface RedisClusterCommands<K, V> extends RedisHashCommands<K, V>, Red
      */
     List<K> clusterGetKeysInSlot(int slot, int count);
 
+    /**
+     * Returns the number of keys in the specified Redis Cluster hash {@code slot}.
+     *
+     * @param slot the slot
+     * @return Integer reply: The number of keys in the specified hash slot, or an error if the hash slot is invalid.
+     */
+    Long clusterCountKeysInSlot(int slot);
+
     /**
      * Get array of cluster slots to node mappings.
      * 

diff --git a/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java b/src/main/java/com/lambdaworks/redis/protocol/CommandKeyword.java
@@ -8,7 +8,7 @@
  * @author Will Glozer
  */
 public enum CommandKeyword implements ProtocolKeyword {
-    ADDR, ADDSLOTS, AFTER, AGGREGATE, ALPHA, AND, ASK, ASC, BEFORE, BY, CHANNELS, COUNT, DELSLOTS, DESC, SOFT, HARD, ENCODING,
+    ADDR, ADDSLOTS, AFTER, AGGREGATE, ALPHA, AND, ASK, ASC, BEFORE, BY, CHANNELS, COUNT, COUNTKEYSINSLOT, DELSLOTS, DESC, SOFT, HARD, ENCODING,
 
     FAILOVER, FORGET, FLUSH, FORCE, FLUSHSLOTS, GETNAME, GETKEYSINSLOT, HTSTATS, ID, IDLETIME, KILL, LEN, LIMIT, LIST, LOAD, MATCH,
 

diff --git a/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java b/src/test/java/com/lambdaworks/redis/cluster/RedisClusterClientTest.java
@@ -383,4 +383,15 @@ public void getKeysInSlot() throws Exception {
         assertThat(keys).isEqualTo(ImmutableList.of("b"));
     }
 
+    @Test
+    public void countKeysInSlot() throws Exception {
+
+        redissync1.set("b", value);
+        Long result = redissync1.clusterCountKeysInSlot(SlotHash.getSlot("b".getBytes()));
+        assertThat(result).isEqualTo(1L);
+
+        result = redissync1.clusterCountKeysInSlot(SlotHash.getSlot("ZZZ".getBytes()));
+        assertThat(result).isEqualTo(0L);
+    }
+
 }
diff --git a/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ClusterRxCommandTest.java b/src/test/java/com/lambdaworks/redis/cluster/commands/rx/ClusterRxCommandTest.java
@@ -67,7 +67,6 @@ public void before() throws Exception {
 
         connection = client.connect(RedisURI.Builder.redis(host, port1).build());
         rx = connection.reactive();
-
     }
 
     @After
@@ -135,4 +134,23 @@ public void clusterSlaves() throws Exception {
         assertThat(result.size()).isGreaterThan(0);
     }
 
+    @Test
+    public void getKeysInSlot() throws Exception {
+
+        connection.sync().set("b", value);
+        List<String> keys = rx.clusterGetKeysInSlot(SlotHash.getSlot("b".getBytes()), 10).toList().toBlocking().first();
+        assertThat(keys).isEqualTo(ImmutableList.of("b"));
+    }
+
+    @Test
+    public void countKeysInSlot() throws Exception {
+
+        connection.sync().set("b", value);
+        Long result = rx.clusterCountKeysInSlot(SlotHash.getSlot("b".getBytes())).toBlocking().first();
+        assertThat(result).isEqualTo(1L);
+
+        result = rx.clusterCountKeysInSlot(SlotHash.getSlot("ZZZ".getBytes())).toBlocking().first();
+        assertThat(result).isEqualTo(0L);
+    }
+
 }