This is an automated email from the ASF dual-hosted git repository.
jakevin 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 1b2f882d24 [fix](terminal) remove echo database passwd (#15876)
1b2f882d24 is described below
commit 1b2f882d2439261b8008a3840c41e9a10a963b53
Author: zbtzbtzbt <bit_pku_...@163.com>
AuthorDate: Mon Jan 16 22:00:52 2023 +0800
[fix](terminal) remove echo database passwd (#15876)
* remove echo passwd
* add timer for data load
---
tools/ssb-tools/bin/create-ssb-tables.sh | 3 ++-
tools/ssb-tools/bin/gen-ssb-data.sh | 4 ++--
tools/ssb-tools/bin/load-ssb-data.sh | 11 +++++++----
tools/ssb-tools/bin/run-ssb-flat-queries.sh | 3 +--
tools/ssb-tools/bin/run-ssb-queries.sh | 3 +--
tools/tpch-tools/bin/create-tpch-tables.sh | 3 ++-
tools/tpch-tools/bin/load-tpch-data.sh | 12 +++++++-----
tools/tpch-tools/bin/run-tpch-queries.sh | 3 ++-
8 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/tools/ssb-tools/bin/create-ssb-tables.sh
b/tools/ssb-tools/bin/create-ssb-tables.sh
index 4980c52caf..f8860f35a7 100755
--- a/tools/ssb-tools/bin/create-ssb-tables.sh
+++ b/tools/ssb-tools/bin/create-ssb-tables.sh
@@ -93,7 +93,6 @@ export MYSQL_PWD="${PASSWORD}"
echo "FE_HOST: ${FE_HOST}"
echo "FE_QUERY_PORT: ${FE_QUERY_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
echo "DB: ${DB}"
mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -e "CREATE DATABASE IF
NOT EXISTS ${DB}"
@@ -103,3 +102,5 @@ mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}"
-D"${DB}" <"${SSB_DDL}"
echo "Run DDL from ${SSB_FLAT_DDL}"
mysql -h"${FE_HOST}" -u"${USER}" -P"${FE_QUERY_PORT}" -D"${DB}"
<"${SSB_FLAT_DDL}"
+
+echo "ssb tables has been created"
diff --git a/tools/ssb-tools/bin/gen-ssb-data.sh
b/tools/ssb-tools/bin/gen-ssb-data.sh
index 871c3cf3e9..76c85f2b32 100755
--- a/tools/ssb-tools/bin/gen-ssb-data.sh
+++ b/tools/ssb-tools/bin/gen-ssb-data.sh
@@ -29,8 +29,8 @@ ROOT=$(
)
CURDIR=${ROOT}
-SSB_DBGEN_DIR=${CURDIR}/ssb-dbgen/
-SSB_DATA_DIR=${CURDIR}/ssb-data/
+SSB_DBGEN_DIR=${CURDIR}/ssb-dbgen
+SSB_DATA_DIR=${CURDIR}/ssb-data
usage() {
echo "
diff --git a/tools/ssb-tools/bin/load-ssb-data.sh
b/tools/ssb-tools/bin/load-ssb-data.sh
index bda0d758a2..be5c550f93 100755
--- a/tools/ssb-tools/bin/load-ssb-data.sh
+++ b/tools/ssb-tools/bin/load-ssb-data.sh
@@ -188,18 +188,18 @@ ON (p.p_partkey = l.lo_partkey);
check_prerequest "curl --version" "curl"
-# load lineorder
source "${CURDIR}/../conf/doris-cluster.conf"
export MYSQL_PWD=${PASSWORD}
echo "FE_HOST: ${FE_HOST}"
echo "FE_HTTP_PORT: ${FE_HTTP_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
echo "DB: ${DB}"
-date
+start_time=$(date +%s)
+echo "Start time: $(date)"
echo "==========Start to load data into ssb tables=========="
+
echo 'Loading data for table: part'
curl --location-trusted -u "${USER}":"${PASSWORD}" \
-H "column_separator:|" \
@@ -278,4 +278,7 @@ run_sql "set global query_timeout=${origin_query_timeout};"
run_sql "set global parallel_fragment_exec_instance_num=${origin_parallel};"
echo '============================================'
-echo "DONE."
+end_time=$(date +%s)
+echo "End time: $(date)"
+
+echo "Finish load ssb data, Time taken: $((end_time - start_time)) seconds"
diff --git a/tools/ssb-tools/bin/run-ssb-flat-queries.sh
b/tools/ssb-tools/bin/run-ssb-flat-queries.sh
index 7a2154c62c..40d1d044a4 100755
--- a/tools/ssb-tools/bin/run-ssb-flat-queries.sh
+++ b/tools/ssb-tools/bin/run-ssb-flat-queries.sh
@@ -94,7 +94,6 @@ export MYSQL_PWD=${PASSWORD}
echo "FE_HOST: ${FE_HOST}"
echo "FE_QUERY_PORT: ${FE_QUERY_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
echo "DB: ${DB}"
run_sql() {
@@ -150,4 +149,4 @@ run_sql "set global
exec_mem_limit=${origin_exec_mem_limit};"
run_sql "set global batch_size=${origin_batch_size};"
echo '============================================'
-echo 'Done.'
+echo 'Finish ssb-flat queries.'
diff --git a/tools/ssb-tools/bin/run-ssb-queries.sh
b/tools/ssb-tools/bin/run-ssb-queries.sh
index 09996aa04c..04271e8ef4 100755
--- a/tools/ssb-tools/bin/run-ssb-queries.sh
+++ b/tools/ssb-tools/bin/run-ssb-queries.sh
@@ -94,7 +94,6 @@ export MYSQL_PWD=${PASSWORD}
echo "FE_HOST: ${FE_HOST}"
echo "FE_QUERY_PORT: ${FE_QUERY_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
echo "DB: ${DB}"
run_sql() {
@@ -160,4 +159,4 @@ run_sql "set global
enable_projection=${origin_enable_projection};"
run_sql "set global runtime_filter_mode=${origin_runtime_filter_mode};"
echo '============================================'
-echo 'Done.'
+echo 'Finish ssb queries.'
diff --git a/tools/tpch-tools/bin/create-tpch-tables.sh
b/tools/tpch-tools/bin/create-tpch-tables.sh
index 59cd2efbd4..bd0b75e570 100755
--- a/tools/tpch-tools/bin/create-tpch-tables.sh
+++ b/tools/tpch-tools/bin/create-tpch-tables.sh
@@ -90,10 +90,11 @@ export MYSQL_PWD=${PASSWORD}
echo "FE_HOST: ${FE_HOST}"
echo "FE_QUERY_PORT: ${FE_QUERY_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
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
+
+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 2a92ab4d5c..dd59284f3e 100755
--- a/tools/tpch-tools/bin/load-tpch-data.sh
+++ b/tools/tpch-tools/bin/load-tpch-data.sh
@@ -112,7 +112,6 @@ export MYSQL_PWD=${PASSWORD}
echo "FE_HOST: ${FE_HOST}"
echo "FE_HTTP_PORT: ${FE_HTTP_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
echo "DB: ${DB}"
function load_region() {
@@ -165,13 +164,14 @@ function load_lineitem() {
}
# start load
-date
+start_time=$(date +%s)
+echo "Start time: $(date)"
load_region "${TPCH_DATA_DIR}"/region.tbl
load_nation "${TPCH_DATA_DIR}"/nation.tbl
load_supplier "${TPCH_DATA_DIR}"/supplier.tbl
load_customer "${TPCH_DATA_DIR}"/customer.tbl
load_part "${TPCH_DATA_DIR}"/part.tbl
-date
+
# set parallelism
# 以PID为名, 防止创建命名管道时与已有文件重名，从而失败
@@ -232,6 +232,8 @@ done
wait
# 删除文件标识符
exec 3>&-
-date
-echo "DONE."
+end_time=$(date +%s)
+echo "End time: $(date)"
+
+echo "Finish load tpch data, Time taken: $((end_time - start_time)) seconds"
diff --git a/tools/tpch-tools/bin/run-tpch-queries.sh
b/tools/tpch-tools/bin/run-tpch-queries.sh
index 25749de5e7..a198f76703 100755
--- a/tools/tpch-tools/bin/run-tpch-queries.sh
+++ b/tools/tpch-tools/bin/run-tpch-queries.sh
@@ -91,7 +91,6 @@ export MYSQL_PWD=${PASSWORD}
echo "FE_HOST: ${FE_HOST}"
echo "FE_QUERY_PORT: ${FE_QUERY_PORT}"
echo "USER: ${USER}"
-echo "PASSWORD: ${PASSWORD}"
echo "DB: ${DB}"
echo "Time Unit: ms"
@@ -122,3 +121,5 @@ for i in $(seq 1 22); do
sum=$((sum + cost))
done
echo "Total cost: ${sum} ms"
+
+echo 'Finish tpch queries.'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
