This is an automated email from the ASF dual-hosted git repository.
jakevin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d23d1870a2 [fix](Nereids): fix regression-test (#24329)
d23d1870a2 is described below
commit d23d1870a2ac5f6edf06df75b9bb55b147f99977
Author: jakevin <[email protected]>
AuthorDate: Thu Sep 14 13:21:50 2023 +0800
[fix](Nereids): fix regression-test (#24329)
---
.../nereids_tpcds_shape_sf100_p0/shape/query16.out | 48 +++++++++++-----------
.../nereids_tpcds_shape_sf100_p0/shape/query94.out | 40 +++++++++---------
.../nereids_tpcds_shape_sf100_p0/shape/query95.out | 26 ++++++------
.../pipeline/p0/conf/regression-conf.groovy | 2 +-
.../nereids_tpcds_shape_sf100_p0/rf/ds_rf16.groovy | 4 +-
.../nereids_tpcds_shape_sf100_p0/rf/ds_rf94.groovy | 4 +-
.../nereids_tpcds_shape_sf100_p0/rf/ds_rf95.groovy | 4 +-
7 files changed, 65 insertions(+), 63 deletions(-)
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query16.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query16.out
index cffb15de24..43abdade0f 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query16.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query16.out
@@ -4,23 +4,23 @@ PhysicalResultSink
--PhysicalTopN
----PhysicalTopN
------PhysicalProject
---------hashAgg[GLOBAL]
+--------hashAgg[DISTINCT_GLOBAL]
----------PhysicalDistribute
-------------hashAgg[LOCAL]
---------------PhysicalProject
-----------------hashJoin[INNER_JOIN](cs1.cs_ship_date_sk = date_dim.d_date_sk)
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------hashJoin[RIGHT_SEMI_JOIN](cs1.cs_order_number =
cs2.cs_order_number)( not (cs_warehouse_sk = cs_warehouse_sk))
-------------------------PhysicalDistribute
---------------------------PhysicalProject
-----------------------------PhysicalOlapScan[catalog_sales]
-------------------------hashJoin[INNER_JOIN](cs1.cs_call_center_sk =
call_center.cc_call_center_sk)
---------------------------hashJoin[RIGHT_ANTI_JOIN](cs1.cs_order_number =
cr1.cr_order_number)
-----------------------------PhysicalDistribute
-------------------------------PhysicalProject
---------------------------------PhysicalOlapScan[catalog_returns]
-----------------------------PhysicalDistribute
+------------hashAgg[DISTINCT_LOCAL]
+--------------hashAgg[GLOBAL]
+----------------hashAgg[LOCAL]
+------------------PhysicalProject
+--------------------hashJoin[RIGHT_SEMI_JOIN](cs1.cs_order_number =
cs2.cs_order_number)( not (cs_warehouse_sk = cs_warehouse_sk))
+----------------------PhysicalDistribute
+------------------------PhysicalProject
+--------------------------PhysicalOlapScan[catalog_sales]
+----------------------hashJoin[INNER_JOIN](cs1.cs_call_center_sk =
call_center.cc_call_center_sk)
+------------------------hashJoin[RIGHT_ANTI_JOIN](cs1.cs_order_number =
cr1.cr_order_number)
+--------------------------PhysicalDistribute
+----------------------------PhysicalProject
+------------------------------PhysicalOlapScan[catalog_returns]
+--------------------------PhysicalDistribute
+----------------------------hashJoin[INNER_JOIN](cs1.cs_ship_date_sk =
date_dim.d_date_sk)
------------------------------hashJoin[INNER_JOIN](cs1.cs_ship_addr_sk =
customer_address.ca_address_sk)
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[catalog_sales]
@@ -28,12 +28,12 @@ PhysicalResultSink
----------------------------------PhysicalProject
------------------------------------filter((cast(ca_state as VARCHAR(*)) =
'WV'))
--------------------------------------PhysicalOlapScan[customer_address]
---------------------------PhysicalDistribute
-----------------------------PhysicalProject
-------------------------------filter(cc_county IN ('Ziebach County', 'Luce
County', 'Richland County', 'Daviess County', 'Barrow County'))
---------------------------------PhysicalOlapScan[call_center]
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------filter((date_dim.d_date <= days_add(cast('2002-4-01' as
DATEV2), INTERVAL 60 DAY))(date_dim.d_date >= 2002-04-01))
-------------------------PhysicalOlapScan[date_dim]
+------------------------------PhysicalDistribute
+--------------------------------PhysicalProject
+----------------------------------filter((date_dim.d_date <=
2002-05-31)(date_dim.d_date >= 2002-04-01))
+------------------------------------PhysicalOlapScan[date_dim]
+------------------------PhysicalDistribute
+--------------------------PhysicalProject
+----------------------------filter(cc_county IN ('Ziebach County', 'Luce
County', 'Richland County', 'Daviess County', 'Barrow County'))
+------------------------------PhysicalOlapScan[call_center]
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query94.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query94.out
index 850edbe2c4..863a0879b2 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query94.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query94.out
@@ -4,23 +4,23 @@ PhysicalResultSink
--PhysicalTopN
----PhysicalTopN
------PhysicalProject
---------hashAgg[GLOBAL]
+--------hashAgg[DISTINCT_GLOBAL]
----------PhysicalDistribute
-------------hashAgg[LOCAL]
---------------PhysicalProject
-----------------hashJoin[INNER_JOIN](ws1.ws_ship_date_sk = date_dim.d_date_sk)
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------hashJoin[RIGHT_SEMI_JOIN](ws1.ws_order_number =
ws2.ws_order_number)( not (ws_warehouse_sk = ws_warehouse_sk))
+------------hashAgg[DISTINCT_LOCAL]
+--------------hashAgg[GLOBAL]
+----------------hashAgg[LOCAL]
+------------------PhysicalProject
+--------------------hashJoin[RIGHT_SEMI_JOIN](ws1.ws_order_number =
ws2.ws_order_number)( not (ws_warehouse_sk = ws_warehouse_sk))
+----------------------PhysicalDistribute
+------------------------PhysicalProject
+--------------------------PhysicalOlapScan[web_sales]
+----------------------hashJoin[RIGHT_ANTI_JOIN](ws1.ws_order_number =
wr1.wr_order_number)
------------------------PhysicalDistribute
--------------------------PhysicalProject
-----------------------------PhysicalOlapScan[web_sales]
-------------------------hashJoin[RIGHT_ANTI_JOIN](ws1.ws_order_number =
wr1.wr_order_number)
---------------------------PhysicalDistribute
-----------------------------PhysicalProject
-------------------------------PhysicalOlapScan[web_returns]
---------------------------PhysicalDistribute
-----------------------------hashJoin[INNER_JOIN](ws1.ws_web_site_sk =
web_site.web_site_sk)
+----------------------------PhysicalOlapScan[web_returns]
+------------------------PhysicalDistribute
+--------------------------hashJoin[INNER_JOIN](ws1.ws_web_site_sk =
web_site.web_site_sk)
+----------------------------hashJoin[INNER_JOIN](ws1.ws_ship_date_sk =
date_dim.d_date_sk)
------------------------------hashJoin[INNER_JOIN](ws1.ws_ship_addr_sk =
customer_address.ca_address_sk)
--------------------------------PhysicalProject
----------------------------------PhysicalOlapScan[web_sales]
@@ -30,10 +30,10 @@ PhysicalResultSink
--------------------------------------PhysicalOlapScan[customer_address]
------------------------------PhysicalDistribute
--------------------------------PhysicalProject
-----------------------------------filter((cast(web_company_name as VARCHAR(*))
= 'pri'))
-------------------------------------PhysicalOlapScan[web_site]
-------------------PhysicalDistribute
---------------------PhysicalProject
-----------------------filter((date_dim.d_date <= days_add(cast('2000-2-01' as
DATEV2), INTERVAL 60 DAY))(date_dim.d_date >= 2000-02-01))
-------------------------PhysicalOlapScan[date_dim]
+----------------------------------filter((date_dim.d_date <=
2000-04-01)(date_dim.d_date >= 2000-02-01))
+------------------------------------PhysicalOlapScan[date_dim]
+----------------------------PhysicalDistribute
+------------------------------PhysicalProject
+--------------------------------filter((cast(web_company_name as VARCHAR(*)) =
'pri'))
+----------------------------------PhysicalOlapScan[web_site]
diff --git
a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query95.out
b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query95.out
index 4df00ba184..2c6ebe0d7b 100644
--- a/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query95.out
+++ b/regression-test/data/nereids_tpcds_shape_sf100_p0/shape/query95.out
@@ -14,15 +14,12 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
----PhysicalTopN
------PhysicalTopN
--------PhysicalProject
-----------hashAgg[GLOBAL]
+----------hashAgg[DISTINCT_GLOBAL]
------------PhysicalDistribute
---------------hashAgg[LOCAL]
-----------------PhysicalProject
-------------------hashJoin[INNER_JOIN](ws1.ws_ship_date_sk =
date_dim.d_date_sk)
+--------------hashAgg[DISTINCT_LOCAL]
+----------------hashAgg[GLOBAL]
+------------------hashAgg[LOCAL]
--------------------PhysicalProject
-----------------------filter((date_dim.d_date >= 1999-02-01)(date_dim.d_date
<= days_add(cast('1999-2-01' as DATEV2), INTERVAL 60 DAY)))
-------------------------PhysicalOlapScan[date_dim]
---------------------PhysicalDistribute
----------------------hashJoin[RIGHT_SEMI_JOIN](ws1.ws_order_number =
web_returns.wr_order_number)
------------------------PhysicalProject
--------------------------hashJoin[INNER_JOIN](web_returns.wr_order_number =
ws_wh.ws_order_number)
@@ -38,13 +35,18 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
------------------------------PhysicalCteConsumer ( cteId=CTEId#0 )
--------------------------PhysicalDistribute
----------------------------hashJoin[INNER_JOIN](ws1.ws_web_site_sk =
web_site.web_site_sk)
-------------------------------hashJoin[INNER_JOIN](ws1.ws_ship_addr_sk =
customer_address.ca_address_sk)
---------------------------------PhysicalProject
-----------------------------------PhysicalOlapScan[web_sales]
+------------------------------hashJoin[INNER_JOIN](ws1.ws_ship_date_sk =
date_dim.d_date_sk)
+--------------------------------hashJoin[INNER_JOIN](ws1.ws_ship_addr_sk =
customer_address.ca_address_sk)
+----------------------------------PhysicalProject
+------------------------------------PhysicalOlapScan[web_sales]
+----------------------------------PhysicalDistribute
+------------------------------------PhysicalProject
+--------------------------------------filter((cast(ca_state as VARCHAR(*)) =
'NC'))
+----------------------------------------PhysicalOlapScan[customer_address]
--------------------------------PhysicalDistribute
----------------------------------PhysicalProject
-------------------------------------filter((cast(ca_state as VARCHAR(*)) =
'NC'))
---------------------------------------PhysicalOlapScan[customer_address]
+------------------------------------filter((date_dim.d_date >=
1999-02-01)(date_dim.d_date <= 1999-04-02))
+--------------------------------------PhysicalOlapScan[date_dim]
------------------------------PhysicalDistribute
--------------------------------PhysicalProject
----------------------------------filter((cast(web_company_name as VARCHAR(*))
= 'pri'))
diff --git a/regression-test/pipeline/p0/conf/regression-conf.groovy
b/regression-test/pipeline/p0/conf/regression-conf.groovy
index bc64d1c7a1..5ad2bde38f 100644
--- a/regression-test/pipeline/p0/conf/regression-conf.groovy
+++ b/regression-test/pipeline/p0/conf/regression-conf.groovy
@@ -55,7 +55,7 @@ testDirectories = ""
excludeGroups = ""
// this suites will not be executed
-excludeSuites =
"test_sql_block_rule,test_ddl,test_analyze,test_leading,test_stream_load_move_memtable,ds_rf95,ds_rf16,ds_rf94,test_profile,test_broker_load,test_spark_load,test_refresh_mtmv,test_bitmap_filter,test_export_parquet,nereids_delete_mow_partial_update,insert_group_commit_with_prepare_stmt"
+excludeSuites =
"test_sql_block_rule,test_ddl,test_analyze,test_leading,test_stream_load_move_memtable,test_profile,test_broker_load,test_spark_load,test_refresh_mtmv,test_bitmap_filter,test_export_parquet,nereids_delete_mow_partial_update,insert_group_commit_with_prepare_stmt"
// this directories will not be executed
excludeDirectories = "workload_manager_p1"
diff --git
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf16.groovy
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf16.groovy
index 74242fccab..dadcc356c1 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf16.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf16.groovy
@@ -80,6 +80,6 @@ limit 100;
// def outFile =
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.16"
// File file = new File(outFile)
// file.write(getRuntimeFilters(plan))
-
-
assertEquals("RF4[d_date_sk->[cs_ship_date_sk],RF3[cs_order_number->[cs_order_number],RF2[cc_call_center_sk->[cs_call_center_sk],RF1[cs_order_number->[cr_order_number],RF0[ca_address_sk->[cs_ship_addr_sk]",
getRuntimeFilters(plan))
+
+
assertEquals("RF4[cs_order_number->[cs_order_number],RF3[cc_call_center_sk->[cs_call_center_sk],RF2[cs_order_number->[cr_order_number],RF1[d_date_sk->[cs_ship_date_sk],RF0[ca_address_sk->[cs_ship_addr_sk]",
getRuntimeFilters(plan))
}
diff --git
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf94.groovy
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf94.groovy
index 666c78b919..73bc55ffbc 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf94.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf94.groovy
@@ -78,6 +78,6 @@ limit 100;
// def outFile =
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.94"
// File file = new File(outFile)
// file.write(getRuntimeFilters(plan))
-
-
assertEquals("RF4[d_date_sk->[ws_ship_date_sk],RF3[ws_order_number->[ws_order_number],RF2[ws_order_number->[wr_order_number],RF1[web_site_sk->[ws_web_site_sk],RF0[ca_address_sk->[ws_ship_addr_sk]",
getRuntimeFilters(plan))
+
+
assertEquals("RF4[ws_order_number->[ws_order_number],RF3[ws_order_number->[wr_order_number],RF2[web_site_sk->[ws_web_site_sk],RF1[d_date_sk->[ws_ship_date_sk],RF0[ca_address_sk->[ws_ship_addr_sk]",
getRuntimeFilters(plan))
}
diff --git
a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf95.groovy
b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf95.groovy
index 2ee5b9ae73..075cbfcdfa 100644
--- a/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf95.groovy
+++ b/regression-test/suites/nereids_tpcds_shape_sf100_p0/rf/ds_rf95.groovy
@@ -81,6 +81,6 @@ limit 100;
// def outFile =
"regression-test/suites/nereids_tpcds_shape_sf100_p0/ddl/rf/rf.95"
// File file = new File(outFile)
// file.write(getRuntimeFilters(plan))
-
-
assertEquals("RF0[ws_order_number->[ws_order_number],RF7[ws_ship_date_sk->[d_date_sk],RF4[wr_order_number->[ws_order_number],RF5[wr_order_number->[ws_order_number,
ws_order_number],RF3[ws_order_number->[ws_order_number],RF6[ws_order_number->[ws_order_number,
ws_order_number],RF2[web_site_sk->[ws_web_site_sk],RF1[ca_address_sk->[ws_ship_addr_sk]",
getRuntimeFilters(plan))
+
+
assertEquals("RF0[ws_order_number->[ws_order_number],RF5[wr_order_number->[ws_order_number],RF7[wr_order_number->[ws_order_number,
ws_order_number],RF4[ws_order_number->[ws_order_number],RF6[ws_order_number->[ws_order_number,
ws_order_number],RF3[web_site_sk->[ws_web_site_sk],RF2[d_date_sk->[ws_ship_date_sk],RF1[ca_address_sk->[ws_ship_addr_sk]",
getRuntimeFilters(plan))
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
