Skip to content

Move the column aliases below the SubqueryAlias #7035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 3 commits into from
Jul 20, 2023
Merged

Move the column aliases below the SubqueryAlias #7035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37eb0ce
Move the column aliases below the SubqueryAlias
jonahgao Jul 20, 2023
2d9ad68
Add test
jonahgao Jul 20, 2023
ab82502
Fix tpch tests
jonahgao Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions datafusion/core/tests/sqllogictests/test_files/subquery.slt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,3 +973,14 @@ false
false
true
true


# issue: https://github.com/apache/arrow-datafusion/issues/7027
query TTTT rowsort
SELECT * FROM
(VALUES ('catan-prod1-daily', 'success')) as jobs(cron_job_name, status)
JOIN
(VALUES ('catan-prod1-daily', 'high')) as severity(cron_job_name, level)
ON (severity.cron_job_name = jobs.cron_job_name);
----
catan-prod1-daily success catan-prod1-daily high
56 changes: 27 additions & 29 deletions datafusion/core/tests/sqllogictests/test_files/tpch/q13.slt.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,18 @@ limit 10;
----
logical_plan
Limit: skip=0, fetch=10
--Sort: custdist DESC NULLS FIRST, c_count DESC NULLS FIRST, fetch=10
----Projection: c_count, COUNT(UInt8(1)) AS custdist
------Aggregate: groupBy=[[c_count]], aggr=[[COUNT(UInt8(1))]]
--------Projection: c_orders.COUNT(orders.o_orderkey) AS c_count
----------SubqueryAlias: c_orders
------------Projection: COUNT(orders.o_orderkey)
--------------Aggregate: groupBy=[[customer.c_custkey]], aggr=[[COUNT(orders.o_orderkey)]]
----------------Projection: customer.c_custkey, orders.o_orderkey
------------------Left Join: customer.c_custkey = orders.o_custkey
--------------------TableScan: customer projection=[c_custkey]
--------------------Projection: orders.o_orderkey, orders.o_custkey
----------------------Filter: orders.o_comment NOT LIKE Utf8("%special%requests%")
------------------------TableScan: orders projection=[o_orderkey, o_custkey, o_comment], partial_filters=[orders.o_comment NOT LIKE Utf8("%special%requests%")]
--Sort: custdist DESC NULLS FIRST, c_orders.c_count DESC NULLS FIRST, fetch=10
----Projection: c_orders.c_count, COUNT(UInt8(1)) AS custdist
------Aggregate: groupBy=[[c_orders.c_count]], aggr=[[COUNT(UInt8(1))]]
--------SubqueryAlias: c_orders
----------Projection: COUNT(orders.o_orderkey) AS c_count
------------Aggregate: groupBy=[[customer.c_custkey]], aggr=[[COUNT(orders.o_orderkey)]]
--------------Projection: customer.c_custkey, orders.o_orderkey
----------------Left Join: customer.c_custkey = orders.o_custkey
------------------TableScan: customer projection=[c_custkey]
------------------Projection: orders.o_orderkey, orders.o_custkey
--------------------Filter: orders.o_comment NOT LIKE Utf8("%special%requests%")
----------------------TableScan: orders projection=[o_orderkey, o_custkey, o_comment], partial_filters=[orders.o_comment NOT LIKE Utf8("%special%requests%")]
physical_plan
GlobalLimitExec: skip=0, fetch=10
--SortPreservingMergeExec: [custdist@1 DESC,c_count@0 DESC], fetch=10
Expand All @@ -63,22 +62,21 @@ GlobalLimitExec: skip=0, fetch=10
----------CoalesceBatchesExec: target_batch_size=8192
------------RepartitionExec: partitioning=Hash([c_count@0], 4), input_partitions=4
--------------AggregateExec: mode=Partial, gby=[c_count@0 as c_count], aggr=[COUNT(UInt8(1))]
----------------ProjectionExec: expr=[COUNT(orders.o_orderkey)@0 as c_count]
------------------ProjectionExec: expr=[COUNT(orders.o_orderkey)@1 as COUNT(orders.o_orderkey)]
--------------------AggregateExec: mode=SinglePartitioned, gby=[c_custkey@0 as c_custkey], aggr=[COUNT(orders.o_orderkey)]
----------------------ProjectionExec: expr=[c_custkey@0 as c_custkey, o_orderkey@1 as o_orderkey]
------------------------CoalesceBatchesExec: target_batch_size=8192
--------------------------HashJoinExec: mode=Partitioned, join_type=Left, on=[(c_custkey@0, o_custkey@1)]
----------------------------CoalesceBatchesExec: target_batch_size=8192
------------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4
--------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
----------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey], has_header=false
----------------------------CoalesceBatchesExec: target_batch_size=8192
------------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4
--------------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey, o_custkey@1 as o_custkey]
----------------------------------CoalesceBatchesExec: target_batch_size=8192
------------------------------------FilterExec: o_comment@2 NOT LIKE %special%requests%
--------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_comment], has_header=false
----------------ProjectionExec: expr=[COUNT(orders.o_orderkey)@1 as c_count]
------------------AggregateExec: mode=SinglePartitioned, gby=[c_custkey@0 as c_custkey], aggr=[COUNT(orders.o_orderkey)]
--------------------ProjectionExec: expr=[c_custkey@0 as c_custkey, o_orderkey@1 as o_orderkey]
----------------------CoalesceBatchesExec: target_batch_size=8192
------------------------HashJoinExec: mode=Partitioned, join_type=Left, on=[(c_custkey@0, o_custkey@1)]
--------------------------CoalesceBatchesExec: target_batch_size=8192
----------------------------RepartitionExec: partitioning=Hash([c_custkey@0], 4), input_partitions=4
------------------------------RepartitionExec: partitioning=RoundRobinBatch(4), input_partitions=1
--------------------------------CsvExec: file_groups={1 group: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/customer.tbl]]}, projection=[c_custkey], has_header=false
--------------------------CoalesceBatchesExec: target_batch_size=8192
----------------------------RepartitionExec: partitioning=Hash([o_custkey@1], 4), input_partitions=4
------------------------------ProjectionExec: expr=[o_orderkey@0 as o_orderkey, o_custkey@1 as o_custkey]
--------------------------------CoalesceBatchesExec: target_batch_size=8192
----------------------------------FilterExec: o_comment@2 NOT LIKE %special%requests%
------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:0..4223281], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:4223281..8446562], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:8446562..12669843], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/orders.tbl:12669843..16893122]]}, projection=[o_orderkey, o_custkey, o_comment], has_header=false



