From 80069f7ff49d40fe3ab2cf63eede180ed6dd9dee Mon Sep 17 00:00:00 2001 From: Matthew Gapp <61894094+matthewgapp@users.noreply.github.com> Date: Fri, 26 Jan 2024 09:25:18 -0800 Subject: [PATCH] fix rebase --- datafusion/core/src/physical_optimizer/projection_pushdown.rs | 4 ++-- datafusion/sqllogictest/test_files/cte.slt | 3 +++ testing | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/datafusion/core/src/physical_optimizer/projection_pushdown.rs b/datafusion/core/src/physical_optimizer/projection_pushdown.rs index 49cdd219be01..2d20c487e473 100644 --- a/datafusion/core/src/physical_optimizer/projection_pushdown.rs +++ b/datafusion/core/src/physical_optimizer/projection_pushdown.rs @@ -201,7 +201,7 @@ fn try_swapping_with_memory( MemoryExec::try_new( memory.partitions(), memory.original_schema(), - new_projections, + Some(new_projections), ) .map(|e| Arc::new(e) as _) }) @@ -248,7 +248,7 @@ fn try_swapping_with_streaming_table( StreamingTableExec::try_new( streaming_table.partition_schema().clone(), streaming_table.partitions().clone(), - new_projections.as_ref(), + Some(new_projections.as_ref()), lex_orderings, streaming_table.is_infinite(), ) diff --git a/datafusion/sqllogictest/test_files/cte.slt b/datafusion/sqllogictest/test_files/cte.slt index 43ca55352015..5b12a45491e0 100644 --- a/datafusion/sqllogictest/test_files/cte.slt +++ b/datafusion/sqllogictest/test_files/cte.slt @@ -38,6 +38,9 @@ Projection: NUMBERS.a, NUMBERS.b, NUMBERS.c physical_plan ProjectionExec: expr=[1 as a, 2 as b, 3 as c] --PlaceholderRowExec + + + # enable recursive CTEs statement ok set datafusion.execution.enable_recursive_ctes = true; diff --git a/testing b/testing index 98fceecd024d..18b258cc535f 160000 --- a/testing +++ b/testing @@ -1 +1 @@ -Subproject commit 98fceecd024dccd2f8a00e32fc144975f218acf4 +Subproject commit 18b258cc535f6a97ae170cce2ab463a243ac9a72