File tree 6 files changed +16
-12
lines changed
6 files changed +16
-12
lines changed Original file line number Diff line number Diff line change @@ -13,13 +13,13 @@ jobs:
13
13
- name : Mirrror + trigger CI
14
14
uses : lutengda/gitlab-mirror-and-ci-action@master
15
15
with :
16
- args : " http://gitlab.cnosdb.com:8280 /root/cnosdb"
16
+ args : " http://43.247.178.238:18280 /root/cnosdb"
17
17
env :
18
18
FOLLOW_TAGS : " false"
19
19
FORCE_PUSH : " true"
20
20
LOCAL_GITHUB_REF : ${{ github.ref }}
21
- GITLAB_HOSTNAME : " 43.247.178.238:8280 "
21
+ GITLAB_HOSTNAME : " 43.247.178.238:18280 "
22
22
GITLAB_USERNAME : " root"
23
23
GITLAB_PASSWORD : ${{ secrets.GITLAB_PASSWORD }}
24
- GITLAB_PROJECT_ID : " 9 "
24
+ GITLAB_PROJECT_ID : " 5 "
25
25
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change @@ -43,15 +43,15 @@ jobs:
43
43
- name : Mirrror + trigger CI
44
44
uses : lutengda/gitlab-mirror-and-ci-action@master
45
45
with :
46
- args : " http://gitlab.cnosdb.com:8280 /root/cnosdb"
46
+ args : " http://43.247.178.238:18280 /root/cnosdb"
47
47
env :
48
48
FOLLOW_TAGS : " false"
49
49
FORCE_PUSH : " true"
50
50
LOCAL_GITHUB_REF : ${{ steps.set-var.outputs.source_repo_branch1 }}
51
- GITLAB_HOSTNAME : " 43.247.178.238:8280 "
51
+ GITLAB_HOSTNAME : " 43.247.178.238:18280 "
52
52
GITLAB_USERNAME : " root"
53
53
GITLAB_PASSWORD : ${{ secrets.GITLAB_PASSWORD }}
54
- GITLAB_PROJECT_ID : " 9 "
54
+ GITLAB_PROJECT_ID : " 5 "
55
55
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
56
56
57
57
- name : Comment on PR
Original file line number Diff line number Diff line change @@ -12,12 +12,12 @@ bench-job:
12
12
- killall cnosdb
13
13
- set -e
14
14
# - pkill -9 cnosdb-meta
15
- - sudo rm -rf /data1 /cnosdb
15
+ - sudo rm -rf /home/gitlab-runner /cnosdb
16
16
- echo "compile code"
17
17
- make build_release
18
18
- sleep 10
19
19
- echo "modify default config"
20
- - sed -i "s/tmp/data1 /g" config/config_8902.toml
20
+ - sed -i "s/tmp/home\/gitlab-runner /g" config/config_8902.toml
21
21
# - sed -i "s/tmp/data1/g" config/config_8912.toml
22
22
# - sed -i "s/tmp/data1/g" meta/config/config_8921.toml
23
23
# - sed -i "s/tmp/data1/g" meta/config/config_8901.toml
@@ -36,6 +36,10 @@ bench-job:
36
36
- echo "hits test"
37
37
- commit_id=${commit_id:-$(git log -1 --pretty=%h)}
38
38
- cd benchmark
39
+ - export HITS_DATA_URL="/home/cnosdb_dev/hits.parquet"
40
+ - export TSBS_DATA_URL="/home/cnosdb_dev/cnosdb_iot_123_2022.gz"
41
+ - export TSBS_QUERY_DIR="/home/cnosdb_dev/queries"
42
+ - sudo mv ../target/release/cnosdb-cli /bin/
39
43
- ./benchmark.sh hits
40
44
- ./update-results.sh hits
41
45
-
scp -i /home/gitlab-runner/.ssh/id_rsa ./results/hits.html [email protected] :/usr/src/benchmark-hits/hits_${commit_id}.html
@@ -68,5 +72,5 @@ bench-job:
68
72
- set +e
69
73
- killall cnosdb
70
74
- set -e
71
- - sudo rm -rf /data1 /cnosdb
75
+ - sudo rm -rf /home/gitlab-runner /cnosdb
72
76
- echo "bench job Done"
Original file line number Diff line number Diff line change @@ -16,6 +16,6 @@ ${SQL_CLI} --file ${current_dir}/sql/create.sql >/dev/null
16
16
q_end=$( date +%s.%N)
17
17
q_time=$( echo " $q_end - $q_start " | bc -l)
18
18
19
- data_size=$( wc -c < /data/hits.parquet )
19
+ data_size=$( wc -c < ${HITS_DATA_URL} )
20
20
21
21
echo " ${data_size} ${q_time} "
Original file line number Diff line number Diff line change 1
1
DROP TABLE IF EXISTS hits;
2
2
CREATE EXTERNAL TABLE hits
3
3
STORED AS PARQUET
4
- LOCATION ' /data /hits.parquet' ;
4
+ LOCATION ' /home/cnosdb_dev /hits.parquet' ;
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ export BENCHMARK_DATASET=$1
12
12
export BENCHMARK_TYPE=${BENCHMARK_TYPE:- " pr" }
13
13
14
14
# hits
15
- # export HITS_DATA_URL=${HITS_DATA_URL:-"/data/hits.parquet"}
15
+ export HITS_DATA_URL=${HITS_DATA_URL:- " /data/hits.parquet" }
16
16
17
17
# tsbs
18
18
export TSBS_LOAD_CMD=${TSBS_LOAD_CMD:- " load_cnosdb" }
You can’t perform that action at this time.
0 commit comments