AngersZhuuuu opened a new pull request #30278:
URL: https://github.com/apache/spark/pull/30278
### What changes were proposed in this pull request?
Push down filter throw expand. For case below:
```
create table SPARK_33302_1(pid int, uid int, sid int, dt date, suid int)
using parquet;
create table SPARK_33302_2(pid int, vs int, uid int, csid int) using parquet;
SELECT
years,
appversion,
SUM(uusers) AS users
FROM (SELECT
Date_trunc('year', dt) AS years,
CASE
WHEN h.pid = 3 THEN 'iOS'
WHEN h.pid = 4 THEN 'Android'
ELSE 'Other'
END AS viewport,
h.vs AS appversion,
Count(DISTINCT u.uid) AS uusers
,Count(DISTINCT u.suid) AS srcusers
FROM SPARK_33302_1 u
join SPARK_33302_2 h
ON h.uid = u.uid
GROUP BY 1,
2,
3) AS a
WHERE viewport = 'iOS'
GROUP BY 1,
2
```
Plan. before this pr:
```
== Physical Plan ==
*(5) HashAggregate(keys=[years#30, appversion#32],
functions=[sum(uusers#33L)])
+- Exchange hashpartitioning(years#30, appversion#32, 200), true, [id=#251]
+- *(4) HashAggregate(keys=[years#30, appversion#32],
functions=[partial_sum(uusers#33L)])
+- *(4) HashAggregate(keys=[date_trunc('year', CAST(u.`dt` AS
TIMESTAMP))#45, CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid` = 4) THEN
'Android' ELSE 'Other' END#46, vs#12], functions=[count(if ((gid#44 = 1))
u.`uid`#47 else null)])
+- Exchange hashpartitioning(date_trunc('year', CAST(u.`dt` AS
TIMESTAMP))#45, CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid` = 4) THEN
'Android' ELSE 'Other' END#46, vs#12, 200), true, [id=#246]
+- *(3) HashAggregate(keys=[date_trunc('year', CAST(u.`dt` AS
TIMESTAMP))#45, CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid` = 4) THEN
'Android' ELSE 'Other' END#46, vs#12], functions=[partial_count(if ((gid#44 =
1)) u.`uid`#47 else null)])
+- *(3) HashAggregate(keys=[date_trunc('year', CAST(u.`dt` AS
TIMESTAMP))#45, CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid` = 4) THEN
'Android' ELSE 'Other' END#46, vs#12, u.`uid`#47, u.`suid`#48, gid#44],
functions=[])
+- Exchange hashpartitioning(date_trunc('year',
CAST(u.`dt` AS TIMESTAMP))#45, CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid`
= 4) THEN 'Android' ELSE 'Other' END#46, vs#12, u.`uid`#47, u.`suid`#48,
gid#44, 200), true, [id=#241]
+- *(2) HashAggregate(keys=[date_trunc('year',
CAST(u.`dt` AS TIMESTAMP))#45, CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid`
= 4) THEN 'Android' ELSE 'Other' END#46, vs#12, u.`uid`#47, u.`suid`#48,
gid#44], functions=[])
+- *(2) Filter (CASE WHEN (h.`pid` = 3) THEN 'iOS'
WHEN (h.`pid` = 4) THEN 'Android' ELSE 'Other' END#46 = iOS)
+- *(2) Expand [ArrayBuffer(date_trunc(year,
cast(dt#9 as timestamp), Some(Etc/GMT+7)), CASE WHEN (pid#11 = 3) THEN iOS WHEN
(pid#11 = 4) THEN Android ELSE Other END, vs#12, uid#7, null, 1),
ArrayBuffer(date_trunc(year, cast(dt#9 as timestamp), Some(Etc/GMT+7)), CASE
WHEN (pid#11 = 3) THEN iOS WHEN (pid#11 = 4) THEN Android ELSE Other END,
vs#12, null, suid#10, 2)], [date_trunc('year', CAST(u.`dt` AS TIMESTAMP))#45,
CASE WHEN (h.`pid` = 3) THEN 'iOS' WHEN (h.`pid` = 4) THEN 'Android' ELSE
'Other' END#46, vs#12, u.`uid`#47, u.`suid`#48, gid#44]
+- *(2) Project [uid#7, dt#9, suid#10, pid#11,
vs#12]
+- *(2) BroadcastHashJoin [uid#7],
[uid#13], Inner, BuildRight
:- *(2) Project [uid#7, dt#9, suid#10]
: +- *(2) Filter isnotnull(uid#7)
: +- *(2) ColumnarToRow
: +- FileScan parquet
default.spark_33301_1[uid#7,dt#9,suid#10] Batched: true, DataFilters:
[isnotnull(uid#7)], Format: Parquet, Location:
InMemoryFileIndex[file:/root/spark-3.0.0-bin-hadoop3.2/spark-warehouse/spark_33301_1],
PartitionFilters: [], PushedFilters: [IsNotNull(uid)], ReadSchema:
struct<uid:int,dt:date,suid:int>
+- BroadcastExchange
HashedRelationBroadcastMode(List(cast(input[2, int, true] as bigint))),
[id=#233]
+- *(1) Project [pid#11, vs#12,
uid#13]
+- *(1) Filter isnotnull(uid#13)
+- *(1) ColumnarToRow
+- FileScan parquet
default.spark_33301_2[pid#11,vs#12,uid#13] Batched: true, DataFilters:
[isnotnull(uid#13)], Format: Parquet, Location:
InMemoryFileIndex[file:/root/spark-3.0.0-bin-hadoop3.2/spark-warehouse/spark_33301_2],
PartitionFilters: [], PushedFilters: [IsNotNull(uid)], ReadSchema:
struct<pid:int,vs:int,uid:int>
```
Plan. after. this pr. :
```
== Physical Plan ==
AdaptiveSparkPlan isFinalPlan=false
+- HashAggregate(keys=[years#0, appversion#2], functions=[sum(uusers#3L)],
output=[years#0, appversion#2, users#5L])
+- Exchange hashpartitioning(years#0, appversion#2, 5), true, [id=#71]
+- HashAggregate(keys=[years#0, appversion#2],
functions=[partial_sum(uusers#3L)], output=[years#0, appversion#2, sum#22L])
+- HashAggregate(keys=[date_trunc(year, cast(dt#9 as timestamp),
Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN (pid#11 =
4) THEN Android ELSE Other END#24, vs#12], functions=[count(distinct uid#7)],
output=[years#0, appversion#2, uusers#3L])
+- Exchange hashpartitioning(date_trunc(year, cast(dt#9 as
timestamp), Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN
(pid#11 = 4) THEN Android ELSE Other END#24, vs#12, 5), true, [id=#67]
+- HashAggregate(keys=[date_trunc(year, cast(dt#9 as
timestamp), Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN
(pid#11 = 4) THEN Android ELSE Other END#24, vs#12],
functions=[partial_count(distinct uid#7)], output=[date_trunc(year, cast(dt#9
as timestamp), Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS
WHEN (pid#11 = 4) THEN Android ELSE Other END#24, vs#12, count#27L])
+- HashAggregate(keys=[date_trunc(year, cast(dt#9 as
timestamp), Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN
(pid#11 = 4) THEN Android ELSE Other END#24, vs#12, uid#7], functions=[],
output=[date_trunc(year, cast(dt#9 as timestamp),
Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN (pid#11 =
4) THEN Android ELSE Other END#24, vs#12, uid#7])
+- Exchange hashpartitioning(date_trunc(year, cast(dt#9
as timestamp), Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS
WHEN (pid#11 = 4) THEN Android ELSE Other END#24, vs#12, uid#7, 5), true,
[id=#63]
+- HashAggregate(keys=[date_trunc(year, cast(dt#9 as
timestamp), Some(America/Los_Angeles)) AS date_trunc(year, cast(dt#9 as
timestamp), Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN
(pid#11 = 4) THEN Android ELSE Other END AS CASE WHEN (pid#11 = 3) THEN iOS
WHEN (pid#11 = 4) THEN Android ELSE Other END#24, vs#12, uid#7], functions=[],
output=[date_trunc(year, cast(dt#9 as timestamp),
Some(America/Los_Angeles))#23, CASE WHEN (pid#11 = 3) THEN iOS WHEN (pid#11 =
4) THEN Android ELSE Other END#24, vs#12, uid#7])
+- Project [uid#7, dt#9, pid#11, vs#12]
+- BroadcastHashJoin [uid#7], [uid#13], Inner,
BuildRight, false
:- Filter isnotnull(uid#7)
: +- FileScan parquet
default.t1[uid#7,dt#9] Batched: true, DataFilters: [isnotnull(uid#7)], Format:
Parquet, Location:
InMemoryFileIndex[file:/private/var/folders/4l/7_c5c97s1_gb0d9_d6shygx00000gn/T/warehouse-c069d87...,
PartitionFilters: [], PushedFilters: [IsNotNull(uid)], ReadSchema:
struct<uid:int,dt:date>
+- BroadcastExchange
HashedRelationBroadcastMode(List(cast(input[2, int, false] as bigint)),false),
[id=#58]
+- Filter ((CASE WHEN (pid#11 = 3) THEN
iOS WHEN (pid#11 = 4) THEN Android ELSE Other END = iOS) AND isnotnull(uid#13))
+- FileScan parquet
default.t2[pid#11,vs#12,uid#13] Batched: true, DataFilters: [(CASE WHEN (pid#11
= 3) THEN iOS WHEN (pid#11 = 4) THEN Android ELSE Other END = iOS),
isnotnull..., Format: Parquet, Location:
InMemoryFileIndex[file:/private/var/folders/4l/7_c5c97s1_gb0d9_d6shygx00000gn/T/warehouse-c069d87...,
PartitionFilters: [], PushedFilters: [IsNotNull(uid)], ReadSchema:
struct<pid:int,vs:int,uid:int>
```
### Why are the changes needed?
Improve performance, filter more data.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
Added UT
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
