Skip to content

Commit 0505274

Browse files
authored
chore: print query detail for bench & fix prepare database for load bench (#15032)
1 parent 1416a9c commit 0505274

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

.github/actions/benchmark_cloud/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ runs:
4949
BENDSQL_DSN: "databend://${{ inputs.cloud_user }}:${{ inputs.cloud_password }}@${{ inputs.cloud_gateway }}:443"
5050
run: |
5151
if [[ "${{ inputs.dataset }}" == "load" ]]; then
52-
echo "CREATE DATABASE IF NOT EXISTS load_test_${{ inputs.run_id }};" | bendsql
5352
echo "database=load_test_${{ inputs.run_id }}" >> $GITHUB_OUTPUT
5453
echo "tries=1" >> $GITHUB_OUTPUT
5554
else

benchmark/clickbench/benchmark_cloud.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ esac
5252
echo "#######################################################"
5353
echo "Running benchmark for Databend Cloud with S3 storage..."
5454

55-
export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443/${BENCHMARK_DATABASE}?warehouse=${CLOUD_WAREHOUSE}"
55+
export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443"
5656

5757
echo "Creating warehouse..."
5858
echo "DROP WAREHOUSE IF EXISTS '${CLOUD_WAREHOUSE}';" | bendsql
@@ -71,6 +71,12 @@ until bendsql --query="SHOW WAREHOUSES LIKE '${CLOUD_WAREHOUSE}'" | grep -q "Run
7171
sleep 10
7272
done
7373

74+
export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443/${BENCHMARK_DATABASE}?warehouse=${CLOUD_WAREHOUSE}"
75+
76+
echo "Creating database..."
77+
echo "DROP DATABASE IF EXISTS ${BENCHMARK_DATABASE};" | bendsql --database default
78+
echo "CREATE DATABASE ${BENCHMARK_DATABASE};" | bendsql --database default
79+
7480
echo "Checking session settings..."
7581
bendsql --query="select * from system.settings where value != default;" -o table
7682

@@ -99,7 +105,8 @@ function run_query() {
99105

100106
QUERY_NUM=0
101107
for query in "${BENCHMARK_DATASET}"/queries/*.sql; do
102-
echo "Running Q${QUERY_NUM}: ${query}"
108+
echo -e "\n==>Running Q${QUERY_NUM}: ${query}"
109+
cat "$query"
103110
yq -i ".result += [[]]" -o json result.json
104111
for i in $(seq 1 "$BENCHMARK_TRIES"); do
105112
run_query "$QUERY_NUM" "$i" "$query"

benchmark/clickbench/benchmark_local.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ function run_query() {
110110
TRIES=3
111111
QUERY_NUM=0
112112
for query in "${BENCHMARK_DATASET}"/queries/*.sql; do
113-
echo "Running Q${QUERY_NUM}: ${query}"
113+
echo -e "\n==>Running Q${QUERY_NUM}: ${query}"
114+
cat "$query"
114115
sync
115116
echo 3 | sudo tee /proc/sys/vm/drop_caches
116117
yq -i ".result += [[]]" -o json result.json

0 commit comments

Comments
 (0)