Add a evalReadOnly overload that accepts the script as a String (#…

…2868) * Add a evalReadOnly overload that accepts the script as a String * Fix @SInCE annotation for 7.0
redis · May 31, 2024 · cb9bc8e · cb9bc8e
1 parent 522abfd
commit cb9bc8e
Show file tree

Hide file tree

Showing 11 changed files with 116 additions and 3 deletions.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java b/src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java
@@ -741,6 +741,12 @@ public <T> RedisFuture<T> eval(byte[] script, ScriptOutputType type, K[] keys, V
         return (RedisFuture<T>) dispatch(commandBuilder.eval(script, type, keys, values));
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> RedisFuture<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values) {
+        return evalReadOnly(encodeScript(script), type, keys, values);
+    }
+
     @Override
     public <T> RedisFuture<T> evalReadOnly(byte[] script, ScriptOutputType type, K[] keys, V... values) {
         return (RedisFuture<T>) dispatch(commandBuilder.eval(script, type, true, keys, values));

diff --git a/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java b/src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java
@@ -797,6 +797,12 @@ public <T> Flux<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... val
         return createFlux(() -> commandBuilder.eval(script, type, keys, values));
     }
 
+    @Override
+    @SuppressWarnings("unchecked")
+    public <T> Flux<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values) {
+        return evalReadOnly(encodeScript(script), type, keys, values);
+    }
+
     @Override
     public <T> Flux<T> evalReadOnly(byte[] script, ScriptOutputType type, K[] keys, V... values) {
         return createFlux(() -> commandBuilder.eval(script, type, true, keys, values));

diff --git a/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/api/async/RedisScriptingAsyncCommands.java
@@ -85,6 +85,19 @@ public interface RedisScriptingAsyncCommands<K, V> {
      */
     <T> RedisFuture<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    <T> RedisFuture<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *

diff --git a/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java b/src/main/java/io/lettuce/core/api/reactive/RedisScriptingReactiveCommands.java
@@ -84,6 +84,19 @@ public interface RedisScriptingReactiveCommands<K, V> {
      */
     <T> Flux<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    <T> Flux<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *

diff --git a/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java b/src/main/java/io/lettuce/core/api/sync/RedisScriptingCommands.java
@@ -84,6 +84,19 @@ public interface RedisScriptingCommands<K, V> {
      */
     <T> T eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type output type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    <T> T evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *

diff --git a/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java b/src/main/java/io/lettuce/core/cluster/api/async/NodeSelectionScriptingAsyncCommands.java
@@ -84,6 +84,19 @@ public interface NodeSelectionScriptingAsyncCommands<K, V> {
      */
     <T> AsyncExecutions<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    <T> AsyncExecutions<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *

diff --git a/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java b/src/main/java/io/lettuce/core/cluster/api/sync/NodeSelectionScriptingCommands.java
@@ -84,6 +84,19 @@ public interface NodeSelectionScriptingCommands<K, V> {
      */
     <T> Executions<T> eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    <T> Executions<T> evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *

diff --git a/src/main/kotlin/io/lettuce/core/api/coroutines/RedisScriptingCoroutinesCommands.kt b/src/main/kotlin/io/lettuce/core/api/coroutines/RedisScriptingCoroutinesCommands.kt
@@ -85,6 +85,24 @@ interface RedisScriptingCoroutinesCommands<K : Any, V : Any> {
      */
     suspend fun <T> eval(script: ByteArray, type: ScriptOutputType, keys: Array<K>, vararg values: V): T?
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    suspend fun <T> evalReadOnly(
+        script: String,
+        type: ScriptOutputType,
+        keys: Array<K>,
+        vararg values: V
+    ): T?
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *
@@ -214,4 +232,3 @@ interface RedisScriptingCoroutinesCommands<K : Any, V : Any> {
     suspend fun digest(script: ByteArray): String?
 
 }
-
diff --git a/src/main/kotlin/io/lettuce/core/api/coroutines/RedisScriptingCoroutinesCommandsImpl.kt b/src/main/kotlin/io/lettuce/core/api/coroutines/RedisScriptingCoroutinesCommandsImpl.kt
@@ -51,6 +51,13 @@ internal class RedisScriptingCoroutinesCommandsImpl<K : Any, V : Any>(internal v
 
     override suspend fun <T> eval(script: ByteArray, type: ScriptOutputType, keys: Array<K>, vararg values: V): T? = ops.eval<T>(script, type, keys, *values).awaitFirstOrNull()
 
+    override suspend fun <T> evalReadOnly(
+        script: String,
+        type: ScriptOutputType,
+        keys: Array<K>,
+        vararg values: V
+    ): T? = ops.evalReadOnly<T>(script, type, keys, *values).awaitFirstOrNull()
+
     override suspend fun <T> evalReadOnly(
         script: ByteArray,
         type: ScriptOutputType,
@@ -86,4 +93,3 @@ internal class RedisScriptingCoroutinesCommandsImpl<K : Any, V : Any>(internal v
     override suspend fun digest(script: ByteArray): String = ops.digest(script)
 
 }
-
diff --git a/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java b/src/main/templates/io/lettuce/core/api/RedisScriptingCommands.java
@@ -83,6 +83,19 @@ public interface RedisScriptingCommands<K, V> {
      */
     <T> T eval(byte[] script, ScriptOutputType type, K[] keys, V... values);
 
+    /**
+     * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
+     *
+     * @param script Lua 5.1 script.
+     * @param type the type.
+     * @param keys the keys.
+     * @param values the values.
+     * @param <T> expected return type.
+     * @return script result.
+     * @since 7.0
+     */
+    <T> T evalReadOnly(String script, ScriptOutputType type, K[] keys, V... values);
+
     /**
      * This is a read-only variant of the EVAL command that cannot execute commands that modify data.
      *

diff --git a/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java b/src/test/java/io/lettuce/core/commands/ScriptingCommandIntegrationTests.java
@@ -134,7 +134,7 @@ void evalWithArgs() {
     @EnabledOnCommand("EVAL_RO") // Redis 7.0
     void evalReadOnly() {
         String[] keys = new String[] { "key1" };
-        assertThat((String) redis.evalReadOnly("return KEYS[1]".getBytes(), STATUS, keys, "a")).isEqualTo("key1");
+        assertThat((String) redis.evalReadOnly("return KEYS[1]", STATUS, keys, "a")).isEqualTo("key1");
     }
 
     @Test