wip: fixes after rebase but tpcds_physical_q54 keeps overflowing its …

…stack
apache · Jan 9, 2024 · e0724dd · e0724dd
1 parent e5611b4
commit e0724dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/datafusion/core/src/physical_planner.rs b/datafusion/core/src/physical_planner.rs
@@ -936,7 +936,7 @@ impl DefaultPhysicalPlanner {
                     let filter = FilterExec::try_new(runtime_expr, physical_input)?;
                     Ok(Arc::new(filter.with_default_selectivity(selectivity)?))
                 }
-                LogicalPlan::Union(Union { inputs, schema }) => {
+                LogicalPlan::Union(Union { inputs, schema: _ }) => {
                     let physical_plans = self.create_initial_plan_multi(inputs.iter().map(|lp| lp.as_ref()), session_state, ctx).await?;
 
                     Ok(Arc::new(UnionExec::new(physical_plans)))

diff --git a/datafusion/optimizer/src/optimize_projections.rs b/datafusion/optimizer/src/optimize_projections.rs
@@ -162,6 +162,8 @@ fn optimize_projections(
                 .collect::<Vec<_>>()
         }
         LogicalPlan::EmptyRelation(_)
+        | LogicalPlan::NamedRelation(_)
+        | LogicalPlan::RecursiveQuery(_)
         | LogicalPlan::Statement(_)
         | LogicalPlan::Values(_)
         | LogicalPlan::Extension(_)

diff --git a/datafusion/physical-plan/src/recursive_query.rs b/datafusion/physical-plan/src/recursive_query.rs
@@ -296,6 +296,7 @@ impl RecursiveQueryStream {
                 Err(e) => {
                     return Poll::Ready(Some(Err(DataFusionError::ArrowError(
                         ArrowError::from_external_error(Box::new(e)),
+                        None,
                     ))));
                 }
             }

diff --git a/datafusion/sql/src/query.rs b/datafusion/sql/src/query.rs
@@ -23,8 +23,7 @@ use datafusion_common::{
     plan_err, sql_err, Constraints, DFSchema, DataFusionError, Result, ScalarValue,
 };
 use datafusion_expr::{
-    logical_plan, CreateMemoryTable, DdlStatement, Distinct, Expr, LogicalPlan,
-    LogicalPlanBuilder,
+    CreateMemoryTable, DdlStatement, Distinct, Expr, LogicalPlan, LogicalPlanBuilder,
 };
 use sqlparser::ast::{
     Expr as SQLExpr, Offset as SQLOffset, OrderByExpr, Query, SetExpr, SetOperator,
@@ -172,9 +171,10 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                             planner_context.insert_cte(cte_name.clone(), final_plan);
                         }
                         _ => {
-                            return Err(DataFusionError::SQL(ParserError(
-                                "Invalid recursive CTE".to_string(),
-                            )));
+                            return Err(DataFusionError::SQL(
+                                ParserError("Invalid recursive CTE".to_string()),
+                                None,
+                            ));
                         }
                     };
                 } else {