Support RedisGraph (#2941)

* Support RedisGraph * Support Graph in Pipelines * modify graph in pipeline * address lgtm alert * fix
redis · Mar 20, 2022 · 10ebde8 · 10ebde8
1 parent 9683a8f
commit 10ebde8
Show file tree

Hide file tree

Showing 43 changed files with 3,602 additions and 66 deletions.
diff --git a/src/main/java/redis/clients/jedis/ClusterPipeline.java b/src/main/java/redis/clients/jedis/ClusterPipeline.java
@@ -44,4 +44,11 @@ protected HostAndPort getNodeKey(CommandArguments args) {
   protected Connection getConnection(HostAndPort nodeKey) {
     return provider.getConnection(nodeKey);
   }
+
+  /**
+   * This method must be called after constructor, if graph commands are going to be used.
+   */
+  public void prepareGraphCommands() {
+    super.prepareGraphCommands(provider);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java b/src/main/java/redis/clients/jedis/MultiNodePipelineBase.java
@@ -17,10 +17,13 @@
 import redis.clients.jedis.commands.PipelineBinaryCommands;
 import redis.clients.jedis.commands.PipelineCommands;
 import redis.clients.jedis.commands.RedisModulePipelineCommands;
+import redis.clients.jedis.graph.GraphCommandObjects;
+import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
 import redis.clients.jedis.params.*;
+import redis.clients.jedis.providers.ConnectionProvider;
 import redis.clients.jedis.resps.*;
 import redis.clients.jedis.search.IndexOptions;
 import redis.clients.jedis.search.Query;
@@ -39,6 +42,7 @@ public abstract class MultiNodePipelineBase implements PipelineCommands, Pipelin
   private volatile boolean synced;
 
   private final CommandObjects commandObjects;
+  private GraphCommandObjects graphCommandObjects;
 
   public MultiNodePipelineBase(CommandObjects commandObjects) {
     pipelinedResponses = new LinkedHashMap<>();
@@ -47,6 +51,13 @@ public MultiNodePipelineBase(CommandObjects commandObjects) {
     this.commandObjects = commandObjects;
   }
 
+  /**
+   * Sub-classes must call this method, if graph commands are going to be used.
+   */
+  protected final void prepareGraphCommands(ConnectionProvider connectionProvider) {
+    this.graphCommandObjects = new GraphCommandObjects(connectionProvider);
+  }
+
   protected abstract HostAndPort getNodeKey(CommandArguments args);
 
   protected abstract Connection getConnection(HostAndPort nodeKey);
@@ -3952,6 +3963,53 @@ public Response<Map<String, Object>> topkInfo(String key) {
   }
   // RedisBloom commands
 
+  // RedisGraph commands
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, long timeout) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, long timeout) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, params));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public Response<String> graphDelete(String name) {
+    return appendCommand(graphCommandObjects.graphDelete(name));
+  }
+  // RedisGraph commands
+
   public Response<Long> waitReplicas(int replicas, long timeout) {
     return appendCommand(commandObjects.waitReplicas(replicas, timeout));
   }

diff --git a/src/main/java/redis/clients/jedis/Pipeline.java b/src/main/java/redis/clients/jedis/Pipeline.java
@@ -18,6 +18,8 @@
 import redis.clients.jedis.commands.ProtocolCommand;
 import redis.clients.jedis.commands.RedisModulePipelineCommands;
 import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.graph.GraphCommandObjects;
+import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
@@ -38,19 +40,22 @@ public class Pipeline extends Queable implements PipelineCommands, PipelineBinar
   protected final Connection connection;
 //  private final Jedis jedis;
   private final CommandObjects commandObjects;
+  private final GraphCommandObjects graphCommandObjects;
 
   public Pipeline(Connection connection) {
 //    super(connection);
     this.connection = connection;
 //    this.jedis = null;
     this.commandObjects = new CommandObjects();
+    this.graphCommandObjects = new GraphCommandObjects(this.connection);
   }
 
   public Pipeline(Jedis jedis) {
 //    super(jedis.getConnection());
     this.connection = jedis.getConnection();
 //    this.jedis = jedis;
     this.commandObjects = new CommandObjects();
+    this.graphCommandObjects = new GraphCommandObjects(this.connection);
   }
 
   public final <T> Response<T> appendCommand(CommandObject<T> commandObject) {
@@ -3960,6 +3965,53 @@ public Response<Map<String, Object>> topkInfo(String key) {
   }
   // RedisBloom commands
 
+  // RedisGraph commands
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, long timeout) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, long timeout) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, params));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public Response<String> graphDelete(String name) {
+    return appendCommand(graphCommandObjects.graphDelete(name));
+  }
+  // RedisGraph commands
+
   public Response<Long> waitReplicas(int replicas, long timeout) {
     return appendCommand(commandObjects.waitReplicas(replicas, timeout));
   }

diff --git a/src/main/java/redis/clients/jedis/ShardedPipeline.java b/src/main/java/redis/clients/jedis/ShardedPipeline.java
@@ -51,4 +51,11 @@ protected HostAndPort getNodeKey(CommandArguments args) {
   protected Connection getConnection(HostAndPort nodeKey) {
     return provider.getConnection(nodeKey);
   }
+
+  /**
+   * This method must be called after constructor, if graph commands are going to be used.
+   */
+  public void prepareGraphCommands() {
+    super.prepareGraphCommands(provider);
+  }
 }
diff --git a/src/main/java/redis/clients/jedis/TransactionBase.java b/src/main/java/redis/clients/jedis/TransactionBase.java
@@ -24,6 +24,8 @@
 import redis.clients.jedis.commands.RedisModulePipelineCommands;
 import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
