diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateExpandDistinctAggregatesRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateExpandDistinctAggregatesRule.java index aab5e7bd2ce96..f0a8ab601ea67 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateExpandDistinctAggregatesRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateExpandDistinctAggregatesRule.java @@ -22,7 +22,6 @@ import org.apache.flink.util.Preconditions; import org.apache.calcite.linq4j.Ord; -import org.apache.calcite.plan.Contexts; import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.rel.RelCollations; @@ -107,20 +106,6 @@ public FlinkAggregateExpandDistinctAggregatesRule( this.useGroupingSets = useGroupingSets; } - @Deprecated // to be removed before 2.0 - public FlinkAggregateExpandDistinctAggregatesRule( - Class clazz, - boolean useGroupingSets, - RelFactories.JoinFactory joinFactory) { - this(clazz, useGroupingSets, RelBuilder.proto(Contexts.of(joinFactory))); - } - - @Deprecated // to be removed before 2.0 - public FlinkAggregateExpandDistinctAggregatesRule( - Class clazz, RelFactories.JoinFactory joinFactory) { - this(clazz, false, RelBuilder.proto(Contexts.of(joinFactory))); - } - // ~ Methods ---------------------------------------------------------------- public void onMatch(RelOptRuleCall call) { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java index cbb6f44de91e1..05a9ce3088240 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java @@ -110,58 +110,6 @@ public FlinkAggregateJoinTransposeRule( this.allowFunctions = allowFunctions; } - @Deprecated // to be removed before 2.0 - public FlinkAggregateJoinTransposeRule( - Class aggregateClass, - RelFactories.AggregateFactory aggregateFactory, - Class joinClass, - RelFactories.JoinFactory joinFactory) { - this(aggregateClass, joinClass, RelBuilder.proto(aggregateFactory, joinFactory), false); - } - - @Deprecated // to be removed before 2.0 - public FlinkAggregateJoinTransposeRule( - Class aggregateClass, - RelFactories.AggregateFactory aggregateFactory, - Class joinClass, - RelFactories.JoinFactory joinFactory, - boolean allowFunctions) { - this( - aggregateClass, - joinClass, - RelBuilder.proto(aggregateFactory, joinFactory), - allowFunctions); - } - - @Deprecated // to be removed before 2.0 - public FlinkAggregateJoinTransposeRule( - Class aggregateClass, - RelFactories.AggregateFactory aggregateFactory, - Class joinClass, - RelFactories.JoinFactory joinFactory, - RelFactories.ProjectFactory projectFactory) { - this( - aggregateClass, - joinClass, - RelBuilder.proto(aggregateFactory, joinFactory, projectFactory), - false); - } - - @Deprecated // to be removed before 2.0 - public FlinkAggregateJoinTransposeRule( - Class aggregateClass, - RelFactories.AggregateFactory aggregateFactory, - Class joinClass, - RelFactories.JoinFactory joinFactory, - RelFactories.ProjectFactory projectFactory, - boolean allowFunctions) { - this( - aggregateClass, - joinClass, - RelBuilder.proto(aggregateFactory, joinFactory, projectFactory), - allowFunctions); - } - private boolean containsSnapshot(RelNode relNode) { RelNode original = null; if (relNode instanceof RelSubset) { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRule.java index 8f9227cd4b6b5..dbd98760dc137 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRule.java @@ -52,11 +52,6 @@ public class FlinkAggregateRemoveRule extends RelOptRule { // ~ Constructors ----------------------------------------------------------- - @Deprecated // to be removed before 2.0 - public FlinkAggregateRemoveRule(Class aggregateClass) { - this(aggregateClass, RelFactories.LOGICAL_BUILDER); - } - /** Creates an FlinkAggregateRemoveRule. */ public FlinkAggregateRemoveRule( Class aggregateClass, RelBuilderFactory relBuilderFactory) { diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkBushyJoinReorderRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkBushyJoinReorderRule.java index 6a10cac980c58..6ababa305149b 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkBushyJoinReorderRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkBushyJoinReorderRule.java @@ -27,7 +27,6 @@ import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Join; import org.apache.calcite.rel.core.JoinRelType; -import org.apache.calcite.rel.core.RelFactories; import org.apache.calcite.rel.metadata.RelMetadataQuery; import org.apache.calcite.rel.rules.LoptMultiJoin; import org.apache.calcite.rel.rules.MultiJoin; @@ -39,7 +38,6 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexShuttle; import org.apache.calcite.tools.RelBuilder; -import org.apache.calcite.tools.RelBuilderFactory; import org.apache.calcite.util.ImmutableBitSet; import org.immutables.value.Value; @@ -88,19 +86,6 @@ protected FlinkBushyJoinReorderRule(Config config) { super(config); } - @Deprecated // to be removed before 2.0 - public FlinkBushyJoinReorderRule(RelBuilderFactory relBuilderFactory) { - this(Config.DEFAULT.withRelBuilderFactory(relBuilderFactory).as(Config.class)); - } - - @Deprecated // to be removed before 2.0 - public FlinkBushyJoinReorderRule( - RelFactories.JoinFactory joinFactory, - RelFactories.ProjectFactory projectFactory, - RelFactories.FilterFactory filterFactory) { - this(RelBuilder.proto(joinFactory, projectFactory, filterFactory)); - } - @Override public void onMatch(RelOptRuleCall call) { final RelBuilder relBuilder = call.builder(); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinReorderRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinReorderRule.java index 9b6d92abcb3f5..260a3ab83dd87 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinReorderRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinReorderRule.java @@ -23,12 +23,9 @@ import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelRule; -import org.apache.calcite.rel.core.RelFactories; import org.apache.calcite.rel.rules.LoptOptimizeJoinRule; import org.apache.calcite.rel.rules.MultiJoin; import org.apache.calcite.rel.rules.TransformationRule; -import org.apache.calcite.tools.RelBuilder; -import org.apache.calcite.tools.RelBuilderFactory; import org.immutables.value.Value; /** @@ -59,22 +56,6 @@ protected FlinkJoinReorderRule(FlinkJoinReorderRule.Config config) { super(config); } - @Deprecated // to be removed before 2.0 - public FlinkJoinReorderRule(RelBuilderFactory relBuilderFactory) { - this( - FlinkJoinReorderRule.Config.DEFAULT - .withRelBuilderFactory(relBuilderFactory) - .as(FlinkJoinReorderRule.Config.class)); - } - - @Deprecated // to be removed before 2.0 - public FlinkJoinReorderRule( - RelFactories.JoinFactory joinFactory, - RelFactories.ProjectFactory projectFactory, - RelFactories.FilterFactory filterFactory) { - this(RelBuilder.proto(joinFactory, projectFactory, filterFactory)); - } - @Override public void onMatch(RelOptRuleCall call) { final MultiJoin multiJoinRel = call.rel(0); diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinToMultiJoinRule.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinToMultiJoinRule.java index 1712176f1f7cc..b402e3b2fabe5 100644 --- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinToMultiJoinRule.java +++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinToMultiJoinRule.java @@ -56,7 +56,6 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.rex.RexUtil; import org.apache.calcite.rex.RexVisitorImpl; -import org.apache.calcite.tools.RelBuilderFactory; import org.apache.calcite.util.ImmutableBitSet; import org.apache.calcite.util.ImmutableIntList; import org.apache.calcite.util.Pair; @@ -139,21 +138,6 @@ public JoinToMultiJoinRule(Config config) { super(config); } - @Deprecated // to be removed before 2.0 - public JoinToMultiJoinRule(Class clazz) { - this(Config.DEFAULT.withOperandFor(clazz)); - } - - @Deprecated // to be removed before 2.0 - public JoinToMultiJoinRule( - Class joinClass, RelBuilderFactory relBuilderFactory) { - this( - Config.DEFAULT - .withRelBuilderFactory(relBuilderFactory) - .as(Config.class) - .withOperandFor(joinClass)); - } - // ~ Methods ---------------------------------------------------------------- /**