Skip to content

Commit 319e315

Browse files
authored
Revert "Add support for FT.CREATE #2717 (#3150)" (#3160)
This reverts commit 636a503.
1 parent 2086820 commit 319e315

23 files changed

+17
-1764
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
import io.lettuce.core.protocol.CommandType;
4949
import io.lettuce.core.protocol.ProtocolKeyword;
5050
import io.lettuce.core.protocol.RedisCommand;
51-
import io.lettuce.core.search.Field;
52-
import io.lettuce.core.search.arguments.CreateArgs;
5351
import reactor.core.publisher.Mono;
5452

5553
import java.time.Duration;
@@ -81,17 +79,14 @@ public abstract class AbstractRedisAsyncCommands<K, V> implements RedisAclAsyncC
8179
RedisKeyAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>, RedisListAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
8280
RedisSortedSetAsyncCommands<K, V>, RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>,
8381
RedisHLLAsyncCommands<K, V>, BaseRedisAsyncCommands<K, V>, RedisTransactionalAsyncCommands<K, V>,
84-
RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V>, RedisJsonAsyncCommands<K, V>,
85-
RediSearchAsyncCommands<K, V> {
82+
RedisGeoAsyncCommands<K, V>, RedisClusterAsyncCommands<K, V>, RedisJsonAsyncCommands<K, V> {
8683

8784
private final StatefulConnection<K, V> connection;
8885

8986
private final RedisCommandBuilder<K, V> commandBuilder;
9087

9188
private final RedisJsonCommandBuilder<K, V> jsonCommandBuilder;
9289

93-
private final RediSearchCommandBuilder<K, V> searchCommandBuilder;
94-
9590
private final Mono<JsonParser> parser;
9691

9792
/**
@@ -106,7 +101,6 @@ public AbstractRedisAsyncCommands(StatefulConnection<K, V> connection, RedisCode
106101
this.connection = connection;
107102
this.commandBuilder = new RedisCommandBuilder<>(codec);
108103
this.jsonCommandBuilder = new RedisJsonCommandBuilder<>(codec, parser);
109-
this.searchCommandBuilder = new RediSearchCommandBuilder<>(codec);
110104
}
111105

112106
/**
@@ -1484,11 +1478,6 @@ public boolean isOpen() {
14841478
return connection.isOpen();
14851479
}
14861480

1487-
@Override
1488-
public RedisFuture<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields) {
1489-
return dispatch(searchCommandBuilder.ftCreate(index, options, fields));
1490-
}
1491-
14921481
@Override
14931482
public RedisFuture<List<Long>> jsonArrappend(K key, JsonPath jsonPath, JsonValue... values) {
14941483
return dispatch(jsonCommandBuilder.jsonArrappend(key, jsonPath, values));

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
import io.lettuce.core.protocol.RedisCommand;
5050
import io.lettuce.core.protocol.TracedCommand;
5151
import io.lettuce.core.resource.ClientResources;
52-
import io.lettuce.core.search.Field;
53-
import io.lettuce.core.search.arguments.CreateArgs;
5452
import io.lettuce.core.tracing.TraceContext;
5553
import io.lettuce.core.tracing.TraceContextProvider;
5654
import io.lettuce.core.tracing.Tracing;
@@ -86,21 +84,19 @@
8684
* @author Tihomir Mateev
8785
* @since 4.0
8886
*/
89-
public abstract class AbstractRedisReactiveCommands<K, V> implements RedisAclReactiveCommands<K, V>,
90-
RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>, RedisStringReactiveCommands<K, V>,
91-
RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>,
92-
RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>,
93-
BaseRedisReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>,
94-
RedisClusterReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>, RediSearchReactiveCommands<K, V> {
87+
public abstract class AbstractRedisReactiveCommands<K, V>
88+
implements RedisAclReactiveCommands<K, V>, RedisHashReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
89+
RedisStringReactiveCommands<K, V>, RedisListReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
90+
RedisSortedSetReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
91+
RedisHLLReactiveCommands<K, V>, BaseRedisReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>,
92+
RedisGeoReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V> {
9593

9694
private final StatefulConnection<K, V> connection;
9795

9896
private final RedisCommandBuilder<K, V> commandBuilder;
9997

10098
private final RedisJsonCommandBuilder<K, V> jsonCommandBuilder;
10199

102-
private final RediSearchCommandBuilder<K, V> searchCommandBuilder;
103-
104100
private final Mono<JsonParser> parser;
105101

106102
private final ClientResources clientResources;
@@ -121,7 +117,6 @@ public AbstractRedisReactiveCommands(StatefulConnection<K, V> connection, RedisC
121117
this.parser = parser;
122118
this.commandBuilder = new RedisCommandBuilder<>(codec);
123119
this.jsonCommandBuilder = new RedisJsonCommandBuilder<>(codec, parser);
124-
this.searchCommandBuilder = new RediSearchCommandBuilder<>(codec);
125120
this.clientResources = connection.getResources();
126121
this.tracingEnabled = clientResources.tracing().isEnabled();
127122
}
@@ -1548,11 +1543,6 @@ public boolean isOpen() {
15481543
return connection.isOpen();
15491544
}
15501545

1551-
@Override
1552-
public Mono<String> ftCreate(K index, CreateArgs<K, V> options, List<Field<K>> fields) {
1553-
return createMono(() -> searchCommandBuilder.ftCreate(index, options, fields));
1554-
}
1555-
15561546
@Override
15571547
public Flux<Long> jsonArrappend(K key, JsonPath jsonPath, JsonValue... values) {
15581548
return createDissolvingFlux(() -> jsonCommandBuilder.jsonArrappend(key, jsonPath, values));

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

Lines changed: 0 additions & 63 deletions
This file was deleted.

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

Lines changed: 0 additions & 38 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public interface RedisAsyncCommands<K, V> extends BaseRedisAsyncCommands<K, V>,
3737
RedisHashAsyncCommands<K, V>, RedisHLLAsyncCommands<K, V>, RedisKeyAsyncCommands<K, V>, RedisListAsyncCommands<K, V>,
3838
RedisScriptingAsyncCommands<K, V>, RedisServerAsyncCommands<K, V>, RedisSetAsyncCommands<K, V>,
3939
RedisSortedSetAsyncCommands<K, V>, RedisStreamAsyncCommands<K, V>, RedisStringAsyncCommands<K, V>,
40-
RedisTransactionalAsyncCommands<K, V>, RedisJsonAsyncCommands<K, V>, RediSearchAsyncCommands<K, V> {
40+
RedisTransactionalAsyncCommands<K, V>, RedisJsonAsyncCommands<K, V> {
4141

4242
/**
4343
* Authenticate to the server.

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

Lines changed: 0 additions & 38 deletions
This file was deleted.

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@
3131
* @author Mark Paluch
3232
* @since 5.0
3333
*/
34-
public interface RedisReactiveCommands<K, V>
35-
extends BaseRedisReactiveCommands<K, V>, RedisAclReactiveCommands<K, V>, RedisClusterReactiveCommands<K, V>,
36-
RedisFunctionReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>, RedisHashReactiveCommands<K, V>,
37-
RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>, RedisListReactiveCommands<K, V>,
38-
RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>, RedisSetReactiveCommands<K, V>,
39-
RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>, RedisStringReactiveCommands<K, V>,
40-
RedisTransactionalReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V>, RediSearchReactiveCommands<K, V> {
34+
public interface RedisReactiveCommands<K, V> extends BaseRedisReactiveCommands<K, V>, RedisAclReactiveCommands<K, V>,
35+
RedisClusterReactiveCommands<K, V>, RedisFunctionReactiveCommands<K, V>, RedisGeoReactiveCommands<K, V>,
36+
RedisHashReactiveCommands<K, V>, RedisHLLReactiveCommands<K, V>, RedisKeyReactiveCommands<K, V>,
37+
RedisListReactiveCommands<K, V>, RedisScriptingReactiveCommands<K, V>, RedisServerReactiveCommands<K, V>,
38+
RedisSetReactiveCommands<K, V>, RedisSortedSetReactiveCommands<K, V>, RedisStreamReactiveCommands<K, V>,
39+
RedisStringReactiveCommands<K, V>, RedisTransactionalReactiveCommands<K, V>, RedisJsonReactiveCommands<K, V> {
4140

4241
/**
4342
* Authenticate to the server.

src/main/java/io/lettuce/core/api/sync/RediSearchCommands.java

Lines changed: 0 additions & 37 deletions
This file was deleted.

src/main/java/io/lettuce/core/api/sync/RedisCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public interface RedisCommands<K, V> extends BaseRedisCommands<K, V>, RedisAclCo
3636
RedisFunctionCommands<K, V>, RedisGeoCommands<K, V>, RedisHashCommands<K, V>, RedisHLLCommands<K, V>,
3737
RedisKeyCommands<K, V>, RedisListCommands<K, V>, RedisScriptingCommands<K, V>, RedisServerCommands<K, V>,
3838
RedisSetCommands<K, V>, RedisSortedSetCommands<K, V>, RedisStreamCommands<K, V>, RedisStringCommands<K, V>,
39-
RedisTransactionalCommands<K, V>, RedisJsonCommands<K, V>, RediSearchCommands<K, V> {
39+
RedisTransactionalCommands<K, V>, RedisJsonCommands<K, V> {
4040

4141
/**
4242
* Authenticate to the server.

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

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)