Skip to content

Commit 37f320b

Browse files
sundy-lisundy-li
authored
Merge pull request #10480 from sundy-li/native-ci
2 parents 1b233aa + 1a63037 commit 37f320b

17 files changed

+275
-96
lines changed

‎.github/actions/test_sqllogic_standalone_linux/action.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ runs:
3131
env:
3232
TEST_HANDLERS: ${{ inputs.handlers }}
3333
run: bash ./scripts/ci/ci-run-sqllogic-tests.sh ${{ inputs.dirs }}
34+
- name: Run native sqllogic Tests with Standalone mode
35+
shell: bash
36+
env:
37+
TEST_HANDLERS: ${{ inputs.handlers }}
38+
run: bash ./scripts/ci/ci-run-sqllogic-tests-native.sh

‎Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ rpath = false
184184
# For example:
185185
# arrow-format = { git = "https://github.com/datafuse-extras/arrow-format", rev = "78dacc1" }
186186

187-
arrow2 = { git = "https://github.com/jorgecarleitao/arrow2", rev = "9749aee" }
187+
arrow2 = { git = "https://github.com/jorgecarleitao/arrow2", rev = "db87f71" }
188188
parquet2 = { git = "https://github.com/jorgecarleitao/parquet2", rev = "ed0e1ff" }
189189
limits-rs = { git = "https://github.com/datafuse-extras/limits-rs", rev = "abfcf7b" }
190190
metrics = { git = "https://github.com/datafuse-extras/metrics.git", rev = "fc2ecd1" }

