[CALCITE-7280] Introduce RelNode.copy, which can copy variables set

Author: dssysolyatin

arrow/src/main/java/org/apache/calcite/adapter/arrow/ArrowFilter.java

@@ -21,11 +21,15 @@
 import org.apache.calcite.plan.RelOptPlanner;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.CorrelationId;
 import org.apache.calcite.rel.core.Filter;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rex.RexNode;
 
 import java.util.List;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 import static java.util.Objects.requireNonNull;
 
@@ -51,7 +55,9 @@ class ArrowFilter extends Filter implements ArrowRel {
     return requireNonNull(cost, "cost").multiplyBy(0.1);
   }
 
-  @Override public ArrowFilter copy(RelTraitSet traitSet, RelNode input, RexNode condition) {
+  @Override public ArrowFilter copy(RelTraitSet traitSet, RelNode input, RexNode condition,
+      Set<CorrelationId> variablesSet) {
+    checkArgument(variablesSet.isEmpty());
     return new ArrowFilter(getCluster(), traitSet, input, condition);
   }
 

arrow/src/main/java/org/apache/calcite/adapter/arrow/ArrowProject.java

@@ -21,6 +21,7 @@
 import org.apache.calcite.plan.RelOptPlanner;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.CorrelationId;
 import org.apache.calcite.rel.core.Project;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rel.type.RelDataType;
@@ -34,6 +35,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 import static java.util.Objects.requireNonNull;
 
@@ -52,7 +56,8 @@ class ArrowProject extends Project implements ArrowRel {
   }
 
   @Override public Project copy(RelTraitSet traitSet, RelNode input,
-      List<RexNode> projects, RelDataType rowType) {
+      List<RexNode> projects, RelDataType rowType, Set<CorrelationId> variablesSet) {
+    checkArgument(variablesSet.isEmpty());
     return new ArrowProject(getCluster(), traitSet, input, projects,
         rowType);
   }

cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraFilter.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.core.CorrelationId;
 import org.apache.calcite.rel.core.Filter;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rel.type.RelDataType;
@@ -48,6 +49,8 @@
 import java.util.List;
 import java.util.Set;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import static org.apache.calcite.util.DateTimeStringUtils.ISO_DATETIME_FRACTIONAL_SECOND_FORMAT;
 import static org.apache.calcite.util.DateTimeStringUtils.getDateFormatter;
 
@@ -98,7 +101,8 @@ public CassandraFilter(
   }
 
   @Override public CassandraFilter copy(RelTraitSet traitSet, RelNode input,
-      RexNode condition) {
+      RexNode condition, Set<CorrelationId> variablesSet) {
+    checkArgument(variablesSet.isEmpty());
     return new CassandraFilter(getCluster(), traitSet, input, condition,
         partitionKeys, clusteringKeys, implicitFieldCollations);
   }

cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraProject.java

@@ -21,6 +21,7 @@
 import org.apache.calcite.plan.RelOptPlanner;
 import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.CorrelationId;
 import org.apache.calcite.rel.core.Project;
 import org.apache.calcite.rel.metadata.RelMetadataQuery;
 import org.apache.calcite.rel.type.RelDataType;
@@ -35,6 +36,9 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 import static java.util.Objects.requireNonNull;
 
@@ -51,7 +55,8 @@ public CassandraProject(RelOptCluster cluster, RelTraitSet traitSet,
   }
 
   @Override public Project copy(RelTraitSet traitSet, RelNode input,
-      List<RexNode> projects, RelDataType rowType) {
+      List<RexNode> projects, RelDataType rowType, Set<CorrelationId> variablesSet) {
+    checkArgument(variablesSet.isEmpty());
     return new CassandraProject(getCluster(), traitSet, input, projects,
         rowType);
   }

core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableAsofJoin.java

@@ -96,8 +96,8 @@ public static EnumerableAsofJoin create(
   }
 
   @Override public EnumerableAsofJoin copy(RelTraitSet traitSet, RexNode condition,
-                                           RelNode left, RelNode right, JoinRelType joinType,
-                                           boolean semiJoinDone) {
+      RelNode left, RelNode right, Set<CorrelationId> variablesSet, JoinRelType joinType,
+      boolean semiJoinDone) {
     // This method does not know about the matchCondition, so it should not be called
     throw new RuntimeException("This method should not be called");
   }

core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableBatchNestedLoopJoin.java

@@ -113,8 +113,8 @@ public static EnumerableBatchNestedLoopJoin create(
   }
 
   @Override public EnumerableBatchNestedLoopJoin copy(RelTraitSet traitSet,
-      RexNode condition, RelNode left, RelNode right, JoinRelType joinType,
-      boolean semiJoinDone) {
+      RexNode condition, RelNode left, RelNode right, Set<CorrelationId> variablesSet,
+      JoinRelType joinType, boolean semiJoinDone) {
     return new EnumerableBatchNestedLoopJoin(getCluster(), traitSet,
         left, right, condition, variablesSet, requiredColumns, joinType);
   }

core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableFilter.java

@@ -23,6 +23,7 @@
 import org.apache.calcite.rel.RelCollations;
 import org.apache.calcite.rel.RelDistributionTraitDef;
 import org.apache.calcite.rel.RelNode;
+import org.apache.calcite.rel.core.CorrelationId;
 import org.apache.calcite.rel.core.Filter;
 import org.apache.calcite.rel.metadata.RelMdCollation;
 import org.apache.calcite.rel.metadata.RelMdDistribution;
@@ -35,6 +36,9 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.List;
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkArgument;
 
 /** Implementation of {@link org.apache.calcite.rel.core.Filter} in
  * {@link org.apache.calcite.adapter.enumerable.EnumerableConvention enumerable calling convention}. */
@@ -69,7 +73,8 @@ public static EnumerableFilter create(final RelNode input,
   }
 
   @Override public EnumerableFilter copy(RelTraitSet traitSet, RelNode input,
-      RexNode condition) {
+      RexNode condition, Set<CorrelationId> variablesSet) {
+    checkArgument(variablesSet.isEmpty());
     return new EnumerableFilter(getCluster(), traitSet, input, condition);
   }
 

core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableHashJoin.java

@@ -98,9 +98,9 @@ public static EnumerableHashJoin create(
         variablesSet, joinType);
   }
 
