Fix comments bar & ifrah

valkey-io · Jul 1, 2024 · 97d4d9e · 97d4d9e
1 parent a224af1
commit 97d4d9e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 29 deletions.
diff --git a/java/client/src/main/java/glide/api/BaseClient.java b/java/client/src/main/java/glide/api/BaseClient.java
@@ -1565,10 +1565,10 @@ public CompletableFuture<Long> pexpiretime(@NonNull GlideString key) {
     public CompletableFuture<Object> invokeScript(@NonNull Script script) {
         if (script.getBinarySafeOutput()) {
             return commandManager.submitScript(
-                    script, List.of(), List.of(), this::handleObjectOrNullResponse);
+                    script, List.of(), List.of(), this::handleBinaryObjectOrNullResponse);
         } else {
             return commandManager.submitScript(
-                    script, List.of(), List.of(), this::handleBinaryObjectOrNullResponse);
+                    script, List.of(), List.of(), this::handleObjectOrNullResponse);
         }
     }
 
@@ -1580,13 +1580,13 @@ public CompletableFuture<Object> invokeScript(
                     script,
                     options.getKeys().stream().map(GlideString::gs).collect(Collectors.toList()),
                     options.getArgs().stream().map(GlideString::gs).collect(Collectors.toList()),
-                    this::handleObjectOrNullResponse);
+                    this::handleBinaryObjectOrNullResponse);
         } else {
             return commandManager.submitScript(
                     script,
                     options.getKeys().stream().map(GlideString::gs).collect(Collectors.toList()),
                     options.getArgs().stream().map(GlideString::gs).collect(Collectors.toList()),
-                    this::handleBinaryObjectOrNullResponse);
+                    this::handleObjectOrNullResponse);
         }
     }
 
@@ -1595,10 +1595,10 @@ public CompletableFuture<Object> invokeScript(
             @NonNull Script script, @NonNull ScriptOptionsGlideString options) {
         if (script.getBinarySafeOutput()) {
             return commandManager.submitScript(
-                    script, options.getKeys(), options.getArgs(), this::handleObjectOrNullResponse);
+                    script, options.getKeys(), options.getArgs(), this::handleBinaryObjectOrNullResponse);
         } else {
             return commandManager.submitScript(
-                    script, options.getKeys(), options.getArgs(), this::handleBinaryObjectOrNullResponse);
+                    script, options.getKeys(), options.getArgs(), this::handleObjectOrNullResponse);
         }
     }
 

diff --git a/java/client/src/main/java/glide/api/models/Script.java b/java/client/src/main/java/glide/api/models/Script.java
@@ -1,7 +1,6 @@
 /** Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0 */
 package glide.api.models;
 
-import static glide.api.models.GlideString.gs;
 import static glide.ffi.resolvers.ScriptResolver.dropScript;
 import static glide.ffi.resolvers.ScriptResolver.storeScript;
 
