Apache DataFusion SQL Query Engine
fix: update filter predicates for min/max aggregates only if bounds change (#20380)
notashesb0566c57cc0b
diff --git a/datafusion/physical-plan/src/aggregates/no_grouping.rs b/datafusion/physical-plan/src/aggregates/no_grouping.rsindex fe8942097a..a7dd7c9a66 100644--- a/datafusion/physical-plan/src/aggregates/no_grouping.rs+++ b/datafusion/physical-plan/src/aggregates/no_grouping.rs@@ -161,6 +161,8 @@ impl AggregateStreamInner {return Ok(());};+ let mut bounds_changed = false;+for acc_info in &filter_state.supported_accumulators_info {let acc =self.accumulators@@ -176,20 +178,27 @@ impl AggregateStreamInner {let current_bound = acc.evaluate()?;{let mut bound = acc_info.shared_bound.lock();- match acc_info.aggr_type {+ let new_bound = match acc_info.aggr_type {DynamicFilterAggregateType::Max => {- *bound = scalar_max(&bound, ¤t_bound)?;+ scalar_max(&bound, ¤t_bound)?}DynamicFilterAggregateType::Min => {- *bound = scalar_min(&bound, ¤t_bound)?;+ scalar_min(&bound, ¤t_bound)?}+ };+ if new_bound != *bound {+ *bound = new_bound;+ bounds_changed = true;}}}- // Step 2: Sync the dynamic filter physical expression with reader- let predicate = self.build_dynamic_filter_from_accumulator_bounds()?;- filter_state.filter.update(predicate)?;+ // Step 2: Sync the dynamic filter physical expression with reader,+ // but only if any bound actually changed.+ if bounds_changed {+ let predicate = self.build_dynamic_filter_from_accumulator_bounds()?;+ filter_state.filter.update(predicate)?;+ }Ok(())}