result set impl is now holding a local ref to redis graph api

Author: DvirDukhan

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

@@ -27,12 +27,6 @@ public class RedisGraphAPI {
     private final List<String> relationshipTypes = new ArrayList<>();
     private final List<String> propertyNames = new ArrayList<>();
 
-    private static final Map<String, RedisGraphAPI> apiMap = new ConcurrentHashMap<>();
-
-
-
-
-    
     private static final CharSequenceTranslator ESCAPE_CHYPER;
     static {
         final Map<CharSequence, CharSequence> escapeJavaMap = new HashMap<>();
@@ -70,9 +64,6 @@ public RedisGraphAPI(String graphId, String host, int port) {
     public RedisGraphAPI(String graphId, Pool<Jedis> jedis) {
         this.graphId = graphId;
         this.client = jedis;
-        apiMap.put(graphId, this);
-
-
     }
 
     /**
@@ -93,7 +84,7 @@ public ResultSet query(String query, Object ...args) {
       }
 
       try (Jedis conn = getConnection()) {
-          return new ResultSetImpl(sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply(), graphId);
+          return new ResultSetImpl(sendCompactCommand(conn, Command.QUERY, graphId, query).getObjectMultiBulkReply(), this);
       }
     }
 
@@ -104,6 +95,10 @@ public ResultSet query(String query, Object ...args) {
      * @return delete running time statistics 
      */
     public String deleteGraph() {
+        //clear local state
+        labels.clear();
+        propertyNames.clear();
+        relationshipTypes.clear();
         try (Jedis conn = getConnection()) {
           return sendCommand(conn, Command.DELETE, graphId).getBulkReply();
 		}
@@ -166,7 +161,6 @@ public ResultSet callProcedure(String procedure  ){
     public ResultSet callProcedure(String procedure, List<String> args  ){
         return callProcedure(procedure, args, new HashMap<>());
 
-
     }
 
 
@@ -250,9 +244,7 @@ private void getProcedureInfo(List<String> list, String procedure){
         while (resultSet.hasNext()){
             Record record = resultSet.next();
             list.add(record.getString(0));
-
         }
-
     }
 
 
@@ -273,15 +265,6 @@ public ResultSet callProcedure(String procedure, List<String> args  , Map<String
             q.append(String.join(",", y));
         }
         return query(q.toString());
-
-
     }
 
-    /**
-     * static function to access an initialized graph api
-     * @return an initialized instance of RedisGraphAPI
-     */
-    public static RedisGraphAPI getInstance(String graphId){
-        return apiMap.get(graphId);
-    }
 }

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

@@ -17,16 +17,16 @@ public class ResultSetImpl implements ResultSet {
     private final List<Record> results = new ArrayList<>();
 
     private int position = 0;
-    private final String graphId;
+    private final RedisGraphAPI redisGraphAPI;
 
     /**
      *
      * @param rawResponse the raw representation of response is at most 3 lists of objects.
      *                    The last list is the statistics list.
-     * @param  graphId, the graph ID
+     * @param  redisGraphAPI, the graph api
      */
-    public ResultSetImpl(List<Object> rawResponse, String graphId){
-        this.graphId = graphId;
+    public ResultSetImpl(List<Object> rawResponse, RedisGraphAPI redisGraphAPI){
+        this.redisGraphAPI = redisGraphAPI;
         if(rawResponse.size() != 3){
 
             parseStatistics(rawResponse.get(rawResponse.size()-1));
@@ -78,7 +78,6 @@ private void parseResult(List<List<Object>> rawResultSet) {
                 Record record = new RecordImpl(header.getSchemaNames(), parsedRow);
                 results.add(record);
 
-
             }
 
         }
@@ -125,7 +124,7 @@ private Node deserializeNode(List<Object> rawNodeData) {
         deserializeGraphEntityId(node, rawNodeData.get(0));
         List<Long> labelsIndices = (List<Long>) rawNodeData.get(1);
         for (long labelIndex : labelsIndices) {
-            String label = RedisGraphAPI.getInstance(graphId).getLabel((int) labelIndex);
+            String label = redisGraphAPI.getLabel((int) labelIndex);
             node.addLabel(label);
         }
         deserializeGraphEntityProperties(node, (List<List<Object>>) rawNodeData.get(2));
@@ -157,7 +156,7 @@ private Edge deserializeEdge(List<Object> rawEdgeData) {
         Edge edge = new Edge();
         deserializeGraphEntityId(edge, rawEdgeData.get(0));
 
-        String relationshipType = RedisGraphAPI.getInstance(graphId).getRelationshipType(((Long) rawEdgeData.get(1)).intValue());
+        String relationshipType = redisGraphAPI.getRelationshipType(((Long) rawEdgeData.get(1)).intValue());
         edge.setRelationshipType(relationshipType);
 
         edge.setSource((int) (long) rawEdgeData.get(2));
@@ -181,7 +180,7 @@ void deserializeGraphEntityProperties(GraphEntity entity, List<List<Object>> raw
 
         for (List<Object> rawProperty : rawProperties) {
             Property property = new Property();
-            property.setName(RedisGraphAPI.getInstance(graphId).getPropertyName( ((Long) rawProperty.get(0)).intValue()));
+            property.setName(redisGraphAPI.getPropertyName( ((Long) rawProperty.get(0)).intValue()));
 
             //trimmed for getting to value using deserializeScalar
             List<Object> propertyScalar = rawProperty.subList(1, rawProperty.size());