@@ -26,19 +25,10 @@ public class Script implements AutoCloseable {
      * Wraps around creating a Script object from <code>code</code>.
      *
      * @param code To execute with a ScriptInvoke call.
+     * @param binarySafeOutput Indicates if the output can return binary data.
      */
-    public Script(String code, Boolean binarySafeOutput) {
-        hash = storeScript(gs(code).getBytes());
-        this.binarySafeOutput = binarySafeOutput;
-    }
-
-    /**
-     * Wraps around creating a Script object from <code>code</code>.
-     *
-     * @param code To execute with a ScriptInvoke call.
-     */
-    public Script(GlideString code, Boolean binarySafeOutput) {
-        hash = storeScript(code.getBytes());
+    public <T> Script(T code, Boolean binarySafeOutput) {
+        this.hash = storeScript(GlideString.of(code).getBytes());
         this.binarySafeOutput = binarySafeOutput;
     }
 

diff --git a/java/integTest/src/test/java/glide/SharedCommandTests.java b/java/integTest/src/test/java/glide/SharedCommandTests.java
@@ -2563,12 +2563,12 @@ public void invokeScript_test(BaseClient client) {
         String key1 = UUID.randomUUID().toString();
         String key2 = UUID.randomUUID().toString();
 
-        try (Script script = new Script("return 'Hello'", true)) {
+        try (Script script = new Script("return 'Hello'", false)) {
             Object response = client.invokeScript(script).get();
             assertEquals("Hello", response);
         }
 
-        try (Script script = new Script("return redis.call('SET', KEYS[1], ARGV[1])", true)) {
+        try (Script script = new Script("return redis.call('SET', KEYS[1], ARGV[1])", false)) {
             Object setResponse1 =
                     client
                             .invokeScript(script, ScriptOptions.builder().key(key1).arg("value1").build())
@@ -2582,7 +2582,7 @@ public void invokeScript_test(BaseClient client) {
             assertEquals(OK, setResponse2);
         }
 
-        try (Script script = new Script("return redis.call('GET', KEYS[1])", true)) {
+        try (Script script = new Script("return redis.call('GET', KEYS[1])", false)) {
             Object getResponse1 =
                     client.invokeScript(script, ScriptOptions.builder().key(key1).build()).get();
             assertEquals("value1", getResponse1);
@@ -2603,12 +2603,12 @@ public void invokeScript_gs_test(BaseClient client) {
         GlideString key1 = gs(UUID.randomUUID().toString());
         GlideString key2 = gs(UUID.randomUUID().toString());
 
-        try (Script script = new Script(gs("return 'Hello'"), false)) {
+        try (Script script = new Script(gs("return 'Hello'"), true)) {
             Object response = client.invokeScript(script).get();
             assertEquals(gs("Hello"), response);
         }
 
-        try (Script script = new Script(gs("return redis.call('SET', KEYS[1], ARGV[1])"), false)) {
+        try (Script script = new Script(gs("return redis.call('SET', KEYS[1], ARGV[1])"), true)) {
             Object setResponse1 =
                     client
                             .invokeScript(
@@ -2624,7 +2624,7 @@ public void invokeScript_gs_test(BaseClient client) {
             assertEquals(OK, setResponse2);
         }
 
-        try (Script script = new Script(gs("return redis.call('GET', KEYS[1])"), false)) {
+        try (Script script = new Script(gs("return redis.call('GET', KEYS[1])"), true)) {
             Object getResponse1 =
                     client.invokeScript(script, ScriptOptionsGlideString.builder().key(key1).build()).get();
             assertEquals(gs("value1"), getResponse1);

diff --git a/node/src/BaseClient.ts b/node/src/BaseClient.ts
@@ -1632,7 +1632,7 @@ export class BaseClient {
             keys: option?.keys?.map((item) => {
                 if (typeof item === "string") {
                     // Convert the string to a Uint8Array
-                    return new TextEncoder().encode(item);
+                    return Buffer.from(item);
                 } else {
                     // If it's already a Uint8Array, just return it
                     return item;
@@ -1641,7 +1641,7 @@ export class BaseClient {
             args: option?.args?.map((item) => {
                 if (typeof item === "string") {
                     // Convert the string to a Uint8Array
-                    return new TextEncoder().encode(item);
+                    return Buffer.from(item);
                 } else {
                     // If it's already a Uint8Array, just return it
                     return item;

diff --git a/python/python/glide/async_commands/core.py b/python/python/glide/async_commands/core.py
@@ -4971,8 +4971,8 @@ async def invoke_script(
 
         Args:
             script (Script): The Lua script to execute.
-            keys (Union[str, bytes]): The keys that are used in the script.
-            args (Union[str, bytes]): The arguments for the script.
+            keys (List[Union[str, bytes]]): The keys that are used in the script.
+            args (List[Union[str, bytes]]): The arguments for the script.
 
         Returns:
             TResult: a value that depends on the script that was executed.