Apache DataFusion SQL Query Engine
Skip unnecessary plan rebuild in adjust_input_keys_ordering for non-join plans (#21947)
Qi Zhud64898205d65
diff --git a/datafusion/core/tests/physical_optimizer/enforce_distribution.rs b/datafusion/core/tests/physical_optimizer/enforce_distribution.rsindex 4aea2a052a..78bb02ab11 100644--- a/datafusion/core/tests/physical_optimizer/enforce_distribution.rs+++ b/datafusion/core/tests/physical_optimizer/enforce_distribution.rs@@ -3978,3 +3978,33 @@ fn maintains_order_preserves_spm_through_union_with_prefer_existing_sort() -> ReOk(())}++/// Verifies that `adjust_input_keys_ordering` returns `Transformed::no`+/// for a simple scan plan with no key requirements, avoiding an+/// unnecessary plan rebuild.+#[test]+fn adjust_input_keys_ordering_no_transform_for_scan() -> Result<()> {+ let plan: Arc<dyn ExecutionPlan> = parquet_exec();+ let requirements = PlanWithKeyRequirements::new_default(plan);+ let result = adjust_input_keys_ordering(requirements)?;+ assert!(+ !result.transformed,+ "expected Transformed::no for a scan plan with empty requirements"+ );+ Ok(())+}++/// Verifies that `adjust_input_keys_ordering` applied via `transform_down`+/// over a filter -> scan tree returns `Transformed::no` when there are no+/// join/aggregate key requirements.+#[test]+fn adjust_input_keys_ordering_no_transform_for_filter_scan() -> Result<()> {+ let plan: Arc<dyn ExecutionPlan> = filter_exec(parquet_exec());+ let requirements = PlanWithKeyRequirements::new_default(plan);+ let result = requirements.transform_down(adjust_input_keys_ordering)?;+ assert!(+ !result.transformed,+ "expected Transformed::no for a filter->scan tree with no key requirements"+ );+ Ok(())+}diff --git a/datafusion/physical-optimizer/src/enforce_distribution.rs b/datafusion/physical-optimizer/src/enforce_distribution.rsindex 87d0943610..c522867c05 100644--- a/datafusion/physical-optimizer/src/enforce_distribution.rs+++ b/datafusion/physical-optimizer/src/enforce_distribution.rs@@ -412,6 +412,9 @@ pub fn adjust_input_keys_ordering(|| plan.is::<WindowAggExec>(){requirements.data.clear();+ } else if requirements.data.is_empty() {+ // No requirements to push down and no plan changes — skip rebuild.+ return Ok(Transformed::no(requirements));} else {// By default, push down the parent requirements to childrenfor child in requirements.children.iter_mut() {