Merge pull request #41838 from rubik-cube-man/redis-params

Set the correct length of parameters when constructing the Redis arguments
quarkusio · Jul 20, 2024 · c9d196c · c9d196c
2 parents bb4e226 + 3b7f59b
commit c9d196c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/...ions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/search/QueryArgs.java b/...ions/redis-client/runtime/src/main/java/io/quarkus/redis/datasource/search/QueryArgs.java
@@ -545,7 +545,7 @@ public List<Object> toArgs(Codec encoder) {
 
         if (!params.isEmpty() || !byteArrayParams.isEmpty()) {
             list.add("PARAMS");
-            list.add(Integer.toString(params.size() + byteArrayParams.size()));
+            list.add(Integer.toString((params.size() + byteArrayParams.size()) * 2));
             for (Map.Entry<String, byte[]> entry : byteArrayParams.entrySet()) {
                 list.add(entry.getKey());
                 list.add(entry.getValue());

diff --git a/...ns/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/SearchCommandsTest.java b/...ns/redis-client/runtime/src/test/java/io/quarkus/redis/datasource/SearchCommandsTest.java
@@ -736,6 +736,25 @@ void testTagVals() {
         assertThatThrownBy(() -> search.ftTagVals("idx:movie", "title"));
     }
 
+    @Test
+    void testParams() {
+        setupMovies();
+
+        QueryArgs queryArgs = new QueryArgs().param("GENRE", "Action").dialect(2);
+        var res = search.ftSearch("idx:movie", "@genre:{$GENRE}", queryArgs);
+        assertThat(res.count()).isEqualTo(2);
+        assertThat(res.documents()).allSatisfy(doc -> assertThat(doc.property("genre").asString()).isEqualTo("Action"));
+
+        queryArgs = new QueryArgs().param("LOWEST_RATING", "8").param("HIGHEST_RATING", "9");
+        queryArgs.dialect(2);
+        res = search.ftSearch("idx:movie", "@rating: [$LOWEST_RATING, $HIGHEST_RATING]", queryArgs);
+        assertThat(res.count()).isEqualTo(3);
+        assertThat(res.documents()).allSatisfy(doc -> {
+            assertThat(doc.property("rating").asDouble()).isGreaterThan(8.0);
+            assertThat(doc.property("rating").asDouble()).isLessThan(9.0);
+        });
+    }
+
     @Test
     void testDictAndSpellcheck() {
         search.ftCreate("my-index", new CreateArgs().prefixes("word:").indexedField("word", FieldType.TEXT));
@@ -875,7 +894,7 @@ void testKNearestNeighborsDouble() {
 
         QueryArgs args = new QueryArgs()
                 .sortByAscending("vector_score")
-                .param("DIALECT", "2")
+                .dialect(2)
                 .param("BLOB", queryVector);
         SearchQueryResponse response = ds.search().ftSearch("IDX:double", query, args);
         assertEquals(1, response.count());
@@ -906,7 +925,7 @@ void testKNearestNeighborsFloat() {
         String query = "*=>[ KNN 1 @vector $BLOB AS vector_score ]";
         QueryArgs args = new QueryArgs()
                 .sortByAscending("vector_score")
-                .param("DIALECT", "2")
+                .dialect(2)
                 .param("BLOB", queryVector);
 
         SearchQueryResponse response = ds.search().ftSearch("IDX:float", query, args);