diff --git a/datafusion-examples/examples/planner_api.rs b/datafusion-examples/examples/planner_api.rs index e52f0d78682f7..41110a3e0a9cf 100644 --- a/datafusion-examples/examples/planner_api.rs +++ b/datafusion-examples/examples/planner_api.rs @@ -17,7 +17,7 @@ use datafusion::error::Result; use datafusion::logical_expr::{LogicalPlan, PlanType}; -use datafusion::physical_plan::displayable; +use datafusion::physical_plan::{displayable, DisplayFormatType}; use datafusion::physical_planner::DefaultPhysicalPlanner; use datafusion::prelude::*; @@ -78,7 +78,11 @@ async fn to_physical_plan_in_one_api_demo( println!( "Physical plan direct from logical plan:\n\n{}\n\n", displayable(physical_plan.as_ref()) - .to_stringified(false, PlanType::InitialPhysicalPlan) + .to_stringified( + false, + PlanType::InitialPhysicalPlan, + DisplayFormatType::Default + ) .plan ); @@ -120,7 +124,11 @@ async fn to_physical_plan_step_by_step_demo( println!( "Final physical plan:\n\n{}\n\n", displayable(physical_plan.as_ref()) - .to_stringified(false, PlanType::InitialPhysicalPlan) + .to_stringified( + false, + PlanType::InitialPhysicalPlan, + DisplayFormatType::Default + ) .plan ); @@ -135,7 +143,11 @@ async fn to_physical_plan_step_by_step_demo( println!( "Optimized physical plan:\n\n{}\n\n", displayable(physical_plan.as_ref()) - .to_stringified(false, PlanType::InitialPhysicalPlan) + .to_stringified( + false, + PlanType::InitialPhysicalPlan, + DisplayFormatType::Default + ) .plan ); diff --git a/datafusion/core/src/physical_planner.rs b/datafusion/core/src/physical_planner.rs index 9ccde53f207c4..05b05f45367a5 100644 --- a/datafusion/core/src/physical_planner.rs +++ b/datafusion/core/src/physical_planner.rs @@ -2721,6 +2721,9 @@ mod tests { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "NoOpExecutionPlan") } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/core/tests/custom_sources_cases/mod.rs b/datafusion/core/tests/custom_sources_cases/mod.rs index aafefac04e321..de2bd71de9df9 100644 --- a/datafusion/core/tests/custom_sources_cases/mod.rs +++ b/datafusion/core/tests/custom_sources_cases/mod.rs @@ -138,6 +138,9 @@ impl DisplayAs for CustomExecutionPlan { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "CustomExecutionPlan: projection={:#?}", self.projection) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs b/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs index af0506a505581..4cda92216b491 100644 --- a/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs +++ b/datafusion/core/tests/custom_sources_cases/provider_filter_pushdown.rs @@ -92,6 +92,9 @@ impl DisplayAs for CustomPlan { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "CustomPlan: batch_size={}", self.batches.len(),) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/core/tests/custom_sources_cases/statistics.rs b/datafusion/core/tests/custom_sources_cases/statistics.rs index 1fd6dfec79fbd..2d258b3585528 100644 --- a/datafusion/core/tests/custom_sources_cases/statistics.rs +++ b/datafusion/core/tests/custom_sources_cases/statistics.rs @@ -141,6 +141,9 @@ impl DisplayAs for StatisticsValidation { self.stats.num_rows, ) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/core/tests/physical_optimizer/join_selection.rs b/datafusion/core/tests/physical_optimizer/join_selection.rs index ae7adacadb197..82c1044d17631 100644 --- a/datafusion/core/tests/physical_optimizer/join_selection.rs +++ b/datafusion/core/tests/physical_optimizer/join_selection.rs @@ -925,6 +925,9 @@ impl DisplayAs for UnboundedExec { self.batch_produce.is_none(), ) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } @@ -1020,6 +1023,9 @@ impl DisplayAs for StatisticsExec { self.stats.num_rows, ) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/core/tests/user_defined/user_defined_plan.rs b/datafusion/core/tests/user_defined/user_defined_plan.rs index fae4b2cd82ab0..3e52afbbae267 100644 --- a/datafusion/core/tests/user_defined/user_defined_plan.rs +++ b/datafusion/core/tests/user_defined/user_defined_plan.rs @@ -700,6 +700,9 @@ impl DisplayAs for TopKExec { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "TopKExec: k={}", self.k) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/physical-plan/src/aggregates/mod.rs b/datafusion/physical-plan/src/aggregates/mod.rs index 81e2af6a44f20..956046ecbb380 100644 --- a/datafusion/physical-plan/src/aggregates/mod.rs +++ b/datafusion/physical-plan/src/aggregates/mod.rs @@ -1800,6 +1800,9 @@ mod tests { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "TestYieldingExec") } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } diff --git a/datafusion/physical-plan/src/sorts/sort.rs b/datafusion/physical-plan/src/sorts/sort.rs index c00a312636f5f..dfc8d58aacd18 100644 --- a/datafusion/physical-plan/src/sorts/sort.rs +++ b/datafusion/physical-plan/src/sorts/sort.rs @@ -1102,6 +1102,9 @@ mod tests { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "UnboundableExec",).unwrap() } + DisplayFormatType::TreeRender => { + write!(f, "").unwrap() // TODO(renjj): add display info + } } Ok(()) } diff --git a/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs b/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs index 85e692217d670..9b38372845ee8 100644 --- a/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs +++ b/datafusion/physical-plan/src/sorts/sort_preserving_merge.rs @@ -1389,6 +1389,9 @@ mod tests { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "CongestedExec",).unwrap() } + DisplayFormatType::TreeRender => { + write!(f, "").unwrap() // TODO(renjj): add display info + } } Ok(()) } diff --git a/datafusion/physical-plan/src/test/exec.rs b/datafusion/physical-plan/src/test/exec.rs index f0149faa84331..55d0a8dad26cd 100644 --- a/datafusion/physical-plan/src/test/exec.rs +++ b/datafusion/physical-plan/src/test/exec.rs @@ -175,6 +175,9 @@ impl DisplayAs for MockExec { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "MockExec") } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } @@ -337,6 +340,9 @@ impl DisplayAs for BarrierExec { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "BarrierExec") } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } @@ -449,6 +455,9 @@ impl DisplayAs for ErrorExec { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "ErrorExec") } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } @@ -535,6 +544,9 @@ impl DisplayAs for StatisticsExec { self.stats.num_rows, ) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } @@ -630,6 +642,9 @@ impl DisplayAs for BlockingExec { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "BlockingExec",) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } } @@ -772,6 +787,9 @@ impl DisplayAs for PanicExec { DisplayFormatType::Default | DisplayFormatType::Verbose => { write!(f, "PanicExec",) } + DisplayFormatType::TreeRender => { + write!(f, "") // TODO(renjj): add display info + } } } }