Add support for CLUSTER DELSLOTSRANGE and CLUSTER ADDSLOTSRANGE c…

…ommands #1904 Original pull request: #1983.
redis · Feb 28, 2022 · d210bfd · d210bfd
1 parent 24b8a7a
commit d210bfd
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 2 deletions.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -351,6 +351,11 @@ public RedisFuture<String> clusterAddSlots(int... slots) {
         return dispatch(commandBuilder.clusterAddslots(slots));
     }
 
+    @Override
+    public RedisFuture<String> clusterAddSlotsRange(Range<Integer>... ranges) {
+        return dispatch(commandBuilder.clusterAddSlotsRange(ranges));
+    }
+
     @Override
     public RedisFuture<String> clusterBumpepoch() {
         return dispatch(commandBuilder.clusterBumpepoch());
@@ -371,6 +376,11 @@ public RedisFuture<String> clusterDelSlots(int... slots) {
         return dispatch(commandBuilder.clusterDelslots(slots));
     }
 
+    @Override
+    public RedisFuture<String> clusterDelSlotsRange(Range<Integer>... ranges) {
+        return dispatch(commandBuilder.clusterDelSlotsRange(ranges));
+    }
+
     @Override
     public RedisFuture<String> clusterFailover(boolean force) {
         return dispatch(commandBuilder.clusterFailover(force));

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -371,6 +371,11 @@ public Mono<String> clusterAddSlots(int... slots) {
         return createMono(() -> commandBuilder.clusterAddslots(slots));
     }
 
+    @Override
+    public Mono<String> clusterAddSlotsRange(Range<Integer>... ranges) {
+        return createMono(() -> commandBuilder.clusterAddSlotsRange(ranges));
+    }
+
     @Override
     public Mono<String> clusterBumpepoch() {
         return createMono(() -> commandBuilder.clusterBumpepoch());
@@ -391,6 +396,11 @@ public Mono<String> clusterDelSlots(int... slots) {
         return createMono(() -> commandBuilder.clusterDelslots(slots));
     }
 
+    @Override
+    public Mono<String> clusterDelSlotsRange(Range<Integer>... ranges) {
+        return createMono(() -> commandBuilder.clusterDelSlotsRange(ranges));
+    }
+
     @Override
     public Mono<String> clusterFailover(boolean force) {
         return createMono(() -> commandBuilder.clusterFailover(force));

diff --git a/src/main/java/io/lettuce/core/RedisCommandBuilder.java b/src/main/java/io/lettuce/core/RedisCommandBuilder.java
@@ -478,6 +478,18 @@ Command<K, V, String> clusterAddslots(int[] slots) {
         return createCommand(CLUSTER, new StatusOutput<>(codec), args);
     }
 
+    Command<K, V, String> clusterAddSlotsRange(Range<Integer>... ranges) {
+        notEmptyRanges(ranges);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(ADDSLOTSRANGE);
+
+        for (Range<Integer> range : ranges) {
+            args.add(range.getLower().getValue());
+            args.add(range.getUpper().getValue());
+        }
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
     Command<K, V, String> clusterBumpepoch() {
         CommandArgs<K, V> args = new CommandArgs<>(codec).add(BUMPEPOCH);
         return createCommand(CLUSTER, new StatusOutput<>(codec), args);
@@ -506,6 +518,18 @@ Command<K, V, String> clusterDelslots(int[] slots) {
         return createCommand(CLUSTER, new StatusOutput<>(codec), args);
     }
 
+    Command<K, V, String> clusterDelSlotsRange(Range<Integer>... ranges) {
+        notEmptyRanges(ranges);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).add(DELSLOTSRANGE);
+
+        for (Range<Integer> range : ranges) {
+            args.add(range.getLower().getValue());
+            args.add(range.getUpper().getValue());
+        }
+        return createCommand(CLUSTER, new StatusOutput<>(codec), args);
+    }
+
     Command<K, V, String> clusterFailover(boolean force) {
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).add(FAILOVER);
@@ -3982,4 +4006,7 @@ private static void notNullRange(Range<?> range) {
         LettuceAssert.notNull(range, "Range " + MUST_NOT_BE_NULL);
     }
 
+    private static void notEmptyRanges(Range<?>[] ranges) {
+        LettuceAssert.notEmpty(ranges, "Ranges " + MUST_NOT_BE_NULL);
+    }
 }
diff --git a/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/RedisClusterAsyncCommands.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 
 import io.lettuce.core.KeyValue;
+import io.lettuce.core.Range;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.api.async.*;
 
@@ -105,6 +106,14 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
      */
     RedisFuture<Long> clusterCountKeysInSlot(int slot);
 
+    /**
+     * Takes a list of slot ranges (specified by start and end slots) to assign to the node.
+     *
+     * @param ranges a list of slot ranges (specified by start and end slots)
+     * @return String simple-string-reply
+     */
+    RedisFuture<String> clusterAddSlotsRange(Range<Integer>... ranges);
+
     /**
      * Removes slots from the cluster node.
      *
@@ -113,6 +122,14 @@ public interface RedisClusterAsyncCommands<K, V> extends BaseRedisAsyncCommands<
      */
     RedisFuture<String> clusterDelSlots(int... slots);
 
+    /**
+     * Takes a list of slot ranges (specified by start and end slots) to remove to the node.
+     *
+     * @param ranges a list of slot ranges (specified by start and end slots)
+     * @return String simple-string-reply
+     */
+    RedisFuture<String> clusterDelSlotsRange(Range<Integer>... ranges);
+
     /**
      * Failover a cluster node. Turns the currently connected node into a master and the master into its replica.
      *

diff --git a/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java b/src/main/java/io/lettuce/core/cluster/api/reactive/RedisClusterReactiveCommands.java
@@ -18,6 +18,7 @@
 import java.time.Duration;
 import java.util.Map;
 
+import io.lettuce.core.Range;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import io.lettuce.core.KeyValue;
@@ -107,6 +108,14 @@ public interface RedisClusterReactiveCommands<K, V>
      */
     Mono<Long> clusterCountKeysInSlot(int slot);
 
+    /**
+     * Takes a list of slot ranges (specified by start and end slots) to assign to the node.
+     *
+     * @param ranges a list of slot ranges (specified by start and end slots)
+     * @return String simple-string-reply
+     */
+    Mono<String> clusterAddSlotsRange(Range<Integer>... ranges);
+
     /**
      * Removes slots from the cluster node.
      *
@@ -115,6 +124,14 @@ public interface RedisClusterReactiveCommands<K, V>
      */
     Mono<String> clusterDelSlots(int... slots);
 
+    /**
+     * Takes a list of slot ranges (specified by start and end slots) to remove to the node.
+     *
+     * @param ranges a list of slot ranges (specified by start and end slots)
+     * @return String simple-string-reply
+     */
+    Mono<String> clusterDelSlotsRange(Range<Integer>... ranges);
+
     /**
      * Failover a cluster node. Turns the currently connected node into a master and the master into its replica.
      *

diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/RedisClusterCommands.java
@@ -18,6 +18,7 @@
 import java.time.Duration;
 import java.util.List;
 
+import io.lettuce.core.Range;
 import io.lettuce.core.api.sync.*;
 
 /**
@@ -104,6 +105,14 @@ public interface RedisClusterCommands<K, V>
      */
     Long clusterCountKeysInSlot(int slot);
 
+    /**
+     * Takes a list of slot ranges (specified by start and end slots) to assign to the node.
+     *
+     * @param ranges a list of slot ranges (specified by start and end slots)
+     * @return String simple-string-reply
+     */
+    String clusterAddSlotsRange(Range<Integer>... ranges);
+
     /**
      * Removes slots from the cluster node.
      *
@@ -112,6 +121,14 @@ public interface RedisClusterCommands<K, V>
      */
     String clusterDelSlots(int... slots);
 
+    /**
+     * Takes a list of slot ranges (specified by start and end slots) to remove to the node.
+     *
+     * @param ranges a list of slot ranges (specified by start and end slots)
+     * @return String simple-string-reply
+     */
+    String clusterDelSlotsRange(Range<Integer>... ranges);
+
     /**
      * Failover a cluster node. Turns the currently connected node into a master and the master into its replica.
      *

diff --git a/src/main/java/io/lettuce/core/protocol/CommandKeyword.java b/src/main/java/io/lettuce/core/protocol/CommandKeyword.java
@@ -27,9 +27,9 @@
  */
 public enum CommandKeyword implements ProtocolKeyword {
 
-    ABSTTL, ADDR, ADDSLOTS, AFTER, AGGREGATE, ALLCHANNELS, ALLCOMMANDS, ALLKEYS, ALPHA, AND, ASK, ASC, ASYNC, BEFORE, BLOCK, BUMPEPOCH,
+    ABSTTL, ADDR, ADDSLOTS, ADDSLOTSRANGE, AFTER, AGGREGATE, ALLCHANNELS, ALLCOMMANDS, ALLKEYS, ALPHA, AND, ASK, ASC, ASYNC, BEFORE, BLOCK, BUMPEPOCH,
 
-    BY, BYLEX, BYSCORE, CACHING, CAT, CH, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, CONSUMERS, CREATE, DB, DELSLOTS, DELUSER, DESC, SOFT, HARD, ENCODING,
+    BY, BYLEX, BYSCORE, CACHING, CAT, CH, CHANNELS, COPY, COUNT, COUNTKEYSINSLOT, CONSUMERS, CREATE, DB, DELSLOTS, DELSLOTSRANGE, DELUSER, DESC, SOFT, HARD, ENCODING,
 
     FAILOVER, FORGET, FLUSH, FORCE, FREQ, FLUSHSLOTS, GENPASS, GETNAME, GETUSER, GETKEYSINSLOT, GETREDIR, GROUP, GROUPS, HTSTATS, ID, IDLE,
 

diff --git a/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java b/src/test/java/io/lettuce/core/cluster/RedisClusterSetupTest.java
@@ -157,6 +157,16 @@ public void clusterDelSlots() {
         Wait.untilEquals(11996, () -> getOwnPartition(redis1).getSlots().size()).waitOrTimeout();
     }
 
+    @Test
+    public void clusterDelSlotsRange() {
+
+        ClusterSetup.setup2Masters(clusterHelper);
+
+        redis1.clusterDelSlotsRange(Range.create(1, 4), Range.create(5, 6));
+
+        Wait.untilEquals(11994, () -> getOwnPartition(redis1).getSlots().size()).waitOrTimeout();
+    }
+
     @Test
     public void clusterSetSlots() {