jackwener commented on code in PR #4888:
URL: https://github.com/apache/arrow-datafusion/pull/4888#discussion_r1069161553
##########
datafusion/optimizer/src/push_down_filter.rs:
##########
@@ -749,7 +749,9 @@ impl OptimizerRule for PushDownFilter {
_ => plan.clone(),
};
- Ok(Some(utils::optimize_children(self, &new_plan, config)?))
+ Ok(Some(
+ utils::optimize_children(self, &new_plan,
config)?.unwrap_or(new_plan),
Review Comment:
```suggestion
optimize_children(self, &new_plan, config)?.unwrap_or(new_plan),
```
##########
datafusion/optimizer/src/utils.rs:
##########
@@ -37,18 +37,26 @@ use std::sync::Arc;
/// type. Useful for optimizer rules which want to leave the type
/// of plan unchanged but still apply to the children.
/// This also handles the case when the `plan` is a [`LogicalPlan::Explain`].
+///
+/// Returning `Ok(None)` indicates that the plan can't be optimized by the
`optimizer`.
pub fn optimize_children(
optimizer: &impl OptimizerRule,
plan: &LogicalPlan,
config: &dyn OptimizerConfig,
-) -> Result<LogicalPlan> {
+) -> Result<Option<LogicalPlan>> {
let new_exprs = plan.expressions();
let mut new_inputs = Vec::with_capacity(plan.inputs().len());
+ let mut plan_is_changed = false;
for input in plan.inputs() {
let new_input = optimizer.try_optimize(input, config)?;
+ plan_is_changed = plan_is_changed || new_input.is_some();
new_inputs.push(new_input.unwrap_or_else(|| input.clone()))
}
- from_plan(plan, &new_exprs, &new_inputs)
+ if plan_is_changed {
+ Ok(Some(from_plan(plan, &new_exprs, &new_inputs)?))
+ } else {
+ Ok(None)
+ }
Review Comment:
Nice👍
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
