This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new 963b649d1e feat: make error handling in indent explain consistent with
that in tree (#16097)
963b649d1e is described below
commit 963b649d1e021e2516c2d652a8aa9fc486a5a1ba
Author: Chen Chongchen <[email protected]>
AuthorDate: Wed May 21 01:15:45 2025 +0800
feat: make error handling in indent explain consistent with that in tree
(#16097)
* feat: make error handling in indent consistent with that in tree
* update test
* return all plans instead of throwing err
* update test
---
datafusion/core/src/physical_planner.rs | 60 ++++++++++++++++++++++++++++++++-
1 file changed, 59 insertions(+), 1 deletion(-)
diff --git a/datafusion/core/src/physical_planner.rs
b/datafusion/core/src/physical_planner.rs
index f2535218ff..2e82656c91 100644
--- a/datafusion/core/src/physical_planner.rs
+++ b/datafusion/core/src/physical_planner.rs
@@ -1712,6 +1712,14 @@ impl DefaultPhysicalPlanner {
let config = &session_state.config_options().explain;
let explain_format = &e.explain_format;
+ if !e.logical_optimization_succeeded {
+ return Ok(Arc::new(ExplainExec::new(
+ Arc::clone(e.schema.inner()),
+ e.stringified_plans.clone(),
+ true,
+ )));
+ }
+
match explain_format {
ExplainFormat::Indent => { /* fall through */ }
ExplainFormat::Tree => {
@@ -2190,7 +2198,9 @@ mod tests {
use arrow::array::{ArrayRef, DictionaryArray, Int32Array};
use arrow::datatypes::{DataType, Field, Int32Type};
use datafusion_common::config::ConfigOptions;
- use datafusion_common::{assert_contains, DFSchemaRef, TableReference};
+ use datafusion_common::{
+ assert_contains, DFSchemaRef, TableReference, ToDFSchema as _,
+ };
use datafusion_execution::runtime_env::RuntimeEnv;
use datafusion_execution::TaskContext;
use datafusion_expr::{col, lit, LogicalPlanBuilder,
UserDefinedLogicalNodeCore};
@@ -2687,6 +2697,54 @@ mod tests {
}
}
+ #[tokio::test]
+ async fn test_explain_indent_err() {
+ let planner = DefaultPhysicalPlanner::default();
+ let ctx = SessionContext::new();
+ let schema = Schema::new(vec![Field::new("id", DataType::Int32,
false)]);
+ let plan = Arc::new(
+ scan_empty(Some("employee"), &schema, None)
+ .unwrap()
+ .explain(true, false)
+ .unwrap()
+ .build()
+ .unwrap(),
+ );
+
+ // Create a schema
+ let schema = Arc::new(Schema::new(vec![
+ Field::new("plan_type", DataType::Utf8, false),
+ Field::new("plan", DataType::Utf8, false),
+ ]));
+
+ // Create invalid indentation in the plan
+ let stringified_plans =
+ vec![StringifiedPlan::new(PlanType::FinalLogicalPlan, "Test Err")];
+
+ let explain = Explain {
+ verbose: false,
+ explain_format: ExplainFormat::Indent,
+ plan,
+ stringified_plans,
+ schema: schema.to_dfschema_ref().unwrap(),
+ logical_optimization_succeeded: false,
+ };
+ let plan = planner
+ .handle_explain(&explain, &ctx.state())
+ .await
+ .unwrap();
+ if let Some(plan) = plan.as_any().downcast_ref::<ExplainExec>() {
+ let stringified_plans = plan.stringified_plans();
+ assert_eq!(stringified_plans.len(), 1);
+ assert_eq!(stringified_plans[0].plan.as_str(), "Test Err");
+ } else {
+ panic!(
+ "Plan was not an explain plan: {}",
+ displayable(plan.as_ref()).indent(true)
+ );
+ }
+ }
+
#[tokio::test]
async fn test_maybe_fix_colon_in_physical_name() {
// The physical schema has a field name with a colon
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
