Skip to content

Commit cbab71c

Browse files
sazzad16sazzad16
authored
Remove Graph module support (#4073)
1 parent cd9346a commit cbab71c

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
-4168
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
@@ -19,7 +19,6 @@
1919
import redis.clients.jedis.bloom.*;
2020
import redis.clients.jedis.bloom.RedisBloomProtocol.*;
2121
import redis.clients.jedis.commands.ProtocolCommand;
22-
import redis.clients.jedis.graph.GraphProtocol.*;
2322
import redis.clients.jedis.json.*;
2423
import redis.clients.jedis.json.JsonProtocol.JsonCommand;
2524
import redis.clients.jedis.json.DefaultGsonObjectMapper;
@@ -4382,38 +4381,6 @@ public final CommandObject<List<Double>> tdigestByRevRank(String key, long... ra
43824381
}
43834382
// RedisBloom commands
43844383

4385-
// RedisGraph commands
4386-
@Deprecated
4387-
public final CommandObject<List<String>> graphList() {
4388-
return new CommandObject<>(commandArguments(GraphCommand.LIST), BuilderFactory.STRING_LIST);
4389-
}
4390-
4391-
@Deprecated
4392-
public final CommandObject<List<String>> graphProfile(String graphName, String query) {
4393-
return new CommandObject<>(commandArguments(GraphCommand.PROFILE).key(graphName).add(query), BuilderFactory.STRING_LIST);
4394-
}
4395-
4396-
@Deprecated
4397-
public final CommandObject<List<String>> graphExplain(String graphName, String query) {
4398-
return new CommandObject<>(commandArguments(GraphCommand.EXPLAIN).key(graphName).add(query), BuilderFactory.STRING_LIST);
4399-
}
4400-
4401-
@Deprecated
4402-
public final CommandObject<List<List<Object>>> graphSlowlog(String graphName) {
4403-
return new CommandObject<>(commandArguments(GraphCommand.SLOWLOG).key(graphName), BuilderFactory.ENCODED_OBJECT_LIST_LIST);
4404-
}
4405-
4406-
@Deprecated
4407-
public final CommandObject<String> graphConfigSet(String configName, Object value) {
4408-
return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.SET).add(configName).add(value), BuilderFactory.STRING);
4409-
}
4410-
4411-
@Deprecated
4412-
public final CommandObject<Map<String, Object>> graphConfigGet(String configName) {
4413-
return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.GET).add(configName), BuilderFactory.ENCODED_OBJECT_MAP);
4414-
}
4415-
// RedisGraph commands
4416-
44174384
// Transaction commands
44184385
public final CommandObject<String> watch(String... keys) {
44194386
return new CommandObject<>(commandArguments(WATCH).keys((Object[]) keys), BuilderFactory.STRING);

‎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
@@ -25,8 +25,6 @@
2525
import redis.clients.jedis.csc.CacheFactory;
2626
import redis.clients.jedis.exceptions.JedisException;
2727
import redis.clients.jedis.executors.*;
28-
import redis.clients.jedis.graph.GraphCommandObjects;
29-
import redis.clients.jedis.graph.ResultSet;
3028
import redis.clients.jedis.json.JsonSetParams;
3129
import redis.clients.jedis.json.Path;
3230
import redis.clients.jedis.json.Path2;
@@ -56,7 +54,6 @@ public class UnifiedJedis implements JedisCommands, JedisBinaryCommands,
5654
protected final ConnectionProvider provider;
5755
protected final CommandExecutor executor;
5856
protected final CommandObjects commandObjects;
59-
private final GraphCommandObjects graphCommandObjects;
6057
private JedisBroadcastAndRoundRobinConfig broadcastAndRoundRobinConfig = null;
6158
private final Cache cache;
6259

@@ -164,7 +161,6 @@ public UnifiedJedis(Connection connection) {
164161
if (proto != null) {
165162
this.commandObjects.setProtocol(proto);
166163
}
167-
this.graphCommandObjects = new GraphCommandObjects(this);
168164
if (connection instanceof CacheConnection) {
169165
this.cache = ((CacheConnection) connection).getCache();
170166
} else {
@@ -297,8 +293,6 @@ private UnifiedJedis(CommandExecutor executor, ConnectionProvider provider, Comm
297293
this.commandObjects.setProtocol(protocol);
298294
}
299295

300-
this.graphCommandObjects = new GraphCommandObjects(this);
301-
this.graphCommandObjects.setBaseCommandArgumentsCreator((comm) -> this.commandObjects.commandArguments(comm));
302296
this.cache = cache;
303297
}
304298

@@ -4962,98 +4956,6 @@ public List<Double> tdigestByRevRank(String key, long... ranks) {
49624956
}
49634957
// RedisBloom commands
49644958

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

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package redis.clients.jedis.commands;
22

33
import redis.clients.jedis.bloom.commands.RedisBloomCommands;
4-
import redis.clients.jedis.graph.RedisGraphCommands;
54
import redis.clients.jedis.json.commands.RedisJsonCommands;
65
import redis.clients.jedis.search.RediSearchCommands;
76
import redis.clients.jedis.timeseries.RedisTimeSeriesCommands;
@@ -10,7 +9,6 @@ public interface RedisModuleCommands extends
109
RediSearchCommands,
1110
RedisJsonCommands,
1211
RedisTimeSeriesCommands,
13-
RedisBloomCommands,
14-
RedisGraphCommands {
12+
RedisBloomCommands {
1513

1614
}

0 commit comments

Comments
 (0)