fix(interactive): Enhance Support for Optimizing IC Benchmark Queries

interactive_engine/compiler/src/main/antlr4/CypherGS.g4

@@ -52,7 +52,26 @@ 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 ) )* ( 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 ) ;
+
+oC_CallSubQuery
+ : CALL SP? '{' SP? oC_SubQuery SP? '}';
+
+oC_UnionCallSubQuery
+ : oC_CallSubQuery ( SP? UNION SP? oC_CallSubQuery )* ;
+
+UNION : ( 'U' | 'u' ) ( 'N' | 'n' ) ( 'I' | 'i' ) ( 'O' | 'o' ) ( 'N' | 'n' ) ;
 
 oC_Match
  : ( OPTIONAL SP )? MATCH SP? oC_Pattern ( SP? oC_Where )? ;

interactive_engine/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

interactive_engine/compiler/src/main/java/com/alibaba/graphscope/common/ir/planner/PlannerGroup.java

@@ -58,6 +58,9 @@ public synchronized RelNode optimize(RelNode before, GraphIOProcessor ioProcesso
  // apply rules of 'FilterPushDown' before the match optimization
  relPlanner.setRoot(before);
  RelNode relOptimized = relPlanner.findBestExp();
+ if (config.getRules().contains(FlatJoinToExpandRule.class.getSimpleName())) {
+ relOptimized = relOptimized.accept(new FlatJoinToExpandRule(config));
+ }
  if (config.getOpt() == PlannerConfig.Opt.CBO) {
  relOptimized =
  relOptimized.accept(