Add SCRIPT SHOW command #2171

shohamazon · 2024-08-20T17:03:19Z

TODO:

add default routing to random node
add to is_readonly_cmd

Yury-Fridlyand

Changelog? Transaction?

java/client/src/main/java/glide/api/commands/GenericBaseCommands.java

Yury-Fridlyand · 2024-08-20T17:56:30Z

java/client/src/main/java/glide/api/BaseClient.java

+    @Override
+    public CompletableFuture<String> scriptShow(@NonNull String sha1) {
+        return commandManager.submitNewCommand(
+                ScriptShow, new String[] {sha1}, this::handleStringResponse);


Does it return null if no script found? If yes, use another handler

no it panics

Oh right valkey-io/valkey#617
Should be added to the doc in all clients

Yury-Fridlyand · 2024-08-20T17:57:07Z

java/integTest/src/test/java/glide/SharedCommandTests.java

+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("getClients")
+    public void scriptShow_test(BaseClient client) {
+        assumeTrue(SERVER_VERSION.isGreaterThanOrEqualTo("7.9.0"));


Why 7.9? Use 8.0

its release candidate so it would be changed when they will actually release it #2168

You can put version check 8.0 and tests start run on this version once everything implemented

or make it a constant we just need to update the constant when it's released.

I have already added this before so it wont make any difference now 🙁

node/src/BaseClient.ts

Yury-Fridlyand · 2024-08-20T17:59:24Z

node/src/BaseClient.ts

+     * See {@link https://valkey.io/commands/script-show} for more details.
+     *
+     * @param sha1 - The SHA1 digest of the script.
+     * @param decoder - (Optional) {@link Decoder} type which defines how to handle the response. If not set, the default decoder from the client config will be used.


Suggested change

* @param decoder - (Optional) {@link Decoder} type which defines how to handle the response. If not set, the default decoder from the client config will be used.

* @param decoder - (Optional) {@link Decoder} type which defines how to handle the response.

* If not set, the {@link BaseClientConfiguration.defaultDecoder|default decoder} will be used.

I copied it from another command

We're going to update it in all commands

Actually we decided to use DecoderOption, see #2234

node/tests/SharedTests.ts

python/python/tests/test_async_client.py

shohamazon · 2024-09-09T14:58:16Z

Changelog? Transaction?

will add changelog, we dont have scripts in transaction

acarbonetto · 2024-09-11T18:07:47Z

java/client/src/test/java/glide/api/GlideClientTest.java

@@ -1581,6 +1582,53 @@ public void invokeScript_with_ScriptOptionsGlideString_returns_success() {
        assertEquals(payload, response.get());
    }

+    /*@SneakyThrows


can you throw in a comment to explain why this was removed/commented out?

Enabling this test causes the scan_with_option tests to fail CI. TODO: fix the scan_with_options tests and remove dependency on dynamic libraries

acarbonetto · 2024-09-11T18:26:05Z

java/integTest/src/test/java/glide/SharedCommandTests.java

+    @ParameterizedTest(autoCloseArguments = false)
+    @MethodSource("getClients")
+    public void scriptShow_test(BaseClient client) {
+        assumeTrue(SERVER_VERSION.isGreaterThanOrEqualTo("7.9.0"));


or make it a constant we just need to update the constant when it's released.

acarbonetto · 2024-09-11T18:26:42Z

node/src/BaseClient.ts

+     * ```
+     */
+    public async scriptShow(
+        sha1: GlideString,


nit: is there a reason why we don't pass the Script object and internally we can call script.getHash()?

same as script exists, kill ect...

well... the comment could apply to any of these commands.

I have no idea 🙉

acarbonetto · 2024-09-11T21:02:57Z

java/client/src/test/java/glide/api/GlideClientTest.java

+    public void scriptShow_returns_script_source_glidestring() {
+        // setup
+        GlideString scriptSource = gs("return { KEYS[1], ARGV[1] }");
+        Script script = mock(Script.class);


Remove
Your unit tests are probably failing because of this mock. And script is not needed anywhere.

java/client/src/test/java/glide/api/GlideClientTest.java

Signed-off-by: Shoham Elias <shohame@amazon.com>

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com>

Signed-off-by: Shoham Elias <shohame@amazon.com>

Signed-off-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com>

Signed-off-by: Shoham Elias <shohame@amazon.com>

shohamazon requested a review from a team as a code owner August 20, 2024 17:03

shohamazon added python node java issues and fixes related to the java client labels Aug 20, 2024

Yury-Fridlyand reviewed Aug 20, 2024

View reviewed changes

asafpamzn mentioned this pull request Aug 25, 2024

Valkey 8 support #2033

Closed

7 tasks

shohamazon added the Valkey-8 Support for Valkey-8 features label Sep 9, 2024

shohamazon force-pushed the script-show branch from 89d69ae to f077e21 Compare September 11, 2024 16:18

shohamazon added the Release blocker label Sep 11, 2024

acarbonetto approved these changes Sep 11, 2024

View reviewed changes

acarbonetto reviewed Sep 11, 2024

View reviewed changes

shohamazon commented Sep 12, 2024

View reviewed changes

java/client/src/test/java/glide/api/GlideClientTest.java Outdated Show resolved Hide resolved

shohamazon and others added 5 commits September 12, 2024 07:32

Add SCRIPT SHOW command

b06908e

Signed-off-by: Shoham Elias <shohame@amazon.com>

Apply suggestions from code review

d4cf84a

Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com>

pr comments

5e994a7

Signed-off-by: Shoham Elias <shohame@amazon.com>

core

b667e6c

Signed-off-by: Shoham Elias <shohame@amazon.com>

remove thisssss

cb110a0

Signed-off-by: Shoham Elias <shohame@amazon.com>

shohamazon force-pushed the script-show branch from f5e149b to cb110a0 Compare September 12, 2024 07:32

Update java/client/src/test/java/glide/api/GlideClientTest.java

2176da8

Signed-off-by: Shoham Elias <116083498+shohamazon@users.noreply.github.com>

shohamazon force-pushed the script-show branch from c0cbe05 to 80c2ecd Compare September 12, 2024 08:13

run linter

d1b7c50

Signed-off-by: Shoham Elias <shohame@amazon.com>

shohamazon force-pushed the script-show branch 2 times, most recently from 8929f01 to af8f6ec Compare September 12, 2024 09:20

final

2737476

Signed-off-by: Shoham Elias <shohame@amazon.com>

shohamazon force-pushed the script-show branch from af8f6ec to 2737476 Compare September 12, 2024 09:40

shohamazon merged commit 7d5de72 into valkey-io:main Sep 12, 2024
42 checks passed

shohamazon deleted the script-show branch September 12, 2024 10:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add SCRIPT SHOW command #2171

Add SCRIPT SHOW command #2171

shohamazon commented Aug 20, 2024 •

edited

Loading

Yury-Fridlyand left a comment

Yury-Fridlyand Aug 20, 2024

shohamazon Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

shohamazon Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

acarbonetto Sep 11, 2024

shohamazon Sep 12, 2024

Yury-Fridlyand Aug 20, 2024

shohamazon Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

shohamazon Aug 20, 2024

Yury-Fridlyand Sep 9, 2024

shohamazon commented Sep 9, 2024

acarbonetto Sep 11, 2024

acarbonetto Sep 11, 2024

acarbonetto Sep 11, 2024

acarbonetto Sep 11, 2024

shohamazon Sep 11, 2024

acarbonetto Sep 11, 2024

shohamazon Sep 12, 2024

acarbonetto Sep 11, 2024

	* @param decoder - (Optional) {@link Decoder} type which defines how to handle the response. If not set, the default decoder from the client config will be used.
	* @param decoder - (Optional) {@link Decoder} type which defines how to handle the response.
	* If not set, the {@link BaseClientConfiguration.defaultDecoder\|default decoder} will be used.

Add SCRIPT SHOW command #2171

Add SCRIPT SHOW command #2171

Conversation

shohamazon commented Aug 20, 2024 • edited Loading

Yury-Fridlyand left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shohamazon commented Sep 9, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shohamazon commented Aug 20, 2024 •

edited

Loading