[CALCITE-7511] Route RelShuttle dispatch through type-specific visit overloads

core/src/main/java/org/apache/calcite/rel/RelHomogeneousShuttle.java

@@ -16,9 +16,19 @@
  */
 package org.apache.calcite.rel;
 
+import org.apache.calcite.rel.core.Collect;
+import org.apache.calcite.rel.core.Combine;
+import org.apache.calcite.rel.core.ConditionalCorrelate;
+import org.apache.calcite.rel.core.Sample;
+import org.apache.calcite.rel.core.Snapshot;
+import org.apache.calcite.rel.core.SortExchange;
 import org.apache.calcite.rel.core.TableFunctionScan;
 import org.apache.calcite.rel.core.TableScan;
+import org.apache.calcite.rel.core.TableSpool;
+import org.apache.calcite.rel.core.Uncollect;
+import org.apache.calcite.rel.core.Window;
 import org.apache.calcite.rel.logical.LogicalAggregate;
+import org.apache.calcite.rel.logical.LogicalAsofJoin;
 import org.apache.calcite.rel.logical.LogicalCalc;
 import org.apache.calcite.rel.logical.LogicalCorrelate;
 import org.apache.calcite.rel.logical.LogicalExchange;
@@ -38,7 +48,7 @@
  * Visits all the relations in a homogeneous way: always redirects calls to
  * {@code accept(RelNode)}.
  */
 public class RelHomogeneousShuttle extends RelShuttleImpl {
   @Override public RelNode visit(LogicalAggregate aggregate) {
     return visit((RelNode) aggregate);
   }
@@ -71,6 +81,10 @@
     return visit((RelNode) join);
   }
 
+  @Override public RelNode visit(LogicalAsofJoin asofJoin) {
+    return visit((RelNode) asofJoin);
+  }
+
   @Override public RelNode visit(LogicalCorrelate correlate) {
     return visit((RelNode) correlate);
   }
@@ -106,4 +120,40 @@
   @Override public RelNode visit(LogicalRepeatUnion repeatUnion) {
     return visit((RelNode) repeatUnion);
   }
+
+  @Override public RelNode visit(Window window) {
+    return visit((RelNode) window);
+  }
+
+  @Override public RelNode visit(Snapshot snapshot) {
+    return visit((RelNode) snapshot);
+  }
+
+  @Override public RelNode visit(Collect collect) {
+    return visit((RelNode) collect);
+  }
+
+  @Override public RelNode visit(Sample sample) {
+    return visit((RelNode) sample);
+  }
+
+  @Override public RelNode visit(Uncollect uncollect) {
+    return visit((RelNode) uncollect);
+  }
+
+  @Override public RelNode visit(Combine combine) {
+    return visit((RelNode) combine);
+  }
+
+  @Override public RelNode visit(ConditionalCorrelate conditionalCorrelate) {
+    return visit((RelNode) conditionalCorrelate);
+  }
+
+  @Override public RelNode visit(SortExchange sortExchange) {
+    return visit((RelNode) sortExchange);
+  }
+
+  @Override public RelNode visit(TableSpool tableSpool) {
+    return visit((RelNode) tableSpool);
+  }
 }

core/src/main/java/org/apache/calcite/rel/RelShuttle.java

@@ -16,8 +16,17 @@
  */
 package org.apache.calcite.rel;
 
+import org.apache.calcite.rel.core.Collect;
+import org.apache.calcite.rel.core.Combine;
+import org.apache.calcite.rel.core.ConditionalCorrelate;
+import org.apache.calcite.rel.core.Sample;
+import org.apache.calcite.rel.core.Snapshot;
+import org.apache.calcite.rel.core.SortExchange;
 import org.apache.calcite.rel.core.TableFunctionScan;
 import org.apache.calcite.rel.core.TableScan;
+import org.apache.calcite.rel.core.TableSpool;
+import org.apache.calcite.rel.core.Uncollect;
+import org.apache.calcite.rel.core.Window;
 import org.apache.calcite.rel.logical.LogicalAggregate;
 import org.apache.calcite.rel.logical.LogicalAsofJoin;
 import org.apache.calcite.rel.logical.LogicalCalc;
@@ -75,5 +84,23 @@ public interface RelShuttle {
 
   RelNode visit(LogicalRepeatUnion logicalRepeatUnion);
 
+  RelNode visit(Window window);
+
+  RelNode visit(Snapshot snapshot);
+
+  RelNode visit(Collect collect);
+
+  RelNode visit(Sample sample);
+
+  RelNode visit(Uncollect uncollect);
+
+  RelNode visit(Combine combine);
+
+  RelNode visit(ConditionalCorrelate conditionalCorrelate);
+
+  RelNode visit(SortExchange sortExchange);
+
+  RelNode visit(TableSpool tableSpool);
+
   RelNode visit(RelNode other);
 }

