Skip to content

Commit e0724dd

Browse files
committed
wip: fixes after rebase but tpcds_physical_q54 keeps overflowing its stack
1 parent e5611b4 commit e0724dd

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

datafusion/core/src/physical_planner.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ impl DefaultPhysicalPlanner {
936936
let filter = FilterExec::try_new(runtime_expr, physical_input)?;
937937
Ok(Arc::new(filter.with_default_selectivity(selectivity)?))
938938
}
939-
LogicalPlan::Union(Union { inputs, schema }) => {
939+
LogicalPlan::Union(Union { inputs, schema: _ }) => {
940940
let physical_plans = self.create_initial_plan_multi(inputs.iter().map(|lp| lp.as_ref()), session_state, ctx).await?;
941941

942942
Ok(Arc::new(UnionExec::new(physical_plans)))

datafusion/optimizer/src/optimize_projections.rs

+2
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ fn optimize_projections(
162162
.collect::<Vec<_>>()
163163
}
164164
LogicalPlan::EmptyRelation(_)
165+
| LogicalPlan::NamedRelation(_)
166+
| LogicalPlan::RecursiveQuery(_)
165167
| LogicalPlan::Statement(_)
166168
| LogicalPlan::Values(_)
167169
| LogicalPlan::Extension(_)

datafusion/physical-plan/src/recursive_query.rs

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ impl RecursiveQueryStream {
296296
Err(e) => {
297297
return Poll::Ready(Some(Err(DataFusionError::ArrowError(
298298
ArrowError::from_external_error(Box::new(e)),
299+
None,
299300
))));
300301
}
301302
}

datafusion/sql/src/query.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ use datafusion_common::{
2323
plan_err, sql_err, Constraints, DFSchema, DataFusionError, Result, ScalarValue,
2424
};
2525
use datafusion_expr::{
26-
logical_plan, CreateMemoryTable, DdlStatement, Distinct, Expr, LogicalPlan,
27-
LogicalPlanBuilder,
26+
CreateMemoryTable, DdlStatement, Distinct, Expr, LogicalPlan, LogicalPlanBuilder,
2827
};
2928
use sqlparser::ast::{
3029
Expr as SQLExpr, Offset as SQLOffset, OrderByExpr, Query, SetExpr, SetOperator,
@@ -172,9 +171,10 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
172171
planner_context.insert_cte(cte_name.clone(), final_plan);
173172
}
174173
_ => {
175-
return Err(DataFusionError::SQL(ParserError(
176-
"Invalid recursive CTE".to_string(),
177-
)));
174+
return Err(DataFusionError::SQL(
175+
ParserError("Invalid recursive CTE".to_string()),
176+
None,
177+
));
178178
}
179179
};
180180
} else {

0 commit comments

Comments
 (0)