Merge branch 'ir_cypher_label' of https://github.com/shirly121/GraphS…

…cope into ir_cypher_label
alibaba · Sep 25, 2023 · 83a1785 · 83a1785
2 parents 31ec724 + a1650a5
commit 83a1785
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/...ngine/compiler/src/main/java/com/alibaba/graphscope/cypher/result/CypherRecordParser.java b/...ngine/compiler/src/main/java/com/alibaba/graphscope/cypher/result/CypherRecordParser.java
@@ -316,16 +316,29 @@ private String parseLabelValue(Common.Value value, GraphLabelType type) {
             case STR:
                 return value.getStr();
             case I32:
+                return parseLabelValue(value.getI32(), type);
             case I64:
-                long labelId = value.getI64();
-                for (GraphLabelType.Entry entry : type.getLabelsEntry()) {
-                    if (entry.getLabelId() == labelId) {
-                        return entry.getLabel();
-                    }
-                }
+                return parseLabelValue(value.getI64(), type);
             default:
                 throw new IllegalArgumentException(
-                        "cannot parse label value=" + value + " from expected type=" + type);
+                        "cannot parse label value with type=" + value.getItemCase().name());
+        }
+    }
+
+    private String parseLabelValue(long labelId, GraphLabelType type) {
+        List<Object> expectedLabelIds = Lists.newArrayList();
+        for (GraphLabelType.Entry entry : type.getLabelsEntry()) {
+            if (entry.getLabelId() == labelId) {
+                return entry.getLabel();
+            }
+            expectedLabelIds.add(entry.getLabelId());
         }
+        throw new IllegalArgumentException(
+                "cannot parse label value="
+                        + labelId
+                        + " from expected type="
+                        + type
+                        + ", expected ids are "
+                        + expectedLabelIds);
     }
 }