Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN #2174

shohamazon · 2024-08-20T19:18:38Z

No description provided.

Yury-Fridlyand · 2024-08-20T23:41:52Z

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

+     *     at even indices and the value is at odd indices. If options.noValues is set to <code>true
+     *     </code>, the second element will only contain the fields without the values.


Suggested change

* at even indices and the value is at odd indices. If options.noValues is set to <code>true

* </code>, the second element will only contain the fields without the values.

* at even indices and the value is at odd indices. If <code>options.noValues</code> is set to <code>true</code>, the second element will only contain the fields without the values.

and rerun spotless

using andrews suggestion

Yury-Fridlyand · 2024-08-20T23:42:01Z

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

@@ -732,7 +733,8 @@ public interface HashBaseCommands {
     *     </code> returned on the last iteration of the result. The second element is always an
     *     <code>Array</code> of the subset of the hash held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the key is
-     *     at even indices and the value is at odd indices.
+     *     at even indices and the value is at odd indices. If options.noValues is set to <code>true


Yury-Fridlyand · 2024-08-20T23:42:04Z

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

@@ -2790,7 +2790,8 @@ CompletableFuture<Map<GlideString, Double>> zinterWithScores(
     *     <code>
     *     Array</code> of the subset of the sorted set held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the value
-     *     is at even indices and the score is at odd indices.
+     *     is at even indices and the score is at odd indices. If options.noScores is to <code>true


Yury-Fridlyand · 2024-08-20T23:42:07Z

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

@@ -2827,7 +2828,8 @@ CompletableFuture<Map<GlideString, Double>> zinterWithScores(
     *     <code>
     *     Array</code> of the subset of the sorted set held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the value
-     *     is at even indices and the score is at odd indices.
+     *     is at even indices and the score is at odd indices. If options.noScores is to <code>true


Yury-Fridlyand · 2024-08-20T23:42:14Z

java/client/src/main/java/glide/api/models/BaseTransaction.java

@@ -7052,7 +7052,9 @@ public <ArgType> T zscan(@NonNull ArgType key, @NonNull ArgType cursor) {
     *     the <code>cursor</code> returned on the last iteration of the sorted set. The second
     *     element is always an <code>Array</code> of the subset of the sorted set held in <code>key
     *     </code>. The array in the second element is always a flattened series of <code>String
-     *     </code> pairs, where the value is at even indices and the score is at odd indices.
+     *     </code> pairs, where the value is at even indices and the score is at odd indices. If
+     *     options.noScores is to <code>true</code>, the second element will only contain the members


Yury-Fridlyand · 2024-08-20T23:55:36Z

node/tests/TestUtilities.ts

@@ -729,6 +729,24 @@ export async function transactionTest(
    responseData.push(["hset(key4, { [field]: value })", 1]);
    baseTransaction.hscan(key4, "0");
    responseData.push(['hscan(key4, "0")', ["0", [field, value]]]);
+
+    if (gte(version, "7.9.0")) {


Suggested change

if (gte(version, "7.9.0")) {

if (gte(version, "8.0.0")) {

Yury-Fridlyand · 2024-08-20T23:55:43Z

node/tests/TestUtilities.ts

@@ -972,6 +990,25 @@ export async function transactionTest(
    responseData.push(["zadd(key12, { one: 1, two: 2 })", 2]);
    baseTransaction.zscan(key12, "0");
    responseData.push(['zscan(key12, "0")', ["0", ["one", "1", "two", "2"]]]);
+
+    if (gte(version, "7.9.0")) {


Suggested change

if (gte(version, "7.9.0")) {

if (gte(version, "8.0.0")) {

Yury-Fridlyand · 2024-08-20T23:56:53Z

python/python/tests/test_async_client.py

@@ -10020,6 +10020,16 @@ async def test_zscan(self, glide_client: GlideClusterClient):
        assert result[result_cursor_index] != b"0"
        assert len(result[result_collection_index]) >= 0

+        # Test no_scores option
+        if not await check_if_server_version_lt(glide_client, "7.9.0"):


Suggested change

if not await check_if_server_version_lt(glide_client, "7.9.0"):

if not await check_if_server_version_lt(glide_client, "8.0.0"):

Same here - need to find a way to make this check pass with RC

Yury-Fridlyand · 2024-08-20T23:56:58Z

python/python/tests/test_async_client.py

@@ -10137,6 +10147,16 @@ async def test_hscan(self, glide_client: GlideClusterClient):
        assert result[result_cursor_index] != b"0"
        assert len(result[result_collection_index]) >= 0

+        # Test no_values option
+        if not await check_if_server_version_lt(glide_client, "7.9.0"):


Yury-Fridlyand · 2024-08-20T23:57:05Z

python/python/tests/test_transaction.py

@@ -306,6 +306,9 @@ async def transaction_test(
    args.append([b"0", [key3.encode(), b"10.5"]])
    transaction.hscan(key4, "0", match="*", count=10)
    args.append([b"0", [key3.encode(), b"10.5"]])
+    if not await check_if_server_version_lt(glide_client, "7.9.0"):


acarbonetto · 2024-08-20T23:49:14Z

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

@@ -696,7 +696,8 @@ public interface HashBaseCommands {
     *     </code> returned on the last iteration of the result. The second element is always an
     *     <code>Array</code> of the subset of the hash held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the key is


Suggested change

* second element is always a flattened series of <code>String</code> pairs, where the key is

* second element is a flattened series of <code>String</code> pairs, where the key is

acarbonetto · 2024-08-20T23:49:33Z

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

@@ -732,7 +733,8 @@ public interface HashBaseCommands {
     *     </code> returned on the last iteration of the result. The second element is always an
     *     <code>Array</code> of the subset of the hash held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the key is


Suggested change

* second element is always a flattened series of <code>String</code> pairs, where the key is

* second element is a flattened series of <code>String</code> pairs, where the key is

acarbonetto · 2024-08-20T23:54:46Z

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

@@ -696,7 +696,8 @@ public interface HashBaseCommands {
     *     </code> returned on the last iteration of the result. The second element is always an
     *     <code>Array</code> of the subset of the hash held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the key is
-     *     at even indices and the value is at odd indices.
+     *     at even indices and the value is at odd indices. If options.noValues is set to <code>true


You will need to add import glide.api.models.commands.scan.HScanOptions.HScanOptionsBuilder;

Suggested change

* at even indices and the value is at odd indices. If options.noValues is set to <code>true

* at even indices and the value is at odd indices. If {@link HScanOptionsBuilder#noValues} is set to <code>true

acarbonetto · 2024-08-20T23:55:16Z

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

@@ -732,7 +733,8 @@ public interface HashBaseCommands {
     *     </code> returned on the last iteration of the result. The second element is always an
     *     <code>Array</code> of the subset of the hash held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the key is
-     *     at even indices and the value is at odd indices.
+     *     at even indices and the value is at odd indices. If options.noValues is set to <code>true


You will need to add import glide.api.models.commands.scan.HScanOptions.HScanOptionsBuilder;

Suggested change

* at even indices and the value is at odd indices. If options.noValues is set to <code>true

* at even indices and the value is at odd indices. If {@link HScanOptionsBuilder#noValues} is set to <code>true

acarbonetto · 2024-08-20T23:57:42Z

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

@@ -2790,7 +2790,8 @@ CompletableFuture<Map<GlideString, Double>> zinterWithScores(
     *     <code>
     *     Array</code> of the subset of the sorted set held in <code>key</code>. The array in the
     *     second element is always a flattened series of <code>String</code> pairs, where the value
-     *     is at even indices and the score is at odd indices.
+     *     is at even indices and the score is at odd indices. If options.noScores is to <code>true


You will need to add import glide.api.models.commands.scan.ZScanOptions.ZScanOptionsBuilder;

Suggested change

* is at even indices and the score is at odd indices. If options.noScores is to <code>true

* is at even indices and the score is at odd indices. If {@link ZScanOptionsBuilder#noScores} is to <code>true

acarbonetto · 2024-08-21T00:03:56Z

node/src/Transaction.ts

     * Command Response - An `Array` of the `cursor` and the subset of the sorted set held by `key`.
     *      The first element is always the `cursor` for the next iteration of results. `0` will be the `cursor`
     *      returned on the last iteration of the sorted set. The second element is always an `Array` of the subset
     *      of the sorted set held in `key`. The `Array` in the second element is always a flattened series of
     *      `String` pairs, where the value is at even indices and the score is at odd indices.
+     *      If options.noScores is to `true`, the second element will only contain the members without scores.


Suggested change

* If options.noScores is to `true`, the second element will only contain the members without scores.

* If `options.noScores` is to `true`, the second element will only contain the members without scores.

acarbonetto · 2024-08-21T00:04:26Z

python/python/glide/async_commands/core.py

-                `String` pairs, where the value is at even indices and the score is at odd indices.
+            The first element is always the `cursor` for the next iteration of results. `0` will be the `cursor`
+            returned on the last iteration of the sorted set. The second element is always an `Array` of the subset
+            of the sorted set held in `key`. The `Array` in the second element is always a flattened series of


Suggested change

of the sorted set held in `key`. The `Array` in the second element is always a flattened series of

of the sorted set held in `key`. The `Array` in the second element is a flattened series of

acarbonetto · 2024-08-21T00:04:35Z

python/python/glide/async_commands/core.py

@@ -6196,13 +6219,15 @@ async def hscan(
            count (Optional[int]): `COUNT` is a just a hint for the command for how many elements to fetch from the hash.
                `COUNT` could be ignored until the hash is large enough for the `SCAN` commands to represent the results
                as compact single-allocation packed encoding.
+            no_values (bool): If `True`, the command will not return values the fields in the hash. Since Valkey "8.0.0".

        Returns:
            List[Union[bytes, List[bytes]]]: An `Array` of the `cursor` and the subset of the hash held by `key`.
                The first element is always the `cursor` for the next iteration of results. `0` will be the `cursor`
                returned on the last iteration of the hash. The second element is always an `Array` of the subset of the
                hash held in `key`. The `Array` in the second element is always a flattened series of `String` pairs,


Suggested change

hash held in `key`. The `Array` in the second element is always a flattened series of `String` pairs,

hash held in `key`. The `Array` in the second element is a flattened series of `String` pairs,

acarbonetto · 2024-08-21T00:04:52Z

python/python/glide/async_commands/transaction.py

-                `String` pairs, where the value is at even indices and the score is at odd indices.
+            The first element is always the `cursor` for the next iteration of results. `0` will be the `cursor`
+            returned on the last iteration of the sorted set. The second element is always an `Array` of the subset
+            of the sorted set held in `key`. The `Array` in the second element is always a flattened series of


Suggested change

of the sorted set held in `key`. The `Array` in the second element is always a flattened series of

of the sorted set held in `key`. The `Array` in the second element is a flattened series of

acarbonetto · 2024-08-21T00:05:00Z

python/python/glide/async_commands/transaction.py

                subset of the hash then there could be a case where the result is empty although there are items that
                match the pattern specified. This is due to the default `COUNT` being `10` which indicates that it will
                only fetch and match `10` items from the list.
            count (Optional[int]): `COUNT` is a just a hint for the command for how many elements to fetch from the hash.
                `COUNT` could be ignored until the hash is large enough for the `SCAN` commands to represent the results
                as compact single-allocation packed encoding.
+            no_values (bool): If `True`, the command will not return values the fields in the hash. Since Valkey "8.0.0".

        Returns:
            List[Union[bytes, List[bytes]]]: An `Array` of the `cursor` and the subset of the hash held by `key`.
                The first element is always the `cursor` for the next iteration of results. `0` will be the `cursor`
                returned on the last iteration of the hash. The second element is always an `Array` of the subset of the
                hash held in `key`. The `Array` in the second element is always a flattened series of `String` pairs,


Suggested change

hash held in `key`. The `Array` in the second element is always a flattened series of `String` pairs,

hash held in `key`. The `Array` in the second element is a flattened series of `String` pairs,

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

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

shohamazon requested a review from a team as a code owner August 20, 2024 19:18

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

acarbonetto approved these changes Aug 21, 2024

View reviewed changes

asafpamzn mentioned this pull request Aug 25, 2024

Valkey 8 support #2033

Closed

7 tasks

shohamazon added 2 commits September 5, 2024 09:47

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN

e9bd841

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

fix test

b1cdc0b

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

shohamazon force-pushed the scan-8 branch 3 times, most recently from fdefbc4 to ed814f3 Compare September 5, 2024 11:28

pr comments

d66f394

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

shohamazon force-pushed the scan-8 branch from ed814f3 to d66f394 Compare September 5, 2024 13:53

shohamazon merged commit b2c0575 into valkey-io:main Sep 5, 2024
23 checks passed

shohamazon deleted the scan-8 branch September 5, 2024 14:15

prateek-kumar-improving pushed a commit to Bit-Quill/valkey-glide that referenced this pull request Sep 5, 2024

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN (valkey-io#2174)

900bb4d

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

janhavigupta007 pushed a commit to janhavigupta007/glide-for-redis that referenced this pull request Sep 11, 2024

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN (valkey-io#2174)

d0cced4

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN #2174

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN #2174

shohamazon commented Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

shohamazon Sep 5, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

Yury-Fridlyand Aug 20, 2024

acarbonetto Aug 20, 2024

acarbonetto Aug 20, 2024

acarbonetto Aug 20, 2024

acarbonetto Aug 20, 2024

acarbonetto Aug 20, 2024

acarbonetto Aug 21, 2024

acarbonetto Aug 21, 2024

acarbonetto Aug 21, 2024

acarbonetto Aug 21, 2024

acarbonetto Aug 21, 2024

		* at even indices and the value is at odd indices. If options.noValues is set to <code>true
		* </code>, the second element will only contain the fields without the values.

	if not await check_if_server_version_lt(glide_client, "7.9.0"):
	if not await check_if_server_version_lt(glide_client, "8.0.0"):

	* second element is always a flattened series of <code>String</code> pairs, where the key is
	* second element is a flattened series of <code>String</code> pairs, where the key is

	* is at even indices and the score is at odd indices. If options.noScores is to <code>true
	* is at even indices and the score is at odd indices. If {@link ZScanOptionsBuilder#noScores} is to <code>true

	* If options.noScores is to `true`, the second element will only contain the members without scores.
	* If `options.noScores` is to `true`, the second element will only contain the members without scores.

	of the sorted set held in `key`. The `Array` in the second element is always a flattened series of
	of the sorted set held in `key`. The `Array` in the second element is a flattened series of

	hash held in `key`. The `Array` in the second element is always a flattened series of `String` pairs,
	hash held in `key`. The `Array` in the second element is a flattened series of `String` pairs,

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN #2174

Add NOSCORES option to ZSCAN & NOVALUES option to HSCAN #2174

Conversation

shohamazon commented Aug 20, 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

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