Valkey-8: add BY/GET support for SORT/RO in cluster mode

Signed-off-by: Shoham Elias <shohame@amazon.com>
valkey-io · Sep 12, 2024 · 4569e52 · 4569e52
1 parent 11da7d9
commit 4569e52
Show file tree

Hide file tree

Showing 32 changed files with 1,685 additions and 2,131 deletions.
diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java
@@ -228,6 +228,8 @@
 import glide.api.models.commands.ScriptOptions;
 import glide.api.models.commands.ScriptOptionsGlideString;
 import glide.api.models.commands.SetOptions;
+import glide.api.models.commands.SortOptions;
+import glide.api.models.commands.SortOptionsBinary;
 import glide.api.models.commands.WeightAggregateOptions.Aggregate;
 import glide.api.models.commands.WeightAggregateOptions.KeyArray;
 import glide.api.models.commands.WeightAggregateOptions.KeyArrayBinary;
@@ -4691,6 +4693,23 @@ public CompletableFuture<GlideString[]> sort(@NonNull GlideString key) {
                 response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
     }
 
+    @Override
+    public CompletableFuture<String[]> sort(@NonNull String key, @NonNull SortOptions sortOptions) {
+        String[] arguments = ArrayUtils.addFirst(sortOptions.toArgs(), key);
+        return commandManager.submitNewCommand(
+                Sort, arguments, response -> castArray(handleArrayResponse(response), String.class));
+    }
+
+    @Override
+    public CompletableFuture<GlideString[]> sort(
+            @NonNull GlideString key, @NonNull SortOptionsBinary sortOptions) {
+        GlideString[] arguments = new ArgsBuilder().add(key).add(sortOptions.toArgs()).toArray();
+        return commandManager.submitNewCommand(
+                Sort,
+                arguments,
+                response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
+    }
+
     @Override
     public CompletableFuture<String[]> sortReadOnly(@NonNull String key) {
         return commandManager.submitNewCommand(
@@ -4707,6 +4726,27 @@ public CompletableFuture<GlideString[]> sortReadOnly(@NonNull GlideString key) {
                 response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
     }
 
+    @Override
+    public CompletableFuture<String[]> sortReadOnly(
+            @NonNull String key, @NonNull SortOptions sortOptions) {
+        String[] arguments = ArrayUtils.addFirst(sortOptions.toArgs(), key);
+        return commandManager.submitNewCommand(
+                SortReadOnly,
+                arguments,
+                response -> castArray(handleArrayResponse(response), String.class));
+    }
+
+    @Override
+    public CompletableFuture<GlideString[]> sortReadOnly(
+            @NonNull GlideString key, @NonNull SortOptionsBinary sortOptions) {
+        GlideString[] arguments = new ArgsBuilder().add(key).add(sortOptions.toArgs()).toArray();
+
+        return commandManager.submitNewCommand(
+                SortReadOnly,
+                arguments,
+                response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
+    }
+
     @Override
     public CompletableFuture<Long> sortStore(@NonNull String key, @NonNull String destination) {
         return commandManager.submitNewCommand(
@@ -4722,6 +4762,32 @@ public CompletableFuture<Long> sortStore(
                 this::handleLongResponse);
     }
 
+    @Override
+    public CompletableFuture<Long> sortStore(
+            @NonNull String key, @NonNull String destination, @NonNull SortOptions sortOptions) {
+        String[] storeArguments = new String[] {STORE_COMMAND_STRING, destination};
+        String[] arguments =
+                concatenateArrays(new String[] {key}, sortOptions.toArgs(), storeArguments);
+        return commandManager.submitNewCommand(Sort, arguments, this::handleLongResponse);
+    }
+
+    @Override
+    public CompletableFuture<Long> sortStore(
+            @NonNull GlideString key,
+            @NonNull GlideString destination,
+            @NonNull SortOptionsBinary sortOptions) {
+
+        GlideString[] arguments =
+                new ArgsBuilder()
+                        .add(key)
+                        .add(sortOptions.toArgs())
+                        .add(STORE_COMMAND_STRING)
+                        .add(destination)
+                        .toArray();
+
+        return commandManager.submitNewCommand(Sort, arguments, this::handleLongResponse);
+    }
+
     @Override
     public CompletableFuture<String[]> geosearch(
             @NonNull String key,

diff --git a/java/client/src/main/java/glide/api/GlideClient.java b/java/client/src/main/java/glide/api/GlideClient.java
@@ -29,12 +29,9 @@
 import static command_request.CommandRequestOuterClass.RequestType.RandomKey;
 import static command_request.CommandRequestOuterClass.RequestType.Scan;
 import static command_request.CommandRequestOuterClass.RequestType.Select;
-import static command_request.CommandRequestOuterClass.RequestType.Sort;
-import static command_request.CommandRequestOuterClass.RequestType.SortReadOnly;
 import static command_request.CommandRequestOuterClass.RequestType.Time;
 import static command_request.CommandRequestOuterClass.RequestType.UnWatch;
 import static glide.api.models.GlideString.gs;
-import static glide.api.models.commands.SortBaseOptions.STORE_COMMAND_STRING;
 import static glide.api.models.commands.function.FunctionListOptions.LIBRARY_NAME_VALKEY_API;
 import static glide.api.models.commands.function.FunctionListOptions.WITH_CODE_VALKEY_API;
 import static glide.api.models.commands.function.FunctionLoadOptions.REPLACE;
@@ -51,8 +48,6 @@
 import glide.api.models.Transaction;
 import glide.api.models.commands.FlushMode;
 import glide.api.models.commands.InfoOptions.Section;
-import glide.api.models.commands.SortOptions;
-import glide.api.models.commands.SortOptionsBinary;
 import glide.api.models.commands.function.FunctionRestorePolicy;
 import glide.api.models.commands.scan.ScanOptions;
 import glide.api.models.configuration.GlideClientConfiguration;
@@ -481,70 +476,6 @@ public CompletableFuture<GlideString> randomKeyBinary() {
                 RandomKey, new GlideString[0], this::handleGlideStringOrNullResponse);
     }
 
-    @Override
-    public CompletableFuture<String[]> sort(@NonNull String key, @NonNull SortOptions sortOptions) {
-        String[] arguments = ArrayUtils.addFirst(sortOptions.toArgs(), key);
-        return commandManager.submitNewCommand(
-                Sort, arguments, response -> castArray(handleArrayResponse(response), String.class));
-    }
-
-    @Override
-    public CompletableFuture<GlideString[]> sort(
-            @NonNull GlideString key, @NonNull SortOptionsBinary sortOptions) {
-        GlideString[] arguments = new ArgsBuilder().add(key).add(sortOptions.toArgs()).toArray();
-        return commandManager.submitNewCommand(
-                Sort,
-                arguments,
-                response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
-    }
-
-    @Override
-    public CompletableFuture<String[]> sortReadOnly(
-            @NonNull String key, @NonNull SortOptions sortOptions) {
-        String[] arguments = ArrayUtils.addFirst(sortOptions.toArgs(), key);
-        return commandManager.submitNewCommand(
-                SortReadOnly,
-                arguments,
-                response -> castArray(handleArrayResponse(response), String.class));
-    }
-
-    @Override
-    public CompletableFuture<GlideString[]> sortReadOnly(
-            @NonNull GlideString key, @NonNull SortOptionsBinary sortOptions) {
-        GlideString[] arguments = new ArgsBuilder().add(key).add(sortOptions.toArgs()).toArray();
-
-        return commandManager.submitNewCommand(
-                SortReadOnly,
-                arguments,
-                response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
-    }
-
-    @Override
-    public CompletableFuture<Long> sortStore(
-            @NonNull String key, @NonNull String destination, @NonNull SortOptions sortOptions) {
-        String[] storeArguments = new String[] {STORE_COMMAND_STRING, destination};
-        String[] arguments =
-                concatenateArrays(new String[] {key}, sortOptions.toArgs(), storeArguments);
-        return commandManager.submitNewCommand(Sort, arguments, this::handleLongResponse);
-    }
-
-    @Override
-    public CompletableFuture<Long> sortStore(
-            @NonNull GlideString key,
-            @NonNull GlideString destination,
-            @NonNull SortOptionsBinary sortOptions) {
-
-        GlideString[] arguments =
-                new ArgsBuilder()
-                        .add(key)
-                        .add(sortOptions.toArgs())
-                        .add(STORE_COMMAND_STRING)
-                        .add(destination)
-                        .toArray();
-
-        return commandManager.submitNewCommand(Sort, arguments, this::handleLongResponse);
-    }
-
     @Override
     public CompletableFuture<Object[]> scan(@NonNull String cursor) {
         return commandManager.submitNewCommand(Scan, new String[] {cursor}, this::handleArrayResponse);

diff --git a/java/client/src/main/java/glide/api/GlideClusterClient.java b/java/client/src/main/java/glide/api/GlideClusterClient.java
@@ -30,13 +30,10 @@
 import static command_request.CommandRequestOuterClass.RequestType.PubSubSNumSub;
 import static command_request.CommandRequestOuterClass.RequestType.RandomKey;
 import static command_request.CommandRequestOuterClass.RequestType.SPublish;
-import static command_request.CommandRequestOuterClass.RequestType.Sort;
-import static command_request.CommandRequestOuterClass.RequestType.SortReadOnly;
 import static command_request.CommandRequestOuterClass.RequestType.Time;
 import static command_request.CommandRequestOuterClass.RequestType.UnWatch;
 import static glide.api.commands.ServerManagementCommands.VERSION_VALKEY_API;
 import static glide.api.models.GlideString.gs;
-import static glide.api.models.commands.SortBaseOptions.STORE_COMMAND_STRING;
 import static glide.api.models.commands.function.FunctionListOptions.LIBRARY_NAME_VALKEY_API;
 import static glide.api.models.commands.function.FunctionListOptions.WITH_CODE_VALKEY_API;
 import static glide.api.models.commands.function.FunctionLoadOptions.REPLACE;
@@ -57,7 +54,6 @@
 import glide.api.models.GlideString;
 import glide.api.models.commands.FlushMode;
 import glide.api.models.commands.InfoOptions.Section;
-import glide.api.models.commands.SortClusterOptions;
 import glide.api.models.commands.function.FunctionRestorePolicy;
 import glide.api.models.commands.scan.ClusterScanCursor;
 import glide.api.models.commands.scan.ScanOptions;
@@ -74,7 +70,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 import lombok.NonNull;
-import org.apache.commons.lang3.ArrayUtils;
 import response.ResponseOuterClass.Response;
 
 /** Async (non-blocking) client for Cluster mode. Use {@link #createClient} to request a client. */
@@ -1130,72 +1125,6 @@ public CompletableFuture<Object[]> scanBinary(ClusterScanCursor cursor, ScanOpti
                         result -> new Object[] {new NativeClusterScanCursor(result[0].toString()), result[1]});
     }
 
-    @Override
-    public CompletableFuture<String[]> sort(
-            @NonNull String key, @NonNull SortClusterOptions sortClusterOptions) {
-        String[] arguments = ArrayUtils.addFirst(sortClusterOptions.toArgs(), key);
-        return commandManager.submitNewCommand(
-                Sort, arguments, response -> castArray(handleArrayResponse(response), String.class));
-    }
-
-    @Override
-    public CompletableFuture<GlideString[]> sort(
-            @NonNull GlideString key, @NonNull SortClusterOptions sortClusterOptions) {
-        GlideString[] arguments = new ArgsBuilder().add(key).add(sortClusterOptions.toArgs()).toArray();
-
-        return commandManager.submitNewCommand(
-                Sort,
-                arguments,
-                response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
-    }
-
-    @Override
-    public CompletableFuture<String[]> sortReadOnly(
-            @NonNull String key, @NonNull SortClusterOptions sortClusterOptions) {
-        String[] arguments = ArrayUtils.addFirst(sortClusterOptions.toArgs(), key);
-        return commandManager.submitNewCommand(
-                SortReadOnly,
-                arguments,
-                response -> castArray(handleArrayResponse(response), String.class));
-    }
-
-    @Override
-    public CompletableFuture<GlideString[]> sortReadOnly(
-            @NonNull GlideString key, @NonNull SortClusterOptions sortClusterOptions) {
-        GlideString[] arguments = new ArgsBuilder().add(key).add(sortClusterOptions.toArgs()).toArray();
-        return commandManager.submitNewCommand(
-                SortReadOnly,
-                arguments,
-                response -> castArray(handleArrayOrNullResponseBinary(response), GlideString.class));
-    }
-
-    @Override
-    public CompletableFuture<Long> sortStore(
-            @NonNull String key,
-            @NonNull String destination,
-            @NonNull SortClusterOptions sortClusterOptions) {
-        String[] storeArguments = new String[] {STORE_COMMAND_STRING, destination};
-        String[] arguments =
-                concatenateArrays(new String[] {key}, sortClusterOptions.toArgs(), storeArguments);
-        return commandManager.submitNewCommand(Sort, arguments, this::handleLongResponse);
-    }
-
-    @Override
-    public CompletableFuture<Long> sortStore(
-            @NonNull GlideString key,
-            @NonNull GlideString destination,
-            @NonNull SortClusterOptions sortClusterOptions) {
-        GlideString[] arguments =
-                new ArgsBuilder()
-                        .add(key)
-                        .add(sortClusterOptions.toArgs())
-                        .add(STORE_COMMAND_STRING)
-                        .add(destination)
-                        .toArray();
-
-        return commandManager.submitNewCommand(Sort, arguments, this::handleLongResponse);
-    }
-
     /** A {@link ClusterScanCursor} implementation for interacting with the Rust layer. */
     private static final class NativeClusterScanCursor
             implements CommandManager.ClusterScanCursorDetail {