Expand Down
54 changes: 26 additions & 28 deletions datafusion/core/tests/sqllogictests/test_files/tpch/q15.slt.part
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,31 @@ order by
----
logical_plan
Sort: supplier.s_suppkey ASC NULLS LAST
--Projection: supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, total_revenue
----Inner Join: total_revenue = __scalar_sq_1.MAX(total_revenue)
------Projection: supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, total_revenue
--------Inner Join: supplier.s_suppkey = supplier_no
--Projection: supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, revenue0.total_revenue
----Inner Join: revenue0.total_revenue = __scalar_sq_1.MAX(revenue0.total_revenue)
------Projection: supplier.s_suppkey, supplier.s_name, supplier.s_address, supplier.s_phone, revenue0.total_revenue
--------Inner Join: supplier.s_suppkey = revenue0.supplier_no
----------TableScan: supplier projection=[s_suppkey, s_name, s_address, s_phone]
----------Projection: revenue0.l_suppkey AS supplier_no, revenue0.SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount) AS total_revenue
------------SubqueryAlias: revenue0
----------SubqueryAlias: revenue0
------------Projection: lineitem.l_suppkey AS supplier_no, SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount) AS total_revenue
--------------Aggregate: groupBy=[[lineitem.l_suppkey]], aggr=[[SUM(lineitem.l_extendedprice * (Decimal128(Some(1),20,0) - lineitem.l_discount)) AS SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]]
----------------Projection: lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount
------------------Filter: lineitem.l_shipdate >= Date32("9496") AND lineitem.l_shipdate < Date32("9587")
--------------------TableScan: lineitem projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], partial_filters=[lineitem.l_shipdate >= Date32("9496"), lineitem.l_shipdate < Date32("9587")]
------SubqueryAlias: __scalar_sq_1
--------Aggregate: groupBy=[[]], aggr=[[MAX(total_revenue)]]
----------Projection: revenue0.SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount) AS total_revenue
------------SubqueryAlias: revenue0
--------------Projection: SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)
----------------Aggregate: groupBy=[[lineitem.l_suppkey]], aggr=[[SUM(lineitem.l_extendedprice * (Decimal128(Some(1),20,0) - lineitem.l_discount)) AS SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]]
------------------Projection: lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount
--------------------Filter: lineitem.l_shipdate >= Date32("9496") AND lineitem.l_shipdate < Date32("9587")
----------------------TableScan: lineitem projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], partial_filters=[lineitem.l_shipdate >= Date32("9496"), lineitem.l_shipdate < Date32("9587")]
--------Aggregate: groupBy=[[]], aggr=[[MAX(revenue0.total_revenue)]]
----------SubqueryAlias: revenue0
------------Projection: SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount) AS total_revenue
--------------Aggregate: groupBy=[[lineitem.l_suppkey]], aggr=[[SUM(lineitem.l_extendedprice * (Decimal128(Some(1),20,0) - lineitem.l_discount)) AS SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]]
----------------Projection: lineitem.l_suppkey, lineitem.l_extendedprice, lineitem.l_discount
------------------Filter: lineitem.l_shipdate >= Date32("9496") AND lineitem.l_shipdate < Date32("9587")
--------------------TableScan: lineitem projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], partial_filters=[lineitem.l_shipdate >= Date32("9496"), lineitem.l_shipdate < Date32("9587")]
physical_plan
SortPreservingMergeExec: [s_suppkey@0 ASC NULLS LAST]
--SortExec: expr=[s_suppkey@0 ASC NULLS LAST]
----ProjectionExec: expr=[s_suppkey@0 as s_suppkey, s_name@1 as s_name, s_address@2 as s_address, s_phone@3 as s_phone, total_revenue@4 as total_revenue]
------CoalesceBatchesExec: target_batch_size=8192
--------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(total_revenue@4, MAX(total_revenue)@0)]
--------HashJoinExec: mode=Partitioned, join_type=Inner, on=[(total_revenue@4, MAX(revenue0.total_revenue)@0)]
----------CoalesceBatchesExec: target_batch_size=8192
------------RepartitionExec: partitioning=Hash([total_revenue@4], 4), input_partitions=4
--------------ProjectionExec: expr=[s_suppkey@0 as s_suppkey, s_name@1 as s_name, s_address@2 as s_address, s_phone@3 as s_phone, total_revenue@5 as total_revenue]
Expand All @@ -96,20 +95,19 @@ SortPreservingMergeExec: [s_suppkey@0 ASC NULLS LAST]
----------------------------------FilterExec: l_shipdate@3 >= 9496 AND l_shipdate@3 < 9587
------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false
----------CoalesceBatchesExec: target_batch_size=8192
------------RepartitionExec: partitioning=Hash([MAX(total_revenue)@0], 4), input_partitions=1
--------------AggregateExec: mode=Final, gby=[], aggr=[MAX(total_revenue)]
------------RepartitionExec: partitioning=Hash([MAX(revenue0.total_revenue)@0], 4), input_partitions=1
--------------AggregateExec: mode=Final, gby=[], aggr=[MAX(revenue0.total_revenue)]
----------------CoalescePartitionsExec
------------------AggregateExec: mode=Partial, gby=[], aggr=[MAX(total_revenue)]
--------------------ProjectionExec: expr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)@0 as total_revenue]
----------------------ProjectionExec: expr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)@1 as SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]
------------------------AggregateExec: mode=FinalPartitioned, gby=[l_suppkey@0 as l_suppkey], aggr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]
--------------------------CoalesceBatchesExec: target_batch_size=8192
----------------------------RepartitionExec: partitioning=Hash([l_suppkey@0], 4), input_partitions=4
------------------------------AggregateExec: mode=Partial, gby=[l_suppkey@0 as l_suppkey], aggr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]
--------------------------------ProjectionExec: expr=[l_suppkey@0 as l_suppkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount]
----------------------------------CoalesceBatchesExec: target_batch_size=8192
------------------------------------FilterExec: l_shipdate@3 >= 9496 AND l_shipdate@3 < 9587
--------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false
------------------AggregateExec: mode=Partial, gby=[], aggr=[MAX(revenue0.total_revenue)]
--------------------ProjectionExec: expr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)@1 as total_revenue]
----------------------AggregateExec: mode=FinalPartitioned, gby=[l_suppkey@0 as l_suppkey], aggr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]
------------------------CoalesceBatchesExec: target_batch_size=8192
--------------------------RepartitionExec: partitioning=Hash([l_suppkey@0], 4), input_partitions=4
----------------------------AggregateExec: mode=Partial, gby=[l_suppkey@0 as l_suppkey], aggr=[SUM(lineitem.l_extendedprice * Int64(1) - lineitem.l_discount)]
------------------------------ProjectionExec: expr=[l_suppkey@0 as l_suppkey, l_extendedprice@1 as l_extendedprice, l_discount@2 as l_discount]
--------------------------------CoalesceBatchesExec: target_batch_size=8192
----------------------------------FilterExec: l_shipdate@3 >= 9496 AND l_shipdate@3 < 9587
------------------------------------CsvExec: file_groups={4 groups: [[WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:0..18561749], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:18561749..37123498], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:37123498..55685247], [WORKSPACE_ROOT/datafusion/core/tests/sqllogictests/test_files/tpch/data/lineitem.tbl:55685247..74246996]]}, projection=[l_suppkey, l_extendedprice, l_discount, l_shipdate], has_header=false