core/src/main/java/org/apache/calcite/rel/RelShuttleImpl.java

@@ -17,8 +17,17 @@
 package org.apache.calcite.rel;
 
 import org.apache.calcite.linq4j.Ord;
+import org.apache.calcite.rel.core.Collect;
+import org.apache.calcite.rel.core.Combine;
+import org.apache.calcite.rel.core.ConditionalCorrelate;
+import org.apache.calcite.rel.core.Sample;
+import org.apache.calcite.rel.core.Snapshot;
+import org.apache.calcite.rel.core.SortExchange;
 import org.apache.calcite.rel.core.TableFunctionScan;
 import org.apache.calcite.rel.core.TableScan;
+import org.apache.calcite.rel.core.TableSpool;
+import org.apache.calcite.rel.core.Uncollect;
+import org.apache.calcite.rel.core.Window;
 import org.apache.calcite.rel.logical.LogicalAggregate;
 import org.apache.calcite.rel.logical.LogicalAsofJoin;
 import org.apache.calcite.rel.logical.LogicalCalc;
@@ -47,7 +56,7 @@
  * {@link RelNode#copy(org.apache.calcite.plan.RelTraitSet, java.util.List)} if
  * any children change.
  */
 public class RelShuttleImpl implements RelShuttle {
   protected final Deque<RelNode> stack = new ArrayDeque<>();
 
   /**
@@ -147,6 +156,42 @@
     return visitChildren(logicalRepeatUnion);
   }
 
+  @Override public RelNode visit(Window window) {
+    return visitChildren(window);
+  }
+
+  @Override public RelNode visit(Snapshot snapshot) {
+    return visitChildren(snapshot);
+  }
+
+  @Override public RelNode visit(Collect collect) {
+    return visitChildren(collect);
+  }
+
+  @Override public RelNode visit(Sample sample) {
+    return visitChildren(sample);
+  }
+
+  @Override public RelNode visit(Uncollect uncollect) {
+    return visitChildren(uncollect);
+  }
+
+  @Override public RelNode visit(Combine combine) {
+    return visitChildren(combine);
+  }
+
+  @Override public RelNode visit(ConditionalCorrelate conditionalCorrelate) {
+    return visitChildren(conditionalCorrelate);
+  }
+
+  @Override public RelNode visit(SortExchange sortExchange) {
+    return visitChildren(sortExchange);
+  }
+
+  @Override public RelNode visit(TableSpool tableSpool) {
+    return visitChildren(tableSpool);
+  }
+
   @Override public RelNode visit(RelNode other) {
     return visitChildren(other);
   }

core/src/main/java/org/apache/calcite/rel/core/Collect.java

@@ -21,6 +21,7 @@
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelInput;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.SingleRel;
 import org.apache.calcite.rel.type.RelDataType;
@@ -183,6 +184,10 @@ public RelNode copy(RelTraitSet traitSet, RelNode input) {
     return new Collect(getCluster(), traitSet, input, rowType());
   }
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public RelWriter explainTerms(RelWriter pw) {
     return super.explainTerms(pw)
         .item("field", getFieldName());

core/src/main/java/org/apache/calcite/rel/core/Combine.java

@@ -23,6 +23,7 @@
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.AbstractRelNode;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rel.type.RelDataType;
@@ -60,6 +61,10 @@ public Combine(RelOptCluster cluster, RelTraitSet traitSet, List<RelNode> inputs
     return new Combine(getCluster(), traitSet, inputs);
   }
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public void replaceInput(int ordinalInParent, RelNode rel) {
     // Combine has multiple inputs stored in an immutable list.
     // To replace an input, we need to create a new list with the replacement.

core/src/main/java/org/apache/calcite/rel/core/ConditionalCorrelate.java

@@ -19,6 +19,7 @@
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.hint.RelHint;
 import org.apache.calcite.rel.rules.CoreRules;
@@ -69,6 +70,10 @@ public abstract ConditionalCorrelate copy(RelTraitSet traitSet, RelNode left, Re
       CorrelationId correlationId, ImmutableBitSet requiredColumns, JoinRelType joinType,
       RexNode condition);
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public RelWriter explainTerms(RelWriter pw) {
     return super.explainTerms(pw)
         .itemIf("condition", condition, !condition.isAlwaysTrue());

core/src/main/java/org/apache/calcite/rel/core/Sample.java

@@ -22,6 +22,7 @@
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelInput;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.SingleRel;
 
@@ -79,6 +80,10 @@ private static RelOptSamplingParameters getSamplingParameters(
     return new Sample(getCluster(), sole(inputs), params);
   }
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   /**
    * Retrieve the sampling parameters for this Sample.
    */

core/src/main/java/org/apache/calcite/rel/core/Snapshot.java

@@ -20,6 +20,7 @@
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelInput;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.SingleRel;
 import org.apache.calcite.rel.hint.Hintable;
@@ -119,6 +120,10 @@ protected Snapshot(
     return copy(traitSet, getInput(), condition);
   }
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public RelWriter explainTerms(RelWriter pw) {
     return super.explainTerms(pw)
         .item("period", period);

core/src/main/java/org/apache/calcite/rel/core/SortExchange.java

@@ -24,6 +24,7 @@
 import org.apache.calcite.rel.RelDistributionTraitDef;
 import org.apache.calcite.rel.RelInput;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 
 import static java.util.Objects.requireNonNull;
@@ -85,6 +86,10 @@ protected SortExchange(RelInput input) {
   public abstract SortExchange copy(RelTraitSet traitSet, RelNode newInput,
       RelDistribution newDistribution, RelCollation newCollation);
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   /**
    * Returns the array of {@link org.apache.calcite.rel.RelFieldCollation}s
    * asked for by the sort specification, from most significant to least

core/src/main/java/org/apache/calcite/rel/core/TableFunctionScan.java

@@ -22,6 +22,7 @@
 import org.apache.calcite.rel.AbstractRelNode;
 import org.apache.calcite.rel.RelInput;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.hint.Hintable;
 import org.apache.calcite.rel.hint.RelHint;
@@ -140,6 +141,10 @@ protected TableFunctionScan(RelInput input) {
 
   //~ Methods ----------------------------------------------------------------
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public final TableFunctionScan copy(RelTraitSet traitSet,
       List<RelNode> inputs) {
     return copy(traitSet, inputs, rexCall, elementType, getRowType(),

core/src/main/java/org/apache/calcite/rel/core/TableSpool.java

@@ -21,6 +21,7 @@
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 
 import static java.util.Objects.requireNonNull;
@@ -46,6 +47,10 @@ protected TableSpool(RelOptCluster cluster, RelTraitSet traitSet,
     return table;
   }
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public RelWriter explainTerms(RelWriter pw) {
     super.explainTerms(pw);
     return pw.item("table", table.getQualifiedName());

core/src/main/java/org/apache/calcite/rel/core/Uncollect.java

@@ -21,6 +21,7 @@
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelInput;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.SingleRel;
 import org.apache.calcite.rel.type.RelDataType;
@@ -112,6 +113,10 @@ public static Uncollect create(
 
   //~ Methods ----------------------------------------------------------------
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public RelWriter explainTerms(RelWriter pw) {
     return super.explainTerms(pw)
         .itemIf("withOrdinality", withOrdinality, withOrdinality);

core/src/main/java/org/apache/calcite/rel/core/Window.java

@@ -25,6 +25,7 @@
 import org.apache.calcite.rel.RelCollations;
 import org.apache.calcite.rel.RelFieldCollation;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.RelShuttle;
 import org.apache.calcite.rel.RelWriter;
 import org.apache.calcite.rel.SingleRel;
 import org.apache.calcite.rel.hint.Hintable;
@@ -210,6 +211,10 @@ public List<RexLiteral> getConstants() {
     return constants;
   }
 
+  @Override public RelNode accept(RelShuttle shuttle) {
+    return shuttle.visit(this);
+  }
+
   @Override public @Nullable RelOptCost computeSelfCost(RelOptPlanner planner,
       RelMetadataQuery mq) {
     // Cost is proportional to the number of rows and the number of

core/src/main/java/org/apache/calcite/rel/logical/ToLogicalConverter.java

@@ -57,6 +57,14 @@ public ToLogicalConverter(RelBuilder relBuilder) {
     return LogicalTableScan.create(scan.getCluster(), scan.getTable(), scan.getHints());
   }
 
+  @Override public RelNode visit(Window window) {
+    return visit((RelNode) window);
+  }
+
+  @Override public RelNode visit(Uncollect uncollect) {
+    return visit((RelNode) uncollect);
+  }
+
   @Override public RelNode visit(RelNode relNode) {
     if (relNode instanceof Aggregate) {
       final Aggregate agg = (Aggregate) relNode;