Skip to content

Commit b1dae57

Browse files
sazzad16sazzad16
committed
Remove Graph module support
1 parent a46700a commit b1dae57

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4
-4181
lines changed

‎src/main/java/redis/clients/jedis/ClusterPipeline.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ private static ClusterCommandObjects createClusterCommandObjects(RedisProtocol p
4646
return cco;
4747
}
4848

49-
/**
50-
* This method must be called after constructor, if graph commands are going to be used.
51-
*/
52-
public void prepareGraphCommands() {
53-
super.prepareGraphCommands(provider);
54-
}
55-
5649
@Override
5750
public void close() {
5851
try {

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

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import redis.clients.jedis.gears.*;
2323
import redis.clients.jedis.gears.RedisGearsProtocol.*;
2424
import redis.clients.jedis.gears.resps.GearsLibraryInfo;
25-
import redis.clients.jedis.graph.GraphProtocol.*;
2625
import redis.clients.jedis.json.*;
2726
import redis.clients.jedis.json.JsonProtocol.JsonCommand;
2827
import redis.clients.jedis.json.DefaultGsonObjectMapper;
@@ -4385,38 +4384,6 @@ public final CommandObject<List<Double>> tdigestByRevRank(String key, long... ra
43854384
}
43864385
// RedisBloom commands
43874386

4388-
// RedisGraph commands
4389-
@Deprecated
4390-
public final CommandObject<List<String>> graphList() {
4391-
return new CommandObject<>(commandArguments(GraphCommand.LIST), BuilderFactory.STRING_LIST);
4392-
}
4393-
4394-
@Deprecated
4395-
public final CommandObject<List<String>> graphProfile(String graphName, String query) {
4396-
return new CommandObject<>(commandArguments(GraphCommand.PROFILE).key(graphName).add(query), BuilderFactory.STRING_LIST);
4397-
}
4398-
4399-
@Deprecated
4400-
public final CommandObject<List<String>> graphExplain(String graphName, String query) {
4401-
return new CommandObject<>(commandArguments(GraphCommand.EXPLAIN).key(graphName).add(query), BuilderFactory.STRING_LIST);
4402-
}
4403-
4404-
@Deprecated
4405-
public final CommandObject<List<List<Object>>> graphSlowlog(String graphName) {
4406-
return new CommandObject<>(commandArguments(GraphCommand.SLOWLOG).key(graphName), BuilderFactory.ENCODED_OBJECT_LIST_LIST);
4407-
}
4408-
4409-
@Deprecated
4410-
public final CommandObject<String> graphConfigSet(String configName, Object value) {
4411-
return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.SET).add(configName).add(value), BuilderFactory.STRING);
4412-
}
4413-
4414-
@Deprecated
4415-
public final CommandObject<Map<String, Object>> graphConfigGet(String configName) {
4416-
return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.GET).add(configName), BuilderFactory.ENCODED_OBJECT_MAP);
4417-
}
4418-
// RedisGraph commands
4419-
44204387
// RedisGears commands
44214388
@Deprecated
44224389
public final CommandObject<String> tFunctionLoad(String libraryCode, TFunctionLoadParams params) {

‎src/main/java/redis/clients/jedis/MultiNodePipelineBase.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import org.slf4j.LoggerFactory;
1515

1616
import redis.clients.jedis.exceptions.JedisConnectionException;
17-
import redis.clients.jedis.graph.GraphCommandObjects;
18-
import redis.clients.jedis.providers.ConnectionProvider;
1917
import redis.clients.jedis.util.IOUtils;
2018

2119
public abstract class MultiNodePipelineBase extends PipelineBase {
@@ -39,16 +37,6 @@ public MultiNodePipelineBase(CommandObjects commandObjects) {
3937
connections = new LinkedHashMap<>();
4038
}
4139

42-
/**
43-
* Sub-classes must call this method, if graph commands are going to be used.
44-
* @param connectionProvider connection provider
45-
*/
46-
protected final void prepareGraphCommands(ConnectionProvider connectionProvider) {
47-
GraphCommandObjects graphCommandObjects = new GraphCommandObjects(connectionProvider);
48-
graphCommandObjects.setBaseCommandArgumentsCreator((comm) -> this.commandObjects.commandArguments(comm));
49-
super.setGraphCommands(graphCommandObjects);
50-
}
51-
5240
protected abstract HostAndPort getNodeKey(CommandArguments args);
5341

5442
protected abstract Connection getConnection(HostAndPort nodeKey);

‎src/main/java/redis/clients/jedis/Pipeline.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import redis.clients.jedis.commands.DatabasePipelineCommands;
1010
import redis.clients.jedis.exceptions.JedisDataException;
11-
import redis.clients.jedis.graph.GraphCommandObjects;
1211
import redis.clients.jedis.params.*;
1312
import redis.clients.jedis.util.IOUtils;
1413
import redis.clients.jedis.util.KeyValue;
@@ -43,9 +42,6 @@ private static CommandObjects createCommandObjects(Connection connection) {
4342
super(commandObjects);
4443
this.connection = connection;
4544
this.closeConnection = closeConnection;
46-
GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this.connection);
47-
graphCommandObjects.setBaseCommandArgumentsCreator(protocolCommand -> commandObjects.commandArguments(protocolCommand));
48-
setGraphCommands(graphCommandObjects);
4945
}
5046

5147
@Override

‎src/main/java/redis/clients/jedis/PipeliningBase.java‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
import redis.clients.jedis.commands.PipelineCommands;
1212
import redis.clients.jedis.commands.ProtocolCommand;
1313
import redis.clients.jedis.commands.RedisModulePipelineCommands;
14-
import redis.clients.jedis.graph.GraphCommandObjects;
15-
import redis.clients.jedis.graph.ResultSet;
1614
import redis.clients.jedis.json.JsonSetParams;
1715
import redis.clients.jedis.json.Path;
1816
import redis.clients.jedis.json.Path2;
@@ -30,19 +28,11 @@ public abstract class PipeliningBase
3028
implements PipelineCommands, PipelineBinaryCommands, RedisModulePipelineCommands {
3129

3230
protected final CommandObjects commandObjects;
33-
private GraphCommandObjects graphCommandObjects;
3431

3532
protected PipeliningBase(CommandObjects commandObjects) {
3633
this.commandObjects = commandObjects;
3734
}
3835

39-
/**
40-
* Sub-classes must call this method, if graph commands are going to be used.
41-
*/
42-
protected final void setGraphCommands(GraphCommandObjects graphCommandObjects) {
43-
this.graphCommandObjects = graphCommandObjects;
44-
}
45-
4636
protected abstract <T> Response<T> appendCommand(CommandObject<T> commandObject);
4737

4838
@Override
@@ -4370,58 +4360,6 @@ public Response<List<Double>> tdigestByRevRank(String key, long... ranks) {
43704360
}
43714361
// RedisBloom commands
43724362

4373-
// RedisGraph commands
4374-
@Override
4375-
public Response<ResultSet> graphQuery(String name, String query) {
4376-
return appendCommand(graphCommandObjects.graphQuery(name, query));
4377-
}
4378-
4379-
@Override
4380-
public Response<ResultSet> graphReadonlyQuery(String name, String query) {
4381-
return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query));
4382-
}
4383-
4384-
@Override
4385-
public Response<ResultSet> graphQuery(String name, String query, long timeout) {
4386-
return appendCommand(graphCommandObjects.graphQuery(name, query, timeout));
4387-
}
4388-
4389-
@Override
4390-
public Response<ResultSet> graphReadonlyQuery(String name, String query, long timeout) {
4391-
return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
4392-
}
4393-
4394-
@Override
4395-
public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params) {
4396-
return appendCommand(graphCommandObjects.graphQuery(name, query, params));
4397-
}
4398-
4399-
@Override
4400-
public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params) {
4401-
return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
4402-
}
4403-
4404-
@Override
4405-
public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params, long timeout) {
4406-
return appendCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
4407-
}
4408-
4409-
@Override
4410-
public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
4411-
return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
4412-
}
4413-
4414-
@Override
4415-
public Response<String> graphDelete(String name) {
4416-
return appendCommand(graphCommandObjects.graphDelete(name));
4417-
}
4418-
4419-
@Override
4420-
public Response<List<String>> graphProfile(String graphName, String query) {
4421-
return appendCommand(commandObjects.graphProfile(graphName, query));
4422-
}
4423-
// RedisGraph commands
4424-
44254363
public Response<Object> sendCommand(ProtocolCommand cmd, String... args) {
44264364
return sendCommand(new CommandArguments(cmd).addObjects((Object[]) args));
44274365
}

