Align Search APIs and behaviour with Redis 8.0+

src/main/java/redis/clients/jedis/CommandObjects.java

@@ -48,8 +48,7 @@ protected RedisProtocol getProtocol() {
   }
 
   protected volatile CommandKeyArgumentPreProcessor keyPreProcessor = null;
-  private JedisBroadcastAndRoundRobinConfig broadcastAndRoundRobinConfig = null;
-  private Lock mapperLock = new ReentrantLock(true);    
+  private Lock mapperLock = new ReentrantLock(true);
   private volatile JsonObjectMapper jsonObjectMapper;
   private final AtomicInteger searchDialect = new AtomicInteger(2); // DEFAULT_SEARCH_DIALECT = 2;
 
@@ -58,10 +57,6 @@ void setKeyArgumentPreProcessor(CommandKeyArgumentPreProcessor keyPreProcessor)
     this.keyPreProcessor = keyPreProcessor;
   }
 
-  void setBroadcastAndRoundRobinConfig(JedisBroadcastAndRoundRobinConfig config) {
-    this.broadcastAndRoundRobinConfig = config;
-  }
-
   protected CommandArguments commandArguments(ProtocolCommand command) {
     CommandArguments comArgs = new CommandArguments(command);
     if (keyPreProcessor != null) comArgs.setKeyArgumentPreProcessor(keyPreProcessor);
@@ -2941,7 +2936,7 @@ public final CommandObject<List<Object>> xreadGroup(byte[] groupName, byte[] con
   }
 
   public final CommandObject<List<Map.Entry<byte[], List<StreamEntryBinary>>>> xreadGroupBinary(
-      byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, 
+      byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams,
       Map.Entry<byte[], StreamEntryID>... streams) {
     CommandArguments args = commandArguments(XREADGROUP)
         .add(GROUP).add(groupName).add(consumer)
@@ -2956,7 +2951,7 @@ public final CommandObject<List<Map.Entry<byte[], List<StreamEntryBinary>>>> xre
   }
 
   public final CommandObject<Map<byte[], List<StreamEntryBinary>>> xreadGroupBinaryAsMap(
-      byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams, 
+      byte[] groupName, byte[] consumer, XReadGroupParams xReadGroupParams,
       Map.Entry<byte[], StreamEntryID>... streams) {
     CommandArguments args = commandArguments(XREADGROUP)
         .add(GROUP).add(groupName).add(consumer)
@@ -3445,37 +3440,42 @@ public final CommandObject<Long> hsetObject(String key, Map<String, Object> hash
     return new CommandObject<>(addFlatMapArgs(commandArguments(HSET).key(key), hash), BuilderFactory.LONG);
   }
 
-  private boolean isRoundRobinSearchCommand() {
-    if (broadcastAndRoundRobinConfig == null) {
-      return true;
-    } else if (broadcastAndRoundRobinConfig.getRediSearchModeInCluster() == JedisBroadcastAndRoundRobinConfig.RediSearchMode.LIGHT) {
-      return false;
-    }
-    return true;
+  private boolean isRoundRobinSearchCommand(SearchCommand sc) {
+
+    return !(sc.equals(SearchCommand.SUGGET) || sc.equals(SearchCommand.SUGADD) || sc.equals(
+        SearchCommand.SUGLEN) || sc.equals(SearchCommand.SUGDEL) || sc.equals(
+        SearchCommand.CURSOR));
   }
 
   private CommandArguments checkAndRoundRobinSearchCommand(SearchCommand sc, String idx) {
     CommandArguments ca = commandArguments(sc);
-    if (isRoundRobinSearchCommand()) {
+    if (isRoundRobinSearchCommand(sc)) {
       ca.add(idx);
     } else {
       ca.key(idx);
     }
     return ca;
   }
 
-  private CommandArguments checkAndRoundRobinSearchCommand(SearchCommand sc, String idx1, String idx2) {
+  private CommandArguments checkAndRoundRobinSearchCommand(SearchCommand sc, String idx1,
+      String idx2) {
     CommandArguments ca = commandArguments(sc);
-    if (isRoundRobinSearchCommand()) {
+    if (isRoundRobinSearchCommand(sc)) {
       ca.add(idx1).add(idx2);
     } else {
       ca.key(idx1).key(idx2);
     }
     return ca;
   }
 
-  private CommandArguments checkAndRoundRobinSearchCommand(CommandArguments commandArguments, byte[] indexName) {
-    return isRoundRobinSearchCommand() ? commandArguments.add(indexName) : commandArguments.key(indexName);
+  private CommandArguments checkAndRoundRobinSearchCommand(SearchCommand sc, byte[] indexName) {
+    CommandArguments ca = commandArguments(sc);
+    if (isRoundRobinSearchCommand(sc)) {
+      ca.add(indexName);
+    } else {
+      ca.key(indexName);
+    }
+    return ca;
   }
 
   private <T> CommandObject<T> directSearchCommand(CommandObject<T> object, String indexName) {
@@ -3556,7 +3556,7 @@ public final CommandObject<SearchResult> ftSearch(byte[] indexName, Query query)
     if (protocol == RedisProtocol.RESP3) {
       throw new UnsupportedOperationException("binary ft.search is not implemented with resp3.");
     }
-    return new CommandObject<>(checkAndRoundRobinSearchCommand(commandArguments(SearchCommand.SEARCH), indexName)
+    return new CommandObject<>(checkAndRoundRobinSearchCommand(SearchCommand.SEARCH, indexName)
         .addParams(query.dialectOptional(searchDialect.get())), getSearchResultBuilder(null,
         () -> new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), false)));
   }