This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 9481728b37627c54fce7e13ea8d336d3b90ce498 Author: xzj7019 <[email protected]> AuthorDate: Thu Feb 22 19:46:16 2024 +0800 [tools] update tools script (#31286) --- tools/tpcds-tools/bin/create-tpcds-tables.sh | 5 +++++ tools/tpcds-tools/bin/run-tpcds-queries.sh | 12 +++++++----- tools/tpcds-tools/conf/opt/opt_sf1.sql | 1 + tools/tpcds-tools/conf/opt/opt_sf100.sql | 1 + tools/tpcds-tools/conf/opt/opt_sf1000.sql | 1 + tools/tpcds-tools/conf/opt/opt_sf10000.sql | 1 + tools/tpcds-tools/constraints/build-fk-constraints.sql | 3 +++ tools/tpcds-tools/constraints/build-pk-constraints.sql | 2 ++ tools/tpcds-tools/constraints/build-uk-constraints.sql | 1 + 9 files changed, 22 insertions(+), 5 deletions(-) diff --git a/tools/tpcds-tools/bin/create-tpcds-tables.sh b/tools/tpcds-tools/bin/create-tpcds-tables.sh index c9268fef7e5..82ae17c6e8e 100755 --- a/tools/tpcds-tools/bin/create-tpcds-tables.sh +++ b/tools/tpcds-tools/bin/create-tpcds-tables.sh @@ -122,4 +122,9 @@ else echo "${SCALE_FACTOR} scale is NOT supported currently" fi +echo "Build constraints" +mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" <"${CURDIR}"/../constraints/build-pk-constraints.sql +mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" <"${CURDIR}"/../constraints/build-uk-constraints.sql +mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" <"${CURDIR}"/../constraints/build-fk-constraints.sql + echo "tpcds tables has been created" diff --git a/tools/tpcds-tools/bin/run-tpcds-queries.sh b/tools/tpcds-tools/bin/run-tpcds-queries.sh index f3d8e58bffd..f13bc5003f4 100755 --- a/tools/tpcds-tools/bin/run-tpcds-queries.sh +++ b/tools/tpcds-tools/bin/run-tpcds-queries.sh @@ -134,9 +134,13 @@ backup_session_variables() { k="${line/set global /}" k="${k%=*}" v=$(get_session_variable "${k}") - echo "set global ${k}=${v};" >>"${backup_session_variables_file}" + echo "set global ${k}='${v}';" >>"${backup_session_variables_file}" done < <(grep -v '^ *#' <"${TPCDS_OPT_CONF}") } +clean_up() { + mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" -e"source ${backup_session_variables_file};" + rm -f "${backup_session_variables_file}" +} backup_session_variables echo '============================================' @@ -195,10 +199,8 @@ for i in ${query_array[@]}; do fi done +clean_up + echo "Total cold run time: ${cold_run_sum} ms" echo "Total hot run time: ${best_hot_run_sum} ms" echo 'Finish tpcds queries.' - -echo "Restore session variables" -run_sql "source ${backup_session_variables_file};" -rm -f "${backup_session_variables_file}" diff --git a/tools/tpcds-tools/conf/opt/opt_sf1.sql b/tools/tpcds-tools/conf/opt/opt_sf1.sql index ea43723c30d..dafe9f37134 100644 --- a/tools/tpcds-tools/conf/opt/opt_sf1.sql +++ b/tools/tpcds-tools/conf/opt/opt_sf1.sql @@ -1 +1,2 @@ set global runtime_filter_wait_time_ms=1000; +set global enable_nereids_rules='ELIMINATE_GROUP_BY_KEY'; diff --git a/tools/tpcds-tools/conf/opt/opt_sf100.sql b/tools/tpcds-tools/conf/opt/opt_sf100.sql index ea43723c30d..dafe9f37134 100644 --- a/tools/tpcds-tools/conf/opt/opt_sf100.sql +++ b/tools/tpcds-tools/conf/opt/opt_sf100.sql @@ -1 +1,2 @@ set global runtime_filter_wait_time_ms=1000; +set global enable_nereids_rules='ELIMINATE_GROUP_BY_KEY'; diff --git a/tools/tpcds-tools/conf/opt/opt_sf1000.sql b/tools/tpcds-tools/conf/opt/opt_sf1000.sql index 17d8fa190f3..2e42f2ed9e7 100644 --- a/tools/tpcds-tools/conf/opt/opt_sf1000.sql +++ b/tools/tpcds-tools/conf/opt/opt_sf1000.sql @@ -1 +1,2 @@ set global runtime_filter_wait_time_ms=10000; +set global enable_nereids_rules='ELIMINATE_GROUP_BY_KEY'; diff --git a/tools/tpcds-tools/conf/opt/opt_sf10000.sql b/tools/tpcds-tools/conf/opt/opt_sf10000.sql index ef11bad93de..47233ff6910 100644 --- a/tools/tpcds-tools/conf/opt/opt_sf10000.sql +++ b/tools/tpcds-tools/conf/opt/opt_sf10000.sql @@ -1 +1,2 @@ set global runtime_filter_wait_time_ms=100000; +set global enable_nereids_rules='ELIMINATE_GROUP_BY_KEY'; diff --git a/tools/tpcds-tools/constraints/build-fk-constraints.sql b/tools/tpcds-tools/constraints/build-fk-constraints.sql new file mode 100644 index 00000000000..f5706172603 --- /dev/null +++ b/tools/tpcds-tools/constraints/build-fk-constraints.sql @@ -0,0 +1,3 @@ +alter table store_sales add constraint ss_c_fk foreign key(ss_customer_sk) references customer(c_customer_sk); +alter table web_sales add constraint ws_c_fk foreign key(ws_bill_customer_sk) references customer(c_customer_sk); +alter table catalog_sales add constraint cs_c_fk foreign key(cs_bill_customer_sk) references customer(c_customer_sk); diff --git a/tools/tpcds-tools/constraints/build-pk-constraints.sql b/tools/tpcds-tools/constraints/build-pk-constraints.sql new file mode 100644 index 00000000000..9abb8192dfe --- /dev/null +++ b/tools/tpcds-tools/constraints/build-pk-constraints.sql @@ -0,0 +1,2 @@ +alter table item add constraint i_pk primary key (i_item_sk); +alter table customer add constraint c_pk primary key (c_customer_sk); diff --git a/tools/tpcds-tools/constraints/build-uk-constraints.sql b/tools/tpcds-tools/constraints/build-uk-constraints.sql new file mode 100644 index 00000000000..a7fff4dc329 --- /dev/null +++ b/tools/tpcds-tools/constraints/build-uk-constraints.sql @@ -0,0 +1 @@ +alter table customer add constraint c_uk unique (c_customer_id); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
