Skip to content

[FLINK-36843][table-planner] Remove deprecated method in table-planner #27822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
balassai wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −122
Open

[FLINK-36843][table-planner] Remove deprecated method in table-planner #27822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions ...he/flink/table/planner/plan/rules/logical/FlinkAggregateExpandDistinctAggregatesRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -107,20 +106,6 @@ public FlinkAggregateExpandDistinctAggregatesRule(
this.useGroupingSets = useGroupingSets;
}

@Deprecated // to be removed before 2.0
public FlinkAggregateExpandDistinctAggregatesRule(
Class<? extends LogicalAggregate> clazz,
boolean useGroupingSets,
RelFactories.JoinFactory joinFactory) {
this(clazz, useGroupingSets, RelBuilder.proto(Contexts.of(joinFactory)));
}

@Deprecated // to be removed before 2.0
public FlinkAggregateExpandDistinctAggregatesRule(
Class<? extends LogicalAggregate> clazz, RelFactories.JoinFactory joinFactory) {
this(clazz, false, RelBuilder.proto(Contexts.of(joinFactory)));
}

// ~ Methods ----------------------------------------------------------------

public void onMatch(RelOptRuleCall call) {
Expand Down
52 changes: 0 additions & 52 deletions ...va/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateJoinTransposeRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,58 +110,6 @@ public FlinkAggregateJoinTransposeRule(
this.allowFunctions = allowFunctions;
}

@Deprecated // to be removed before 2.0
public FlinkAggregateJoinTransposeRule(
Class<? extends Aggregate> aggregateClass,
RelFactories.AggregateFactory aggregateFactory,
Class<? extends Join> joinClass,
RelFactories.JoinFactory joinFactory) {
this(aggregateClass, joinClass, RelBuilder.proto(aggregateFactory, joinFactory), false);
}

@Deprecated // to be removed before 2.0
public FlinkAggregateJoinTransposeRule(
Class<? extends Aggregate> aggregateClass,
RelFactories.AggregateFactory aggregateFactory,
Class<? extends Join> joinClass,
RelFactories.JoinFactory joinFactory,
boolean allowFunctions) {
this(
aggregateClass,
joinClass,
RelBuilder.proto(aggregateFactory, joinFactory),
allowFunctions);
}

@Deprecated // to be removed before 2.0
public FlinkAggregateJoinTransposeRule(
Class<? extends Aggregate> aggregateClass,
RelFactories.AggregateFactory aggregateFactory,
Class<? extends Join> 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<? extends Aggregate> aggregateClass,
RelFactories.AggregateFactory aggregateFactory,
Class<? extends Join> 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) {
Expand Down
5 changes: 0 additions & 5 deletions ...main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkAggregateRemoveRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ public class FlinkAggregateRemoveRule extends RelOptRule {

// ~ Constructors -----------------------------------------------------------

@Deprecated // to be removed before 2.0
public FlinkAggregateRemoveRule(Class<? extends Aggregate> aggregateClass) {
this(aggregateClass, RelFactories.LOGICAL_BUILDER);
}

/** Creates an FlinkAggregateRemoveRule. */
public FlinkAggregateRemoveRule(
Class<? extends Aggregate> aggregateClass, RelBuilderFactory relBuilderFactory) {
Expand Down
15 changes: 0 additions & 15 deletions ...ain/java/org/apache/flink/table/planner/plan/rules/logical/FlinkBushyJoinReorderRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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();
Expand Down
19 changes: 0 additions & 19 deletions ...src/main/java/org/apache/flink/table/planner/plan/rules/logical/FlinkJoinReorderRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 0 additions & 16 deletions .../src/main/java/org/apache/flink/table/planner/plan/rules/logical/JoinToMultiJoinRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -139,21 +138,6 @@ public JoinToMultiJoinRule(Config config) {
super(config);
}

@Deprecated // to be removed before 2.0
public JoinToMultiJoinRule(Class<? extends Join> clazz) {
this(Config.DEFAULT.withOperandFor(clazz));
}

@Deprecated // to be removed before 2.0
public JoinToMultiJoinRule(
Class<? extends Join> joinClass, RelBuilderFactory relBuilderFactory) {
this(
Config.DEFAULT
.withRelBuilderFactory(relBuilderFactory)
.as(Config.class)
.withOperandFor(joinClass));
}

// ~ Methods ----------------------------------------------------------------

/**
Expand Down