Skip to content

Apache DataFusion SQL Query Engine

chore(optimizer): remove deprecated `supports_rewrite` (#26180)

Huaijine6a11e5f1dd5
diff --git a/datafusion-examples/examples/query_planning/optimizer_rule.rs b/datafusion-examples/examples/query_planning/optimizer_rule.rs
index 67683b7fe2..d76c8f29e8 100644
--- a/datafusion-examples/examples/query_planning/optimizer_rule.rs
+++ b/datafusion-examples/examples/query_planning/optimizer_rule.rs
@@ -108,11 +108,6 @@ impl OptimizerRule for MyOptimizerRule {
"my_optimizer_rule"
}
- // New OptimizerRules should use the "rewrite" api as it is more efficient
- fn supports_rewrite(&self) -> bool {
- true
- }
-
/// Ask the optimizer to handle the plan recursion. `rewrite` will be called
/// on each plan node.
fn apply_order(&self) -> Option<ApplyOrder> {
diff --git a/datafusion/core/tests/user_defined/statistics_requests.rs b/datafusion/core/tests/user_defined/statistics_requests.rs
index 079639baf1..5ea6b7ad1a 100644
--- a/datafusion/core/tests/user_defined/statistics_requests.rs
+++ b/datafusion/core/tests/user_defined/statistics_requests.rs
@@ -59,10 +59,6 @@ impl OptimizerRule for RequestColumnStatistics {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/core/tests/user_defined/user_defined_plan.rs b/datafusion/core/tests/user_defined/user_defined_plan.rs
index 080b1112f3..6c566b71f6 100644
--- a/datafusion/core/tests/user_defined/user_defined_plan.rs
+++ b/datafusion/core/tests/user_defined/user_defined_plan.rs
@@ -428,10 +428,6 @@ impl OptimizerRule for OptimizerMakeExtensionNodeInvalid {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
// Example rewrite pass which impacts validity of the extension node.
fn rewrite(
&self,
@@ -500,10 +496,6 @@ impl OptimizerRule for TopKOptimizerRule {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
// Example rewrite pass to insert a user defined LogicalPlanNode
fn rewrite(
&self,
diff --git a/datafusion/optimizer/src/common_subexpr_eliminate.rs b/datafusion/optimizer/src/common_subexpr_eliminate.rs
index 9a9ffc36a1..72615083d9 100644
--- a/datafusion/optimizer/src/common_subexpr_eliminate.rs
+++ b/datafusion/optimizer/src/common_subexpr_eliminate.rs
@@ -540,10 +540,6 @@ fn get_consecutive_window_exprs(
}
impl OptimizerRule for CommonSubexprEliminate {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn apply_order(&self) -> Option<ApplyOrder> {
// This rule handles recursion itself in a `ApplyOrder::TopDown` like manner.
// This is because in some cases adjacent nodes are collected (e.g. `Window`) and
diff --git a/datafusion/optimizer/src/decorrelate_lateral_join.rs b/datafusion/optimizer/src/decorrelate_lateral_join.rs
index a8df5e69e3..0c97c2a1d6 100644
--- a/datafusion/optimizer/src/decorrelate_lateral_join.rs
+++ b/datafusion/optimizer/src/decorrelate_lateral_join.rs
@@ -45,10 +45,6 @@ impl DecorrelateLateralJoin {
}
impl OptimizerRule for DecorrelateLateralJoin {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/decorrelate_predicate_subquery.rs b/datafusion/optimizer/src/decorrelate_predicate_subquery.rs
index bfd5109761..0a016cd949 100644
--- a/datafusion/optimizer/src/decorrelate_predicate_subquery.rs
+++ b/datafusion/optimizer/src/decorrelate_predicate_subquery.rs
@@ -57,10 +57,6 @@ impl DecorrelatePredicateSubquery {
}
impl OptimizerRule for DecorrelatePredicateSubquery {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/eliminate_aggregate_distinct.rs b/datafusion/optimizer/src/eliminate_aggregate_distinct.rs
index a0c0fde4fd..c6d65979e9 100644
--- a/datafusion/optimizer/src/eliminate_aggregate_distinct.rs
+++ b/datafusion/optimizer/src/eliminate_aggregate_distinct.rs
@@ -68,10 +68,6 @@ impl OptimizerRule for EliminateAggregateDistinct {
Some(ApplyOrder::BottomUp)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/eliminate_cross_join.rs b/datafusion/optimizer/src/eliminate_cross_join.rs
index d1e72e254e..6464b6a6fd 100644
--- a/datafusion/optimizer/src/eliminate_cross_join.rs
+++ b/datafusion/optimizer/src/eliminate_cross_join.rs
@@ -75,10 +75,6 @@ impl EliminateCrossJoin {
///
/// This fix helps to improve the performance of TPCH Q19. issue#78
impl OptimizerRule for EliminateCrossJoin {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
#[cfg_attr(feature = "recursive_protection", recursive::recursive)]
fn rewrite(
&self,
diff --git a/datafusion/optimizer/src/eliminate_duplicated_expr.rs b/datafusion/optimizer/src/eliminate_duplicated_expr.rs
index f2f489ab82..97a53eef74 100644
--- a/datafusion/optimizer/src/eliminate_duplicated_expr.rs
+++ b/datafusion/optimizer/src/eliminate_duplicated_expr.rs
@@ -55,10 +55,6 @@ impl OptimizerRule for EliminateDuplicatedExpr {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/eliminate_filter.rs b/datafusion/optimizer/src/eliminate_filter.rs
index 5df9c00347..7841311d6b 100644
--- a/datafusion/optimizer/src/eliminate_filter.rs
+++ b/datafusion/optimizer/src/eliminate_filter.rs
@@ -49,10 +49,6 @@ impl OptimizerRule for EliminateFilter {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/eliminate_group_by_constant.rs b/datafusion/optimizer/src/eliminate_group_by_constant.rs
index f0efe96668..a5f8d2ca47 100644
--- a/datafusion/optimizer/src/eliminate_group_by_constant.rs
+++ b/datafusion/optimizer/src/eliminate_group_by_constant.rs
@@ -39,10 +39,6 @@ impl EliminateGroupByConstant {
}
impl OptimizerRule for EliminateGroupByConstant {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/eliminate_limit.rs b/datafusion/optimizer/src/eliminate_limit.rs
index 951c1443b4..3b12330207 100644
--- a/datafusion/optimizer/src/eliminate_limit.rs
+++ b/datafusion/optimizer/src/eliminate_limit.rs
@@ -49,10 +49,6 @@ impl OptimizerRule for EliminateLimit {
Some(ApplyOrder::BottomUp)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/eliminate_outer_join.rs b/datafusion/optimizer/src/eliminate_outer_join.rs
index 466c5bb83a..34feded110 100644
--- a/datafusion/optimizer/src/eliminate_outer_join.rs
+++ b/datafusion/optimizer/src/eliminate_outer_join.rs
@@ -95,10 +95,6 @@ impl OptimizerRule for EliminateOuterJoin {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/extract_equijoin_predicate.rs b/datafusion/optimizer/src/extract_equijoin_predicate.rs
index af5e601ef9..b279cac660 100644
--- a/datafusion/optimizer/src/extract_equijoin_predicate.rs
+++ b/datafusion/optimizer/src/extract_equijoin_predicate.rs
@@ -49,10 +49,6 @@ impl ExtractEquijoinPredicate {
}
impl OptimizerRule for ExtractEquijoinPredicate {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn name(&self) -> &str {
"extract_equijoin_predicate"
}
diff --git a/datafusion/optimizer/src/filter_null_join_keys.rs b/datafusion/optimizer/src/filter_null_join_keys.rs
index e3de8048a8..dd13b4b037 100644
--- a/datafusion/optimizer/src/filter_null_join_keys.rs
+++ b/datafusion/optimizer/src/filter_null_join_keys.rs
@@ -33,10 +33,6 @@ use std::sync::Arc;
pub struct FilterNullJoinKeys {}
impl OptimizerRule for FilterNullJoinKeys {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn apply_order(&self) -> Option<ApplyOrder> {
Some(ApplyOrder::BottomUp)
}
diff --git a/datafusion/optimizer/src/optimize_projections/mod.rs b/datafusion/optimizer/src/optimize_projections/mod.rs
index 3bbaf887ca..7d47f4514a 100644
--- a/datafusion/optimizer/src/optimize_projections/mod.rs
+++ b/datafusion/optimizer/src/optimize_projections/mod.rs
@@ -89,10 +89,6 @@ impl OptimizerRule for OptimizeProjections {
None
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/optimize_unions.rs b/datafusion/optimizer/src/optimize_unions.rs
index 80f8ebeef1..a68899063d 100644
--- a/datafusion/optimizer/src/optimize_unions.rs
+++ b/datafusion/optimizer/src/optimize_unions.rs
@@ -47,10 +47,6 @@ impl OptimizerRule for OptimizeUnions {
Some(ApplyOrder::BottomUp)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/optimizer.rs b/datafusion/optimizer/src/optimizer.rs
index fa5523784b..94583d545d 100644
--- a/datafusion/optimizer/src/optimizer.rs
+++ b/datafusion/optimizer/src/optimizer.rs
@@ -93,12 +93,6 @@ pub trait OptimizerRule: Debug {
None
}
- /// Does this rule support rewriting owned plans (rather than by reference)?
- #[deprecated(since = "47.0.0", note = "This method is no longer used")]
- fn supports_rewrite(&self) -> bool {
- true
- }
-
/// Try to rewrite `plan` to an optimized form, returning [`Transformed::yes`]
/// if the plan was rewritten and [`Transformed::no`] if it was not.
///
@@ -995,10 +989,6 @@ mod tests {
"bad rule"
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
_plan: LogicalPlan,
@@ -1017,10 +1007,6 @@ mod tests {
"get table_scan rule"
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
_plan: LogicalPlan,
@@ -1045,10 +1031,6 @@ mod tests {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
@@ -1092,10 +1074,6 @@ mod tests {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/propagate_empty_relation.rs b/datafusion/optimizer/src/propagate_empty_relation.rs
index 49e358a854..bd96c55861 100644
--- a/datafusion/optimizer/src/propagate_empty_relation.rs
+++ b/datafusion/optimizer/src/propagate_empty_relation.rs
@@ -48,10 +48,6 @@ impl OptimizerRule for PropagateEmptyRelation {
Some(ApplyOrder::BottomUp)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/push_down_filter.rs b/datafusion/optimizer/src/push_down_filter.rs
index efd5a61e4e..1f1b1a6973 100644
--- a/datafusion/optimizer/src/push_down_filter.rs
+++ b/datafusion/optimizer/src/push_down_filter.rs
@@ -856,10 +856,6 @@ impl OptimizerRule for PushDownFilter {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/push_down_limit.rs b/datafusion/optimizer/src/push_down_limit.rs
index 499a2c993c..24b5f5eef3 100644
--- a/datafusion/optimizer/src/push_down_limit.rs
+++ b/datafusion/optimizer/src/push_down_limit.rs
@@ -62,10 +62,6 @@ impl PushDownLimit {
/// Push down Limit.
impl OptimizerRule for PushDownLimit {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/replace_distinct_aggregate.rs b/datafusion/optimizer/src/replace_distinct_aggregate.rs
index cc26163790..5400a9feec 100644
--- a/datafusion/optimizer/src/replace_distinct_aggregate.rs
+++ b/datafusion/optimizer/src/replace_distinct_aggregate.rs
@@ -76,10 +76,6 @@ impl ReplaceDistinctWithAggregate {
}
impl OptimizerRule for ReplaceDistinctWithAggregate {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/scalar_subquery_to_join.rs b/datafusion/optimizer/src/scalar_subquery_to_join.rs
index c6374660ef..745418f3ad 100644
--- a/datafusion/optimizer/src/scalar_subquery_to_join.rs
+++ b/datafusion/optimizer/src/scalar_subquery_to_join.rs
@@ -84,10 +84,6 @@ impl ScalarSubqueryToJoin {
}
impl OptimizerRule for ScalarSubqueryToJoin {
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs b/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs
index 41dd24b6d8..c98ac48871 100644
--- a/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs
+++ b/datafusion/optimizer/src/simplify_expressions/simplify_exprs.rs
@@ -59,10 +59,6 @@ impl OptimizerRule for SimplifyExpressions {
Some(ApplyOrder::BottomUp)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/single_distinct_to_groupby.rs b/datafusion/optimizer/src/single_distinct_to_groupby.rs
index f3afcc8fee..aabfec83c0 100644
--- a/datafusion/optimizer/src/single_distinct_to_groupby.rs
+++ b/datafusion/optimizer/src/single_distinct_to_groupby.rs
@@ -224,10 +224,6 @@ impl OptimizerRule for SingleDistinctToGroupBy {
Some(ApplyOrder::TopDown)
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,
diff --git a/datafusion/optimizer/src/unions_to_filter.rs b/datafusion/optimizer/src/unions_to_filter.rs
index 7bc39a084f..345c28187d 100644
--- a/datafusion/optimizer/src/unions_to_filter.rs
+++ b/datafusion/optimizer/src/unions_to_filter.rs
@@ -48,10 +48,6 @@ impl OptimizerRule for UnionsToFilter {
"unions_to_filter"
}
- fn supports_rewrite(&self) -> bool {
- true
- }
-
fn rewrite(
&self,
plan: LogicalPlan,