This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 5f17c038c90 branch-3.1: [regression-test](fix) fix tpcds q24 query and
result #51497 (#54707)
5f17c038c90 is described below
commit 5f17c038c90d14dde99aa6a1daec58a11ca7a5cc
Author: shuke <[email protected]>
AuthorDate: Fri Aug 15 17:38:55 2025 +0800
branch-3.1: [regression-test](fix) fix tpcds q24 query and result #51497
(#54707)
picked from #51497
---
.../inverted_index_p1/tpcds_sf1_index/sql/q24_1.out | Bin 307 -> 109 bytes
.../inverted_index_p1/tpcds_sf1_index/sql/q24_2.out | Bin 137 -> 109 bytes
.../tpcds_sf100_dup_without_key_p2/sql/q24_1.out | Bin 27654 -> 1496 bytes
.../tpcds_sf100_dup_without_key_p2/sql/q24_2.out | Bin 3795 -> 188 bytes
regression-test/data/tpcds_sf100_p2/sql/q24_1.out | Bin 27654 -> 1496 bytes
regression-test/data/tpcds_sf100_p2/sql/q24_2.out | Bin 3795 -> 188 bytes
regression-test/data/tpcds_sf1_p1/sql/q24_1.out | Bin 307 -> 109 bytes
regression-test/data/tpcds_sf1_p1/sql/q24_2.out | Bin 137 -> 109 bytes
.../data/tpcds_sf1_unique_p1/sql/q24_1.out | Bin 307 -> 109 bytes
.../data/tpcds_sf1_unique_p1/sql/q24_2.out | Bin 137 -> 109 bytes
.../inverted_index_p1/tpcds_sf1_index/sql/q24_1.sql | 3 ++-
.../inverted_index_p1/tpcds_sf1_index/sql/q24_2.sql | 3 ++-
.../tpcds_sf100_dup_without_key_p2/sql/q24_1.sql | 3 ++-
.../tpcds_sf100_dup_without_key_p2/sql/q24_2.sql | 3 ++-
regression-test/suites/tpcds_sf100_p2/sql/q24_1.sql | 3 ++-
regression-test/suites/tpcds_sf100_p2/sql/q24_2.sql | 3 ++-
regression-test/suites/tpcds_sf1_p1/sql/q24_1.sql | 3 ++-
regression-test/suites/tpcds_sf1_p1/sql/q24_2.sql | 3 ++-
.../suites/tpcds_sf1_unique_p1/sql/q24_1.sql | 3 ++-
.../suites/tpcds_sf1_unique_p1/sql/q24_2.sql | 5 +++++
20 files changed, 23 insertions(+), 9 deletions(-)
diff --git
a/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_1.out
b/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_1.out
index b5b3781427f..a87a3f6eb2f 100644
Binary files
a/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_1.out and
b/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_1.out differ
diff --git
a/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_2.out
b/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_2.out
index 3dd7690d52b..04afb1f4cd5 100644
Binary files
a/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_2.out and
b/regression-test/data/inverted_index_p1/tpcds_sf1_index/sql/q24_2.out differ
diff --git a/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_1.out
b/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_1.out
index 2a91a6a701a..239f109f792 100644
Binary files
a/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_1.out and
b/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_1.out differ
diff --git a/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_2.out
b/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_2.out
index dd0227eea25..aa16345d4d5 100644
Binary files
a/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_2.out and
b/regression-test/data/tpcds_sf100_dup_without_key_p2/sql/q24_2.out differ
diff --git a/regression-test/data/tpcds_sf100_p2/sql/q24_1.out
b/regression-test/data/tpcds_sf100_p2/sql/q24_1.out
index 2a91a6a701a..239f109f792 100644
Binary files a/regression-test/data/tpcds_sf100_p2/sql/q24_1.out and
b/regression-test/data/tpcds_sf100_p2/sql/q24_1.out differ
diff --git a/regression-test/data/tpcds_sf100_p2/sql/q24_2.out
b/regression-test/data/tpcds_sf100_p2/sql/q24_2.out
index dd0227eea25..aa16345d4d5 100644
Binary files a/regression-test/data/tpcds_sf100_p2/sql/q24_2.out and
b/regression-test/data/tpcds_sf100_p2/sql/q24_2.out differ
diff --git a/regression-test/data/tpcds_sf1_p1/sql/q24_1.out
b/regression-test/data/tpcds_sf1_p1/sql/q24_1.out
index b5b3781427f..a87a3f6eb2f 100644
Binary files a/regression-test/data/tpcds_sf1_p1/sql/q24_1.out and
b/regression-test/data/tpcds_sf1_p1/sql/q24_1.out differ
diff --git a/regression-test/data/tpcds_sf1_p1/sql/q24_2.out
b/regression-test/data/tpcds_sf1_p1/sql/q24_2.out
index 3dd7690d52b..04afb1f4cd5 100644
Binary files a/regression-test/data/tpcds_sf1_p1/sql/q24_2.out and
b/regression-test/data/tpcds_sf1_p1/sql/q24_2.out differ
diff --git a/regression-test/data/tpcds_sf1_unique_p1/sql/q24_1.out
b/regression-test/data/tpcds_sf1_unique_p1/sql/q24_1.out
index b5b3781427f..a87a3f6eb2f 100644
Binary files a/regression-test/data/tpcds_sf1_unique_p1/sql/q24_1.out and
b/regression-test/data/tpcds_sf1_unique_p1/sql/q24_1.out differ
diff --git a/regression-test/data/tpcds_sf1_unique_p1/sql/q24_2.out
b/regression-test/data/tpcds_sf1_unique_p1/sql/q24_2.out
index 3dd7690d52b..04afb1f4cd5 100644
Binary files a/regression-test/data/tpcds_sf1_unique_p1/sql/q24_2.out and
b/regression-test/data/tpcds_sf1_unique_p1/sql/q24_2.out differ
diff --git
a/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_1.sql
b/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_1.sql
index 65571698e1e..7dd33b66803 100644
--- a/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_1.sql
+++ b/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_1.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git
a/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_2.sql
b/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_2.sql
index db04507c9c9..90770946c0c 100644
--- a/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_2.sql
+++ b/regression-test/suites/inverted_index_p1/tpcds_sf1_index/sql/q24_2.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git
a/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_1.sql
b/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_1.sql
index 71711c8579c..d504d784da9 100644
--- a/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_1.sql
+++ b/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_1.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ and c_current_addr_sk = ca_address_sk
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git
a/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_2.sql
b/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_2.sql
index b8f7099eb47..c4efb602430 100644
--- a/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_2.sql
+++ b/regression-test/suites/tpcds_sf100_dup_without_key_p2/sql/q24_2.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git a/regression-test/suites/tpcds_sf100_p2/sql/q24_1.sql
b/regression-test/suites/tpcds_sf100_p2/sql/q24_1.sql
index 71711c8579c..89b4e0b9e49 100644
--- a/regression-test/suites/tpcds_sf100_p2/sql/q24_1.sql
+++ b/regression-test/suites/tpcds_sf100_p2/sql/q24_1.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git a/regression-test/suites/tpcds_sf100_p2/sql/q24_2.sql
b/regression-test/suites/tpcds_sf100_p2/sql/q24_2.sql
index b8f7099eb47..c4efb602430 100644
--- a/regression-test/suites/tpcds_sf100_p2/sql/q24_2.sql
+++ b/regression-test/suites/tpcds_sf100_p2/sql/q24_2.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git a/regression-test/suites/tpcds_sf1_p1/sql/q24_1.sql
b/regression-test/suites/tpcds_sf1_p1/sql/q24_1.sql
index 65571698e1e..7dd33b66803 100644
--- a/regression-test/suites/tpcds_sf1_p1/sql/q24_1.sql
+++ b/regression-test/suites/tpcds_sf1_p1/sql/q24_1.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git a/regression-test/suites/tpcds_sf1_p1/sql/q24_2.sql
b/regression-test/suites/tpcds_sf1_p1/sql/q24_2.sql
index db04507c9c9..90770946c0c 100644
--- a/regression-test/suites/tpcds_sf1_p1/sql/q24_2.sql
+++ b/regression-test/suites/tpcds_sf1_p1/sql/q24_2.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_1.sql
b/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_1.sql
index 65571698e1e..7dd33b66803 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_1.sql
+++ b/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_1.sql
@@ -24,7 +24,8 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
- AND (c_birth_country = upper(ca_country))
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
diff --git a/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_2.sql
b/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_2.sql
index db04507c9c9..f83d1079f53 100644
--- a/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_2.sql
+++ b/regression-test/suites/tpcds_sf1_unique_p1/sql/q24_2.sql
@@ -24,7 +24,12 @@ WITH
AND (ss_customer_sk = c_customer_sk)
AND (ss_item_sk = i_item_sk)
AND (ss_store_sk = s_store_sk)
+<<<<<<< HEAD
AND (c_birth_country = upper(ca_country))
+=======
+ AND (c_current_addr_sk = ca_address_sk)
+ AND (c_birth_country <> upper(ca_country))
+>>>>>>> 7033a21c20 ([regression-test](fix) fix tpcds q24 query and result
(#51497))
AND (s_zip = ca_zip)
AND (s_market_id = 8)
GROUP BY c_last_name, c_first_name, s_store_name, ca_state, s_state,
i_color, i_current_price, i_manager_id, i_units, i_size
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