query ITTTR
Expand Down
13 changes: 6 additions & 7 deletions datafusion/sql/src/planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ use datafusion_common::{OwnedTableReference, TableReference};
use datafusion_expr::logical_plan::{LogicalPlan, LogicalPlanBuilder};
use datafusion_expr::utils::find_column_exprs;
use datafusion_expr::TableSource;
use datafusion_expr::{col, AggregateUDF, Expr, ScalarUDF, SubqueryAlias};
use datafusion_expr::{col, AggregateUDF, Expr, ScalarUDF};

use crate::utils::make_decimal_type;

Expand Down Expand Up @@ -222,18 +222,17 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
Ok(Schema::new(fields))
}

/// Apply the given TableAlias to the top-level projection.
/// Apply the given TableAlias to the input plan
pub(crate) fn apply_table_alias(
&self,
plan: LogicalPlan,
alias: TableAlias,
) -> Result<LogicalPlan> {
let apply_name_plan = LogicalPlan::SubqueryAlias(SubqueryAlias::try_new(
plan,
self.normalizer.normalize(alias.name),
)?);
let plan = self.apply_expr_alias(plan, alias.columns)?;

self.apply_expr_alias(apply_name_plan, alias.columns)
LogicalPlanBuilder::from(plan)
.alias(self.normalizer.normalize(alias.name))?
.build()
}

pub(crate) fn apply_expr_alias(
Expand Down
Loading