changed pull request comments

Author: DvirDukhan

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

@@ -157,12 +157,10 @@ private BinaryClient sendCommand(Jedis conn, ProtocolCommand provider, String ..
      * @return
      */
     private BinaryClient sendCompactCommand(Jedis conn, ProtocolCommand provider, String ...args) {
-        BinaryClient binaryClient = conn.getClient();
         String[] t = new String[args.length +1];
         System.arraycopy(args, 0 , t, 0, args.length);
         t[args.length]="--COMPACT";
-        binaryClient.sendCommand(provider, t);
-        return binaryClient;
+        return sendCommand(conn, provider, t);
     }
 
     private Jedis getConnection() {
@@ -175,18 +173,18 @@ private Jedis getConnection() {
      * @param graphId a graph to perform the query on
      * @param procedure - procedure to execute
      * @param args - procedure arguments
-     * @param kwargs
+     * @param kwargs - procedure output arguments
      * @return
      */
     public ResultSet callProcedure(String graphId, String procedure, List<String> args  , Map<String, List<String>> kwargs ){
 
         args = args.stream().map( s -> Utils.quoteString(s)).collect(Collectors.toList());
-        StringBuilder q =  new StringBuilder();
-        q.append(String.format("CALL %s(%s)", procedure, String.join(",", args)));
-        List<String> y = kwargs.getOrDefault("y", null);
-        if(y != null){
-            q.append(String.join(",", y));
+        StringBuilder queryString =  new StringBuilder();
+        queryString.append(String.format("CALL %s(%s)", procedure, String.join(",", args)));
+        List<String> kwargsList = kwargs.getOrDefault("y", null);
+        if(kwargsList != null){
+            queryString.append(String.join(",", kwargsList));
         }
-        return query(graphId, q.toString());
+        return query(graphId, queryString.toString());
     }
 }

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

@@ -8,9 +8,9 @@
  */
 public class GraphCache {
 
-    GraphCacheList labels;
-    GraphCacheList propertyNames;
-    GraphCacheList relationshipTypes;
+    private final GraphCacheList labels;
+    private final GraphCacheList propertyNames;
+    private final GraphCacheList relationshipTypes;
 
     /**
      *

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

@@ -5,19 +5,22 @@
 import com.redislabs.redisgraph.ResultSet;
 
 import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * Represents a local cache of list of strings. Holds data from a specific procedure, for a specific graph.
  */
-public class GraphCacheList extends ArrayList<String> {
+public class GraphCacheList {
 
-    private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
-    private final ReentrantReadWriteLock.ReadLock readLock = lock.readLock();
-    private final ReentrantReadWriteLock.WriteLock writeLock = lock.writeLock();
+    private Object mutex = new Object();
     private final String graphId;
     private final String procedure;
     private final RedisGraph redisGraph;
+    List<String>  data = new CopyOnWriteArrayList<>();
+
+
 
     /**
      *
@@ -38,17 +41,14 @@ public GraphCacheList(String graphId, String procedure, RedisGraph redisGraph) {
      * @return The string value of the specific procedure response, at the given index.
      */
     public String getCachedData(int index) {
-        if (index >= this.size()) {
-            writeLock.lock();
-            //check again
-            if (index >= this.size()) {
-                getProcedureInfo();
+        if (index >= data.size()) {
+            synchronized (mutex){
+                if (index >= data.size()) {
+                    getProcedureInfo();
+                }
             }
-            writeLock.unlock();
         }
-        readLock.lock();
-        String s = this.get(index);
-        readLock.unlock();
+        String s = data.get(index);
         return s;
 
     }
@@ -58,10 +58,15 @@ public String getCachedData(int index) {
      */
     private void getProcedureInfo() {
         ResultSet resultSet = redisGraph.callProcedure(graphId, procedure);
-        this.clear();
+        List<String> newData = new ArrayList<>();
+        int i = data.size();
         while (resultSet.hasNext()) {
             Record record = resultSet.next();
-            this.add(record.getString(0));
+            if(i >= data.size()){
+                newData.add(record.getString(0));
+            }
+            i++;
         }
+        data.addAll(newData);
     }
 }

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

@@ -29,10 +29,6 @@ public class StatisticsImpl implements Statistics  {
 	}
 
 
-	public List<byte[]> getRaw() {
-		return raw;
-	}
-
 	/**
 	 *
 	 * @param label the requested statistic label as key
@@ -138,13 +134,13 @@ public boolean equals(Object o) {
 		if (this == o) return true;
 		if (!(o instanceof StatisticsImpl)) return false;
 		StatisticsImpl that = (StatisticsImpl) o;
-		return Objects.equals(getRaw(), that.getRaw()) &&
+		return Objects.equals(raw, raw) &&
 				Objects.equals(getStatistics(), that.getStatistics());
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(getRaw(), getStatistics());
+		return Objects.hash(raw, getStatistics());
 	}
 
 	@Override