+import redis.clients.jedis.graph.GraphCommandObjects;
+import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
@@ -43,6 +45,7 @@ public abstract class TransactionBase extends Queable implements PipelineCommand
 
   protected final Connection connection;
   private final CommandObjects commandObjects;
+  private final GraphCommandObjects graphCommandObjects;
 
   private boolean broken = false;
   private boolean inWatch = false;
@@ -58,6 +61,7 @@ public TransactionBase(Connection connection) {
   public TransactionBase(Connection connection, boolean doMulti) {
     this.connection = connection;
     this.commandObjects = new CommandObjects();
+    this.graphCommandObjects = new GraphCommandObjects(this.connection);
     if (doMulti) multi();
   }
 
@@ -4029,6 +4033,53 @@ public Response<Map<String, Object>> topkInfo(String key) {
   }
   // RedisBloom commands
 
+  // RedisGraph commands
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, long timeout) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, long timeout) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, params));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
+  }
+
+  @Override
+  public Response<ResultSet> graphQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return appendCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public Response<ResultSet> graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return appendCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public Response<String> graphDelete(String name) {
+    return appendCommand(graphCommandObjects.graphDelete(name));
+  }
+  // RedisGraph commands
+
   public Response<Long> waitReplicas(int replicas, long timeout) {
     return appendCommand(commandObjects.waitReplicas(replicas, timeout));
   }

diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -21,6 +21,8 @@
 import redis.clients.jedis.commands.SampleKeyedCommands;
 import redis.clients.jedis.commands.RedisModuleCommands;
 import redis.clients.jedis.executors.*;
+import redis.clients.jedis.graph.GraphCommandObjects;
+import redis.clients.jedis.graph.ResultSet;
 import redis.clients.jedis.json.JsonSetParams;
 import redis.clients.jedis.json.Path;
 import redis.clients.jedis.json.Path2;
@@ -45,6 +47,7 @@ public class UnifiedJedis implements JedisCommands, JedisBinaryCommands,
   protected final ConnectionProvider provider;
   protected final CommandExecutor executor;
   private final CommandObjects commandObjects;
+  private final GraphCommandObjects graphCommandObjects = new GraphCommandObjects(this);
 
   public UnifiedJedis() {
     this(new HostAndPort(Protocol.DEFAULT_HOST, Protocol.DEFAULT_PORT));
@@ -4071,6 +4074,53 @@ public Map<String, Object> topkInfo(String key) {
   }
   // RedisBloom commands
 
+  // RedisGraph commands
+  @Override
+  public ResultSet graphQuery(String name, String query) {
+    return executeCommand(graphCommandObjects.graphQuery(name, query));
+  }
+
+  @Override
+  public ResultSet graphReadonlyQuery(String name, String query) {
+    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query));
+  }
+
+  @Override
+  public ResultSet graphQuery(String name, String query, long timeout) {
+    return executeCommand(graphCommandObjects.graphQuery(name, query, timeout));
+  }
+
+  @Override
+  public ResultSet graphReadonlyQuery(String name, String query, long timeout) {
+    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, timeout));
+  }
+
+  @Override
+  public ResultSet graphQuery(String name, String query, Map<String, Object> params) {
+    return executeCommand(graphCommandObjects.graphQuery(name, query, params));
+  }
+
+  @Override
+  public ResultSet graphReadonlyQuery(String name, String query, Map<String, Object> params) {
+    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, params));
+  }
+
+  @Override
+  public ResultSet graphQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return executeCommand(graphCommandObjects.graphQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public ResultSet graphReadonlyQuery(String name, String query, Map<String, Object> params, long timeout) {
+    return executeCommand(graphCommandObjects.graphReadonlyQuery(name, query, params, timeout));
+  }
+
+  @Override
+  public String graphDelete(String name) {
+    return executeCommand(graphCommandObjects.graphDelete(name));
+  }
+  // RedisGraph commands
+
   public Object sendCommand(ProtocolCommand cmd) {
     return executeCommand(commandObjects.commandArguments(cmd));
   }

diff --git a/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java b/src/main/java/redis/clients/jedis/commands/RedisModuleCommands.java
@@ -1,6 +1,7 @@
 package redis.clients.jedis.commands;
 
 import redis.clients.jedis.bloom.RedisBloomCommands;
+import redis.clients.jedis.graph.RedisGraphCommands;
 import redis.clients.jedis.json.RedisJsonCommands;
 import redis.clients.jedis.search.RediSearchCommands;
 import redis.clients.jedis.timeseries.RedisTimeSeriesCommands;
@@ -9,6 +10,7 @@ public interface RedisModuleCommands extends
     RediSearchCommands,
     RedisJsonCommands,
     RedisTimeSeriesCommands,
-    RedisBloomCommands {
+    RedisBloomCommands,
+    RedisGraphCommands {
 
 }
diff --git a/src/main/java/redis/clients/jedis/commands/RedisModulePipelineCommands.java b/src/main/java/redis/clients/jedis/commands/RedisModulePipelineCommands.java
@@ -1,6 +1,7 @@
 package redis.clients.jedis.commands;
 
 import redis.clients.jedis.bloom.RedisBloomPipelineCommands;
+import redis.clients.jedis.graph.RedisGraphPipelineCommands;
 import redis.clients.jedis.json.RedisJsonPipelineCommands;
 import redis.clients.jedis.search.RediSearchPipelineCommands;
 import redis.clients.jedis.timeseries.RedisTimeSeriesPipelineCommands;
@@ -9,6 +10,7 @@ public interface RedisModulePipelineCommands extends
     RediSearchPipelineCommands,
     RedisJsonPipelineCommands,
     RedisTimeSeriesPipelineCommands,
-    RedisBloomPipelineCommands {
+    RedisBloomPipelineCommands,
+    RedisGraphPipelineCommands {
 
 }