Merge pull request #102 from RedisGraph/map_support

swilly22 · web-flow · commit 7a7ccd8b6531 · 2021-01-23T23:36:12.000+02:00
map support
diff --git a/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java b/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetImpl.java
@@ -11,18 +11,14 @@
 import redis.clients.jedis.util.SafeEncoder;
 import redis.clients.jedis.exceptions.JedisDataException;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Objects;
+import java.util.*;
 
 public class ResultSetImpl implements ResultSet {
-    
+
 
     private final Header header;
     private final Statistics statistics;
-    private final List<Record> results ;
+    private final List<Record> results;
 
     private int position = 0;
     private final RedisGraph redisGraph;
@@ -31,15 +27,15 @@ public class ResultSetImpl implements ResultSet {
     /**
      * @param rawResponse the raw representation of response is at most 3 lists of objects.
      *                    The last list is the statistics list.
-     * @param redisGraph the graph connection
-     * @param cache the graph local cache
+     * @param redisGraph  the graph connection
+     * @param cache       the graph local cache
      */
     public ResultSetImpl(List<Object> rawResponse, RedisGraph redisGraph, GraphCache cache) {
         this.redisGraph = redisGraph;
         this.cache = cache;
 
         // If a run-time error occurred, the last member of the rawResponse will be a JedisDataException.
-        if (rawResponse.get(rawResponse.size()-1) instanceof JedisDataException) {
+        if (rawResponse.get(rawResponse.size() - 1) instanceof JedisDataException) {
 
             throw new JRedisGraphRunTimeException((Throwable) rawResponse.get(rawResponse.size() - 1));
         }
@@ -48,8 +44,8 @@ public ResultSetImpl(List<Object> rawResponse, RedisGraph redisGraph, GraphCache
 
             header = parseHeader(new ArrayList<>());
             results = new ArrayList<>();
-            statistics = rawResponse.isEmpty() ? parseStatistics(new ArrayList<Objects>()) : 
-              parseStatistics(rawResponse.get(rawResponse.size() - 1)) ; 
+            statistics = rawResponse.isEmpty() ? parseStatistics(new ArrayList<Objects>()) :
+                    parseStatistics(rawResponse.get(rawResponse.size() - 1));
 
         } else {
 
@@ -61,7 +57,6 @@ public ResultSetImpl(List<Object> rawResponse, RedisGraph redisGraph, GraphCache
 
 
     /**
-     *
      * @param rawResultSet - raw result set representation
      * @return parsed result set
      */
@@ -88,10 +83,10 @@ private List<Record> parseResult(List<List<Object>> rawResultSet) {
                         case COLUMN_RELATION:
                             parsedRow.add(deserializeEdge(obj));
                             break;
-                        case COLUMN_SCALAR: 
+                        case COLUMN_SCALAR:
                             parsedRow.add(deserializeScalar(obj));
                             break;
-                        default: 
+                        default:
                             parsedRow.add(null);
                             break;
                     }
@@ -106,7 +101,6 @@ private List<Record> parseResult(List<List<Object>> rawResultSet) {
     }
 
     /**
-     *
      * @param rawStatistics raw statistics representation
      * @return parsed statistics
      */
@@ -116,7 +110,6 @@ private StatisticsImpl parseStatistics(Object rawStatistics) {
 
 
     /**
-     *
      * @param rawHeader - raw header representation
      * @return parsed header
      */
@@ -180,11 +173,11 @@ private Edge deserializeEdge(List<Object> rawEdgeData) {
         deserializeGraphEntityId(edge, rawEdgeData.get(0));
 
         String relationshipType = cache.getRelationshipType(((Long) rawEdgeData.get(1)).intValue(),
-                                                                        redisGraph);
+                redisGraph);
         edge.setRelationshipType(relationshipType);
 
-        edge.setSource( (long) rawEdgeData.get(2));
-        edge.setDestination( (long) rawEdgeData.get(3));
+        edge.setSource((long) rawEdgeData.get(2));
+        edge.setDestination((long) rawEdgeData.get(3));
 
         deserializeGraphEntityProperties(edge, (List<List<Object>>) rawEdgeData.get(4));
 
@@ -205,7 +198,7 @@ private void deserializeGraphEntityProperties(GraphEntity entity, List<List<Obje
         for (List<Object> rawProperty : rawProperties) {
             Property<Object> property = new Property<>();
             property.setName(cache.getPropertyName(((Long) rawProperty.get(0)).intValue(),
-                                                                redisGraph));
+                    redisGraph));
 
             //trimmed for getting to value using deserializeScalar
             List<Object> propertyScalar = rawProperty.subList(1, rawProperty.size());
@@ -244,12 +237,25 @@ private Object deserializeScalar(List<Object> rawScalarData) {
                 return deserializeEdge((List<Object>) obj);
             case VALUE_PATH:
                 return deserializePath(obj);
+            case VALUE_MAP:
+                return deserializeMap(obj);
             case VALUE_UNKNOWN:
             default:
                 return obj;
         }
     }
 
+    private Map<String, Object> deserializeMap(Object rawScalarData) {
+        List<Object> keyTypeValueEntries = (List<Object>) rawScalarData;
+        Map<String, Object> map = new HashMap<>();
+        for (int i = 0; i < keyTypeValueEntries.size(); i += 2) {
+            String key = SafeEncoder.encode((byte[]) keyTypeValueEntries.get(i));
+            Object value = deserializeScalar((List<Object>) keyTypeValueEntries.get(i + 1));
+            map.put(key, value);
+        }
+        return map;
+    }
+
     private Path deserializePath(Object rawScalarData) {
         List<List<Object>> array = (List<List<Object>>) rawScalarData;
         List<Node> nodes = (List<Node>) deserializeScalar(array.get(0));
@@ -322,9 +328,9 @@ public String toString() {
     }
 
 
-	@Override
-	public Iterator<Record> iterator() {
-		// TODO Auto-generated method stub
-		return results.iterator();
-	}
+    @Override
+    public Iterator<Record> iterator() {
+        // TODO Auto-generated method stub
+        return results.iterator();
+    }
 }
diff --git a/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetScalarTypes.java b/src/main/java/com/redislabs/redisgraph/impl/resultset/ResultSetScalarTypes.java
@@ -12,7 +12,8 @@ enum ResultSetScalarTypes {
     VALUE_ARRAY,
     VALUE_EDGE,
     VALUE_NODE,
-    VALUE_PATH;
+    VALUE_PATH,
+    VALUE_MAP;
 
     private static final ResultSetScalarTypes[] values = values();
 
diff --git a/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java b/src/test/java/com/redislabs/redisgraph/RedisGraphAPITest.java
@@ -954,6 +954,29 @@ public void testCachedExecution() {
         Assert.assertTrue(resultSet.getStatistics().cachedExecution());
     }
 
+    @Test
+    public void testMapDataType() {
+        Map<String, Object> expected = new HashMap<>();
+        expected.put("a", (long)1);
+        expected.put("b", "str");
+        expected.put("c", null);
+        List<Object> d = new ArrayList<>();
+        d.add((long)1);
+        d.add((long)2);
+        d.add((long)3);
+        expected.put("d", d);
+        expected.put("e", true);
+        Map<String, Object>f = new HashMap<>();
+        f.put("x", (long)1);
+        f.put("y", (long)2);
+        expected.put("f", f);
+        ResultSet res = api.query("social",  "RETURN {a:1, b:'str', c:NULL, d:[1,2,3], e:True, f:{x:1, y:2}}");
+        Assert.assertEquals(1, res.size());
+        Record r = res.next();
+        Map<String, Object> actual = r.getValue(0);
+        Assert.assertEquals(expected, actual);
+    }
+
     @Test
     public void timeoutArgument() {
         ResultSet rs = api.query("social", "UNWIND range(0,100) AS x WITH x AS x WHERE x = 100 RETURN x", 1L);