‎scripts/ci/ci-run-sqllogic-tests-cluster.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ if [ $# -gt 0 ]; then
1818
fi
1919
echo "Run suites using argument: $RUN_DIR"
2020

21-
for i in `seq 1 3`
22-
do
23-
echo "Starting databend-sqllogic tests $i"
24-
target/${BUILD_PROFILE}/databend-sqllogictests --handlers ${TEST_HANDLERS} ${RUN_DIR} --enable_sandbox --parallel 8 --debug
21+
for i in $(seq 1 3); do
22+
echo "Starting databend-sqllogic tests $i"
23+
target/${BUILD_PROFILE}/databend-sqllogictests --handlers ${TEST_HANDLERS} ${RUN_DIR} --enable_sandbox --parallel 8 --debug
2524

26-
if [ $? -ne 0 ];then
27-
break
28-
fi
25+
if [ $? -ne 0 ]; then
26+
break
27+
fi
2928
done

‎scripts/ci/ci-run-sqllogic-tests-native.sh‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
# Copyright 2020-2021 The Databend Authors.
3+
# SPDX-License-Identifier: Apache-2.0.
4+
5+
set -e
6+
7+
export STORAGE_ALLOW_INSECURE=true
8+
9+
echo "Starting standalone DatabendQuery and DatabendMeta"
10+
./scripts/ci/deploy/databend-query-standalone-native.sh
11+
12+
TEST_HANDLERS=${TEST_HANDLERS:-"mysql,http,clickhouse"}
13+
BUILD_PROFILE=${BUILD_PROFILE:-debug}
14+
15+
RUN_DIR=""
16+
if [ $# -gt 0 ]; then
17+
RUN_DIR="--run_dir $*"
18+
fi
19+
echo "Run suites using argument: $RUN_DIR"
20+
21+
echo "Starting databend-sqllogic tests"
22+
target/${BUILD_PROFILE}/databend-sqllogictests --handlers ${TEST_HANDLERS} ${RUN_DIR} --skip_dir management,mode,explain,tpch --enable_sandbox --parallel 8 --debug

‎scripts/ci/ci-run-sqllogic-tests.sh‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ if [ $# -gt 0 ]; then
1818
fi
1919
echo "Run suites using argument: $RUN_DIR"
2020

21+
for i in $(seq 1 3); do
22+
echo "Starting databend-sqllogic tests $i"
23+
target/${BUILD_PROFILE}/databend-sqllogictests --handlers ${TEST_HANDLERS} ${RUN_DIR} --skip_dir management --enable_sandbox --parallel 8 --debug
2124

22-
for i in `seq 1 3`
23-
do
24-
echo "Starting databend-sqllogic tests $i"
25-
target/${BUILD_PROFILE}/databend-sqllogictests --handlers ${TEST_HANDLERS} ${RUN_DIR} --skip_dir management --enable_sandbox --parallel 8 --debug
26-
27-
if [ $? -ne 0 ];then
28-
break
29-
fi
25+
if [ $? -ne 0 ]; then
26+
break
27+
fi
3028
done

‎scripts/ci/ci-run-stateful-hive-tests-standalone.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ echo "Starting standalone DatabendQuery(debug profile)"
1111
SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
1212
cd "$SCRIPT_PATH/../../tests" || exit
1313

14-
for i in `seq 1 3`
15-
do
16-
echo "Starting databend-test $i"
17-
./databend-test --mode 'standalone' --run-dir 2_stateful_hive
14+
for i in $(seq 1 3); do
15+
echo "Starting databend-test $i"
16+
./databend-test --mode 'standalone' --run-dir 2_stateful_hive
1817

19-
if [ $? -ne 0 ];then
20-
break
21-
fi
18+
if [ $? -ne 0 ]; then
19+
break
20+
fi
2221
done

‎scripts/ci/ci-run-stateful-tests-cluster-s3.sh‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ echo "Starting Cluster databend-query"
2828
SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
2929
cd "$SCRIPT_PATH/../../tests" || exit
3030

31-
for i in `seq 1 3`
32-
do
33-
echo "Starting databend-test $i"
34-
./databend-test --mode 'cluster' --run-dir 1_stateful
31+
for i in $(seq 1 3); do
32+
echo "Starting databend-test $i"
33+
./databend-test --mode 'cluster' --run-dir 1_stateful
3534

36-
if [ $? -ne 0 ];then
37-
break
38-
fi
35+
if [ $? -ne 0 ]; then
36+
break
37+
fi
3938
done

‎scripts/ci/ci-run-stateful-tests-standalone-s3.sh‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,20 @@ fi
3434
SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
3535
cd "$SCRIPT_PATH/../../tests" || exit
3636

37-
for i in `seq 1 3`
38-
do
39-
echo "Starting databend-test $i"
40-
./databend-test $1 --mode 'standalone' --run-dir 1_stateful
41-
42-
if [ $? -ne 0 ];then
43-
break
44-
fi
45-
46-
# only expected to get adopted in stateful tests
47-
if [[ "$ALLOW_SHARING" == "true" ]]; then
48-
./databend-test $1 --mode 'standalone' --run-dir 3_stateful_sharing
49-
fi
50-
51-
if [ $? -ne 0 ];then
52-
break
53-
fi
37+
for i in $(seq 1 3); do
38+
echo "Starting databend-test $i"
39+
./databend-test $1 --mode 'standalone' --run-dir 1_stateful
40+
41+
if [ $? -ne 0 ]; then
42+
break
43+
fi
44+
45+
# only expected to get adopted in stateful tests
46+
if [[ "$ALLOW_SHARING" == "true" ]]; then
47+
./databend-test $1 --mode 'standalone' --run-dir 3_stateful_sharing
48+
fi
49+
50+
if [ $? -ne 0 ]; then
51+
break
52+
fi
5453
done

‎scripts/ci/ci-run-stateless-tests-cluster.sh‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@ export RUST_BACKTRACE=full
1313
SCRIPT_PATH="$(cd "$(dirname "$0")" >/dev/null 2>&1 && pwd)"
1414
cd "$SCRIPT_PATH/../../tests" || exit
1515

16-
for i in `seq 1 3`
17-
do
18-
echo "Starting databend-test $i"
19-
# 13_0004_q4: https://github.com/datafuselabs/databend/issues/8107
20-
./databend-test --mode 'cluster' --run-dir 0_stateless --skip '13_0004_q4'
16+
for i in $(seq 1 3); do
17+
echo "Starting databend-test $i"
18+
# 13_0004_q4: https://github.com/datafuselabs/databend/issues/8107
19+
./databend-test --mode 'cluster' --run-dir 0_stateless --skip '13_0004_q4'
2120

22-
if [ $? -ne 0 ];then
23-
break
24-
fi
21+
if [ $? -ne 0 ]; then
22+
break
23+
fi
2524
done

0 commit comments

Comments
 (0)