This is an automated email from the ASF dual-hosted git repository.
englefly pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 6883d86585d [fix](nereids) fix tpcds 10t orc shape for 3.0 (#41649)
6883d86585d is described below
commit 6883d86585dc7e041438fd66d397bab3a687487a
Author: minghong <engle...@gmail.com>
AuthorDate: Thu Oct 10 16:53:46 2024 +0800
[fix](nereids) fix tpcds 10t orc shape for 3.0 (#41649)
## Proposed changes
Issue Number: close #xxx
<!--Describe your changes.-->
---
.../data/nereids_tpcds_shape_sf10t_orc/shape/query11.out | 14 +++++++-------
.../data/nereids_tpcds_shape_sf10t_orc/shape/query2.out | 10 +++++-----
.../data/nereids_tpcds_shape_sf10t_orc/shape/query4.out | 14 +++++++-------
.../data/nereids_tpcds_shape_sf10t_orc/shape/query41.out | 2 +-
.../data/nereids_tpcds_shape_sf10t_orc/shape/query8.out | 9 ++++-----
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git
a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query11.out
b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query11.out
index 82db2123eb1..2727eb396b3 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query11.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query11.out
@@ -38,20 +38,20 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
------PhysicalDistribute[DistributionSpecGather]
--------PhysicalTopN[LOCAL_SORT]
----------PhysicalProject
-------------hashJoin[INNER_JOIN shuffleBucket]
hashCondition=((t_s_firstyear.customer_id = t_w_secyear.customer_id))
otherCondition=((if((year_total > 0.00), (cast(year_total as DECIMALV3(38, 8))
/ year_total), 0.000000) > if((year_total > 0.00), (cast(year_total as
DECIMALV3(38, 8)) / year_total), 0.000000))) build RFs:RF6
customer_id->[customer_id]
---------------PhysicalProject
-----------------filter((t_w_secyear.dyear = 2000) and (t_w_secyear.sale_type =
'w'))
-------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF6
+------------hashJoin[INNER_JOIN bucketShuffle]
hashCondition=((t_s_firstyear.customer_id = t_w_secyear.customer_id))
otherCondition=((if((year_total > 0.00), (cast(year_total as DECIMALV3(38, 8))
/ year_total), 0.000000) > if((year_total > 0.00), (cast(year_total as
DECIMALV3(38, 8)) / year_total), 0.000000))) build RFs:RF6
customer_id->[customer_id,customer_id,customer_id]
--------------PhysicalProject
----------------hashJoin[INNER_JOIN bucketShuffle]
hashCondition=((t_s_firstyear.customer_id = t_w_firstyear.customer_id))
otherCondition=() build RFs:RF5 customer_id->[customer_id,customer_id]
------------------hashJoin[INNER_JOIN shuffle]
hashCondition=((t_s_secyear.customer_id = t_s_firstyear.customer_id))
otherCondition=() build RFs:RF4 customer_id->[customer_id]
--------------------PhysicalProject
----------------------filter((t_s_secyear.dyear = 2000) and
(t_s_secyear.sale_type = 's'))
-------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF4
RF5
+------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF4
RF5 RF6
--------------------PhysicalProject
----------------------filter((t_s_firstyear.dyear = 1999) and
(t_s_firstyear.sale_type = 's') and (t_s_firstyear.year_total > 0.00))
-------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF5
+------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF5
RF6
------------------PhysicalProject
--------------------filter((t_w_firstyear.dyear = 1999) and
(t_w_firstyear.sale_type = 'w') and (t_w_firstyear.year_total > 0.00))
-----------------------PhysicalCteConsumer ( cteId=CTEId#0 )
+----------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF6
+--------------PhysicalProject
+----------------filter((t_w_secyear.dyear = 2000) and (t_w_secyear.sale_type =
'w'))
+------------------PhysicalCteConsumer ( cteId=CTEId#0 )
diff --git
a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query2.out
b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query2.out
index 45d3bd88c05..cc4538c16b7 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query2.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query2.out
@@ -23,16 +23,16 @@ PhysicalCteAnchor ( cteId=CTEId#1 )
----------PhysicalProject
------------hashJoin[INNER_JOIN broadcast] hashCondition=((date_dim.d_week_seq
= d_week_seq2)) otherCondition=() build RFs:RF3 d_week_seq->[d_week_seq]
--------------PhysicalProject
-----------------hashJoin[INNER_JOIN shuffle]
hashCondition=((date_dim.d_week_seq = d_week_seq1)) otherCondition=() build
RFs:RF2 d_week_seq1->[d_week_seq]
-------------------PhysicalProject
---------------------filter((date_dim.d_year = 1998))
-----------------------PhysicalOlapScan[date_dim] apply RFs: RF2
+----------------hashJoin[INNER_JOIN broadcast]
hashCondition=((date_dim.d_week_seq = d_week_seq1)) otherCondition=() build
RFs:RF2 d_week_seq->[d_week_seq]
------------------PhysicalProject
--------------------hashJoin[INNER_JOIN shuffle]
hashCondition=((expr_cast(d_week_seq1 as BIGINT) = expr_(d_week_seq2 - 53)))
otherCondition=() build RFs:RF1 expr_(d_week_seq2 - 53)->[cast(d_week_seq as
BIGINT)]
----------------------PhysicalProject
-------------------------PhysicalCteConsumer ( cteId=CTEId#1 ) apply RFs: RF1
+------------------------PhysicalCteConsumer ( cteId=CTEId#1 ) apply RFs: RF1
RF2
----------------------PhysicalProject
------------------------PhysicalCteConsumer ( cteId=CTEId#1 ) apply RFs: RF3
+------------------PhysicalProject
+--------------------filter((date_dim.d_year = 1998))
+----------------------PhysicalOlapScan[date_dim]
--------------PhysicalProject
----------------filter((date_dim.d_year = 1999))
------------------PhysicalOlapScan[date_dim]
diff --git
a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query4.out
b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query4.out
index 163b1cb7c71..07c89db8968 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query4.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query4.out
@@ -60,22 +60,22 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
--------------PhysicalProject
----------------hashJoin[INNER_JOIN bucketShuffle]
hashCondition=((t_s_firstyear.customer_id = t_w_firstyear.customer_id))
otherCondition=() build RFs:RF9
customer_id->[customer_id,customer_id,customer_id,customer_id]
------------------PhysicalProject
---------------------hashJoin[INNER_JOIN shuffleBucket]
hashCondition=((t_s_firstyear.customer_id = t_c_secyear.customer_id))
otherCondition=((if((year_total > 0.000000), (cast(year_total as DECIMALV3(38,
16)) / year_total), NULL) > if((year_total > 0.000000), (cast(year_total as
DECIMALV3(38, 16)) / year_total), NULL))) build RFs:RF8
customer_id->[customer_id]
-----------------------PhysicalProject
-------------------------filter((t_c_secyear.dyear = 2000) and
(t_c_secyear.sale_type = 'c'))
---------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF8
RF9
+--------------------hashJoin[INNER_JOIN bucketShuffle]
hashCondition=((t_s_firstyear.customer_id = t_c_secyear.customer_id))
otherCondition=((if((year_total > 0.000000), (cast(year_total as DECIMALV3(38,
16)) / year_total), NULL) > if((year_total > 0.000000), (cast(year_total as
DECIMALV3(38, 16)) / year_total), NULL))) build RFs:RF8
customer_id->[customer_id,customer_id,customer_id]
----------------------PhysicalProject
------------------------hashJoin[INNER_JOIN bucketShuffle]
hashCondition=((t_s_firstyear.customer_id = t_c_firstyear.customer_id))
otherCondition=() build RFs:RF7 customer_id->[customer_id,customer_id]
--------------------------hashJoin[INNER_JOIN shuffle]
hashCondition=((t_s_secyear.customer_id = t_s_firstyear.customer_id))
otherCondition=() build RFs:RF6 customer_id->[customer_id]
----------------------------PhysicalProject
------------------------------filter((t_s_secyear.dyear = 2000) and
(t_s_secyear.sale_type = 's'))
---------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply
RFs: RF6 RF7 RF9
+--------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply
RFs: RF6 RF7 RF8 RF9
----------------------------PhysicalProject
------------------------------filter((t_s_firstyear.dyear = 1999) and
(t_s_firstyear.sale_type = 's') and (t_s_firstyear.year_total > 0.000000))
---------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply
RFs: RF7 RF9
+--------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply
RFs: RF7 RF8 RF9
--------------------------PhysicalProject
----------------------------filter((t_c_firstyear.dyear = 1999) and
(t_c_firstyear.sale_type = 'c') and (t_c_firstyear.year_total > 0.000000))
-------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs:
RF9
+------------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs:
RF8 RF9
+----------------------PhysicalProject
+------------------------filter((t_c_secyear.dyear = 2000) and
(t_c_secyear.sale_type = 'c'))
+--------------------------PhysicalCteConsumer ( cteId=CTEId#0 ) apply RFs: RF9
------------------PhysicalProject
--------------------filter((t_w_firstyear.dyear = 1999) and
(t_w_firstyear.sale_type = 'w') and (t_w_firstyear.year_total > 0.000000))
----------------------PhysicalCteConsumer ( cteId=CTEId#0 )
diff --git
a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query41.out
b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query41.out
index 11bcf3db2e7..a470709da68 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query41.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query41.out
@@ -13,7 +13,7 @@ PhysicalResultSink
--------------------filter((i1.i_manufact_id <= 1010) and (i1.i_manufact_id >=
970))
----------------------PhysicalOlapScan[item] apply RFs: RF0
------------------PhysicalProject
---------------------filter((ifnull(item_cnt, 0) > 0))
+--------------------filter((item_cnt > 0))
----------------------hashAgg[GLOBAL]
------------------------PhysicalDistribute[DistributionSpecHash]
--------------------------hashAgg[LOCAL]
diff --git
a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query8.out
b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query8.out
index 00f211d1292..f46875bd0bc 100644
--- a/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query8.out
+++ b/regression-test/data/nereids_tpcds_shape_sf10t_orc/shape/query8.out
@@ -29,13 +29,12 @@ PhysicalResultSink
------------------------------PhysicalDistribute[DistributionSpecHash]
--------------------------------hashAgg[LOCAL]
----------------------------------PhysicalProject
-------------------------------------hashJoin[INNER_JOIN shuffle]
hashCondition=((customer_address.ca_address_sk = customer.c_current_addr_sk))
otherCondition=() build RFs:RF0 ca_address_sk->[c_current_addr_sk]
+------------------------------------hashJoin[INNER_JOIN shuffle]
hashCondition=((customer_address.ca_address_sk = customer.c_current_addr_sk))
otherCondition=() build RFs:RF0 c_current_addr_sk->[ca_address_sk]
--------------------------------------PhysicalProject
-----------------------------------------filter((customer.c_preferred_cust_flag
= 'Y'))
-------------------------------------------PhysicalOlapScan[customer] apply
RFs: RF0
+----------------------------------------PhysicalOlapScan[customer_address]
apply RFs: RF0
--------------------------------------PhysicalProject
-----------------------------------------filter(substring(ca_zip, 1, 5) IN
('10298', '10374', '10425', '11340', '11489', '11618', '11652', '11686',
'11855', '11912', '12197', '12318', '12320', '12350', '13086', '13123',
'13261', '13338', '13376', '13378', '13443', '13844', '13869', '13918',
'14073', '14155', '14196', '14242', '14312', '14440', '14530', '14851',
'15371', '15475', '15543', '15734', '15751', '15782', '15794', '16005',
'16226', '16364', '16515', '16704', '16791', '16891', '17 [...]
-------------------------------------------PhysicalOlapScan[customer_address]
+----------------------------------------filter((customer.c_preferred_cust_flag
= 'Y'))
+------------------------------------------PhysicalOlapScan[customer]
----------------------PhysicalDistribute[DistributionSpecHash]
------------------------PhysicalProject
--------------------------filter(substring(ca_zip, 1, 5) IN ('10298', '10374',
'10425', '11340', '11489', '11618', '11652', '11686', '11855', '11912',
'12197', '12318', '12320', '12350', '13086', '13123', '13261', '13338',
'13376', '13378', '13443', '13844', '13869', '13918', '14073', '14155',
'14196', '14242', '14312', '14440', '14530', '14851', '15371', '15475',
'15543', '15734', '15751', '15782', '15794', '16005', '16226', '16364',
'16515', '16704', '16791', '16891', '17167', '17193', [...]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
