commit 01f41f47b7150b00790173455208bb626dd7364b
author ggalvizo <ggalvizo@uci.edu> Tue Apr 26 18:42:38 2022 -0700
committer Glenn Galvizo <ggalvizo@uci.edu> Wed Apr 27 02:00:57 2022 +0000
tree e203239054af00fe4a33eb3a7fe883e3cb7c2a4d
parent b081ed561ff3dba59433fbd4bb191e746dcd2f12

[NO-ISSUE][GRAPHIX] Refactoring AST body normalization.

Details:
  - No longer going through hoops to normalize a graph element body
    (we no longer follow the SQL++ AST rewriter way of normalizing view
    bodies).
  - Removing the IGraphExpr interface, this was never used.

Change-Id: I852bef041abb876cc2414b0d2b75e40411c60330
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb-graph/+/16204
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Glenn Galvizo <ggalvizo@uci.edu>

asterix-graphix/src/main/resources/lang-extension/lang.txt

diff --git a/asterix-graphix/src/main/resources/lang-extension/lang.txt b/asterix-graphix/src/main/resources/lang-extension/lang.txt
index 12643bf..a1d12e6 100644
--- a/asterix-graphix/src/main/resources/lang-extension/lang.txt
+++ b/asterix-graphix/src/main/resources/lang-extension/lang.txt
@@ -26,7 +26,6 @@
 import org.apache.asterix.graphix.lang.clause.MatchClause;
 import org.apache.asterix.graphix.lang.expression.EdgePatternExpr;
 import org.apache.asterix.graphix.lang.expression.GraphConstructor;
-import org.apache.asterix.graphix.lang.expression.IGraphExpr;
 import org.apache.asterix.graphix.lang.expression.PathPatternExpr;
 import org.apache.asterix.graphix.lang.expression.VertexPatternExpr;
 import org.apache.asterix.graphix.lang.optype.MatchType;
@@ -577,7 +576,7 @@
   VariableExpr edgeVariable = null;
 
   // We default to undirected edges.
-  EdgeDescriptor.EdgeType edgeType = EdgeDescriptor.EdgeType.UNDIRECTED;
+  EdgeDescriptor.EdgeDirection edgeDirection = EdgeDescriptor.EdgeDirection.UNDIRECTED;
 }
 {
   (
@@ -590,11 +589,11 @@
       ( <COLON> edgeDetail = EdgeDetail() )?
       <RIGHTBRACKET> <MINUS>
     )?
-    ( <GT> { edgeType = EdgeDescriptor.EdgeType.LEFT_TO_RIGHT; } )?
+    ( <GT> { edgeDirection = EdgeDescriptor.EdgeDirection.LEFT_TO_RIGHT; } )?
     |
     <LT> {
       startToken = token;
-      edgeType = EdgeDescriptor.EdgeType.RIGHT_TO_LEFT;
+      edgeDirection = EdgeDescriptor.EdgeDirection.RIGHT_TO_LEFT;
     }
     <MINUS>
     (
@@ -607,8 +606,8 @@
     )?
   )
   {
-    // Edges (by default) are of class EDGE_PATTERN and are not sub-paths.
-    IGraphExpr.GraphExprKind edgeClass = IGraphExpr.GraphExprKind.EDGE_PATTERN;
+    // Edges (by default) are of pattern type EDGE and are not sub-paths.
+    EdgeDescriptor.PatternType patternType = EdgeDescriptor.PatternType.EDGE;
     Integer hopCountMin = 1;
     Integer hopCountMax = 1;
 
@@ -618,13 +617,13 @@
 
       // We have explicitly specified "{" and "}". Use sub-path semantics.
       if (edgeDetail.second != null) {
-        edgeClass = IGraphExpr.GraphExprKind.PATH_PATTERN;
+        patternType = EdgeDescriptor.PatternType.PATH;
         hopCountMin = edgeDetail.second.first;
         hopCountMax = edgeDetail.second.second;
       }
     }
 
-    return new EdgeDescriptor(edgeType, edgeClass, labels, edgeVariable, hopCountMin, hopCountMax);
+    return new EdgeDescriptor(edgeDirection, patternType, labels, edgeVariable, hopCountMin, hopCountMax);
   }
 }