support features for ic benchmark

alibaba · Oct 17, 2024 · b05b29f · b05b29f
1 parent ff7693f
commit b05b29f
Show file tree

Hide file tree

Showing 10 changed files with 303 additions and 312 deletions.
diff --git a/interactive_engine/compiler/src/main/antlr4/CypherGS.g4 b/interactive_engine/compiler/src/main/antlr4/CypherGS.g4
@@ -52,7 +52,15 @@ CALL : ( 'C' | 'c' ) ( 'A' | 'a' ) ( 'L' | 'l' ) ( 'L' | 'l' ) ;
 YIELD : ( 'Y' | 'y' ) ( 'I' | 'i' ) ( 'E' | 'e' ) ( 'L' | 'l' ) ( 'D' | 'd' ) ;
 
 oC_RegularQuery
-     :  oC_Match ( SP? ( oC_Match | oC_With | oC_Unwind | oC_UnionCallSubQuery ) )* ( SP oC_Return ) ;
+     : ( oC_ReadingClause SP? )* SP? oC_ReadingClause ( SP oC_Return )
+     ;
+
+oC_ReadingClause
+    :  oC_Match
+    |  oC_Unwind
+    |  oC_With
+    |  oC_UnionCallSubQuery
+    ;
 
 oC_SubQuery
      : ( ( oC_Match | oC_With | oC_Unwind ) SP? )* ( SP? oC_Return ) ;

diff --git a/...ne/compiler/src/main/java/com/alibaba/graphscope/common/ir/planner/GraphRelOptimizer.java b/...ne/compiler/src/main/java/com/alibaba/graphscope/common/ir/planner/GraphRelOptimizer.java
@@ -21,6 +21,8 @@
 import com.alibaba.graphscope.common.ir.meta.IrMeta;
 import com.alibaba.graphscope.common.ir.meta.glogue.calcite.GraphRelMetadataQuery;
 import com.alibaba.graphscope.common.ir.meta.glogue.calcite.handler.GraphMetadataHandlerProvider;
+import com.alibaba.graphscope.common.ir.meta.schema.CommonOptTable;
+import com.alibaba.graphscope.common.ir.rel.CommonTableScan;
 import com.alibaba.graphscope.common.ir.rel.GraphShuttle;
 import com.alibaba.graphscope.common.ir.rel.graph.GraphLogicalSource;
 import com.alibaba.graphscope.common.ir.rel.graph.match.AbstractLogicalMatch;
@@ -32,6 +34,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 
 import org.apache.calcite.plan.GraphOptCluster;
 import org.apache.calcite.plan.RelOptPlanner;
