This is an automated email from the ASF dual-hosted git repository. yiguolei 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 84a24397894 [case](tpcds) Fix error column name of tpcds table store (#49579) 84a24397894 is described below commit 84a24397894554883aaee65e3c56cf69f6e9d213 Author: zxealous <zhouchang...@baidu.com> AuthorDate: Fri Mar 28 14:09:54 2025 +0800 [case](tpcds) Fix error column name of tpcds table store (#49579) --- .../suites/fault_injection_p0/test_admin_clean_trash.groovy | 2 +- .../suites/inverted_index_p1/tpcds_sf1_index/ddl/store.sql | 2 +- regression-test/suites/nereids_hint_tpcds_p0/load.groovy | 4 ++-- regression-test/suites/nereids_p0/infer_expr_name/load.groovy | 2 +- .../suites/shape_check/tpcds_sf100/constraints/load.groovy | 4 ++-- regression-test/suites/shape_check/tpcds_sf100/load.groovy | 4 ++-- regression-test/suites/shape_check/tpcds_sf1000/load.groovy | 4 ++-- regression-test/suites/shape_check/tpcds_sf10t_orc/load.groovy | 2 +- regression-test/suites/tpcds_sf1000_p2/ddl/store.sql | 2 +- regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store.sql | 2 +- .../suites/tpcds_sf100_dup_without_key_p2/ddl/store_load.sql | 2 +- regression-test/suites/tpcds_sf100_p2/ddl/store.sql | 2 +- regression-test/suites/tpcds_sf100_p2/ddl/store_load.sql | 2 +- regression-test/suites/tpcds_sf1_p1/ddl/store.sql | 2 +- regression-test/suites/tpcds_sf1_unique_ck_p1/ddl/store.sql | 2 +- regression-test/suites/tpcds_sf1_unique_p1/ddl/store.sql | 2 +- tools/tpcds-tools/bin/load-tpcds-data.sh | 2 +- tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql | 2 +- tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql | 2 +- tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql | 2 +- tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/regression-test/suites/fault_injection_p0/test_admin_clean_trash.groovy b/regression-test/suites/fault_injection_p0/test_admin_clean_trash.groovy index 4e4e4532a03..bc1389ffc97 100644 --- a/regression-test/suites/fault_injection_p0/test_admin_clean_trash.groovy +++ b/regression-test/suites/fault_injection_p0/test_admin_clean_trash.groovy @@ -497,7 +497,7 @@ suite("test_admin_clean_trash", "nonConcurrent") { s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/regression-test/suites/inverted_index_p1/tpcds_sf1_index/ddl/store.sql b/regression-test/suites/inverted_index_p1/tpcds_sf1_index/ddl/store.sql index 0550ea628a3..4df5365ae47 100644 --- a/regression-test/suites/inverted_index_p1/tpcds_sf1_index/ddl/store.sql +++ b/regression-test/suites/inverted_index_p1/tpcds_sf1_index/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2), + s_tax_percentage decimal(5,2), INDEX s_store_sk_idx(s_store_sk) USING BITMAP COMMENT "s_store_sk index", INDEX s_store_id_idx(s_store_id) USING INVERTED COMMENT "s_store_id index", INDEX s_store_name_idx(s_store_name) USING INVERTED COMMENT "s_store_name index", diff --git a/regression-test/suites/nereids_hint_tpcds_p0/load.groovy b/regression-test/suites/nereids_hint_tpcds_p0/load.groovy index f4cf57113a6..a7a37b6a5d7 100644 --- a/regression-test/suites/nereids_hint_tpcds_p0/load.groovy +++ b/regression-test/suites/nereids_hint_tpcds_p0/load.groovy @@ -602,7 +602,7 @@ suite("load") { s_zip char(10), s_country varchar(20), s_gmt_offset decimalv3(5,2), - s_tax_precentage decimalv3(5,2) + s_tax_percentage decimalv3(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 @@ -2480,7 +2480,7 @@ suite("load") { """ sql """ - alter table store modify column s_tax_precentage set stats ('row_count'='1002', 'ndv'='12', 'num_nulls'='8', 'min_value'='0.00', 'max_value'='0.11', 'data_size'='4008') + alter table store modify column s_tax_percentage set stats ('row_count'='1002', 'ndv'='12', 'num_nulls'='8', 'min_value'='0.00', 'max_value'='0.11', 'data_size'='4008') """ sql """ diff --git a/regression-test/suites/nereids_p0/infer_expr_name/load.groovy b/regression-test/suites/nereids_p0/infer_expr_name/load.groovy index ecc84655e05..7e716b13436 100644 --- a/regression-test/suites/nereids_p0/infer_expr_name/load.groovy +++ b/regression-test/suites/nereids_p0/infer_expr_name/load.groovy @@ -614,7 +614,7 @@ suite("load") { s_zip char(10), s_country varchar(20), s_gmt_offset decimalv3(5,2), - s_tax_precentage decimalv3(5,2) + s_tax_percentage decimalv3(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/regression-test/suites/shape_check/tpcds_sf100/constraints/load.groovy b/regression-test/suites/shape_check/tpcds_sf100/constraints/load.groovy index b2dca961e4d..d8a049519ed 100644 --- a/regression-test/suites/shape_check/tpcds_sf100/constraints/load.groovy +++ b/regression-test/suites/shape_check/tpcds_sf100/constraints/load.groovy @@ -602,7 +602,7 @@ suite("load") { s_zip char(10), s_country varchar(20), s_gmt_offset decimalv3(5,2), - s_tax_precentage decimalv3(5,2) + s_tax_percentage decimalv3(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 @@ -2484,7 +2484,7 @@ suite("load") { """ sql """ - alter table store modify column s_tax_precentage set stats ('row_count'='1002', 'ndv'='12', 'num_nulls'='8', 'min_value'='0.00', 'max_value'='0.11', 'data_size'='4008') + alter table store modify column s_tax_percentage set stats ('row_count'='1002', 'ndv'='12', 'num_nulls'='8', 'min_value'='0.00', 'max_value'='0.11', 'data_size'='4008') """ sql """ diff --git a/regression-test/suites/shape_check/tpcds_sf100/load.groovy b/regression-test/suites/shape_check/tpcds_sf100/load.groovy index 48ad6bda53d..8853fd2b724 100644 --- a/regression-test/suites/shape_check/tpcds_sf100/load.groovy +++ b/regression-test/suites/shape_check/tpcds_sf100/load.groovy @@ -613,7 +613,7 @@ suite("load") { s_zip char(10), s_country varchar(20), s_gmt_offset decimalv3(5,2), - s_tax_precentage decimalv3(5,2) + s_tax_percentage decimalv3(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 @@ -2139,7 +2139,7 @@ alter table catalog_sales modify column cs_ship_hdemo_sk set stats ('row_count'= """ sql """ -alter table store modify column s_tax_precentage set stats ('row_count'='402', 'ndv'='1', 'min_value'='0.00', 'max_value'='0.11', 'avg_size'='1608', 'max_size'='1608' ) +alter table store modify column s_tax_percentage set stats ('row_count'='402', 'ndv'='1', 'min_value'='0.00', 'max_value'='0.11', 'avg_size'='1608', 'max_size'='1608' ) """ sql """ diff --git a/regression-test/suites/shape_check/tpcds_sf1000/load.groovy b/regression-test/suites/shape_check/tpcds_sf1000/load.groovy index 1a5c3980e84..5ea4258b820 100644 --- a/regression-test/suites/shape_check/tpcds_sf1000/load.groovy +++ b/regression-test/suites/shape_check/tpcds_sf1000/load.groovy @@ -602,7 +602,7 @@ suite("load") { s_zip char(10), s_country varchar(20), s_gmt_offset decimalv3(5,2), - s_tax_precentage decimalv3(5,2) + s_tax_percentage decimalv3(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 @@ -2480,7 +2480,7 @@ suite("load") { """ sql """ - alter table store modify column s_tax_precentage set stats ('row_count'='1002', 'ndv'='12', 'num_nulls'='8', 'min_value'='0.00', 'max_value'='0.11', 'data_size'='4008') + alter table store modify column s_tax_percentage set stats ('row_count'='1002', 'ndv'='12', 'num_nulls'='8', 'min_value'='0.00', 'max_value'='0.11', 'data_size'='4008') """ sql """ diff --git a/regression-test/suites/shape_check/tpcds_sf10t_orc/load.groovy b/regression-test/suites/shape_check/tpcds_sf10t_orc/load.groovy index d7f96be6492..4ea9914fdb3 100644 --- a/regression-test/suites/shape_check/tpcds_sf10t_orc/load.groovy +++ b/regression-test/suites/shape_check/tpcds_sf10t_orc/load.groovy @@ -477,7 +477,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DISTRIBUTED BY RANDOM PROPERTIES ( diff --git a/regression-test/suites/tpcds_sf1000_p2/ddl/store.sql b/regression-test/suites/tpcds_sf1000_p2/ddl/store.sql index 57cac7ad52d..f43af4b67a0 100644 --- a/regression-test/suites/tpcds_sf1000_p2/ddl/store.sql +++ b/regression-test/suites/tpcds_sf1000_p2/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk, s_store_id) DISTRIBUTED BY HASH(s_store_id) BUCKETS 3 diff --git a/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store.sql b/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store.sql index 18a695336f2..73f8e39e953 100644 --- a/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store.sql +++ b/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 PROPERTIES ( diff --git a/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store_load.sql b/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store_load.sql index 21853ba2bae..adc5c1272ae 100644 --- a/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store_load.sql +++ b/regression-test/suites/tpcds_sf100_dup_without_key_p2/ddl/store_load.sql @@ -2,6 +2,6 @@ LOAD LABEL ${loadLabel} ( DATA INFILE("s3://${s3BucketName}/regression/tpcds/sf100/store.dat.gz") INTO TABLE store COLUMNS TERMINATED BY "|" - (s_store_sk, s_store_id, s_rec_start_date, s_rec_end_date, s_closed_date_sk, s_store_name, s_number_employees, s_floor_space, s_hours, s_manager, s_market_id, s_geography_class, s_market_desc, s_market_manager, s_division_id, s_division_name, s_company_id, s_company_name, s_street_number, s_street_name, s_street_type, s_suite_number, s_city, s_county, s_state, s_zip, s_country, s_gmt_offset, s_tax_precentage) + (s_store_sk, s_store_id, s_rec_start_date, s_rec_end_date, s_closed_date_sk, s_store_name, s_number_employees, s_floor_space, s_hours, s_manager, s_market_id, s_geography_class, s_market_desc, s_market_manager, s_division_id, s_division_name, s_company_id, s_company_name, s_street_number, s_street_name, s_street_type, s_suite_number, s_city, s_county, s_state, s_zip, s_country, s_gmt_offset, s_tax_percentage) ) diff --git a/regression-test/suites/tpcds_sf100_p2/ddl/store.sql b/regression-test/suites/tpcds_sf100_p2/ddl/store.sql index ac23bce9629..ac66308eb9e 100644 --- a/regression-test/suites/tpcds_sf100_p2/ddl/store.sql +++ b/regression-test/suites/tpcds_sf100_p2/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/regression-test/suites/tpcds_sf100_p2/ddl/store_load.sql b/regression-test/suites/tpcds_sf100_p2/ddl/store_load.sql index 21853ba2bae..adc5c1272ae 100644 --- a/regression-test/suites/tpcds_sf100_p2/ddl/store_load.sql +++ b/regression-test/suites/tpcds_sf100_p2/ddl/store_load.sql @@ -2,6 +2,6 @@ LOAD LABEL ${loadLabel} ( DATA INFILE("s3://${s3BucketName}/regression/tpcds/sf100/store.dat.gz") INTO TABLE store COLUMNS TERMINATED BY "|" - (s_store_sk, s_store_id, s_rec_start_date, s_rec_end_date, s_closed_date_sk, s_store_name, s_number_employees, s_floor_space, s_hours, s_manager, s_market_id, s_geography_class, s_market_desc, s_market_manager, s_division_id, s_division_name, s_company_id, s_company_name, s_street_number, s_street_name, s_street_type, s_suite_number, s_city, s_county, s_state, s_zip, s_country, s_gmt_offset, s_tax_precentage) + (s_store_sk, s_store_id, s_rec_start_date, s_rec_end_date, s_closed_date_sk, s_store_name, s_number_employees, s_floor_space, s_hours, s_manager, s_market_id, s_geography_class, s_market_desc, s_market_manager, s_division_id, s_division_name, s_company_id, s_company_name, s_street_number, s_street_name, s_street_type, s_suite_number, s_city, s_county, s_state, s_zip, s_country, s_gmt_offset, s_tax_percentage) ) diff --git a/regression-test/suites/tpcds_sf1_p1/ddl/store.sql b/regression-test/suites/tpcds_sf1_p1/ddl/store.sql index 57cac7ad52d..f43af4b67a0 100644 --- a/regression-test/suites/tpcds_sf1_p1/ddl/store.sql +++ b/regression-test/suites/tpcds_sf1_p1/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk, s_store_id) DISTRIBUTED BY HASH(s_store_id) BUCKETS 3 diff --git a/regression-test/suites/tpcds_sf1_unique_ck_p1/ddl/store.sql b/regression-test/suites/tpcds_sf1_unique_ck_p1/ddl/store.sql index 8d16e5cc5d1..cbc3e7f4929 100644 --- a/regression-test/suites/tpcds_sf1_unique_ck_p1/ddl/store.sql +++ b/regression-test/suites/tpcds_sf1_unique_ck_p1/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) UNIQUE KEY(s_store_sk) CLUSTER BY(s_company_id, s_store_id) diff --git a/regression-test/suites/tpcds_sf1_unique_p1/ddl/store.sql b/regression-test/suites/tpcds_sf1_unique_p1/ddl/store.sql index a13864ccffb..0a7a1a97758 100644 --- a/regression-test/suites/tpcds_sf1_unique_p1/ddl/store.sql +++ b/regression-test/suites/tpcds_sf1_unique_p1/ddl/store.sql @@ -27,7 +27,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) UNIQUE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/tools/tpcds-tools/bin/load-tpcds-data.sh b/tools/tpcds-tools/bin/load-tpcds-data.sh index ab9fb9d3361..95b6ebbbc1b 100755 --- a/tools/tpcds-tools/bin/load-tpcds-data.sh +++ b/tools/tpcds-tools/bin/load-tpcds-data.sh @@ -136,7 +136,7 @@ declare -A table_columns=( ['promotion']='p_promo_sk, p_promo_id, p_start_date_sk, p_end_date_sk, p_item_sk, p_cost, p_response_targe, p_promo_name, p_channel_dmail, p_channel_email, p_channel_catalog, p_channel_tv, p_channel_radio, p_channel_press, p_channel_event, p_channel_demo, p_channel_details, p_purpose, p_discount_active' ['reason']='r_reason_sk, r_reason_id, r_reason_desc' ['ship_mode']='sm_ship_mode_sk, sm_ship_mode_id, sm_type, sm_code, sm_carrier, sm_contract' - ['store']='s_store_sk, s_store_id, s_rec_start_date, s_rec_end_date, s_closed_date_sk, s_store_name, s_number_employees, s_floor_space, s_hours, s_manager, s_market_id, s_geography_class, s_market_desc, s_market_manager, s_division_id, s_division_name, s_company_id, s_company_name, s_street_number, s_street_name, s_street_type, s_suite_number, s_city, s_county, s_state, s_zip, s_country, s_gmt_offset, s_tax_precentage' + ['store']='s_store_sk, s_store_id, s_rec_start_date, s_rec_end_date, s_closed_date_sk, s_store_name, s_number_employees, s_floor_space, s_hours, s_manager, s_market_id, s_geography_class, s_market_desc, s_market_manager, s_division_id, s_division_name, s_company_id, s_company_name, s_street_number, s_street_name, s_street_type, s_suite_number, s_city, s_county, s_state, s_zip, s_country, s_gmt_offset, s_tax_percentage' ['store_returns']='sr_returned_date_sk, sr_return_time_sk, sr_item_sk, sr_customer_sk, sr_cdemo_sk, sr_hdemo_sk, sr_addr_sk, sr_store_sk, sr_reason_sk, sr_ticket_number, sr_return_quantity, sr_return_amt, sr_return_tax, sr_return_amt_inc_tax, sr_fee, sr_return_ship_cost, sr_refunded_cash, sr_reversed_charge, sr_store_credit, sr_net_loss' ['store_sales']='ss_sold_date_sk, ss_sold_time_sk, ss_item_sk, ss_customer_sk, ss_cdemo_sk, ss_hdemo_sk, ss_addr_sk, ss_store_sk, ss_promo_sk, ss_ticket_number, ss_quantity, ss_wholesale_cost, ss_list_price, ss_sales_price, ss_ext_discount_amt, ss_ext_sales_price, ss_ext_wholesale_cost, ss_ext_list_price, ss_ext_tax, ss_coupon_amt, ss_net_paid, ss_net_paid_inc_tax, ss_net_profit' ['time_dim']='t_time_sk, t_time_id, t_time, t_hour, t_minute, t_second, t_am_pm, t_shift, t_sub_shift, t_meal_time' diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql index e163086fc52..c1a9b54d816 100644 --- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql +++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1.sql @@ -474,7 +474,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql b/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql index 572bc2f20f8..5237e390905 100644 --- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql +++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf100.sql @@ -485,7 +485,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql index 23b16480be3..d0d2feb4163 100644 --- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql +++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf1000.sql @@ -860,7 +860,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 diff --git a/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql b/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql index e6d62165f97..f75714129ea 100644 --- a/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql +++ b/tools/tpcds-tools/ddl/create-tpcds-tables-sf10000.sql @@ -864,7 +864,7 @@ CREATE TABLE IF NOT EXISTS store ( s_zip char(10), s_country varchar(20), s_gmt_offset decimal(5,2), - s_tax_precentage decimal(5,2) + s_tax_percentage decimal(5,2) ) DUPLICATE KEY(s_store_sk) DISTRIBUTED BY HASH(s_store_sk) BUCKETS 1 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org