Receive metadata as a map

Author: jeffreylovitz

redisgraph/graph.py

@@ -167,8 +167,8 @@ def query(self, q, params=None, timeout=None, read_only=False):
         # ask for compact result-set format
         # specify known graph version
         cmd = "GRAPH.RO_QUERY" if read_only else "GRAPH.QUERY"
-        # command = [cmd, self.name, query, "--compact", "version", self.version]
-        command = [cmd, self.name, query, "--compact"]
+        command = [cmd, self.name, query, "--compact", "version", self.version]
+        #  command = [cmd, self.name, query, "--compact"]
 
         # include timeout is specified
         if timeout:

redisgraph/query_result.py

@@ -98,30 +98,17 @@ def parse_statistics(self, raw_statistics):
 
     def parse_metadata(self, raw_metadata):
         # Decode metadata:
-        # [
-        #   ["version", VERSION],
-        #   ["labels", [[VALUE_STRING, "label_1"] ... ]],
-        #   ["relationship types ", [[VALUE_STRING, "reltype_1"] ... ]],
-        #   ["property keys", [[VALUE_STRING, "prop_1"] ... ]]
-        # ]
-        version = raw_metadata[0][1]
-        raw_labels = raw_metadata[1][1]
-        raw_reltypes = raw_metadata[2][1]
-        raw_props = raw_metadata[3][1]
-
-        # Arrays to be passed into the internal graph structure.
-        labels = [None] * len(raw_labels)
-        reltypes = [None] * len(raw_reltypes)
-        properties = [None] * len(raw_props)
-
-        for idx, label in enumerate(raw_labels):
-            labels[idx] = self.parse_scalar(label)
-
-        for idx, reltype in enumerate(raw_reltypes):
-            reltypes[idx] = self.parse_scalar(reltype)
-
-        for idx, prop in enumerate(raw_props):
-            properties[idx] = self.parse_scalar(prop)
+        # {
+        #   "version", VERSION,
+        #   "labels", [[VALUE_STRING, "label_1"] ... ],
+        #   "relationship types ", [[VALUE_STRING, "reltype_1"] ... ],
+        #   "property keys", [[VALUE_STRING, "prop_1"] ... ]
+        # }
+        metadata = self.parse_map(raw_metadata)
+        version = metadata["version"]
+        labels = metadata["labels"]
+        reltypes = metadata["relationship types"]
+        properties = metadata["property keys"]
 
         # Update the graph's internal metadata.
         self.graph.refresh_metadata(version, labels, reltypes, properties)