Merge pull request #31643 from cescoffier/redis-sorted-set-empty-rang…

…e-bug Fix iterator issue when executing a zrange with score on a missing key
quarkusio · Mar 7, 2023 · 89575ea · 89575ea
2 parents de60978 + 048c4a9
commit 89575ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.../runtime/src/main/java/io/quarkus/redis/runtime/datasource/AbstractSortedSetCommands.java b/.../runtime/src/main/java/io/quarkus/redis/runtime/datasource/AbstractSortedSetCommands.java
@@ -734,6 +734,9 @@ protected String getScoreAsString(double score) {
 
     final List<ScoredValue<V>> decodeAsListOfScoredValues(Response response) {
         List<ScoredValue<V>> list = new ArrayList<>();
+        if (!response.iterator().hasNext()) {
+            return Collections.emptyList();
+        }
         if (response.iterator().next().type() == ResponseType.BULK) {
             // Redis 5
             V current = null;

diff --git a/...redis-client/runtime/src/test/java/io/quarkus/redis/datasource/SortedSetCommandsTest.java b/...redis-client/runtime/src/test/java/io/quarkus/redis/datasource/SortedSetCommandsTest.java
@@ -468,6 +468,12 @@ void zrevrange() {
                 .isEqualTo(List.of(Place.suze, Place.grignan, Place.crussol));
     }
 
+    @Test
+    @RequiresRedis6OrHigher
+    void zrevrangeWithScoreEmpty() {
+        assertThat(ds.sortedSet(String.class).zrangeWithScores("top-products", 0, 2, new ZRangeArgs().rev())).isEmpty();
+    }
+
     @Test
     @RequiresRedis6OrHigher
     void zrevrangeWithScores() {