FT.SEARCH added

Vibe code the FT.SEARCH command
Pulled latest from the integration branch

Fixed a lot of the hallucinations

RESP2 parser improvements

JSON Indexing tests

Add some advanced use-cases

Fixed all integration tests

Fixed schema fields, added vector tests, but they are all failing

Fixed vector search tests

Improve coverage of integration and unit tests

One unit test fails

Author: tishun

src/main/java/io/lettuce/core/AbstractRedisAsyncCommands.java

@@ -48,8 +48,10 @@
 import io.lettuce.core.protocol.CommandType;
 import io.lettuce.core.protocol.ProtocolKeyword;
 import io.lettuce.core.protocol.RedisCommand;
-import io.lettuce.core.search.Field;
+import io.lettuce.core.search.SearchResults;
 import io.lettuce.core.search.arguments.CreateArgs;
+import io.lettuce.core.search.arguments.FieldArgs;
+import io.lettuce.core.search.arguments.SearchArgs;
 import io.lettuce.core.vector.RawVector;
 import io.lettuce.core.vector.VectorMetadata;
 
@@ -1526,15 +1528,20 @@ public boolean isOpen() {
     }
 
     @Override
-    public RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields) {
-        return dispatch(searchCommandBuilder.ftCreate(index, options, fields));
+    public RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, List<FieldArgs<K>> fieldArgs) {
+        return dispatch(searchCommandBuilder.ftCreate(index, options, fieldArgs));
     }
 
     @Override
     public RedisFuture<String> ftDropindex(K index, boolean deleteDocumentKeys) {
         return dispatch(searchCommandBuilder.ftDropindex(index, deleteDocumentKeys));
     }
 
