Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FT.SEARCH, FT.AGGREGATE, etc commands are round robin mode by default #3375

Merged
merged 2 commits into from
Apr 18, 2023
Merged

FT.SEARCH, FT.AGGREGATE, etc commands are round robin mode by default #3375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf4690
FT.SEARCH, FT.AGGREGATE and related commands are defaulted to round r…
sazzad16 Apr 18, 2023
1f5a084
format
sazzad16 Apr 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 0 additions & 131 deletions src/main/java/redis/clients/jedis/ClusterCommandObjects.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,11 @@
import static redis.clients.jedis.Protocol.Command.SCAN;
import static redis.clients.jedis.Protocol.Keyword.TYPE;

import java.util.List;
import java.util.Map;
import java.util.Set;

import redis.clients.jedis.commands.ProtocolCommand;
import redis.clients.jedis.params.ScanParams;
import redis.clients.jedis.resps.ScanResult;
import redis.clients.jedis.search.IndexOptions;
import redis.clients.jedis.search.Query;
import redis.clients.jedis.search.Schema;
import redis.clients.jedis.search.SearchResult;
import redis.clients.jedis.search.aggr.AggregationBuilder;
import redis.clients.jedis.search.aggr.AggregationResult;
import redis.clients.jedis.util.JedisClusterHashTag;

public class ClusterCommandObjects extends CommandObjects {
Expand Down Expand Up @@ -105,127 +97,4 @@ public final CommandObject<ScanResult<byte[]>> scan(byte[] cursor, ScanParams pa
public final CommandObject<Long> waitReplicas(int replicas, long timeout) {
throw new UnsupportedOperationException(CLUSTER_UNSUPPORTED_MESSAGE);
}

// RediSearch commands
// TODO: Send RediSearch command to random 'master' node or random hashslot.
// boolean searchLite = false;

private <T> CommandObject<T> processSearchCommand(String indexName, CommandObject<T> command) {
// if (searchLite) command.getArguments().processKey(indexName);
command.getArguments().processKey(indexName);
return command;
}

@Override
public final CommandObject<String> ftCreate(String indexName, IndexOptions indexOptions, Schema schema) {
return processSearchCommand(indexName, super.ftCreate(indexName, indexOptions, schema));
}

@Override
public final CommandObject<String> ftAlter(String indexName, Schema schema) {
return processSearchCommand(indexName, super.ftAlter(indexName, schema));
}

@Override
public final CommandObject<SearchResult> ftSearch(String indexName, Query query) {
return processSearchCommand(indexName, super.ftSearch(indexName, query));
}

@Override
public final CommandObject<SearchResult> ftSearch(byte[] indexName, Query query) {
CommandObject<SearchResult> command = super.ftSearch(indexName, query);
// if (searchLite) command.getArguments().processKey(indexName);
command.getArguments().processKey(indexName);
return command;
}

@Override
public CommandObject<String> ftExplain(String indexName, Query query) {
return processSearchCommand(indexName, super.ftExplain(indexName, query));
}

@Override
public CommandObject<List<String>> ftExplainCLI(String indexName, Query query) {
return processSearchCommand(indexName, super.ftExplainCLI(indexName, query));
}

@Override
public CommandObject<AggregationResult> ftAggregate(String indexName, AggregationBuilder aggr) {
return processSearchCommand(indexName, super.ftAggregate(indexName, aggr));
}

@Override
public CommandObject<AggregationResult> ftCursorRead(String indexName, long cursorId, int count) {
return processSearchCommand(indexName, super.ftCursorRead(indexName, cursorId, count));
}

@Override
public CommandObject<String> ftCursorDel(String indexName, long cursorId) {
return processSearchCommand(indexName, super.ftCursorDel(indexName, cursorId));
}

@Override
public CommandObject<String> ftDropIndex(String indexName) {
return processSearchCommand(indexName, super.ftDropIndex(indexName));
}

@Override
public CommandObject<String> ftDropIndexDD(String indexName) {
return processSearchCommand(indexName, super.ftDropIndexDD(indexName));
}

@Override
public CommandObject<String> ftSynUpdate(String indexName, String synonymGroupId, String... terms) {
return processSearchCommand(indexName, super.ftSynUpdate(indexName, synonymGroupId, terms));
}

@Override
public CommandObject<Map<String, List<String>>> ftSynDump(String indexName) {
return processSearchCommand(indexName, super.ftSynDump(indexName));
}

@Override
public CommandObject<Map<String, Object>> ftInfo(String indexName) {
return processSearchCommand(indexName, super.ftInfo(indexName));
}

@Override
public CommandObject<Set<String>> ftTagVals(String indexName, String fieldName) {
return processSearchCommand(indexName, super.ftTagVals(indexName, fieldName));
}

@Override
public CommandObject<String> ftAliasAdd(String aliasName, String indexName) {
// CommandObject<String> command = super.ftAliasAdd(aliasName, indexName);
// if (searchLite) command.getArguments().processKey(aliasName).processKey(indexName);
// return command;
return processSearchCommand(indexName, super.ftAliasAdd(aliasName, indexName));
}

@Override
public CommandObject<String> ftAliasUpdate(String aliasName, String indexName) {
// CommandObject<String> command = super.ftAliasUpdate(aliasName, indexName);
// if (searchLite) command.getArguments().processKey(aliasName).processKey(indexName);
// return command;
return processSearchCommand(indexName, super.ftAliasUpdate(aliasName, indexName));
}

@Override
public CommandObject<String> ftAliasDel(String aliasName) {
// CommandObject<String> command = super.ftAliasDel(aliasName);
// if (searchLite) command.getArguments().processKey(aliasName);
// return command;
return processSearchCommand(aliasName, super.ftAliasDel(aliasName));
}

@Override
public CommandObject<Map<String, String>> ftConfigGet(String indexName, String option) {
return processSearchCommand(indexName, super.ftConfigGet(indexName, option));
}

@Override
public CommandObject<String> ftConfigSet(String indexName, String option, String value) {
return processSearchCommand(indexName, super.ftConfigSet(indexName, option, value));
}
// RediSearch commands
}
Loading