testing redisconf branch

Author: DvirDukhan

.circleci/config.yml

@@ -44,7 +44,7 @@ jobs:
 
       - run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}  
 
-      - run: mvn -s .circleci.settings.xml -DskipTests deploy
+      - run: mvn -s  .circleci.settings.xml -DskipTests deploy -P release
 
 workflows:
   version: 2

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

@@ -95,6 +95,10 @@ public ResultSet query(String graphId, String query, Object ...args) {
             conn.close();
             return new ResultSetImpl(rawResponsw, graphCaches.get(graphId));
         }
+        catch (Exception e){
+//            e.printStackTrace();
+            return new ResultSetImpl(new ArrayList<Object>(), graphCaches.get(graphId));
+        }
     }
 
     /**

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

@@ -31,7 +31,8 @@ public ResultSetImpl(List<Object> rawResponse, GraphCache graphCache) {
 
             header = parseHeader(new ArrayList<>());
             results = new ArrayList<>();
-            statistics = parseStatistics(rawResponse.get(rawResponse.size() - 1));
+            statistics = rawResponse.size()> 0 ? parseStatistics(rawResponse.get(rawResponse.size() - 1)) :
+                    parseStatistics(new ArrayList<Objects>());
 
         } else {
 

src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java

@@ -36,6 +36,8 @@ public void deleteGraph() {
         api.close();
     }
 
+
+
     @Test
     public void testCreateNode() {
         // Create a node    	
@@ -110,7 +112,7 @@ public void testDeleteNodes(){
         Assert.assertNull(deleteResult.getStatistics().getStringValue(Label.PROPERTIES_SET));
         Assert.assertNull(deleteResult.getStatistics().getStringValue(Label.NODES_CREATED));
         Assert.assertNull(deleteResult.getStatistics().getStringValue(Label.RELATIONSHIPS_CREATED));
-        Assert.assertNull(deleteResult.getStatistics().getStringValue(Label.RELATIONSHIPS_DELETED));
+        Assert.assertEquals(1, deleteResult.getStatistics().relationshipsDeleted());
         Assert.assertEquals(1, deleteResult.getStatistics().nodesDeleted());
 
         Assert.assertNotNull(deleteResult.getStatistics().getStringValue(Label.QUERY_INTERNAL_EXECUTION_TIME));
@@ -290,14 +292,24 @@ public void testRecord(){
 
 
     @Test
-    public void testMultiThread(){
+    public void tinyTestMultiThread(){
+        ResultSet resultSet = api.query("social", "CREATE ({name:'roi',age:32})");
+        api.query("social", "MATCH (a:person) RETURN a");
+        for (int i =0; i < 10000; i++){
+            List<ResultSet> resultSets = IntStream.range(0,10).parallel().
+                    mapToObj(j-> api.query("social", "MATCH (a:person) RETURN a")).
+                    collect(Collectors.toList());
 
-        Assert.assertNotNull(api.query("social", "CREATE (:person{name:'roi',age:32})"));
-        Assert.assertNotNull(api.query("social", "CREATE (:person{name:'amit',age:30})"));
-        Assert.assertNotNull(api.query("social", "MATCH (a:person), (b:person) WHERE (a.name = 'roi' AND b.name='amit')  CREATE (a)-[:knows]->(b)"));
+        }
 
+    }
 
-        List<ResultSet> resultSets = IntStream.range(0,16).parallel().
+    @Test
+    public void testMultiThread(){
+
+        Assert.assertNotNull(api.query("social", "CREATE (:person {name:'roi', age:32})-[:knows]->(:person {name:'amit',age:30}) "));
+
+        List<ResultSet> resultSets = IntStream.range(0,10).parallel().
                 mapToObj(i-> api.query("social", "MATCH (a:person)-[r:knows]->(b:person) RETURN a,r, a.age")).
                 collect(Collectors.toList());
 
@@ -360,7 +372,7 @@ public void testMultiThread(){
         Assert.assertNotNull(api.query("social", "CREATE (:worker{lastName:'b'})"));
         Assert.assertNotNull(api.query("social", "MATCH (a:worker), (b:worker) WHERE (a.lastName = 'a' AND b.lastName='b')  CREATE (a)-[:worksWith]->(b)"));
 
-        resultSets = IntStream.range(0,16).parallel().
+        resultSets = IntStream.range(0,10).parallel().
                 mapToObj(i-> api.query("social", "MATCH (a:worker)-[r:worksWith]->(b:worker) RETURN a,r")).
                 collect(Collectors.toList());