+    @Override
+    public RedisFuture<SearchResults<K, V>> ftSearch(K index, V query, SearchArgs<K, V> args) {
+        return dispatch(searchCommandBuilder.ftSearch(index, query, args));
+    }
+
     @Override
     public RedisFuture<List<Long>> jsonArrappend(K key, JsonPath jsonPath, JsonValue... values) {
         return dispatch(jsonCommandBuilder.jsonArrappend(key, jsonPath, values));

src/main/java/io/lettuce/core/AbstractRedisReactiveCommands.java

@@ -49,8 +49,10 @@
 import io.lettuce.core.protocol.RedisCommand;
 import io.lettuce.core.protocol.TracedCommand;
 import io.lettuce.core.resource.ClientResources;
-import io.lettuce.core.search.Field;
+import io.lettuce.core.search.SearchResults;
 import io.lettuce.core.search.arguments.CreateArgs;
+import io.lettuce.core.search.arguments.FieldArgs;
+import io.lettuce.core.search.arguments.SearchArgs;
 import io.lettuce.core.tracing.TraceContext;
 import io.lettuce.core.tracing.TraceContextProvider;
 import io.lettuce.core.tracing.Tracing;
@@ -88,13 +90,13 @@
  * @author Tihomir Mateev
  * @since 4.0
  */
-public abstract class AbstractRedisReactiveCommands<K, V> implements RedisAclReactiveCommands<K, V>,
-        RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>, RedisStringReactiveCommands<K, V>,
-        RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>,
-        RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>,
-        BaseRedisReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>,
-        RedisClusterReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>, RedisVectorSetReactiveCommands<K, V>,
-        RediSearchReactiveCommands<K, V>{
+public abstract class AbstractRedisReactiveCommands<K, V>
+        implements RedisAclReactiveCommands<K, V>, RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
+        RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
+        RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
+        RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>,
+        RedisGeoReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>,
+        RedisVectorSetReactiveCommands<K, V>, RediSearchReactiveCommands<K, V> {
 
     private final StatefulConnection<K, V> connection;
 
@@ -1591,15 +1593,20 @@ public boolean isOpen() {
     }
 
     @Override
-    public Mono<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields) {
-        return createMono(() -> searchCommandBuilder.ftCreate(index, options, fields));
+    public Mono<String> ftCreate(K index, CreateArgs<K, V> options, List<FieldArgs<K>> fieldArgs) {
+        return createMono(() -> searchCommandBuilder.ftCreate(index, options, fieldArgs));
     }
 
     @Override
     public Mono<String> ftDropindex(K index, boolean deleteDocumentKeys) {
         return createMono(() -> searchCommandBuilder.ftDropindex(index, deleteDocumentKeys));
     }
 
+    @Override
+    public Mono<SearchResults<K, V>> ftSearch(K index, V query, SearchArgs<K, V> args) {
+        return createMono(() -> searchCommandBuilder.ftSearch(index, query, args));
+    }
+
     @Override
     public Flux<Long> jsonArrappend(K key, JsonPath jsonPath, JsonValue... values) {
         return createDissolvingFlux(() -> jsonCommandBuilder.jsonArrappend(key, jsonPath, values));

src/main/java/io/lettuce/core/RediSearchCommandBuilder.java

@@ -7,14 +7,17 @@
 package io.lettuce.core;
 
 import io.lettuce.core.codec.RedisCodec;
+import io.lettuce.core.output.EncodedComplexOutput;
 import io.lettuce.core.output.StatusOutput;
 import io.lettuce.core.protocol.BaseRedisCommandBuilder;
 import io.lettuce.core.protocol.Command;
 import io.lettuce.core.protocol.CommandArgs;
 import io.lettuce.core.protocol.CommandKeyword;
-import io.lettuce.core.protocol.RedisCommand;
+import io.lettuce.core.search.SearchResults;
+import io.lettuce.core.search.SearchResultsParser;
 import io.lettuce.core.search.arguments.CreateArgs;
-import io.lettuce.core.search.Field;
+import io.lettuce.core.search.arguments.FieldArgs;
+import io.lettuce.core.search.arguments.SearchArgs;
 
 import java.util.List;
 
@@ -25,7 +28,7 @@
  *
  * @param <K> Key type.
  * @param <V> Value type.
- * @since 6.6
+ * @since 6.8
  */
 class RediSearchCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
 
@@ -34,16 +37,16 @@ class RediSearchCommandBuilder<K, V> extends BaseRedisCommandBuilder<K, V> {
     }
 
     /**
-     * Create a new index with the given name, index options and fields.
+     * Create a new index with the given name, index options and fieldArgs.
      *
      * @param index the index name
      * @param createArgs the index options
-     * @param fields the fields
+     * @param fieldArgs the fieldArgs
      * @return the result of the create command
      */
-    public Command<K, V, String> ftCreate(K index, CreateArgs<K, V> createArgs, List<Field<K>> fields) {
+    public Command<K, V, String> ftCreate(K index, CreateArgs<K, V> createArgs, List<FieldArgs<K>> fieldArgs) {
         notNullKey(index);
-        notEmpty(fields.toArray());
+        notEmpty(fieldArgs.toArray());
 
         CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(index);
 
@@ -53,14 +56,36 @@ public Command<K, V, String> ftCreate(K index, CreateArgs<K, V> createArgs, List
 
         args.add(CommandKeyword.SCHEMA);
 
-        for (Field<K> field : fields) {
-            field.build(args);
+        for (FieldArgs<K> arg : fieldArgs) {
+            arg.build(args);
         }
 
         return createCommand(FT_CREATE, new StatusOutput<>(codec), args);
 
     }
 
+    /**
+     * Search the index with the given name using the specified query and search arguments.
+     *
+     * @param index the index name
+     * @param query the query
+     * @param searchArgs the search arguments
+     * @return the result of the search command
+     */
+    public Command<K, V, SearchResults<K, V>> ftSearch(K index, V query, SearchArgs<K, V> searchArgs) {
+        notNullKey(index);
+        notNullKey(query);
+
+        CommandArgs<K, V> args = new CommandArgs<>(codec).addKey(index);
+        args.addValue(query);
+
+        if (searchArgs != null) {
+            searchArgs.build(args);
+        }
+
+        return createCommand(FT_SEARCH, new EncodedComplexOutput<>(codec, new SearchResultsParser<>(codec, searchArgs)), args);
+    }
+
     /**
      * Drop the index with the given name.
      *

src/main/java/io/lettuce/core/api/async/RediSearchAsyncCommands.java

@@ -8,8 +8,10 @@
 
 import java.util.List;
 import io.lettuce.core.RedisFuture;
-import io.lettuce.core.search.Field;
+import io.lettuce.core.search.SearchResults;
 import io.lettuce.core.search.arguments.CreateArgs;
+import io.lettuce.core.search.arguments.FieldArgs;
+import io.lettuce.core.search.arguments.SearchArgs;
 
 /**
  * Asynchronous executed commands for RediSearch functionality
@@ -18,22 +20,23 @@
  * @param <V> Value type.
  * @author Tihomir Mateev
  * @see <a href="https://redis.io/docs/latest/operate/oss_and_stack/stack-with-enterprise/search/">RediSearch</a>
- * @since 6.6
+ * @since 6.8
  * @generated by io.lettuce.apigenerator.CreateAsyncApi
  */
 public interface RediSearchAsyncCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options, and fields.
+     * Create a new index with the given name, creation arguments, and fieldArgs.
      *
      * @param index the index name, as a key
-     * @param options the index {@link CreateArgs}
-     * @param fields the {@link Field}s of the index
+     * @param arguments the index {@link CreateArgs}
+     * @param fieldArgs the {@link FieldArgs}s of the index
      * @return the result of the create command
-     * @since 6.6
+     * @since 6.8
      * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
+     * @see CreateArgs
      */
-    RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
+    RedisFuture<String> ftCreate(K index, CreateArgs<K, V> arguments, List<FieldArgs<K>> fieldArgs);
 
     /**
      * Drop an index.
@@ -47,9 +50,23 @@ public interface RediSearchAsyncCommands<K, V> {
      * @param index the index name, as a key
      * @param deleteDocuments if true, delete the documents as well
      * @return the result of the drop command
-     * @since 6.6
+     * @since 6.8
      * @see <a href="https://redis.io/docs/latest/commands/ft.dropindex/">FT.DROPINDEX</a>
      */
     RedisFuture<String> ftDropindex(K index, boolean deleteDocuments);
 
+    /**
+     * Search the index with a textual query, returning either documents or just identifiers
+     *
+     * @param index the index name, as a key
+     * @param query the query string
+     * @param args the search arguments
+     * @return the result of the search command, see {@link SearchResults}
+     * @since 6.8
+     * @see <a href="https://redis.io/docs/latest/commands/ft.search/">FT.SEARCH</a>
+     * @see SearchResults
+     * @see SearchArgs
+     */
+    RedisFuture<SearchResults<K, V>> ftSearch(K index, V query, SearchArgs<K, V> args);
+
 }

src/main/java/io/lettuce/core/api/async/RedisAsyncCommands.java

@@ -38,7 +38,8 @@ public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>,
         RedisHashAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisListAsyncCommands<K, V>,
         RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
         RedisSortedSetAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>,
-        RedisTransactionalAsyncCommands<K, V>, RedisJsonAsyncCommands<K, V>, RedisVectorSetAsyncCommands<K, V> , RediSearchAsyncCommands<K, V> {
+        RedisTransactionalAsyncCommands<K, V>, RedisJsonAsyncCommands<K, V>, RedisVectorSetAsyncCommands<K, V>,
+        RediSearchAsyncCommands<K, V> {
 
     /**
      * Authenticate to the server.

src/main/java/io/lettuce/core/api/reactive/RediSearchReactiveCommands.java

@@ -7,8 +7,11 @@
 package io.lettuce.core.api.reactive;
 
 import java.util.List;
-import io.lettuce.core.search.Field;
+
+import io.lettuce.core.search.SearchResults;
 import io.lettuce.core.search.arguments.CreateArgs;
+import io.lettuce.core.search.arguments.FieldArgs;
+import io.lettuce.core.search.arguments.SearchArgs;
 import reactor.core.publisher.Mono;
 
 /**
@@ -18,22 +21,23 @@
  * @param <V> Value type.
  * @author Tihomir Mateev
  * @see <a href="https://redis.io/docs/latest/operate/oss_and_stack/stack-with-enterprise/search/">RediSearch</a>
- * @since 6.6
+ * @since 6.8
  * @generated by io.lettuce.apigenerator.CreateReactiveApi
  */
 public interface RediSearchReactiveCommands<K, V> {
 
     /**
-     * Create a new index with the given name, index options, and fields.
+     * Create a new index with the given name, creation arguments, and fieldArgs.
      *
      * @param index the index name, as a key
-     * @param options the index {@link CreateArgs}
-     * @param fields the {@link Field}s of the index
+     * @param arguments the index {@link CreateArgs}
+     * @param fieldArgs the {@link FieldArgs}s of the index
      * @return the result of the create command
-     * @since 6.6
+     * @since 6.8
      * @see <a href="https://redis.io/docs/latest/commands/ft.create/">FT.CREATE</a>
+     * @see CreateArgs
      */
-    Mono<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields);
+    Mono<String> ftCreate(K index, CreateArgs<K, V> arguments, List<FieldArgs<K>> fieldArgs);
 
     /**
      * Drop an index.
@@ -47,9 +51,23 @@ public interface RediSearchReactiveCommands<K, V> {
      * @param index the index name, as a key
      * @param deleteDocuments if true, delete the documents as well
      * @return the result of the drop command
-     * @since 6.6
+     * @since 6.8
      * @see <a href="https://redis.io/docs/latest/commands/ft.dropindex/">FT.DROPINDEX</a>
      */
     Mono<String> ftDropindex(K index, boolean deleteDocuments);
 
+    /**
+     * Search the index with a textual query, returning either documents or just identifiers
+     *
+     * @param index the index name, as a key
+     * @param query the query string
+     * @param args the search arguments
+     * @return the result of the search command, see {@link SearchResults}
+     * @since 6.8
+     * @see <a href="https://redis.io/docs/latest/commands/ft.search/">FT.SEARCH</a>
+     * @see SearchResults
+     * @see SearchArgs
+     */
+    Mono<SearchResults<K, V>> ftSearch(K index, V query, SearchArgs<K, V> args);
+
 }

src/main/java/io/lettuce/core/api/reactive/RedisReactiveCommands.java

@@ -31,13 +31,13 @@
  * @author Mark Paluch
  * @since 5.0
  */
-public interface RedisReactiveCommands<K, V>
-        extends BaseRedisReactiveCommands<K, V>, RedisAclReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>,
-        RedisFunctionReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisHashReactiveCommands<K, V>,
-        RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>, RedisListReactiveCommands<K, V>,
-        RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
-        RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>, RedisStringReactiveCommands<K, V>,
-        RedisTransactionalReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>, RedisVectorSetReactiveCommands<K, V> , RediSearchReactiveCommands<K, V> {
+public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K, V>, RedisAclReactiveCommands<K, V>,
+        RedisClusterReactiveCommands<K, V>, RedisFunctionReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>,
+        RedisHashReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
+        RedisListReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
+        RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>,
+        RedisStringReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>,
+        RedisVectorSetReactiveCommands<K, V>, RediSearchReactiveCommands<K, V> {
 
     /**
      * Authenticate to the server.