This is an automated email from the ASF dual-hosted git repository.
morrysnow 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 eb2db1bfb0 [enhance](Tools) update tpch tools (#24291)
eb2db1bfb0 is described below
commit eb2db1bfb0ea47e43f4c6e77fe71fce52d53b72a
Author: xzj7019 <[email protected]>
AuthorDate: Thu Sep 14 09:47:50 2023 +0800
[enhance](Tools) update tpch tools (#24291)
update tpch tools:
1) extend data scale to sf1/sf100/sf1000/sf10000
2) add table schema, sql, opt config for all different scale.
3) refine result output
---
tools/tpcds-tools/README.md | 4 +-
tools/tpcds-tools/bin/run-tpcds-queries.sh | 16 +++--
tools/tpch-tools/README.md | 6 +-
tools/tpch-tools/bin/create-tpch-tables.sh | 28 +++++++-
tools/tpch-tools/bin/load-tpch-data.sh | 1 +
tools/tpch-tools/bin/run-tpch-queries.sh | 75 ++++++++++++++--------
tools/tpch-tools/conf/opt/opt_sf1.sql | 6 ++
tools/tpch-tools/conf/opt/opt_sf100.sql | 7 ++
tools/tpch-tools/conf/opt/opt_sf1000.sql | 7 ++
tools/tpch-tools/conf/opt/opt_sf10000.sql | 7 ++
...pch-tables.sql => create-tpch-tables-sf100.sql} | 0
...ch-tables.sql => create-tpch-tables-sf1000.sql} | 12 ++--
...h-tables.sql => create-tpch-tables-sf10000.sql} | 12 ++--
...ch-tables.sql => create-tpch-tables-sf2000.sql} | 12 ++--
tools/tpch-tools/ddl/create-tpch-tables.sql | 12 ++--
tools/tpch-tools/queries/{ => sf1}/q1.sql | 0
tools/tpch-tools/queries/{ => sf1}/q10.sql | 0
tools/tpch-tools/queries/{ => sf1}/q11.sql | 0
tools/tpch-tools/queries/{ => sf1}/q12.sql | 0
tools/tpch-tools/queries/{ => sf1}/q13.sql | 0
tools/tpch-tools/queries/{ => sf1}/q14.sql | 0
tools/tpch-tools/queries/{ => sf1}/q15.sql | 0
tools/tpch-tools/queries/{ => sf1}/q16.sql | 0
tools/tpch-tools/queries/{ => sf1}/q17.sql | 0
tools/tpch-tools/queries/{ => sf1}/q18.sql | 0
tools/tpch-tools/queries/{ => sf1}/q19.sql | 0
tools/tpch-tools/queries/{ => sf1}/q2.sql | 0
tools/tpch-tools/queries/{ => sf1}/q20.sql | 0
tools/tpch-tools/queries/{ => sf1}/q21.sql | 0
tools/tpch-tools/queries/{ => sf1}/q22.sql | 0
tools/tpch-tools/queries/{ => sf1}/q3.sql | 0
tools/tpch-tools/queries/{ => sf1}/q4.sql | 0
tools/tpch-tools/queries/{ => sf1}/q5.sql | 0
tools/tpch-tools/queries/{ => sf1}/q6.sql | 0
tools/tpch-tools/queries/{ => sf1}/q7.sql | 0
tools/tpch-tools/queries/{ => sf1}/q8.sql | 0
tools/tpch-tools/queries/{ => sf1}/q9.sql | 0
tools/tpch-tools/queries/{ => sf100}/q1.sql | 0
tools/tpch-tools/queries/{ => sf100}/q10.sql | 0
tools/tpch-tools/queries/{ => sf100}/q11.sql | 0
tools/tpch-tools/queries/{ => sf100}/q12.sql | 0
tools/tpch-tools/queries/{ => sf100}/q13.sql | 0
tools/tpch-tools/queries/{ => sf100}/q14.sql | 0
tools/tpch-tools/queries/{ => sf100}/q15.sql | 0
tools/tpch-tools/queries/{ => sf100}/q16.sql | 0
tools/tpch-tools/queries/{ => sf100}/q17.sql | 0
tools/tpch-tools/queries/{ => sf100}/q18.sql | 0
tools/tpch-tools/queries/{ => sf100}/q19.sql | 0
tools/tpch-tools/queries/{ => sf100}/q2.sql | 0
tools/tpch-tools/queries/{ => sf100}/q20.sql | 0
tools/tpch-tools/queries/{ => sf100}/q21.sql | 0
tools/tpch-tools/queries/{ => sf100}/q22.sql | 0
tools/tpch-tools/queries/{ => sf100}/q3.sql | 0
tools/tpch-tools/queries/{ => sf100}/q4.sql | 0
tools/tpch-tools/queries/{ => sf100}/q5.sql | 0
tools/tpch-tools/queries/{ => sf100}/q6.sql | 0
tools/tpch-tools/queries/{ => sf100}/q7.sql | 0
tools/tpch-tools/queries/{ => sf100}/q8.sql | 0
tools/tpch-tools/queries/{ => sf100}/q9.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q1.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q10.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q11.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q12.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q13.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q14.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q15.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q16.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q17.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q18.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q19.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q2.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q20.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q21.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q22.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q3.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q4.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q5.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q6.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q7.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q8.sql | 0
tools/tpch-tools/queries/{ => sf1000}/q9.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q1.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q10.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q11.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q12.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q13.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q14.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q15.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q16.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q17.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q18.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q19.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q2.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q20.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q21.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q22.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q3.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q4.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q5.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q6.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q7.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q8.sql | 0
tools/tpch-tools/queries/{ => sf10000}/q9.sql | 0
103 files changed, 145 insertions(+), 60 deletions(-)
diff --git a/tools/tpcds-tools/README.md b/tools/tpcds-tools/README.md
index b8fc6eefe8..e4cf768d3c 100644
--- a/tools/tpcds-tools/README.md
+++ b/tools/tpcds-tools/README.md
@@ -37,7 +37,7 @@ follow the steps below:
### 4. create tpc-ds tables. modify `conf/doris-cluster.conf` to specify doris
info, then run script below.
- ./bin/create-tpcds-tables.sh
+ ./bin/create-tpcds-tables.sh -s 1
### 5. load tpc-ds data. use -h for help.
@@ -45,4 +45,4 @@ follow the steps below:
### 6. run tpc-ds queries.
- ./bin/run-tpcds-queries.sh
+ ./bin/run-tpcds-queries.sh -s 1
diff --git a/tools/tpcds-tools/bin/run-tpcds-queries.sh
b/tools/tpcds-tools/bin/run-tpcds-queries.sh
index 086c1dc37a..81dbfb70f1 100755
--- a/tools/tpcds-tools/bin/run-tpcds-queries.sh
+++ b/tools/tpcds-tools/bin/run-tpcds-queries.sh
@@ -17,7 +17,7 @@
# under the License.
##############################################################
-# This script is used to run TPC-DS 103 queries
+# This script is used to run TPC-DS 99 queries
##############################################################
set -eo pipefail
@@ -131,33 +131,39 @@ 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}"
+mkdir -p "${RESULT_DIR}"
touch result.csv
cold_run_sum=0
best_hot_run_sum=0
-i=1
for i in {1..99}; do
cold=0
hot1=0
hot2=0
echo -ne "query${i}\t" | tee -a result.csv
start=$(date +%s%3N)
- mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" --comments
<"${TPCDS_QUERIES_DIR}"/query"${i}".sql >/dev/null
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" --comments
<"${TPCDS_QUERIES_DIR}"/query"${i}".sql >"${RESULT_DIR}"/result"${i}".out
2>"${RESULT_DIR}"/result"${i}".log
end=$(date +%s%3N)
cold=$((end - start))
echo -ne "${cold}\t" | tee -a result.csv
start=$(date +%s%3N)
- mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" --comments
<"${TPCDS_QUERIES_DIR}"/query"${i}".sql >/dev/null
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" --comments
<"${TPCDS_QUERIES_DIR}"/query"${i}".sql >"${RESULT_DIR}"/result"${i}".out
2>"${RESULT_DIR}"/result"${i}".log
end=$(date +%s%3N)
hot1=$((end - start))
echo -ne "${hot1}\t" | tee -a result.csv
start=$(date +%s%3N)
- mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" --comments
<"${TPCDS_QUERIES_DIR}"/query"${i}".sql >/dev/null
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" --comments
<"${TPCDS_QUERIES_DIR}"/query"${i}".sql >"${RESULT_DIR}"/result"${i}".out
2>"${RESULT_DIR}"/result"${i}".log
end=$(date +%s%3N)
hot2=$((end - start))
echo -ne "${hot2}\t" | tee -a result.csv
diff --git a/tools/tpch-tools/README.md b/tools/tpch-tools/README.md
index bd9e483eec..d1b592bc67 100644
--- a/tools/tpch-tools/README.md
+++ b/tools/tpch-tools/README.md
@@ -32,7 +32,7 @@ follow the steps below:
### 3. create tpc-h tables. modify `conf/doris-cluster.conf` to specify doris
info, then run script below.
- ./bin/create-tpch-tables.sh
+ ./bin/create-tpch-tables.sh -s 1
### 4. load tpc-h data. use -h for help.
@@ -40,8 +40,10 @@ follow the steps below:
### 5. run tpc-h queries.
- ./bin/run-tpch-queries.sh
+ ./bin/run-tpch-queries.sh -s 1
NOTICE: At present, Doris's query optimizer and statistical information
functions are not complete, so we rewrite some queries in TPC-H to adapt to
Doris' execution framework, but it does not affect the correctness of the
results. The rewritten SQL is marked with "Modified" in the corresponding .sql
file.
A new query optimizer will be released in subsequent releases.
+
+ Currently, differnt scales use the same suite of query sqls.
diff --git a/tools/tpch-tools/bin/create-tpch-tables.sh
b/tools/tpch-tools/bin/create-tpch-tables.sh
index 385f936a4d..9c494a87cc 100755
--- a/tools/tpch-tools/bin/create-tpch-tables.sh
+++ b/tools/tpch-tools/bin/create-tpch-tables.sh
@@ -42,10 +42,12 @@ Usage: $0
OPTS=$(getopt \
-n "$0" \
-o '' \
+ -o 'hs:' \
-- "$@")
eval set -- "${OPTS}"
HELP=0
+SCALE_FACTOR=1
if [[ $# == 0 ]]; then
usage
@@ -57,6 +59,10 @@ while true; do
HELP=1
shift
;;
+ -s)
+ SCALE_FACTOR=$2
+ shift 2
+ ;;
--)
shift
break
@@ -72,6 +78,11 @@ if [[ "${HELP}" -eq 1 ]]; then
usage
fi
+if [[ ${SCALE_FACTOR} -ne 1 ]] && [[ ${SCALE_FACTOR} -ne 100 ]] && [[
${SCALE_FACTOR} -ne 1000 ]] && [[ ${SCALE_FACTOR} -ne 10000 ]]; then
+ echo "${SCALE_FACTOR} scale is not supported"
+ exit 1
+fi
+
check_prerequest() {
local CMD=$1
local NAME=$2
@@ -93,7 +104,20 @@ echo "DB: ${DB}"
mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -e "CREATE DATABASE IF
NOT EXISTS ${DB}"
-echo "Run SQLs from ${CURDIR}/create-tpch-tables.sql"
-mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
<"${CURDIR}"/../ddl/create-tpch-tables.sql
+if [[ ${SCALE_FACTOR} -eq 1 ]]; then
+ echo "Run SQLs from ${CURDIR}/../ddl/create-tpch-tables.sql"
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
<"${CURDIR}"/../ddl/create-tpch-tables.sql
+elif [[ ${SCALE_FACTOR} -eq 100 ]]; then
+ echo "Run SQLs from ${CURDIR}/../ddl/create-tpch-tables-sf100.sql"
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
<"${CURDIR}"/../ddl/create-tpch-tables-sf100.sql
+elif [[ ${SCALE_FACTOR} -eq 1000 ]]; then
+ echo "Run SQLs from ${CURDIR}/../ddl/create-tpch-tables-sf1000.sql"
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
<"${CURDIR}"/../ddl/create-tpch-tables-sf1000.sql
+elif [[ ${SCALE_FACTOR} -eq 10000 ]]; then
+ echo "Run SQLs from ${CURDIR}/../ddl/create-tpch-tables-sf10000.sql"
+ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
<"${CURDIR}"/../ddl/create-tpch-tables-sf10000.sql
+else
+ echo "${SCALE_FACTOR} scale is NOT supported currently"
+fi
echo "tpch tables has been created"
diff --git a/tools/tpch-tools/bin/load-tpch-data.sh
b/tools/tpch-tools/bin/load-tpch-data.sh
index 33865ca073..e087f470eb 100755
--- a/tools/tpch-tools/bin/load-tpch-data.sh
+++ b/tools/tpch-tools/bin/load-tpch-data.sh
@@ -108,6 +108,7 @@ check_prerequest "curl --version" "curl"
source "${CURDIR}/../conf/doris-cluster.conf"
export MYSQL_PWD=${PASSWORD}
+echo "Parallelism: ${PARALLEL}"
echo "FE_HOST: ${FE_HOST}"
echo "FE_HTTP_PORT: ${FE_HTTP_PORT}"
echo "USER: ${USER}"
diff --git a/tools/tpch-tools/bin/run-tpch-queries.sh
b/tools/tpch-tools/bin/run-tpch-queries.sh
index 39dd0ed58c..116c95795b 100755
--- a/tools/tpch-tools/bin/run-tpch-queries.sh
+++ b/tools/tpch-tools/bin/run-tpch-queries.sh
@@ -17,7 +17,7 @@
# under the License.
##############################################################
-# This script is used to create TPC-H tables
+# This script is used to run TPC-H 22 queries
##############################################################
set -eo pipefail
@@ -29,7 +29,6 @@ ROOT=$(
)
CURDIR="${ROOT}"
-QUERIES_DIR="${CURDIR}/../queries"
usage() {
echo "
@@ -43,10 +42,12 @@ Usage: $0
OPTS=$(getopt \
-n "$0" \
-o '' \
+ -o 'hs:' \
-- "$@")
eval set -- "${OPTS}"
HELP=0
+SCALE_FACTOR=1
if [[ $# == 0 ]]; then
usage
@@ -58,6 +59,10 @@ while true; do
HELP=1
shift
;;
+ -s)
+ SCALE_FACTOR=$2
+ shift 2
+ ;;
--)
shift
break
@@ -73,6 +78,27 @@ if [[ "${HELP}" -eq 1 ]]; then
usage
fi
+if [[ ${SCALE_FACTOR} -eq 1 ]]; then
+ echo "Running tpch sf 1 queries"
+ TPCH_QUERIES_DIR="${CURDIR}/../queries/sf1"
+ TPCH_OPT_CONF="${CURDIR}/../conf/opt/opt_sf1.sql"
+elif [[ ${SCALE_FACTOR} -eq 100 ]]; then
+ echo "Running tpch sf 100 queries"
+ TPCH_QUERIES_DIR="${CURDIR}/../queries/sf100"
+ TPCH_OPT_CONF="${CURDIR}/../conf/opt/opt_sf100.sql"
+elif [[ ${SCALE_FACTOR} -eq 1000 ]]; then
+ echo "Running tpch sf 1000 queries"
+ TPCH_QUERIES_DIR="${CURDIR}/../queries/sf1000"
+ TPCH_OPT_CONF="${CURDIR}/../conf/opt/opt_sf1000.sql"
+elif [[ ${SCALE_FACTOR} -eq 10000 ]]; then
+ echo "Running tpch sf 10000 queries"
+ TPCH_QUERIES_DIR="${CURDIR}/../queries/sf10000"
+ TPCH_OPT_CONF="${CURDIR}/../conf/opt/opt_sf10000.sql"
+else
+ echo "${SCALE_FACTOR} scale is NOT support currently."
+ exit 1
+fi
+
check_prerequest() {
local CMD=$1
local NAME=$2
@@ -85,73 +111,72 @@ check_prerequest() {
check_prerequest "mysql --version" "mysql"
source "${CURDIR}/../conf/doris-cluster.conf"
-export MYSQL_PWD=${PASSWORD}
+export MYSQL_PWD=${PASSWORD:-}
-echo "FE_HOST: ${FE_HOST}"
-echo "FE_QUERY_PORT: ${FE_QUERY_PORT}"
-echo "USER: ${USER}"
-echo "DB: ${DB}"
+echo "FE_HOST: ${FE_HOST:='127.0.0.1'}"
+echo "FE_QUERY_PORT: ${FE_QUERY_PORT:='9030'}"
+echo "USER: ${USER:='root'}"
+echo "DB: ${DB:='tpch'}"
+echo "Time Unit: ms"
run_sql() {
echo "$*"
mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}" -e "$*"
}
-run_sql "set global query_timeout=900;"
+
+echo '============================================'
+run_sql "source ${TPCH_OPT_CONF};"
echo '============================================'
run_sql "show variables;"
echo '============================================'
run_sql "show table status;"
echo '============================================'
start=$(date +%s)
-run_sql "analyze table lineitem with sync;"
-run_sql "analyze table orders with sync;"
-run_sql "analyze table partsupp with sync;"
-run_sql "analyze table part with sync;"
-run_sql "analyze table customer with sync;"
-run_sql "analyze table supplier with sync;"
-run_sql "analyze table nation with sync;"
-run_sql "analyze table region with sync;"
+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}"
+mkdir -p "${RESULT_DIR}"
touch result.csv
cold_run_sum=0
best_hot_run_sum=0
-for i in $(seq 1 22); do
+for i in {1..22}; do
cold=0
hot1=0
hot2=0
-
echo -ne "q${i}\t" | tee -a result.csv
-
start=$(date +%s%3N)
- mysql -h"${FE_HOST}" -u "${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
--comments <"${QUERIES_DIR}/q${i}.sql" >/dev/null
+ mysql -h"${FE_HOST}" -u "${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
--comments <"${TPCH_QUERIES_DIR}"/q"${i}".sql >"${RESULT_DIR}"/result"${i}".out
2>"${RESULT_DIR}"/result"${i}".log
end=$(date +%s%3N)
cold=$((end - start))
echo -ne "${cold}\t" | tee -a result.csv
start=$(date +%s%3N)
- mysql -h"${FE_HOST}" -u "${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
--comments <"${QUERIES_DIR}/q${i}.sql" >/dev/null
+ mysql -h"${FE_HOST}" -u "${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
--comments <"${TPCH_QUERIES_DIR}"/q"${i}".sql >"${RESULT_DIR}"/result"${i}".out
2>"${RESULT_DIR}"/result"${i}".log
end=$(date +%s%3N)
hot1=$((end - start))
echo -ne "${hot1}\t" | tee -a result.csv
start=$(date +%s%3N)
- mysql -h"${FE_HOST}" -u "${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
--comments <"${QUERIES_DIR}/q${i}.sql" >/dev/null
+ mysql -h"${FE_HOST}" -u "${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
--comments <"${TPCH_QUERIES_DIR}"/q"${i}".sql >"${RESULT_DIR}"/result"${i}".out
2>"${RESULT_DIR}"/result"${i}".log
end=$(date +%s%3N)
hot2=$((end - start))
- echo -ne "${hot2}" | tee -a result.csv
-
- echo "" | tee -a result.csv
+ echo -ne "${hot2}\t" | tee -a result.csv
cold_run_sum=$((cold_run_sum + cold))
if [[ ${hot1} -lt ${hot2} ]]; then
best_hot_run_sum=$((best_hot_run_sum + hot1))
+ echo -ne "${hot1}" | tee -a result.csv
+ echo "" | tee -a result.csv
else
best_hot_run_sum=$((best_hot_run_sum + hot2))
+ echo -ne "${hot2}" | tee -a result.csv
+ echo "" | tee -a result.csv
fi
done
diff --git a/tools/tpch-tools/conf/opt/opt_sf1.sql
b/tools/tpch-tools/conf/opt/opt_sf1.sql
new file mode 100644
index 0000000000..b0477b766b
--- /dev/null
+++ b/tools/tpch-tools/conf/opt/opt_sf1.sql
@@ -0,0 +1,6 @@
+set global experimental_enable_nereids_planner=true;
+set global experimental_enable_pipeline_engine=true;
+set global enable_runtime_filter_prune=false;
+set global runtime_filter_wait_time_ms=1000;
+set global enable_fallback_to_original_planner=false;
+set global forbid_unknown_col_stats=true;
diff --git a/tools/tpch-tools/conf/opt/opt_sf100.sql
b/tools/tpch-tools/conf/opt/opt_sf100.sql
new file mode 100644
index 0000000000..7eb8313f53
--- /dev/null
+++ b/tools/tpch-tools/conf/opt/opt_sf100.sql
@@ -0,0 +1,7 @@
+set global experimental_enable_nereids_planner=true;
+set global experimental_enable_pipeline_engine=true;
+set global enable_runtime_filter_prune=false;
+set global runtime_filter_wait_time_ms=10000;
+set global enable_fallback_to_original_planner=false;
+set global forbid_unknown_col_stats=true;
+set global query_timeout=1000;
diff --git a/tools/tpch-tools/conf/opt/opt_sf1000.sql
b/tools/tpch-tools/conf/opt/opt_sf1000.sql
new file mode 100644
index 0000000000..7eb8313f53
--- /dev/null
+++ b/tools/tpch-tools/conf/opt/opt_sf1000.sql
@@ -0,0 +1,7 @@
+set global experimental_enable_nereids_planner=true;
+set global experimental_enable_pipeline_engine=true;
+set global enable_runtime_filter_prune=false;
+set global runtime_filter_wait_time_ms=10000;
+set global enable_fallback_to_original_planner=false;
+set global forbid_unknown_col_stats=true;
+set global query_timeout=1000;
diff --git a/tools/tpch-tools/conf/opt/opt_sf10000.sql
b/tools/tpch-tools/conf/opt/opt_sf10000.sql
new file mode 100644
index 0000000000..bf4b96cacb
--- /dev/null
+++ b/tools/tpch-tools/conf/opt/opt_sf10000.sql
@@ -0,0 +1,7 @@
+set global experimental_enable_nereids_planner=true;
+set global experimental_enable_pipeline_engine=true;
+set global enable_runtime_filter_prune=false;
+set global runtime_filter_wait_time_ms=100000;
+set global enable_fallback_to_original_planner=false;
+set global forbid_unknown_col_stats=true;
+set global query_timeout=1000;
diff --git a/tools/tpch-tools/ddl/create-tpch-tables.sql
b/tools/tpch-tools/ddl/create-tpch-tables-sf100.sql
similarity index 100%
copy from tools/tpch-tools/ddl/create-tpch-tables.sql
copy to tools/tpch-tools/ddl/create-tpch-tables-sf100.sql
diff --git a/tools/tpch-tools/ddl/create-tpch-tables.sql
b/tools/tpch-tools/ddl/create-tpch-tables-sf1000.sql
similarity index 94%
copy from tools/tpch-tools/ddl/create-tpch-tables.sql
copy to tools/tpch-tools/ddl/create-tpch-tables-sf1000.sql
index 1627720899..a2c35ccfd1 100644
--- a/tools/tpch-tools/ddl/create-tpch-tables.sql
+++ b/tools/tpch-tools/ddl/create-tpch-tables-sf1000.sql
@@ -36,7 +36,7 @@ CREATE TABLE lineitem (
)ENGINE=OLAP
DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 768
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -56,7 +56,7 @@ CREATE TABLE orders (
)ENGINE=OLAP
DUPLICATE KEY(`o_orderkey`, `o_orderdate`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 768
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -72,7 +72,7 @@ CREATE TABLE partsupp (
)ENGINE=OLAP
DUPLICATE KEY(`ps_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 192
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -92,7 +92,7 @@ CREATE TABLE part (
)ENGINE=OLAP
DUPLICATE KEY(`p_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 192
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -111,7 +111,7 @@ CREATE TABLE customer (
)ENGINE=OLAP
DUPLICATE KEY(`c_custkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 192
PROPERTIES (
"replication_num" = "1"
);
@@ -128,7 +128,7 @@ CREATE TABLE supplier (
)ENGINE=OLAP
DUPLICATE KEY(`s_suppkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 12
+DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 24
PROPERTIES (
"replication_num" = "1"
);
diff --git a/tools/tpch-tools/ddl/create-tpch-tables.sql
b/tools/tpch-tools/ddl/create-tpch-tables-sf10000.sql
similarity index 94%
copy from tools/tpch-tools/ddl/create-tpch-tables.sql
copy to tools/tpch-tools/ddl/create-tpch-tables-sf10000.sql
index 1627720899..fca22fb62b 100644
--- a/tools/tpch-tools/ddl/create-tpch-tables.sql
+++ b/tools/tpch-tools/ddl/create-tpch-tables-sf10000.sql
@@ -36,7 +36,7 @@ CREATE TABLE lineitem (
)ENGINE=OLAP
DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 6144
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -56,7 +56,7 @@ CREATE TABLE orders (
)ENGINE=OLAP
DUPLICATE KEY(`o_orderkey`, `o_orderdate`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 6144
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -72,7 +72,7 @@ CREATE TABLE partsupp (
)ENGINE=OLAP
DUPLICATE KEY(`ps_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 1536
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -92,7 +92,7 @@ CREATE TABLE part (
)ENGINE=OLAP
DUPLICATE KEY(`p_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 1536
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -111,7 +111,7 @@ CREATE TABLE customer (
)ENGINE=OLAP
DUPLICATE KEY(`c_custkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 1536
PROPERTIES (
"replication_num" = "1"
);
@@ -128,7 +128,7 @@ CREATE TABLE supplier (
)ENGINE=OLAP
DUPLICATE KEY(`s_suppkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 12
+DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 96
PROPERTIES (
"replication_num" = "1"
);
diff --git a/tools/tpch-tools/ddl/create-tpch-tables.sql
b/tools/tpch-tools/ddl/create-tpch-tables-sf2000.sql
similarity index 94%
copy from tools/tpch-tools/ddl/create-tpch-tables.sql
copy to tools/tpch-tools/ddl/create-tpch-tables-sf2000.sql
index 1627720899..6f68943c34 100644
--- a/tools/tpch-tools/ddl/create-tpch-tables.sql
+++ b/tools/tpch-tools/ddl/create-tpch-tables-sf2000.sql
@@ -36,7 +36,7 @@ CREATE TABLE lineitem (
)ENGINE=OLAP
DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 1536
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -56,7 +56,7 @@ CREATE TABLE orders (
)ENGINE=OLAP
DUPLICATE KEY(`o_orderkey`, `o_orderdate`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 1536
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -72,7 +72,7 @@ CREATE TABLE partsupp (
)ENGINE=OLAP
DUPLICATE KEY(`ps_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 384
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -92,7 +92,7 @@ CREATE TABLE part (
)ENGINE=OLAP
DUPLICATE KEY(`p_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 384
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -111,7 +111,7 @@ CREATE TABLE customer (
)ENGINE=OLAP
DUPLICATE KEY(`c_custkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 384
PROPERTIES (
"replication_num" = "1"
);
@@ -128,7 +128,7 @@ CREATE TABLE supplier (
)ENGINE=OLAP
DUPLICATE KEY(`s_suppkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 12
+DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 48
PROPERTIES (
"replication_num" = "1"
);
diff --git a/tools/tpch-tools/ddl/create-tpch-tables.sql
b/tools/tpch-tools/ddl/create-tpch-tables.sql
index 1627720899..a5c34569c7 100644
--- a/tools/tpch-tools/ddl/create-tpch-tables.sql
+++ b/tools/tpch-tools/ddl/create-tpch-tables.sql
@@ -36,7 +36,7 @@ CREATE TABLE lineitem (
)ENGINE=OLAP
DUPLICATE KEY(`l_shipdate`, `l_orderkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`l_orderkey`) BUCKETS 32
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -56,7 +56,7 @@ CREATE TABLE orders (
)ENGINE=OLAP
DUPLICATE KEY(`o_orderkey`, `o_orderdate`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 96
+DISTRIBUTED BY HASH(`o_orderkey`) BUCKETS 32
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "lineitem_orders"
@@ -72,7 +72,7 @@ CREATE TABLE partsupp (
)ENGINE=OLAP
DUPLICATE KEY(`ps_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`ps_partkey`) BUCKETS 12
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -92,7 +92,7 @@ CREATE TABLE part (
)ENGINE=OLAP
DUPLICATE KEY(`p_partkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`p_partkey`) BUCKETS 12
PROPERTIES (
"replication_num" = "1",
"colocate_with" = "part_partsupp"
@@ -111,7 +111,7 @@ CREATE TABLE customer (
)ENGINE=OLAP
DUPLICATE KEY(`c_custkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 24
+DISTRIBUTED BY HASH(`c_custkey`) BUCKETS 12
PROPERTIES (
"replication_num" = "1"
);
@@ -128,7 +128,7 @@ CREATE TABLE supplier (
)ENGINE=OLAP
DUPLICATE KEY(`s_suppkey`)
COMMENT "OLAP"
-DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 12
+DISTRIBUTED BY HASH(`s_suppkey`) BUCKETS 6
PROPERTIES (
"replication_num" = "1"
);
diff --git a/tools/tpch-tools/queries/q1.sql
b/tools/tpch-tools/queries/sf1/q1.sql
similarity index 100%
copy from tools/tpch-tools/queries/q1.sql
copy to tools/tpch-tools/queries/sf1/q1.sql
diff --git a/tools/tpch-tools/queries/q10.sql
b/tools/tpch-tools/queries/sf1/q10.sql
similarity index 100%
copy from tools/tpch-tools/queries/q10.sql
copy to tools/tpch-tools/queries/sf1/q10.sql
diff --git a/tools/tpch-tools/queries/q11.sql
b/tools/tpch-tools/queries/sf1/q11.sql
similarity index 100%
copy from tools/tpch-tools/queries/q11.sql
copy to tools/tpch-tools/queries/sf1/q11.sql
diff --git a/tools/tpch-tools/queries/q12.sql
b/tools/tpch-tools/queries/sf1/q12.sql
similarity index 100%
copy from tools/tpch-tools/queries/q12.sql
copy to tools/tpch-tools/queries/sf1/q12.sql
diff --git a/tools/tpch-tools/queries/q13.sql
b/tools/tpch-tools/queries/sf1/q13.sql
similarity index 100%
copy from tools/tpch-tools/queries/q13.sql
copy to tools/tpch-tools/queries/sf1/q13.sql
diff --git a/tools/tpch-tools/queries/q14.sql
b/tools/tpch-tools/queries/sf1/q14.sql
similarity index 100%
copy from tools/tpch-tools/queries/q14.sql
copy to tools/tpch-tools/queries/sf1/q14.sql
diff --git a/tools/tpch-tools/queries/q15.sql
b/tools/tpch-tools/queries/sf1/q15.sql
similarity index 100%
copy from tools/tpch-tools/queries/q15.sql
copy to tools/tpch-tools/queries/sf1/q15.sql
diff --git a/tools/tpch-tools/queries/q16.sql
b/tools/tpch-tools/queries/sf1/q16.sql
similarity index 100%
copy from tools/tpch-tools/queries/q16.sql
copy to tools/tpch-tools/queries/sf1/q16.sql
diff --git a/tools/tpch-tools/queries/q17.sql
b/tools/tpch-tools/queries/sf1/q17.sql
similarity index 100%
copy from tools/tpch-tools/queries/q17.sql
copy to tools/tpch-tools/queries/sf1/q17.sql
diff --git a/tools/tpch-tools/queries/q18.sql
b/tools/tpch-tools/queries/sf1/q18.sql
similarity index 100%
copy from tools/tpch-tools/queries/q18.sql
copy to tools/tpch-tools/queries/sf1/q18.sql
diff --git a/tools/tpch-tools/queries/q19.sql
b/tools/tpch-tools/queries/sf1/q19.sql
similarity index 100%
copy from tools/tpch-tools/queries/q19.sql
copy to tools/tpch-tools/queries/sf1/q19.sql
diff --git a/tools/tpch-tools/queries/q2.sql
b/tools/tpch-tools/queries/sf1/q2.sql
similarity index 100%
copy from tools/tpch-tools/queries/q2.sql
copy to tools/tpch-tools/queries/sf1/q2.sql
diff --git a/tools/tpch-tools/queries/q20.sql
b/tools/tpch-tools/queries/sf1/q20.sql
similarity index 100%
copy from tools/tpch-tools/queries/q20.sql
copy to tools/tpch-tools/queries/sf1/q20.sql
diff --git a/tools/tpch-tools/queries/q21.sql
b/tools/tpch-tools/queries/sf1/q21.sql
similarity index 100%
copy from tools/tpch-tools/queries/q21.sql
copy to tools/tpch-tools/queries/sf1/q21.sql
diff --git a/tools/tpch-tools/queries/q22.sql
b/tools/tpch-tools/queries/sf1/q22.sql
similarity index 100%
copy from tools/tpch-tools/queries/q22.sql
copy to tools/tpch-tools/queries/sf1/q22.sql
diff --git a/tools/tpch-tools/queries/q3.sql
b/tools/tpch-tools/queries/sf1/q3.sql
similarity index 100%
copy from tools/tpch-tools/queries/q3.sql
copy to tools/tpch-tools/queries/sf1/q3.sql
diff --git a/tools/tpch-tools/queries/q4.sql
b/tools/tpch-tools/queries/sf1/q4.sql
similarity index 100%
copy from tools/tpch-tools/queries/q4.sql
copy to tools/tpch-tools/queries/sf1/q4.sql
diff --git a/tools/tpch-tools/queries/q5.sql
b/tools/tpch-tools/queries/sf1/q5.sql
similarity index 100%
copy from tools/tpch-tools/queries/q5.sql
copy to tools/tpch-tools/queries/sf1/q5.sql
diff --git a/tools/tpch-tools/queries/q6.sql
b/tools/tpch-tools/queries/sf1/q6.sql
similarity index 100%
copy from tools/tpch-tools/queries/q6.sql
copy to tools/tpch-tools/queries/sf1/q6.sql
diff --git a/tools/tpch-tools/queries/q7.sql
b/tools/tpch-tools/queries/sf1/q7.sql
similarity index 100%
copy from tools/tpch-tools/queries/q7.sql
copy to tools/tpch-tools/queries/sf1/q7.sql
diff --git a/tools/tpch-tools/queries/q8.sql
b/tools/tpch-tools/queries/sf1/q8.sql
similarity index 100%
copy from tools/tpch-tools/queries/q8.sql
copy to tools/tpch-tools/queries/sf1/q8.sql
diff --git a/tools/tpch-tools/queries/q9.sql
b/tools/tpch-tools/queries/sf1/q9.sql
similarity index 100%
copy from tools/tpch-tools/queries/q9.sql
copy to tools/tpch-tools/queries/sf1/q9.sql
diff --git a/tools/tpch-tools/queries/q1.sql
b/tools/tpch-tools/queries/sf100/q1.sql
similarity index 100%
copy from tools/tpch-tools/queries/q1.sql
copy to tools/tpch-tools/queries/sf100/q1.sql
diff --git a/tools/tpch-tools/queries/q10.sql
b/tools/tpch-tools/queries/sf100/q10.sql
similarity index 100%
copy from tools/tpch-tools/queries/q10.sql
copy to tools/tpch-tools/queries/sf100/q10.sql
diff --git a/tools/tpch-tools/queries/q11.sql
b/tools/tpch-tools/queries/sf100/q11.sql
similarity index 100%
copy from tools/tpch-tools/queries/q11.sql
copy to tools/tpch-tools/queries/sf100/q11.sql
diff --git a/tools/tpch-tools/queries/q12.sql
b/tools/tpch-tools/queries/sf100/q12.sql
similarity index 100%
copy from tools/tpch-tools/queries/q12.sql
copy to tools/tpch-tools/queries/sf100/q12.sql
diff --git a/tools/tpch-tools/queries/q13.sql
b/tools/tpch-tools/queries/sf100/q13.sql
similarity index 100%
copy from tools/tpch-tools/queries/q13.sql
copy to tools/tpch-tools/queries/sf100/q13.sql
diff --git a/tools/tpch-tools/queries/q14.sql
b/tools/tpch-tools/queries/sf100/q14.sql
similarity index 100%
copy from tools/tpch-tools/queries/q14.sql
copy to tools/tpch-tools/queries/sf100/q14.sql
diff --git a/tools/tpch-tools/queries/q15.sql
b/tools/tpch-tools/queries/sf100/q15.sql
similarity index 100%
copy from tools/tpch-tools/queries/q15.sql
copy to tools/tpch-tools/queries/sf100/q15.sql
diff --git a/tools/tpch-tools/queries/q16.sql
b/tools/tpch-tools/queries/sf100/q16.sql
similarity index 100%
copy from tools/tpch-tools/queries/q16.sql
copy to tools/tpch-tools/queries/sf100/q16.sql
diff --git a/tools/tpch-tools/queries/q17.sql
b/tools/tpch-tools/queries/sf100/q17.sql
similarity index 100%
copy from tools/tpch-tools/queries/q17.sql
copy to tools/tpch-tools/queries/sf100/q17.sql
diff --git a/tools/tpch-tools/queries/q18.sql
b/tools/tpch-tools/queries/sf100/q18.sql
similarity index 100%
copy from tools/tpch-tools/queries/q18.sql
copy to tools/tpch-tools/queries/sf100/q18.sql
diff --git a/tools/tpch-tools/queries/q19.sql
b/tools/tpch-tools/queries/sf100/q19.sql
similarity index 100%
copy from tools/tpch-tools/queries/q19.sql
copy to tools/tpch-tools/queries/sf100/q19.sql
diff --git a/tools/tpch-tools/queries/q2.sql
b/tools/tpch-tools/queries/sf100/q2.sql
similarity index 100%
copy from tools/tpch-tools/queries/q2.sql
copy to tools/tpch-tools/queries/sf100/q2.sql
diff --git a/tools/tpch-tools/queries/q20.sql
b/tools/tpch-tools/queries/sf100/q20.sql
similarity index 100%
copy from tools/tpch-tools/queries/q20.sql
copy to tools/tpch-tools/queries/sf100/q20.sql
diff --git a/tools/tpch-tools/queries/q21.sql
b/tools/tpch-tools/queries/sf100/q21.sql
similarity index 100%
copy from tools/tpch-tools/queries/q21.sql
copy to tools/tpch-tools/queries/sf100/q21.sql
diff --git a/tools/tpch-tools/queries/q22.sql
b/tools/tpch-tools/queries/sf100/q22.sql
similarity index 100%
copy from tools/tpch-tools/queries/q22.sql
copy to tools/tpch-tools/queries/sf100/q22.sql
diff --git a/tools/tpch-tools/queries/q3.sql
b/tools/tpch-tools/queries/sf100/q3.sql
similarity index 100%
copy from tools/tpch-tools/queries/q3.sql
copy to tools/tpch-tools/queries/sf100/q3.sql
diff --git a/tools/tpch-tools/queries/q4.sql
b/tools/tpch-tools/queries/sf100/q4.sql
similarity index 100%
copy from tools/tpch-tools/queries/q4.sql
copy to tools/tpch-tools/queries/sf100/q4.sql
diff --git a/tools/tpch-tools/queries/q5.sql
b/tools/tpch-tools/queries/sf100/q5.sql
similarity index 100%
copy from tools/tpch-tools/queries/q5.sql
copy to tools/tpch-tools/queries/sf100/q5.sql
diff --git a/tools/tpch-tools/queries/q6.sql
b/tools/tpch-tools/queries/sf100/q6.sql
similarity index 100%
copy from tools/tpch-tools/queries/q6.sql
copy to tools/tpch-tools/queries/sf100/q6.sql
diff --git a/tools/tpch-tools/queries/q7.sql
b/tools/tpch-tools/queries/sf100/q7.sql
similarity index 100%
copy from tools/tpch-tools/queries/q7.sql
copy to tools/tpch-tools/queries/sf100/q7.sql
diff --git a/tools/tpch-tools/queries/q8.sql
b/tools/tpch-tools/queries/sf100/q8.sql
similarity index 100%
copy from tools/tpch-tools/queries/q8.sql
copy to tools/tpch-tools/queries/sf100/q8.sql
diff --git a/tools/tpch-tools/queries/q9.sql
b/tools/tpch-tools/queries/sf100/q9.sql
similarity index 100%
copy from tools/tpch-tools/queries/q9.sql
copy to tools/tpch-tools/queries/sf100/q9.sql
diff --git a/tools/tpch-tools/queries/q1.sql
b/tools/tpch-tools/queries/sf1000/q1.sql
similarity index 100%
copy from tools/tpch-tools/queries/q1.sql
copy to tools/tpch-tools/queries/sf1000/q1.sql
diff --git a/tools/tpch-tools/queries/q10.sql
b/tools/tpch-tools/queries/sf1000/q10.sql
similarity index 100%
copy from tools/tpch-tools/queries/q10.sql
copy to tools/tpch-tools/queries/sf1000/q10.sql
diff --git a/tools/tpch-tools/queries/q11.sql
b/tools/tpch-tools/queries/sf1000/q11.sql
similarity index 100%
copy from tools/tpch-tools/queries/q11.sql
copy to tools/tpch-tools/queries/sf1000/q11.sql
diff --git a/tools/tpch-tools/queries/q12.sql
b/tools/tpch-tools/queries/sf1000/q12.sql
similarity index 100%
copy from tools/tpch-tools/queries/q12.sql
copy to tools/tpch-tools/queries/sf1000/q12.sql
diff --git a/tools/tpch-tools/queries/q13.sql
b/tools/tpch-tools/queries/sf1000/q13.sql
similarity index 100%
copy from tools/tpch-tools/queries/q13.sql
copy to tools/tpch-tools/queries/sf1000/q13.sql
diff --git a/tools/tpch-tools/queries/q14.sql
b/tools/tpch-tools/queries/sf1000/q14.sql
similarity index 100%
copy from tools/tpch-tools/queries/q14.sql
copy to tools/tpch-tools/queries/sf1000/q14.sql
diff --git a/tools/tpch-tools/queries/q15.sql
b/tools/tpch-tools/queries/sf1000/q15.sql
similarity index 100%
copy from tools/tpch-tools/queries/q15.sql
copy to tools/tpch-tools/queries/sf1000/q15.sql
diff --git a/tools/tpch-tools/queries/q16.sql
b/tools/tpch-tools/queries/sf1000/q16.sql
similarity index 100%
copy from tools/tpch-tools/queries/q16.sql
copy to tools/tpch-tools/queries/sf1000/q16.sql
diff --git a/tools/tpch-tools/queries/q17.sql
b/tools/tpch-tools/queries/sf1000/q17.sql
similarity index 100%
copy from tools/tpch-tools/queries/q17.sql
copy to tools/tpch-tools/queries/sf1000/q17.sql
diff --git a/tools/tpch-tools/queries/q18.sql
b/tools/tpch-tools/queries/sf1000/q18.sql
similarity index 100%
copy from tools/tpch-tools/queries/q18.sql
copy to tools/tpch-tools/queries/sf1000/q18.sql
diff --git a/tools/tpch-tools/queries/q19.sql
b/tools/tpch-tools/queries/sf1000/q19.sql
similarity index 100%
copy from tools/tpch-tools/queries/q19.sql
copy to tools/tpch-tools/queries/sf1000/q19.sql
diff --git a/tools/tpch-tools/queries/q2.sql
b/tools/tpch-tools/queries/sf1000/q2.sql
similarity index 100%
copy from tools/tpch-tools/queries/q2.sql
copy to tools/tpch-tools/queries/sf1000/q2.sql
diff --git a/tools/tpch-tools/queries/q20.sql
b/tools/tpch-tools/queries/sf1000/q20.sql
similarity index 100%
copy from tools/tpch-tools/queries/q20.sql
copy to tools/tpch-tools/queries/sf1000/q20.sql
diff --git a/tools/tpch-tools/queries/q21.sql
b/tools/tpch-tools/queries/sf1000/q21.sql
similarity index 100%
copy from tools/tpch-tools/queries/q21.sql
copy to tools/tpch-tools/queries/sf1000/q21.sql
diff --git a/tools/tpch-tools/queries/q22.sql
b/tools/tpch-tools/queries/sf1000/q22.sql
similarity index 100%
copy from tools/tpch-tools/queries/q22.sql
copy to tools/tpch-tools/queries/sf1000/q22.sql
diff --git a/tools/tpch-tools/queries/q3.sql
b/tools/tpch-tools/queries/sf1000/q3.sql
similarity index 100%
copy from tools/tpch-tools/queries/q3.sql
copy to tools/tpch-tools/queries/sf1000/q3.sql
diff --git a/tools/tpch-tools/queries/q4.sql
b/tools/tpch-tools/queries/sf1000/q4.sql
similarity index 100%
copy from tools/tpch-tools/queries/q4.sql
copy to tools/tpch-tools/queries/sf1000/q4.sql
diff --git a/tools/tpch-tools/queries/q5.sql
b/tools/tpch-tools/queries/sf1000/q5.sql
similarity index 100%
copy from tools/tpch-tools/queries/q5.sql
copy to tools/tpch-tools/queries/sf1000/q5.sql
diff --git a/tools/tpch-tools/queries/q6.sql
b/tools/tpch-tools/queries/sf1000/q6.sql
similarity index 100%
copy from tools/tpch-tools/queries/q6.sql
copy to tools/tpch-tools/queries/sf1000/q6.sql
diff --git a/tools/tpch-tools/queries/q7.sql
b/tools/tpch-tools/queries/sf1000/q7.sql
similarity index 100%
copy from tools/tpch-tools/queries/q7.sql
copy to tools/tpch-tools/queries/sf1000/q7.sql
diff --git a/tools/tpch-tools/queries/q8.sql
b/tools/tpch-tools/queries/sf1000/q8.sql
similarity index 100%
copy from tools/tpch-tools/queries/q8.sql
copy to tools/tpch-tools/queries/sf1000/q8.sql
diff --git a/tools/tpch-tools/queries/q9.sql
b/tools/tpch-tools/queries/sf1000/q9.sql
similarity index 100%
copy from tools/tpch-tools/queries/q9.sql
copy to tools/tpch-tools/queries/sf1000/q9.sql
diff --git a/tools/tpch-tools/queries/q1.sql
b/tools/tpch-tools/queries/sf10000/q1.sql
similarity index 100%
rename from tools/tpch-tools/queries/q1.sql
rename to tools/tpch-tools/queries/sf10000/q1.sql
diff --git a/tools/tpch-tools/queries/q10.sql
b/tools/tpch-tools/queries/sf10000/q10.sql
similarity index 100%
rename from tools/tpch-tools/queries/q10.sql
rename to tools/tpch-tools/queries/sf10000/q10.sql
diff --git a/tools/tpch-tools/queries/q11.sql
b/tools/tpch-tools/queries/sf10000/q11.sql
similarity index 100%
rename from tools/tpch-tools/queries/q11.sql
rename to tools/tpch-tools/queries/sf10000/q11.sql
diff --git a/tools/tpch-tools/queries/q12.sql
b/tools/tpch-tools/queries/sf10000/q12.sql
similarity index 100%
rename from tools/tpch-tools/queries/q12.sql
rename to tools/tpch-tools/queries/sf10000/q12.sql
diff --git a/tools/tpch-tools/queries/q13.sql
b/tools/tpch-tools/queries/sf10000/q13.sql
similarity index 100%
rename from tools/tpch-tools/queries/q13.sql
rename to tools/tpch-tools/queries/sf10000/q13.sql
diff --git a/tools/tpch-tools/queries/q14.sql
b/tools/tpch-tools/queries/sf10000/q14.sql
similarity index 100%
rename from tools/tpch-tools/queries/q14.sql
rename to tools/tpch-tools/queries/sf10000/q14.sql
diff --git a/tools/tpch-tools/queries/q15.sql
b/tools/tpch-tools/queries/sf10000/q15.sql
similarity index 100%
rename from tools/tpch-tools/queries/q15.sql
rename to tools/tpch-tools/queries/sf10000/q15.sql
diff --git a/tools/tpch-tools/queries/q16.sql
b/tools/tpch-tools/queries/sf10000/q16.sql
similarity index 100%
rename from tools/tpch-tools/queries/q16.sql
rename to tools/tpch-tools/queries/sf10000/q16.sql
diff --git a/tools/tpch-tools/queries/q17.sql
b/tools/tpch-tools/queries/sf10000/q17.sql
similarity index 100%
rename from tools/tpch-tools/queries/q17.sql
rename to tools/tpch-tools/queries/sf10000/q17.sql
diff --git a/tools/tpch-tools/queries/q18.sql
b/tools/tpch-tools/queries/sf10000/q18.sql
similarity index 100%
rename from tools/tpch-tools/queries/q18.sql
rename to tools/tpch-tools/queries/sf10000/q18.sql
diff --git a/tools/tpch-tools/queries/q19.sql
b/tools/tpch-tools/queries/sf10000/q19.sql
similarity index 100%
rename from tools/tpch-tools/queries/q19.sql
rename to tools/tpch-tools/queries/sf10000/q19.sql
diff --git a/tools/tpch-tools/queries/q2.sql
b/tools/tpch-tools/queries/sf10000/q2.sql
similarity index 100%
rename from tools/tpch-tools/queries/q2.sql
rename to tools/tpch-tools/queries/sf10000/q2.sql
diff --git a/tools/tpch-tools/queries/q20.sql
b/tools/tpch-tools/queries/sf10000/q20.sql
similarity index 100%
rename from tools/tpch-tools/queries/q20.sql
rename to tools/tpch-tools/queries/sf10000/q20.sql
diff --git a/tools/tpch-tools/queries/q21.sql
b/tools/tpch-tools/queries/sf10000/q21.sql
similarity index 100%
rename from tools/tpch-tools/queries/q21.sql
rename to tools/tpch-tools/queries/sf10000/q21.sql
diff --git a/tools/tpch-tools/queries/q22.sql
b/tools/tpch-tools/queries/sf10000/q22.sql
similarity index 100%
rename from tools/tpch-tools/queries/q22.sql
rename to tools/tpch-tools/queries/sf10000/q22.sql
diff --git a/tools/tpch-tools/queries/q3.sql
b/tools/tpch-tools/queries/sf10000/q3.sql
similarity index 100%
rename from tools/tpch-tools/queries/q3.sql
rename to tools/tpch-tools/queries/sf10000/q3.sql
diff --git a/tools/tpch-tools/queries/q4.sql
b/tools/tpch-tools/queries/sf10000/q4.sql
similarity index 100%
rename from tools/tpch-tools/queries/q4.sql
rename to tools/tpch-tools/queries/sf10000/q4.sql
diff --git a/tools/tpch-tools/queries/q5.sql
b/tools/tpch-tools/queries/sf10000/q5.sql
similarity index 100%
rename from tools/tpch-tools/queries/q5.sql
rename to tools/tpch-tools/queries/sf10000/q5.sql
diff --git a/tools/tpch-tools/queries/q6.sql
b/tools/tpch-tools/queries/sf10000/q6.sql
similarity index 100%
rename from tools/tpch-tools/queries/q6.sql
rename to tools/tpch-tools/queries/sf10000/q6.sql
diff --git a/tools/tpch-tools/queries/q7.sql
b/tools/tpch-tools/queries/sf10000/q7.sql
similarity index 100%
rename from tools/tpch-tools/queries/q7.sql
rename to tools/tpch-tools/queries/sf10000/q7.sql
diff --git a/tools/tpch-tools/queries/q8.sql
b/tools/tpch-tools/queries/sf10000/q8.sql
similarity index 100%
rename from tools/tpch-tools/queries/q8.sql
rename to tools/tpch-tools/queries/sf10000/q8.sql
diff --git a/tools/tpch-tools/queries/q9.sql
b/tools/tpch-tools/queries/sf10000/q9.sql
similarity index 100%
rename from tools/tpch-tools/queries/q9.sql
rename to tools/tpch-tools/queries/sf10000/q9.sql
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
