Skip to content

Commit 1c13877

Browse files
committed
Remove RediSearch DIALECT 5 support (#3886)
This is partial revert of #3831. Some changes are still available without dialect 5. For example: * Avoid repeating for numeral equality
1 parent 6305343 commit 1c13877

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

src/test/java/redis/clients/jedis/modules/search/SearchTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ public void testQueryParams() {
406406
Query query = new Query("@numval:[$min $max]").addParam("min", 1).addParam("max", 2).dialect(2);
407407
assertEquals(2, client.ftSearch(index, query).getTotalResults());
408408

409-
query = new Query("@numval:[$eq]").addParam("eq", 2).dialect(5);
409+
query = new Query("@numval:[$eq]").addParam("eq", 2).dialect(4);
410410
assertEquals(1, client.ftSearch(index, query).getTotalResults());
411411
}
412412

@@ -533,7 +533,7 @@ public void testJsonWithAlias() {
533533
assertEquals(1, res.getTotalResults());
534534
assertEquals("king:1", res.getDocuments().get(0).getId());
535535

536-
res = client.ftSearch(index, new Query("@num:[42]").dialect(5));
536+
res = client.ftSearch(index, new Query("@num:[42]").dialect(4));
537537
assertEquals(1, res.getTotalResults());
538538
assertEquals("king:1", res.getDocuments().get(0).getId());
539539
}
@@ -777,7 +777,6 @@ public void getTagField() {
777777
assertEquals(1, client.ftSearch(index, new Query("@category:{yellow}")).getTotalResults());
778778
assertEquals(0, client.ftSearch(index, new Query("@category:{purple}")).getTotalResults());
779779
assertEquals(1, client.ftSearch(index, new Query("@category:{orange\\;purple}")).getTotalResults());
780-
assertEquals(1, client.ftSearch(index, new Query("@category:{orange;purple}").dialect(5)).getTotalResults());
781780
assertEquals(4, client.ftSearch(index, new Query("hello")).getTotalResults());
782781

783782
assertEquals(new HashSet<>(Arrays.asList("red", "blue", "green", "yellow", "orange;purple")),
@@ -819,7 +818,6 @@ public void testGetTagFieldWithNonDefaultSeparator() {
819818
assertEquals(1, client.ftSearch(index, new Query("hello @category:{yellow}")).getTotalResults());
820819
assertEquals(0, client.ftSearch(index, new Query("@category:{purple}")).getTotalResults());
821820
assertEquals(1, client.ftSearch(index, new Query("@category:{orange\\,purple}")).getTotalResults());
822-
assertEquals(1, client.ftSearch(index, new Query("@category:{orange,purple}").dialect(5)).getTotalResults());
823821
assertEquals(4, client.ftSearch(index, new Query("hello")).getTotalResults());
824822

825823
assertEquals(new HashSet<>(Arrays.asList("red", "blue", "green", "yellow", "orange,purple")),

src/test/java/redis/clients/jedis/modules/search/SearchWithParamsTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ public void testQueryParams() {
602602
.dialect(2)).getTotalResults());
603603

604604
assertEquals(1, client.ftSearch(index, "@numval:[$eq]",
605-
FTSearchParams.searchParams().addParam("eq", 2).dialect(5)).getTotalResults());
605+
FTSearchParams.searchParams().addParam("eq", 2).dialect(4)).getTotalResults());
606606
}
607607

608608
@Test
@@ -665,7 +665,7 @@ public void testJsonWithAlias() {
665665
assertEquals(1, res.getTotalResults());
666666
assertEquals("king:1", res.getDocuments().get(0).getId());
667667

668-
res = client.ftSearch(index, "@num:[42]", FTSearchParams.searchParams().dialect(5));
668+
res = client.ftSearch(index, "@num:[42]", FTSearchParams.searchParams().dialect(4));
669669
assertEquals(1, res.getTotalResults());
670670
assertEquals("king:1", res.getDocuments().get(0).getId());
671671
}
@@ -871,8 +871,6 @@ public void getTagField() {
871871
assertEquals(1, client.ftSearch(index, "@category:{yellow}").getTotalResults());
872872
assertEquals(0, client.ftSearch(index, "@category:{purple}").getTotalResults());
873873
assertEquals(1, client.ftSearch(index, "@category:{orange\\;purple}").getTotalResults());
874-
assertEquals(1, client.ftSearch(index, "@category:{orange;purple}",
875-
FTSearchParams.searchParams().dialect(5)).getTotalResults());
876874
assertEquals(4, client.ftSearch(index, "hello").getTotalResults());
877875

878876
assertEquals(new HashSet<>(Arrays.asList("red", "blue", "green", "yellow", "orange;purple")),
@@ -912,8 +910,6 @@ public void testGetTagFieldWithNonDefaultSeparator() {
912910
assertEquals(1, client.ftSearch(index, "hello @category:{yellow}").getTotalResults());
913911
assertEquals(0, client.ftSearch(index, "@category:{purple}").getTotalResults());
914912
assertEquals(1, client.ftSearch(index, "@category:{orange\\,purple}").getTotalResults());
915-
assertEquals(1, client.ftSearch(index, "@category:{orange,purple}",
916-
FTSearchParams.searchParams().dialect(5)).getTotalResults());
917913
assertEquals(4, client.ftSearch(index, "hello").getTotalResults());
918914

919915
assertEquals(new HashSet<>(Arrays.asList("red", "blue", "green", "yellow", "orange,purple")),

0 commit comments

Comments
 (0)