[fix](tools) tpch-tools and tpcds-tools update

.gitignore

@@ -52,6 +52,8 @@ thirdparty/src*
 thirdparty/installed*
 thirdparty/doris-thirdparty*.tar.xz
 
+docker/thirdparties/docker-compose/mysql/data
+
 fe_plugins/output
 fe_plugins/**/.factorypath
 
@@ -103,10 +105,13 @@ tools/**/TPC-H_Tools_v*/
 tools/**/tpc-h_v*.docx
 tools/**/tpc-h_v*.pdf
 tools/**/tpch-data/
+tools/tpch-tools/bin/result
 tools/single-node-cluster/fe*
 tools/tpcds-tools/TPC-DS_Tools_*.zip
 tools/tpcds-tools/bin/DSGen-software*
 tools/tpcds-tools/bin/tpcds-data/
+tools/tpcds-tools/bin/result
+tools/**/result.csv
 
 # be-ut
 data_test

tools/tpcds-tools/bin/load-tpcds-data.sh

@@ -197,3 +197,15 @@ end_time=$(date +%s)
 echo "End time: $(date)"
 
 echo "Finish load tpcds data, Time taken: $((end_time - start_time)) seconds"
+echo '============================================'
+echo "analyze database ${DB}"
+run_sql() {
+    echo "$*"
+    mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" -e "$*"
+}
+start=$(date +%s)
+run_sql "analyze database ${DB} with sync;"
+end=$(date +%s)
+analyzeTime=$((end - start))
+echo "analyze database ${DB} with sync total time: ${analyzeTime} s"
+echo '============================================'

tools/tpcds-tools/bin/run-tpcds-queries.sh

@@ -131,21 +131,20 @@ run_sql "show variables;"
 echo '============================================'
 run_sql "show table status;"
 echo '============================================'
-start=$(date +%s)
-run_sql "analyze database ${DB} with sync;"
-end=$(date +%s)
-totalTime=$((end - start))
-echo "analyze database ${DB} with sync total time: ${totalTime} s"
-echo '============================================'
-echo "Time Unit: ms"
 
 RESULT_DIR="${CURDIR}/result"
-rm "${RESULT_DIR}"
+if [[ -d "${RESULT_DIR}" ]]; then
+    rm -r "${RESULT_DIR}"
+fi
 mkdir -p "${RESULT_DIR}"
 touch result.csv
 cold_run_sum=0
 best_hot_run_sum=0
-for i in {1..99}; do
+# run part of queries, set their index to query_array
+# query_array=(59 17 29 25 47 40 54)
+query_array=$(seq 1 99)
+# shellcheck disable=SC2068
+for i in ${query_array[@]}; do
     cold=0
     hot1=0
     hot2=0

tools/tpch-tools/bin/load-tpch-data.sh

@@ -237,3 +237,14 @@ end_time=$(date +%s)
 echo "End time: $(date)"
 
 echo "Finish load tpch data, Time taken: $((end_time - start_time)) seconds"
+echo '============================================'
+run_sql() {
+    echo "$*"
+    mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" -e "$*"
+}
+start=$(date +%s)
+run_sql "analyze database ${DB} with sync;"
+end=$(date +%s)
+totalTime=$((end - start))
+echo "analyze database ${DB} with sync total time: ${totalTime} s"
+echo '============================================'

tools/tpch-tools/bin/run-tpch-queries.sh

@@ -131,21 +131,20 @@ run_sql "show variables;"
 echo '============================================'
 run_sql "show table status;"
 echo '============================================'
-start=$(date +%s)
-run_sql "analyze database ${DB} with sync;"
-end=$(date +%s)
-totalTime=$((end - start))
-echo "analyze database ${DB} with sync total time: ${totalTime} s"
-echo '============================================'
-echo "Time Unit: ms"
 
 RESULT_DIR="${CURDIR}/result"
-rm "${RESULT_DIR}"
+if [[ -d "${RESULT_DIR}" ]]; then
+    rm -r "${RESULT_DIR}"
+fi
 mkdir -p "${RESULT_DIR}"
 touch result.csv
 cold_run_sum=0
 best_hot_run_sum=0
-for i in {1..22}; do
+# run part of queries, set their index to query_array
+# query_array=(59 17 29 25 47 40 54)
+query_array=$(seq 1 22)
+# shellcheck disable=SC2068
+for i in ${query_array[@]}; do
     cold=0
     hot1=0
     hot2=0

tools/tpch-tools/conf/doris-cluster.conf

@@ -26,4 +26,4 @@ export USER='root'
 # Doris password
 export PASSWORD=''
 # The database where TPC-H tables located
-export DB='tpch'
+export DB='tpch_test'