Skip to content

Apache DataFusion SQL Query Engine

refactor: simplify filter pushdown volatility check (#25768)

Yongting You1bd2ad3efe70
diff --git a/datafusion/physical-optimizer/src/filter_pushdown.rs b/datafusion/physical-optimizer/src/filter_pushdown.rs
index 18fe151000..8beadf5d04 100644
--- a/datafusion/physical-optimizer/src/filter_pushdown.rs
+++ b/datafusion/physical-optimizer/src/filter_pushdown.rs
@@ -35,7 +35,6 @@ use std::sync::Arc;
use crate::PhysicalOptimizerRule;
-use datafusion_common::tree_node::{TreeNode, TreeNodeRecursion};
use datafusion_common::{Result, assert_eq_or_internal_err, config::ConfigOptions};
use datafusion_physical_expr::PhysicalExpr;
use datafusion_physical_expr_common::physical_expr::is_volatile;
@@ -706,17 +705,7 @@ impl<T: Clone> FilteredVec<T> {
}
fn allow_pushdown_for_expr(expr: &Arc<dyn PhysicalExpr>) -> bool {
- let mut allow_pushdown = true;
- expr.apply(|e| {
- allow_pushdown = allow_pushdown && !is_volatile(e);
- if allow_pushdown {
- Ok(TreeNodeRecursion::Continue)
- } else {
- Ok(TreeNodeRecursion::Stop)
- }
- })
- .expect("Infallible traversal of PhysicalExpr tree failed");
- allow_pushdown
+ !is_volatile(expr)
}
#[cfg(test)]