-  @Override public EnumerableHashJoin copy(RelTraitSet traitSet, RexNode condition,
-      RelNode left, RelNode right, JoinRelType joinType,
-      boolean semiJoinDone) {
+  @Override public EnumerableHashJoin copy(RelTraitSet traitSet,
+      RexNode condition, RelNode left, RelNode right, Set<CorrelationId> variablesSet,
+      JoinRelType joinType, boolean semiJoinDone) {
     return new EnumerableHashJoin(getCluster(), traitSet, left, right,
         condition, variablesSet, joinType);
   }

core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableMergeJoin.java

@@ -416,8 +416,8 @@ public static EnumerableMergeJoin create(RelNode left, RelNode right,
   }
 
   @Override public EnumerableMergeJoin copy(RelTraitSet traitSet,
-      RexNode condition, RelNode left, RelNode right, JoinRelType joinType,
-      boolean semiJoinDone) {
+      RexNode condition, RelNode left, RelNode right, Set<CorrelationId> variablesSet,
+      JoinRelType joinType, boolean semiJoinDone) {
     return new EnumerableMergeJoin(getCluster(), traitSet, left, right,
         condition, variablesSet, joinType);
   }

core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableNestedLoopJoin.java

@@ -64,8 +64,8 @@ protected EnumerableNestedLoopJoin(RelOptCluster cluster, RelTraitSet traits,
   }
 
   @Override public EnumerableNestedLoopJoin copy(RelTraitSet traitSet,
-      RexNode condition, RelNode left, RelNode right, JoinRelType joinType,
-      boolean semiJoinDone) {
+      RexNode condition, RelNode left, RelNode right, Set<CorrelationId> variablesSet,
+      JoinRelType joinType, boolean semiJoinDone) {
     return new EnumerableNestedLoopJoin(getCluster(), traitSet, left, right,
         condition, variablesSet, joinType);
   }