‎src/main/java/redis/clients/jedis/ReliableTransaction.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import redis.clients.jedis.exceptions.JedisConnectionException;
1414
import redis.clients.jedis.exceptions.JedisDataException;
1515
import redis.clients.jedis.exceptions.JedisException;
16-
import redis.clients.jedis.graph.GraphCommandObjects;
1716

1817
/**
1918
* A transaction where commands are immediately sent to Redis server and the {@code QUEUED} reply checked.
@@ -82,9 +81,6 @@ public ReliableTransaction(Connection connection, boolean doMulti, boolean close
8281
super(commandObjects);
8382
this.connection = connection;
8483
this.closeConnection = closeConnection;
85-
GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this.connection);
86-
graphCommandObjects.setBaseCommandArgumentsCreator(protocolCommand -> commandObjects.commandArguments(protocolCommand));
87-
setGraphCommands(graphCommandObjects);
8884
if (doMulti) multi();
8985
}
9086

‎src/main/java/redis/clients/jedis/ShardedPipeline.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,4 @@ protected HostAndPort getNodeKey(CommandArguments args) {
5757
protected Connection getConnection(HostAndPort nodeKey) {
5858
return provider.getConnection(nodeKey);
5959
}
60-
61-
/**
62-
* This method must be called after constructor, if graph commands are going to be used.
63-
*/
64-
public void prepareGraphCommands() {
65-
super.prepareGraphCommands(provider);
66-
}
6760
}

