resolve merge conflicts

valkey-io · Jun 19, 2024 · a1ee4ab · a1ee4ab
1 parent b9243da
commit a1ee4ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/glide-core/src/protobuf/redis_request.proto b/glide-core/src/protobuf/redis_request.proto
@@ -203,6 +203,7 @@ enum RequestType {
     FunctionKill = 161;
     FunctionStats = 162;
     FCallReadOnly = 163;
+    FlushDB = 164;
     LSet = 165;
     XDel = 166;
     XRange = 167;

diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java
@@ -477,12 +477,6 @@ public CompletableFuture<String> getex(@NonNull String key, @NonNull GetExOption
         return commandManager.submitNewCommand(GetEx, arguments, this::handleStringOrNullResponse);
     }
 
-    @Override
-    public CompletableFuture<String> set(@NonNull byte[] key, @NonNull byte[] value) {
-        return commandManager.submitNewCommand(
-                Set, Arrays.asList(key, value), this::handleStringResponse);
-    }
-
     @Override
     public CompletableFuture<String> set(@NonNull String key, @NonNull String value) {
         return commandManager.submitNewCommand(