From ce63ca88585fe1e4a3e529dbace90f8436bacc22 Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies Date: Thu, 18 May 2023 11:31:47 +0100 Subject: [PATCH] Don't optimize AnalyzeExec (#6379) --- datafusion/core/src/physical_plan/planner.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/datafusion/core/src/physical_plan/planner.rs b/datafusion/core/src/physical_plan/planner.rs index 7577f29e86744..518ac78483e28 100644 --- a/datafusion/core/src/physical_plan/planner.rs +++ b/datafusion/core/src/physical_plan/planner.rs @@ -1192,11 +1192,9 @@ impl DefaultPhysicalPlanner { "Unsupported logical plan: Distinct should be replaced to Aggregate".to_string(), )) } - LogicalPlan::Analyze(a) => { - let input = self.create_initial_plan(&a.input, session_state).await?; - let schema = SchemaRef::new((*a.schema).clone().into()); - Ok(Arc::new(AnalyzeExec::new(a.verbose, input, schema))) - } + LogicalPlan::Analyze(_) => Err(DataFusionError::Internal( + "Unsupported logical plan: Analyze must be root of the plan".to_string(), + )), LogicalPlan::Extension(e) => { let physical_inputs = self.create_initial_plan_multi(e.node.inputs(), session_state).await?; @@ -1851,6 +1849,10 @@ impl DefaultPhysicalPlanner { stringified_plans, e.verbose, )))) + } else if let LogicalPlan::Analyze(a) = logical_plan { + let input = self.create_physical_plan(&a.input, session_state).await?; + let schema = SchemaRef::new((*a.schema).clone().into()); + Ok(Some(Arc::new(AnalyzeExec::new(a.verbose, input, schema)))) } else { Ok(None) }