Return empty map if no properties in valueMap() (#1656)

alibaba · Jun 2, 2022 · b5bb440 · b5bb440
1 parent ce91b0c
commit b5bb440
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...piler/src/main/java/com/alibaba/graphscope/gremlin/result/GremlinResultParserFactory.java b/...piler/src/main/java/com/alibaba/graphscope/gremlin/result/GremlinResultParserFactory.java
@@ -72,6 +72,11 @@ public Object parseFrom(IrResult.Results results) {
                                         ParserUtils.parseElement(column.getEntry().getElement());
                                 if (parseElement instanceof Map) {
                                     Map projectTags = (Map) parseElement;
+                                    // return empty Map if none properties
+                                    Map tagEntry =
+                                            (Map)
+                                                    projectResult.computeIfAbsent(
+                                                            tag, k1 -> new HashMap<>());
                                     projectTags.forEach(
                                             (k, v) -> {
                                                 if (!(v instanceof EmptyValue)) {
@@ -97,11 +102,6 @@ public Object parseFrom(IrResult.Results results) {
                                                                         + " key");
                                                     }
                                                     String property = getPropertyName(nameOrId);
-                                                    Map tagEntry =
-                                                            (Map)
-                                                                    projectResult.computeIfAbsent(
-                                                                            tag,
-                                                                            k1 -> new HashMap<>());
                                                     tagEntry.put(
                                                             property, Collections.singletonList(v));
                                                 }