@@ -45,6 +48,7 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -100,10 +104,26 @@ public RelNode optimize(RelNode before, GraphIOProcessor ioProcessor) {
     public static class MatchOptimizer extends GraphShuttle {
         private final GraphIOProcessor ioProcessor;
         private final RelOptPlanner matchPlanner;
+        // record the common rel(s) which has been optimized
+        private final Map<String, RelNode> commonTableToOpt;
 
         public MatchOptimizer(GraphIOProcessor ioProcessor, RelOptPlanner matchPlanner) {
             this.ioProcessor = ioProcessor;
             this.matchPlanner = matchPlanner;
+            this.commonTableToOpt = Maps.newHashMap();
+        }
+
+        @Override
+        public RelNode visit(CommonTableScan tableScan) {
+            CommonOptTable optTable = (CommonOptTable) tableScan.getTable();
+            String tableName = optTable.getQualifiedName().get(0);
+            RelNode commonOpt = commonTableToOpt.get(tableName);
+            if (commonOpt == null) {
+                commonOpt = optTable.getCommon().accept(this);
+                commonTableToOpt.put(tableName, commonOpt);
+            }
+            return new CommonTableScan(
+                    tableScan.getCluster(), tableScan.getTraitSet(), new CommonOptTable(commonOpt));
         }
 
         @Override

diff --git a/...er/src/main/java/com/alibaba/graphscope/common/ir/planner/rules/FlatJoinToExpandRule.java b/...er/src/main/java/com/alibaba/graphscope/common/ir/planner/rules/FlatJoinToExpandRule.java
@@ -24,6 +24,7 @@
 import com.alibaba.graphscope.common.ir.rel.type.AliasNameWithId;
 import com.alibaba.graphscope.common.ir.rex.RexGraphVariable;
 import com.google.common.collect.Lists;
+
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.core.JoinRelType;
 import org.apache.calcite.rel.logical.LogicalFilter;

diff --git a/...compiler/src/main/java/com/alibaba/graphscope/common/ir/rel/graph/GraphLogicalExpand.java b/...compiler/src/main/java/com/alibaba/graphscope/common/ir/rel/graph/GraphLogicalExpand.java
@@ -23,6 +23,7 @@
 import com.alibaba.graphscope.common.ir.tools.config.GraphOpt;
 import com.alibaba.graphscope.common.ir.type.GraphSchemaType;
 import com.google.common.collect.ImmutableList;
+
 import org.apache.calcite.plan.GraphOptCluster;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;

diff --git a/...e/compiler/src/main/java/com/alibaba/graphscope/common/ir/rel/graph/GraphLogicalGetV.java b/...e/compiler/src/main/java/com/alibaba/graphscope/common/ir/rel/graph/GraphLogicalGetV.java
@@ -22,6 +22,7 @@
 import com.alibaba.graphscope.common.ir.rel.type.TableConfig;
 import com.alibaba.graphscope.common.ir.tools.config.GraphOpt;
 import com.google.common.collect.ImmutableList;
+
 import org.apache.calcite.plan.GraphOptCluster;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;

diff --git a/...compiler/src/main/java/com/alibaba/graphscope/common/ir/rel/graph/GraphLogicalSource.java b/...compiler/src/main/java/com/alibaba/graphscope/common/ir/rel/graph/GraphLogicalSource.java
@@ -20,6 +20,7 @@
 import com.alibaba.graphscope.common.ir.rel.type.TableConfig;
 import com.alibaba.graphscope.common.ir.tools.config.GraphOpt;
 import com.google.common.collect.ImmutableList;
+
 import org.apache.calcite.plan.GraphOptCluster;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.RelShuttle;

diff --git a/...piler/src/main/java/com/alibaba/graphscope/cypher/antlr4/visitor/CallSubQueryVisitor.java b/...piler/src/main/java/com/alibaba/graphscope/cypher/antlr4/visitor/CallSubQueryVisitor.java
@@ -23,6 +23,7 @@
 import com.alibaba.graphscope.common.ir.tools.GraphBuilder;
 import com.alibaba.graphscope.grammar.CypherGSBaseVisitor;
 import com.alibaba.graphscope.grammar.CypherGSParser;
+
 import org.apache.calcite.plan.GraphOptCluster;
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelNode;

diff --git a/...piler/src/main/java/com/alibaba/graphscope/cypher/antlr4/visitor/GraphBuilderVisitor.java b/...piler/src/main/java/com/alibaba/graphscope/cypher/antlr4/visitor/GraphBuilderVisitor.java
@@ -64,8 +64,7 @@ public GraphBuilder visitOC_UnionCallSubQuery(CypherGSParser.OC_UnionCallSubQuer
         for (int i = 0; i < ctx.oC_CallSubQuery().size(); ++i) {
             CypherGSParser.OC_CallSubQueryContext callSubQuery = ctx.oC_CallSubQuery(i);
             if (callSubQuery != null) {
-                branches.add(
-                        new CallSubQueryVisitor(this.builder).visit(callSubQuery));
+                branches.add(new CallSubQueryVisitor(this.builder).visit(callSubQuery));
             }
         }
         Preconditions.checkArgument(