fixed according to PR. changed connection to context connection even in general queries

Author: DvirDukhan

pom.xml

@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>3.1.0-m4</version>
+			<version>3.1.0-rc</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.apache.commons</groupId>

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
-Manifest-Version: 1.0
-Main-Class: com.redislabs.redisgraph.RedisGraphAPI
-
+Manifest-Version: 1.0
+Main-Class: com.redislabs.redisgraph.RedisGraph
+

src/main/java/com/redislabs/redisgraph/graph_entities/GraphEntity.java

@@ -16,8 +16,8 @@ public abstract class GraphEntity {
 
     //members
 
-    int id;
-    final Map<String, Property> propertyMap = new HashMap<>();
+    protected int id;
+    protected final Map<String, Property> propertyMap = new HashMap<>();
 
 
     //setters & getters

src/main/java/com/redislabs/redisgraph/impl/Utils.java

@@ -17,6 +17,7 @@
 public class Utils {
     public static final List<String> dummyList = new ArrayList<>(0);
     public static final Map<String, List<String>> dummyMap = new HashMap<>(0);
+    public static final String compactString = "--COMPACT";
 
 
 
@@ -77,10 +78,23 @@ public static String prepareQuery(String query, Object ...args){
     public static String prepareProcedure(String procedure, List<String> args  , Map<String, List<String>> kwargs){
         args = args.stream().map( s -> Utils.quoteString(s)).collect(Collectors.toList());
         StringBuilder queryStringBuilder =  new StringBuilder();
-        queryStringBuilder.append(String.format("CALL %s(%s)", procedure, String.join(",", args)));
+        queryStringBuilder.append("CALL ").append(procedure).append("(");
+        int i = 0;
+        for (; i < args.size() - 1; i++) {
+            queryStringBuilder.append(args.get(i)).append(",");
+        }
+        if (i == args.size()-1) {
+            queryStringBuilder.append(args.get(i));
+        }
+        queryStringBuilder.append(")");
         List<String> kwargsList = kwargs.getOrDefault("y", null);
         if(kwargsList != null){
-            queryStringBuilder.append(String.join(",", kwargsList));
+            i = 0;
+            for (; i < kwargsList.size() - 1; i++) {
+                queryStringBuilder.append(kwargsList.get(i)).append(",");
+
+            }
+            queryStringBuilder.append(kwargsList.get(i));
         }
         return queryStringBuilder.toString();
     }

src/main/java/com/redislabs/redisgraph/impl/api/ContextedRedisGraph.java

@@ -2,6 +2,7 @@
 
 import com.redislabs.redisgraph.RedisGraphContexted;
 import com.redislabs.redisgraph.ResultSet;
+import com.redislabs.redisgraph.impl.Utils;
 import com.redislabs.redisgraph.impl.graph_cache.RedisGraphCaches;
 import com.redislabs.redisgraph.impl.resultset.ResultSetImpl;
 import redis.clients.jedis.Client;
@@ -45,7 +46,14 @@ protected Jedis getConnection() {
     @Override
     protected ResultSet sendQuery(String graphId, String preparedQuery) {
         Jedis conn = getConnection();
-        List<Object> rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, "--COMPACT");
+        List<Object> rawResponse;
+        try {
+            rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, Utils.compactString);
+        }
+        catch (Exception e) {
+            conn.close();
+            throw e;
+        }
         return new ResultSetImpl(rawResponse, this, graphId, caches.getGraphCache(graphId));
     }
 
@@ -98,7 +106,15 @@ public String unwatch() {
      */
     @Override
     public String deleteGraph(String graphId) {
-        Object response = getConnection().sendCommand(RedisGraphCommand.DELETE, graphId);
+        Jedis conn = getConnection();
+        Object response;
+        try {
+            response = conn.sendCommand(RedisGraphCommand.DELETE, graphId);
+        }
+        catch (Exception e) {
+            conn.close();
+            throw e;
+        }
         //clear local state
         caches.removeGraphCache(graphId);
         return SafeEncoder.encode((byte[]) response);

src/main/java/com/redislabs/redisgraph/impl/api/RedisGraph.java

@@ -3,6 +3,7 @@
 import com.redislabs.redisgraph.RedisGraphContexted;
 import com.redislabs.redisgraph.RedisGraphGeneralContext;
 import com.redislabs.redisgraph.ResultSet;
+import com.redislabs.redisgraph.impl.Utils;
 import com.redislabs.redisgraph.impl.graph_cache.RedisGraphCaches;
 import com.redislabs.redisgraph.impl.resultset.ResultSetImpl;
 import redis.clients.jedis.Jedis;
@@ -68,11 +69,10 @@ protected Jedis getConnection() {
      */
     @Override
     protected ResultSet sendQuery(String graphId, String preparedQuery){
-        List<Object> rawResponse;
-        try(Jedis conn = getConnection()){
-            rawResponse = (List<Object>) conn.sendCommand(RedisGraphCommand.QUERY, graphId, preparedQuery, "--COMPACT");
+        try (ContextedRedisGraph contextedRedisGraph = new ContextedRedisGraph(getConnection())) {
+            contextedRedisGraph.setRedisGraphCaches(caches);
+            return contextedRedisGraph.sendQuery(graphId, preparedQuery);
         }
-        return new ResultSetImpl(rawResponse, this, graphId, caches.getGraphCache(graphId));
     }
 
 

src/main/java/com/redislabs/redisgraph/impl/graph_cache/GraphCacheList.java

@@ -14,13 +14,10 @@
  */
 class GraphCacheList {
 
-    private final Object mutex = new Object();
     private final String graphId;
     private final String procedure;
     private final List<String>  data = new CopyOnWriteArrayList<>();
 
-
-
     /**
      *
      * @param graphId - graph id
@@ -39,7 +36,7 @@ public GraphCacheList(String graphId, String procedure) {
      */
     public String getCachedData(int index, RedisGraph redisGraph) {
         if (index >= data.size()) {
-            synchronized (mutex){
+            synchronized (data){
                 if (index >= data.size()) {
                     getProcedureInfo(redisGraph);
                 }