fix compile errors

irenjj · irenjj · commit ad83ec7a3c4a · 2025-02-15T13:31:38.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2721,6 +2721,9 @@ mod tests {`
`2721`	`2721`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`2722`	`2722`	`write!(f, "NoOpExecutionPlan")`
`2723`	`2723`	`}`
	`2724`	`+ DisplayFormatType::TreeRender => {`
	`2725`	`+ write!(f, "") // TODO(renjj): add display info`
	`2726`	`+ }`
`2724`	`2727`	`}`
`2725`	`2728`	`}`
`2726`	`2729`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ impl DisplayAs for CustomExecutionPlan {`
`138`	`138`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`139`	`139`	`write!(f, "CustomExecutionPlan: projection={:#?}", self.projection)`
`140`	`140`	`}`
	`141`	`+ DisplayFormatType::TreeRender => {`
	`142`	`+ write!(f, "") // TODO(renjj): add display info`
	`143`	`+ }`
`141`	`144`	`}`
`142`	`145`	`}`
`143`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ impl DisplayAs for CustomPlan {`
`92`	`92`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`93`	`93`	`write!(f, "CustomPlan: batch_size={}", self.batches.len(),)`
`94`	`94`	`}`
	`95`	`+ DisplayFormatType::TreeRender => {`
	`96`	`+ write!(f, "") // TODO(renjj): add display info`
	`97`	`+ }`
`95`	`98`	`}`
`96`	`99`	`}`
`97`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,9 @@ impl DisplayAs for StatisticsValidation {`
`141`	`141`	`self.stats.num_rows,`
`142`	`142`	`)`
`143`	`143`	`}`
	`144`	`+ DisplayFormatType::TreeRender => {`
	`145`	`+ write!(f, "") // TODO(renjj): add display info`
	`146`	`+ }`
`144`	`147`	`}`
`145`	`148`	`}`
`146`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -925,6 +925,9 @@ impl DisplayAs for UnboundedExec {`
`925`	`925`	`self.batch_produce.is_none(),`
`926`	`926`	`)`
`927`	`927`	`}`
	`928`	`+ DisplayFormatType::TreeRender => {`
	`929`	`+ write!(f, "") // TODO(renjj): add display info`
	`930`	`+ }`
`928`	`931`	`}`
`929`	`932`	`}`
`930`	`933`	`}`
`@@ -1020,6 +1023,9 @@ impl DisplayAs for StatisticsExec {`
`1020`	`1023`	`self.stats.num_rows,`
`1021`	`1024`	`)`
`1022`	`1025`	`}`
	`1026`	`+ DisplayFormatType::TreeRender => {`
	`1027`	`+ write!(f, "") // TODO(renjj): add display info`
	`1028`	`+ }`
`1023`	`1029`	`}`
`1024`	`1030`	`}`
`1025`	`1031`	`}`
Original file line number	Diff line number	Diff line change
`@@ -700,6 +700,9 @@ impl DisplayAs for TopKExec {`
`700`	`700`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`701`	`701`	`write!(f, "TopKExec: k={}", self.k)`
`702`	`702`	`}`
	`703`	`+ DisplayFormatType::TreeRender => {`
	`704`	`+ write!(f, "") // TODO(renjj): add display info`
	`705`	`+ }`
`703`	`706`	`}`
`704`	`707`	`}`
`705`	`708`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1800,6 +1800,9 @@ mod tests {`
`1800`	`1800`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`1801`	`1801`	`write!(f, "TestYieldingExec")`
`1802`	`1802`	`}`
	`1803`	`+ DisplayFormatType::TreeRender => {`
	`1804`	`+ write!(f, "") // TODO(renjj): add display info`
	`1805`	`+ }`
`1803`	`1806`	`}`
`1804`	`1807`	`}`
`1805`	`1808`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1102,6 +1102,9 @@ mod tests {`
`1102`	`1102`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`1103`	`1103`	`write!(f, "UnboundableExec",).unwrap()`
`1104`	`1104`	`}`
	`1105`	`+ DisplayFormatType::TreeRender => {`
	`1106`	`+ write!(f, "").unwrap() // TODO(renjj): add display info`
	`1107`	`+ }`
`1105`	`1108`	`}`
`1106`	`1109`	`Ok(())`
`1107`	`1110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1389,6 +1389,9 @@ mod tests {`
`1389`	`1389`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`1390`	`1390`	`write!(f, "CongestedExec",).unwrap()`
`1391`	`1391`	`}`
	`1392`	`+ DisplayFormatType::TreeRender => {`
	`1393`	`+ write!(f, "").unwrap() // TODO(renjj): add display info`
	`1394`	`+ }`
`1392`	`1395`	`}`
`1393`	`1396`	`Ok(())`
`1394`	`1397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,9 @@ impl DisplayAs for MockExec {`
`175`	`175`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`176`	`176`	`write!(f, "MockExec")`
`177`	`177`	`}`
	`178`	`+ DisplayFormatType::TreeRender => {`
	`179`	`+ write!(f, "") // TODO(renjj): add display info`
	`180`	`+ }`
`178`	`181`	`}`
`179`	`182`	`}`
`180`	`183`	`}`
`@@ -337,6 +340,9 @@ impl DisplayAs for BarrierExec {`
`337`	`340`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`338`	`341`	`write!(f, "BarrierExec")`
`339`	`342`	`}`
	`343`	`+ DisplayFormatType::TreeRender => {`
	`344`	`+ write!(f, "") // TODO(renjj): add display info`
	`345`	`+ }`
`340`	`346`	`}`
`341`	`347`	`}`
`342`	`348`	`}`
`@@ -449,6 +455,9 @@ impl DisplayAs for ErrorExec {`
`449`	`455`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`450`	`456`	`write!(f, "ErrorExec")`
`451`	`457`	`}`
	`458`	`+ DisplayFormatType::TreeRender => {`
	`459`	`+ write!(f, "") // TODO(renjj): add display info`
	`460`	`+ }`
`452`	`461`	`}`
`453`	`462`	`}`
`454`	`463`	`}`
`@@ -535,6 +544,9 @@ impl DisplayAs for StatisticsExec {`
`535`	`544`	`self.stats.num_rows,`
`536`	`545`	`)`
`537`	`546`	`}`
	`547`	`+ DisplayFormatType::TreeRender => {`
	`548`	`+ write!(f, "") // TODO(renjj): add display info`
	`549`	`+ }`
`538`	`550`	`}`
`539`	`551`	`}`
`540`	`552`	`}`
`@@ -630,6 +642,9 @@ impl DisplayAs for BlockingExec {`
`630`	`642`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`631`	`643`	`write!(f, "BlockingExec",)`
`632`	`644`	`}`
	`645`	`+ DisplayFormatType::TreeRender => {`
	`646`	`+ write!(f, "") // TODO(renjj): add display info`
	`647`	`+ }`
`633`	`648`	`}`
`634`	`649`	`}`
`635`	`650`	`}`
`@@ -772,6 +787,9 @@ impl DisplayAs for PanicExec {`
`772`	`787`	`DisplayFormatType::Default \| DisplayFormatType::Verbose => {`
`773`	`788`	`write!(f, "PanicExec",)`
`774`	`789`	`}`
	`790`	`+ DisplayFormatType::TreeRender => {`
	`791`	`+ write!(f, "") // TODO(renjj): add display info`
	`792`	`+ }`
`775`	`793`	`}`
`776`	`794`	`}`
`777`	`795`	`}`