‎src/main/java/redis/clients/jedis/Transaction.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
import redis.clients.jedis.exceptions.JedisConnectionException;
1414
import redis.clients.jedis.exceptions.JedisDataException;
15-
import redis.clients.jedis.graph.GraphCommandObjects;
1615

1716
/**
1817
* A transaction based on <a href="https://redis.io/docs/manual/pipelining/">pipelining</a>.
@@ -90,9 +89,6 @@ public Transaction(Connection connection, boolean doMulti, boolean closeConnecti
9089
super(commandObjects);
9190
this.connection = connection;
9291
this.closeConnection = closeConnection;
93-
GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this.connection);
94-
graphCommandObjects.setBaseCommandArgumentsCreator(protocolCommand -> commandObjects.commandArguments(protocolCommand));
95-
setGraphCommands(graphCommandObjects);
9692
if (doMulti) multi();
9793
}
9894

‎src/main/java/redis/clients/jedis/UnifiedJedis.java‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@
2828
import redis.clients.jedis.gears.TFunctionListParams;
2929
import redis.clients.jedis.gears.TFunctionLoadParams;
3030
import redis.clients.jedis.gears.resps.GearsLibraryInfo;
31-
import redis.clients.jedis.graph.GraphCommandObjects;
32-
import redis.clients.jedis.graph.ResultSet;
3331
import redis.clients.jedis.json.JsonSetParams;
3432
import redis.clients.jedis.json.Path;
3533
import redis.clients.jedis.json.Path2;
@@ -59,7 +57,6 @@ public class UnifiedJedis implements JedisCommands, JedisBinaryCommands,
5957
protected final ConnectionProvider provider;
6058
protected final CommandExecutor executor;
6159
protected final CommandObjects commandObjects;
62-
private final GraphCommandObjects graphCommandObjects;
6360
private JedisBroadcastAndRoundRobinConfig broadcastAndRoundRobinConfig = null;
6461
private final Cache cache;
6562

@@ -167,7 +164,6 @@ public UnifiedJedis(Connection connection) {
167164
if (proto != null) {
168165
this.commandObjects.setProtocol(proto);
169166
}
170-
this.graphCommandObjects = new GraphCommandObjects(this);
171167
if (connection instanceof CacheConnection) {
172168
this.cache = ((CacheConnection) connection).getCache();
173169
} else {
@@ -300,8 +296,6 @@ private UnifiedJedis(CommandExecutor executor, ConnectionProvider provider, Comm
300296
this.commandObjects.setProtocol(protocol);
301297
}
302298

303-
this.graphCommandObjects = new GraphCommandObjects(this);
304-
this.graphCommandObjects.setBaseCommandArgumentsCreator((comm) -> this.commandObjects.commandArguments(comm));
305299
this.cache = cache;
306300
}
307301

@@ -4965,98 +4959,6 @@ public List<Double> tdigestByRevRank(String key, long... ranks) {
49654959
}
49664960
// RedisBloom commands
49674961

4968-
// RedisGraph commands
4969-
@Override
4970-
@Deprecated
4971-
public ResultSet graphQuery(String name, String query) {
4972-
return executeCommand(graphCommandObjects.graphQuery(name, query));
4973-
}
4974-
4975-
@Override
4976-
@Deprecated
4977-
public ResultSet graphReadonlyQuery(String name, String query) {
4978-
return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query));
4979-
}
4980-
4981-
@Override
4982-
@Deprecated
4983-
public ResultSet graphQuery(String name, String query, long timeout) {
4984-
return executeCommand(graphCommandObjects.graphQuery(name, query, timeout));
4985-
}
4986-
4987-
@Override
4988-
@Deprecated
4989-
public ResultSet graphReadonlyQuery(String name, String query, long timeout) {
4990-
return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
4991-
}
4992-
4993-
@Override
4994-
@Deprecated
4995-
public ResultSet graphQuery(String name, String query, Map<String, Object> params) {
4996-
return executeCommand(graphCommandObjects.graphQuery(name, query, params));
4997-
}
4998-
4999-
@Override
5000-
@Deprecated
5001-
public ResultSet graphReadonlyQuery(String name, String query, Map<String, Object> params) {
5002-
return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
5003-
}
5004-
5005-
@Override
5006-
@Deprecated
5007-
public ResultSet graphQuery(String name, String query, Map<String, Object> params, long timeout) {
5008-
return executeCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
5009-
}
5010-
5011-
@Override
5012-
@Deprecated
5013-
public ResultSet graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
5014-
return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
5015-
}
5016-
5017-
@Override
5018-
@Deprecated
5019-
public String graphDelete(String name) {
5020-
return executeCommand(graphCommandObjects.graphDelete(name));
5021-
}
5022-
5023-
@Override
5024-
@Deprecated
5025-
public List<String> graphList() {
5026-
return executeCommand(commandObjects.graphList());
5027-
}
5028-
5029-
@Override
5030-
@Deprecated
5031-
public List<String> graphProfile(String graphName, String query) {
5032-
return executeCommand(commandObjects.graphProfile(graphName, query));
5033-
}
5034-
5035-
@Override
5036-
@Deprecated
5037-
public List<String> graphExplain(String graphName, String query) {
5038-
return executeCommand(commandObjects.graphExplain(graphName, query));
5039-
}
5040-
5041-
@Override
5042-
@Deprecated
5043-
public List<List<Object>> graphSlowlog(String graphName) {
5044-
return executeCommand(commandObjects.graphSlowlog(graphName));
5045-
}
5046-
5047-
@Override
5048-
@Deprecated
5049-
public String graphConfigSet(String configName, Object value) {
5050-
return executeCommand(commandObjects.graphConfigSet(configName, value));
5051-
}
5052-
5053-
@Override
5054-
@Deprecated
5055-
public Map<String, Object> graphConfigGet(String configName) {
5056-
return executeCommand(commandObjects.graphConfigGet(configName));
5057-
}
5058-
// RedisGraph commands
5059-
50604962
// RedisGears commands
50614963
@Deprecated
50624964
@Override

‎src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import redis.clients.jedis.bloom.commands.RedisBloomCommands;
44
import redis.clients.jedis.gears.RedisGearsCommands;
5-
import redis.clients.jedis.graph.RedisGraphCommands;
65
import redis.clients.jedis.json.commands.RedisJsonCommands;
76
import redis.clients.jedis.search.RediSearchCommands;
87
import redis.clients.jedis.timeseries.RedisTimeSeriesCommands;
@@ -12,7 +11,6 @@ public interface RedisModuleCommands extends
1211
RedisJsonCommands,
1312
RedisTimeSeriesCommands,
1413
RedisBloomCommands,
15-
RedisGraphCommands,
1614
RedisGearsCommands {
1715

1816
}

0 commit comments

Comments
 (0)