From aa67feb11b29ee815c42e858a039175f1c974f9a Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 17 May 2023 22:59:57 +0800 Subject: [PATCH] test: refine test cases (#655) * test: refine test cases * fix: 3.0-taosbenchmark-* * fix: add schedule event * test: merge with develop --- .github/workflows/2.x-aarch64.yml | 5 +++ .github/workflows/2.x-archlinux-release.yml | 9 +++++ .github/workflows/2.x-armv7.yml | 3 ++ .github/workflows/2.x-centos-release.yml | 9 +++++ .github/workflows/2.x-macos-debug.yml | 4 +-- .github/workflows/2.x-macos-release.yml | 4 +-- .github/workflows/2.x-taosbenchmark-debug.yml | 4 +-- .../workflows/2.x-taosbenchmark-release.yml | 4 +-- .github/workflows/2.x-taosdump-debug.yml | 4 +-- .github/workflows/2.x-taosdump-release.yml | 4 +-- .github/workflows/2.x-windows-build.yml | 6 ++-- .github/workflows/3.0-alpine.yml | 5 ++- .github/workflows/3.0-archlinux-release.yml | 13 +++++-- .github/workflows/3.0-coveralls.yml | 36 +++++++++++++++++-- .github/workflows/3.0-macos-debug.yml | 11 +++++- .github/workflows/3.0-macos-release.yml | 11 +++++- .github/workflows/3.0-non-x64.yml | 6 ++-- .github/workflows/3.0-taosbenchmark-debug.yml | 21 +++++++++-- .../workflows/3.0-taosbenchmark-release.yml | 21 +++++++++-- .github/workflows/3.0-taosdump-debug.yml | 14 ++++++-- .github/workflows/3.0-taosdump-release-ws.yml | 15 ++++++-- .github/workflows/3.0-taosdump-release.yml | 14 ++++++-- .github/workflows/3.0-windows-build.yml | 6 ++++ .github/workflows/codeql.yml | 4 +-- .github/workflows/cppcheck.yml | 2 ++ .../commandline-partial-col-numpy.py | 2 +- .../taosbenchmark/commandline-single-table.py | 1 - .../query_json-with-error-sqlfile.py | 2 -- tests/taosbenchmark/reuse-exist-stb.py | 2 -- .../taosc_insert_alltypes_json-partial-col.py | 6 +--- ...aosdemoTestInsertWithJsonStmt-otherPara.py | 2 -- .../taosdemoTestQueryWithJson.py | 1 - tests/taosbenchmark/v3/commandline-vgroups.py | 1 - tests/taosbenchmark/v3/default_tmq_json.py | 32 +++++++++-------- .../v3/query_json-kill-slow-query.py | 1 - 35 files changed, 218 insertions(+), 67 deletions(-) diff --git a/.github/workflows/2.x-aarch64.yml b/.github/workflows/2.x-aarch64.yml index 4adeb404..eaae6533 100644 --- a/.github/workflows/2.x-aarch64.yml +++ b/.github/workflows/2.x-aarch64.yml @@ -92,6 +92,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: submodules: recursive @@ -104,6 +105,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "The uname output was ${{ steps.setup.outputs.uname }}" sudo timedatectl set-timezone Asia/Shanghai @@ -131,6 +133,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: uraimo/run-on-arch-action@v2 with: arch: aarch64 @@ -156,6 +159,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: uraimo/run-on-arch-action@v2 with: arch: aarch64 @@ -182,6 +186,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: uraimo/run-on-arch-action@v2 with: arch: aarch64 diff --git a/.github/workflows/2.x-archlinux-release.yml b/.github/workflows/2.x-archlinux-release.yml index 061ba74a..b982846a 100644 --- a/.github/workflows/2.x-archlinux-release.yml +++ b/.github/workflows/2.x-archlinux-release.yml @@ -83,6 +83,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pacman -Syu --noconfirm > /dev/null pacman -Sy git --noconfirm > /dev/null @@ -92,6 +93,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: submodules: recursive @@ -104,6 +106,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "disable timezone changing" #timedatectl set-timezone Asia/Shanghai @@ -123,6 +126,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -132,6 +136,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -141,6 +146,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' id: cache-rust with: path: | @@ -155,6 +161,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pacman -Sy --noconfirm gcc make cmake zlib snappy gcc-libs pkg-config python3 python-pip > /dev/null gcc --version @@ -171,6 +178,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml > /dev/null pip3 install taospy > /dev/null @@ -187,6 +195,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosdump-failed.txt ]; then cat ~/taosdump-failed.txt; diff --git a/.github/workflows/2.x-armv7.yml b/.github/workflows/2.x-armv7.yml index a22f30cd..21a71c5d 100644 --- a/.github/workflows/2.x-armv7.yml +++ b/.github/workflows/2.x-armv7.yml @@ -92,6 +92,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: submodules: recursive @@ -104,6 +105,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "The uname output was ${{ steps.setup.outputs.uname }}" sudo timedatectl set-timezone Asia/Shanghai @@ -131,6 +133,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: uraimo/run-on-arch-action@v2 with: arch: armv7 diff --git a/.github/workflows/2.x-centos-release.yml b/.github/workflows/2.x-centos-release.yml index 7bdb9b1e..337803a3 100644 --- a/.github/workflows/2.x-centos-release.yml +++ b/.github/workflows/2.x-centos-release.yml @@ -83,6 +83,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "yum update" yum update -y > /dev/null @@ -99,6 +100,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: submodules: recursive @@ -111,6 +113,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "disable timezone changing" #timedatectl set-timezone Asia/Shanghai @@ -130,6 +133,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -139,6 +143,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -148,6 +153,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' id: cache-rust with: path: | @@ -162,6 +168,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | yum install -y python3 python3-pip zlib-devel zlib-static xz-devel snappy-devel jansson jansson-devel pkgconfig libatomic libatomic-static libstdc++-static openssl-devel > /dev/null python3 -m pip install --upgrade pip > /dev/null 2>&1 @@ -177,6 +184,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml > /dev/null pip3 install taospy > /dev/null @@ -193,6 +201,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosdump-failed.txt ]; then cat ~/taosdump-failed.txt; diff --git a/.github/workflows/2.x-macos-debug.yml b/.github/workflows/2.x-macos-debug.yml index 85110fde..7dde0740 100644 --- a/.github/workflows/2.x-macos-debug.yml +++ b/.github/workflows/2.x-macos-debug.yml @@ -73,8 +73,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - github.event_name == 'pull_request' && - steps.changed-files-specific.outputs.any_changed == 'true' + (github.event_name == 'pull_request' + && steps.changed-files-specific.outputs.any_changed == 'true') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge diff --git a/.github/workflows/2.x-macos-release.yml b/.github/workflows/2.x-macos-release.yml index 064d2568..7023fb88 100644 --- a/.github/workflows/2.x-macos-release.yml +++ b/.github/workflows/2.x-macos-release.yml @@ -73,8 +73,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - github.event_name == 'pull_request' && - steps.changed-files-specific.outputs.any_changed == 'true' + (github.event_name == 'pull_request' + && steps.changed-files-specific.outputs.any_changed == 'true') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge diff --git a/.github/workflows/2.x-taosbenchmark-debug.yml b/.github/workflows/2.x-taosbenchmark-debug.yml index bec9d897..71d28ff1 100644 --- a/.github/workflows/2.x-taosbenchmark-debug.yml +++ b/.github/workflows/2.x-taosbenchmark-debug.yml @@ -73,8 +73,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - steps.changed-files-specific.outputs.any_changed == 'true' && - github.event_name == 'pull_request' + (steps.changed-files-specific.outputs.any_changed == 'true' && + github.event_name == 'pull_request') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge diff --git a/.github/workflows/2.x-taosbenchmark-release.yml b/.github/workflows/2.x-taosbenchmark-release.yml index 6c16bc82..51796d31 100644 --- a/.github/workflows/2.x-taosbenchmark-release.yml +++ b/.github/workflows/2.x-taosbenchmark-release.yml @@ -73,8 +73,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - steps.changed-files-specific.outputs.any_changed == 'true' && - github.event_name == 'pull_request' + (steps.changed-files-specific.outputs.any_changed == 'true' + && github.event_name == 'pull_request') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge diff --git a/.github/workflows/2.x-taosdump-debug.yml b/.github/workflows/2.x-taosdump-debug.yml index 115b334b..e6f8f444 100644 --- a/.github/workflows/2.x-taosdump-debug.yml +++ b/.github/workflows/2.x-taosdump-debug.yml @@ -74,8 +74,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - steps.changed-files-specific.outputs.any_changed == 'true' && - github.event_name == 'pull_request' + (steps.changed-files-specific.outputs.any_changed == 'true' + && github.event_name == 'pull_request') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge diff --git a/.github/workflows/2.x-taosdump-release.yml b/.github/workflows/2.x-taosdump-release.yml index a684a395..52d8f98f 100644 --- a/.github/workflows/2.x-taosdump-release.yml +++ b/.github/workflows/2.x-taosdump-release.yml @@ -83,8 +83,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - steps.changed-files-specific.outputs.any_changed == 'true' && - github.event_name == 'pull_request' + (steps.changed-files-specific.outputs.any_changed == 'true' + && github.event_name == 'pull_request') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge diff --git a/.github/workflows/2.x-windows-build.yml b/.github/workflows/2.x-windows-build.yml index 99e17fe4..0726feac 100644 --- a/.github/workflows/2.x-windows-build.yml +++ b/.github/workflows/2.x-windows-build.yml @@ -60,6 +60,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: submodules: recursive @@ -69,8 +70,8 @@ jobs: - name: Checkout TDengine's taos-tools to PR number if: | - github.event_name == 'pull_request' && - steps.changed-files-specific.outputs.any_changed == 'true' + (github.event_name == 'pull_request' + && steps.changed-files-specific.outputs.any_changed == 'true') run: | cd TDengine/src/kit/taos-tools git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge @@ -82,6 +83,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | choco install jom gawk grep -y #cd TDengine && mkdir debug && cd debug && cmake .. -G "NMake Makefiles JOM" -DBUILD_JDBC=false -DBUILD_TOOLS=true && jom && jom install diff --git a/.github/workflows/3.0-alpine.yml b/.github/workflows/3.0-alpine.yml index 94647343..360ccbf8 100644 --- a/.github/workflows/3.0-alpine.yml +++ b/.github/workflows/3.0-alpine.yml @@ -78,6 +78,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: jirutka/setup-alpine@v1 @@ -86,6 +87,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cat /etc/alpine-release apk add argp-standalone bash curl cmake gcc make g++ git go procps lsof valgrind linux-headers libunwind libunwind-dev tzdata wget jansson-dev snappy-dev xz-dev zlib-dev @@ -96,11 +98,12 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' shell: alpine.sh --root {0} run: | git clone --branch main --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1 - cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DBUILD_HTTP=false && make -j8 && make install + cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DBUILD_HTTP=false && make -j2 && make install if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taos ]] then echo "TDengien build failure" diff --git a/.github/workflows/3.0-archlinux-release.yml b/.github/workflows/3.0-archlinux-release.yml index c05585e3..639815cc 100644 --- a/.github/workflows/3.0-archlinux-release.yml +++ b/.github/workflows/3.0-archlinux-release.yml @@ -82,6 +82,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pacman -Syu --noconfirm > /dev/null pacman -Sy git --noconfirm > /dev/null @@ -91,6 +92,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: submodules: recursive @@ -103,6 +105,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "disable timezone changing" #timedatectl set-timezone Asia/Shanghai @@ -113,6 +116,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -122,6 +126,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -131,6 +136,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' id: cache-rust with: path: | @@ -145,11 +151,12 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | - pacman -Sy --noconfirm gcc make cmake zlib snappy gcc-libs pkg-config python3 python-pip > /dev/null + pacman -Sy --noconfirm gcc make cmake gcc-libs gflags pkg-config python3 python-pip snappy zlib > /dev/null gcc --version python3 -m pip install --upgrade pip > /dev/null 2>&1 - cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && make install > /dev/null + cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true && make -j2 > /dev/null && make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -161,6 +168,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v3 with: fetch-depth: 0 # OR "2" -> To retrieve the preceding commit. @@ -179,6 +187,7 @@ jobs: (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml index 37de1fad..c4252627 100644 --- a/.github/workflows/3.0-coveralls.yml +++ b/.github/workflows/3.0-coveralls.yml @@ -66,6 +66,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -77,6 +78,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo timedatectl set-timezone Asia/Shanghai sudo date @@ -115,13 +117,16 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | whoami + sudo apt update > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug ||: cd debug cmake .. -DBUILD_JDBC=false -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug + make -j2 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -130,8 +135,10 @@ jobs: - name: show TDengine's taosws commit if: | - steps.changed-files-specific.outputs.any_changed == 'true' && - github.event_name == 'pull_request' + (steps.changed-files-specific.outputs.any_changed == 'true' + && github.event_name == 'pull_request') + || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd TDengine/tools/taosws-rs git log --oneline | head -1 @@ -141,6 +148,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo apt update > /dev/null sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null @@ -158,6 +166,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug @@ -175,6 +184,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "TEST: taodump -p" cd tests/taosdump @@ -185,6 +195,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -219,6 +230,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -263,6 +275,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -330,6 +343,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -353,6 +367,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -383,6 +398,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -427,6 +443,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -449,6 +466,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -494,6 +512,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -526,6 +545,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -572,6 +592,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -593,6 +614,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -611,6 +633,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -628,6 +651,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -651,6 +675,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -668,6 +693,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo pkill -9 taosadapter || : sudo pkill -9 taosd || : @@ -686,6 +712,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -703,6 +730,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -716,6 +744,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | topdir=`pwd` cd debug @@ -739,6 +768,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: coverallsapp/github-action@master with: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/3.0-macos-debug.yml b/.github/workflows/3.0-macos-debug.yml index 96b4dc0a..d56eedc1 100644 --- a/.github/workflows/3.0-macos-debug.yml +++ b/.github/workflows/3.0-macos-debug.yml @@ -62,6 +62,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -73,6 +74,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | #sudo timedatectl set-timezone Asia/Shanghai #sudo date @@ -82,6 +84,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | brew update brew install argp-standalone pkg-config @@ -92,6 +95,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -101,6 +105,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable @@ -110,6 +115,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' id: cache-rust with: path: | @@ -124,8 +130,9 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | - cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null + cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/bin/taosd ]] || [[ ! -f /usr/local/bin/taosadapter ]] then echo "TDengine build failure" @@ -137,6 +144,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "install package for taos-tools" @@ -153,6 +161,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug diff --git a/.github/workflows/3.0-macos-release.yml b/.github/workflows/3.0-macos-release.yml index c6323e1b..24af65ac 100644 --- a/.github/workflows/3.0-macos-release.yml +++ b/.github/workflows/3.0-macos-release.yml @@ -62,6 +62,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -73,6 +74,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | #sudo timedatectl set-timezone Asia/Shanghai #sudo date @@ -82,6 +84,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | brew update brew install argp-standalone pkg-config @@ -92,6 +95,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -101,6 +105,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable @@ -110,6 +115,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' id: cache-rust with: path: | @@ -124,8 +130,9 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | - cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null + cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/bin/taosd ]] || [[ ! -f /usr/local/bin/taosadapter ]] then echo "TDengine build failure" @@ -137,6 +144,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | echo "install package for taos-tools" @@ -153,6 +161,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug diff --git a/.github/workflows/3.0-non-x64.yml b/.github/workflows/3.0-non-x64.yml index 67eb7c50..fecc4c39 100644 --- a/.github/workflows/3.0-non-x64.yml +++ b/.github/workflows/3.0-non-x64.yml @@ -57,6 +57,7 @@ jobs: env: BASE_BRANCH: ${{ github.base_ref }} if: github.event_name == 'pull_request' + || github.event_name == 'schedule' - uses: actions/checkout@v3 with: @@ -125,6 +126,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: uraimo/run-on-arch-action@v2.1.1 with: arch: aarch64 @@ -142,7 +144,7 @@ jobs: cd TDengine || exit 1 mkdir debug ||: cd debug || exit 1 - cmake .. > /dev/null && make -j8 > /dev/null && make install > /dev/null + cmake .. > /dev/null && make -j2 > /dev/null && make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosd ]] then echo "TDengine build failure" @@ -160,7 +162,7 @@ jobs: mkdir debug ||: cd debug - cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} > /dev/null && make -j8 > /dev/null && make install > /dev/null + cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} > /dev/null && make -j2 > /dev/null && make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" diff --git a/.github/workflows/3.0-taosbenchmark-debug.yml b/.github/workflows/3.0-taosbenchmark-debug.yml index e5737b5e..0212a4a5 100644 --- a/.github/workflows/3.0-taosbenchmark-debug.yml +++ b/.github/workflows/3.0-taosbenchmark-debug.yml @@ -70,6 +70,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo timedatectl set-timezone Asia/Shanghai sudo date @@ -79,6 +80,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -88,6 +90,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -107,8 +110,14 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | - cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug + sudo apt update > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null + cd TDengine && mkdir debug && cd debug \ + && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null \ + && make -j2 > /dev/null && sudo make install > /dev/null \ + && cd .. && rm -rf debug if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -120,6 +129,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo apt update > /dev/null sudo apt install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config expect -y > /dev/null @@ -137,10 +147,11 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug - cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZE=true -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null + cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZE=true -DWEBSOCKET=true > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" @@ -152,6 +163,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null @@ -160,6 +172,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -179,6 +192,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' env: TDENGINE_CLOUD_DSN: ${{ secrets.TDENGINE_CLOUD_DSN }} run: | @@ -200,6 +214,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -219,6 +234,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -245,6 +261,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosbenchmark-release-failed.txt ]; then cat ~/taosbenchmark-release-failed.txt diff --git a/.github/workflows/3.0-taosbenchmark-release.yml b/.github/workflows/3.0-taosbenchmark-release.yml index 3d2110ac..b763cc3c 100644 --- a/.github/workflows/3.0-taosbenchmark-release.yml +++ b/.github/workflows/3.0-taosbenchmark-release.yml @@ -70,6 +70,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo timedatectl set-timezone Asia/Shanghai sudo date @@ -79,6 +80,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -88,6 +90,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -107,8 +110,14 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | - cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug + sudo apt update > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null + cd TDengine && mkdir debug && cd debug \ + && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null \ + && make -j2 > /dev/null && sudo make install > /dev/null \ + && cd .. && rm -rf debug if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -120,6 +129,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo apt update > /dev/null sudo apt install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config expect -y > /dev/null @@ -137,10 +147,11 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug - cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null + cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" @@ -152,6 +163,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null @@ -160,6 +172,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -179,6 +192,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' env: TDENGINE_CLOUD_DSN: ${{ secrets.TDENGINE_CLOUD_DSN }} run: | @@ -200,6 +214,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -219,6 +234,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests @@ -252,6 +268,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosbenchmark-release-failed.txt ]; then cat ~/taosbenchmark-release-failed.txt diff --git a/.github/workflows/3.0-taosdump-debug.yml b/.github/workflows/3.0-taosdump-debug.yml index 32815f89..3ffafe10 100644 --- a/.github/workflows/3.0-taosdump-debug.yml +++ b/.github/workflows/3.0-taosdump-debug.yml @@ -63,6 +63,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -74,6 +75,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo timedatectl set-timezone Asia/Shanghai sudo date @@ -83,6 +85,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -92,11 +95,12 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd TDengine mkdir debug && cd debug cmake .. -DBUILD_HTTP=false > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug + make -j2 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -108,6 +112,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null - name: Checkout taos-tools to PR number @@ -123,11 +128,12 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZE=true > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null + make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" @@ -139,6 +145,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null @@ -147,6 +154,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -175,6 +183,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -204,6 +213,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosdump-failed.txt ]; then cat ~/taosdump-failed.txt; diff --git a/.github/workflows/3.0-taosdump-release-ws.yml b/.github/workflows/3.0-taosdump-release-ws.yml index f2644566..5133622c 100644 --- a/.github/workflows/3.0-taosdump-release-ws.yml +++ b/.github/workflows/3.0-taosdump-release-ws.yml @@ -63,6 +63,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -74,6 +75,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo timedatectl set-timezone Asia/Shanghai sudo date @@ -83,6 +85,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -92,6 +95,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1.0.6 with: toolchain: stable @@ -118,12 +122,13 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd TDengine mkdir debug cd debug cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug + make -j2 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -143,6 +148,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null - name: Checkout taos-tools to PR number @@ -158,11 +164,12 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null + make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" @@ -174,6 +181,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null @@ -182,6 +190,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -203,6 +212,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd debug ./build/bin/taosdump -C https://not-exist.com:80/cloud -D test ||: @@ -214,6 +224,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosdump-failed.txt ]; then if [ -f ~/taosa.log ]; then diff --git a/.github/workflows/3.0-taosdump-release.yml b/.github/workflows/3.0-taosdump-release.yml index 9118672c..d98cef1e 100644 --- a/.github/workflows/3.0-taosdump-release.yml +++ b/.github/workflows/3.0-taosdump-release.yml @@ -63,6 +63,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -74,6 +75,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo timedatectl set-timezone Asia/Shanghai sudo date @@ -83,6 +85,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/setup-go@v3 with: go-version: 1.17 @@ -92,11 +95,12 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd TDengine mkdir debug && cd debug cmake .. -DBUILD_HTTP=false > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug + make -j2 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]] then echo "TDengine build failure" @@ -108,6 +112,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: sudo apt-get install lzma-dev liblzma-dev libjansson-dev libz-dev zlib1g libsnappy-dev pkg-config lcov expect -y > /dev/null - name: Checkout taos-tools to PR number @@ -123,11 +128,12 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | mkdir debug ||: cd debug cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} > /dev/null - make -j8 > /dev/null && sudo make install > /dev/null + make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" @@ -139,6 +145,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | pip3 install decorator numpy fabric2 psutil pandas faker toml taospy > /dev/null @@ -147,6 +154,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -163,6 +171,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd tests sudo pkill -9 taosadapter || : @@ -192,6 +201,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | if [ -f ~/taosdump-failed.txt ]; then cat ~/taosdump-failed.txt diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml index 59489e82..0d782e0c 100644 --- a/.github/workflows/3.0-windows-build.yml +++ b/.github/workflows/3.0-windows-build.yml @@ -60,6 +60,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' @@ -71,6 +72,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | choco install jom gawk grep -y cd TDengine @@ -82,6 +84,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd TDengine/debug cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} && jom -j 8 && jom install @@ -106,6 +109,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -116,6 +120,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | cd TDengine/debug cmake .. -G "NMake Makefiles JOM" -DBUILD_HTTP=false -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true && jom -j8 && jom install @@ -125,6 +130,7 @@ jobs: #(steps.changed-files-specific.outputs.any_changed == 'true' #&& github.event_name == 'pull_request') #|| github.event_name == 'push' + #|| github.event_name == 'schedule' # run: | #cd TDengine/debug diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index a8958d8c..77778846 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -67,7 +67,7 @@ jobs: cd TDengine || exit 1 mkdir debug || exit 1 cd debug || exit 1 - cmake .. > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null + cmake .. > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosd ]] then echo "TDengine build failure" @@ -80,7 +80,7 @@ jobs: mkdir debug || exit 1 cd debug || exit 1 - cmake .. > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null + cmake .. > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]] then echo "taos-tools build failure" diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index c7a5e870..6b8bb56a 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -53,6 +53,7 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | sudo apt update -y > /dev/null sudo apt install -y cppcheck @@ -62,5 +63,6 @@ jobs: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') || github.event_name == 'push' + || github.event_name == 'schedule' run: | for f in `find src inc -type f -name "*.[c,h]" ! -path "src/benchUtilDs.c"`; do cppcheck $f || exit $?; done diff --git a/tests/taosbenchmark/commandline-partial-col-numpy.py b/tests/taosbenchmark/commandline-partial-col-numpy.py index fe384bbc..da6869a9 100644 --- a/tests/taosbenchmark/commandline-partial-col-numpy.py +++ b/tests/taosbenchmark/commandline-partial-col-numpy.py @@ -63,7 +63,7 @@ def run(self): tdSql.query("select * from test.meters") dbresult = tdSql.queryResult for i in range(len(dbresult[0])): - if i in (1, 2) and dbresult[0][i] == None: + if i in (1, 2) and dbresult[0][i] is None: tdLog.exit("result[0][%d] is NULL, which should not be" % i) else: tdLog.info("result[0][{0}] is {1}".format(i, dbresult[0][i])) diff --git a/tests/taosbenchmark/commandline-single-table.py b/tests/taosbenchmark/commandline-single-table.py index d37e290e..7fe1d097 100644 --- a/tests/taosbenchmark/commandline-single-table.py +++ b/tests/taosbenchmark/commandline-single-table.py @@ -11,7 +11,6 @@ # -*- coding: utf-8 -*- import os -import subprocess from util.log import * from util.cases import * diff --git a/tests/taosbenchmark/query_json-with-error-sqlfile.py b/tests/taosbenchmark/query_json-with-error-sqlfile.py index 4fa5e7e7..b5f30981 100644 --- a/tests/taosbenchmark/query_json-with-error-sqlfile.py +++ b/tests/taosbenchmark/query_json-with-error-sqlfile.py @@ -10,9 +10,7 @@ ################################################################### # -*- coding: utf-8 -*- -import ast import os -import re from util.log import * from util.cases import * diff --git a/tests/taosbenchmark/reuse-exist-stb.py b/tests/taosbenchmark/reuse-exist-stb.py index 64eebbf5..cc49570a 100644 --- a/tests/taosbenchmark/reuse-exist-stb.py +++ b/tests/taosbenchmark/reuse-exist-stb.py @@ -10,9 +10,7 @@ ################################################################### # -*- coding: utf-8 -*- -import ast import os -import re from util.log import * from util.cases import * diff --git a/tests/taosbenchmark/taosc_insert_alltypes_json-partial-col.py b/tests/taosbenchmark/taosc_insert_alltypes_json-partial-col.py index 5b618679..2db38187 100644 --- a/tests/taosbenchmark/taosc_insert_alltypes_json-partial-col.py +++ b/tests/taosbenchmark/taosc_insert_alltypes_json-partial-col.py @@ -58,10 +58,6 @@ def getPath(self, tool="taosBenchmark"): return paths[0] def run(self): - tdSql.query("select client_version()") - client_ver = "".join(tdSql.queryResult[0]) - major_ver = client_ver.split(".")[0] - binPath = self.getPath() cmd = ( "%s -f ./taosbenchmark/json/taosc_insert_alltypes-partial-col.json" @@ -114,7 +110,7 @@ def run(self): tdSql.query("select c0,c1,c2 from db.stb limit 1") dbresult = tdSql.queryResult for i in range(len(dbresult[0])): - if i in (0, 1) and dbresult[0][i] == None: + if i in (0, 1) and dbresult[0][i] is None: tdLog.exit("result[0][%d] is NULL, which should not be" % i) else: tdLog.info("result[0][{0}] is {1}".format(i, dbresult[0][i])) diff --git a/tests/taosbenchmark/taosdemoTestInsertWithJsonStmt-otherPara.py b/tests/taosbenchmark/taosdemoTestInsertWithJsonStmt-otherPara.py index 9ee9cb16..6aefcb56 100644 --- a/tests/taosbenchmark/taosdemoTestInsertWithJsonStmt-otherPara.py +++ b/tests/taosbenchmark/taosdemoTestInsertWithJsonStmt-otherPara.py @@ -11,7 +11,6 @@ # -*- coding: utf-8 -*- -import sys import os from util.log import * from util.cases import * @@ -216,7 +215,6 @@ def run(self): ) # child_table_exists = yes, auto_create_table varies = yes tdSql.checkRows(20) - testcaseFilename = os.path.split(__file__)[-1] os.system("rm -rf ./insert_res.txt") def stop(self): diff --git a/tests/taosbenchmark/taosdemoTestQueryWithJson.py b/tests/taosbenchmark/taosdemoTestQueryWithJson.py index e6bb1c6f..b3341f21 100644 --- a/tests/taosbenchmark/taosdemoTestQueryWithJson.py +++ b/tests/taosbenchmark/taosdemoTestQueryWithJson.py @@ -11,7 +11,6 @@ # -*- coding: utf-8 -*- -import sys import os from util.log import * from util.cases import * diff --git a/tests/taosbenchmark/v3/commandline-vgroups.py b/tests/taosbenchmark/v3/commandline-vgroups.py index e2a7a90e..4292e227 100644 --- a/tests/taosbenchmark/v3/commandline-vgroups.py +++ b/tests/taosbenchmark/v3/commandline-vgroups.py @@ -11,7 +11,6 @@ # -*- coding: utf-8 -*- import os -import subprocess from util.log import * from util.cases import * diff --git a/tests/taosbenchmark/v3/default_tmq_json.py b/tests/taosbenchmark/v3/default_tmq_json.py index 7b31818e..f3b0dc0c 100644 --- a/tests/taosbenchmark/v3/default_tmq_json.py +++ b/tests/taosbenchmark/v3/default_tmq_json.py @@ -10,7 +10,8 @@ ################################################################### # -*- coding: utf-8 -*- -import os, signal +# import os, signal +import os from time import sleep from util.log import * from util.cases import * @@ -61,24 +62,25 @@ def run(self): tdLog.info("%s" % cmd) os.system("%s" % cmd) tdSql.execute("reset query cache") - + tdSql.execute("alter database db WAL_RETENTION_PERIOD 3600000") - + cmd = "%s -f ./taosbenchmark/json/tmq.json " % binPath tdLog.info("%s" % cmd) os.system("%s" % cmd) - time.sleep(15) -# try: -# for line in os.popen("ps ax | grep taosBenchmark | grep -v grep"): -# fields = line.split() - -# pid = fields[0] - -# os.kill(int(pid), signal.SIGINT) -# time.sleep(3) -# print("taosBenchmark be killed on purpose") -# except: -# tdLog.exit("failed to kill taosBenchmark") + sleep(15) + + # try: + # for line in os.popen("ps ax | grep taosBenchmark | grep -v grep"): + # fields = line.split() + + # pid = fields[0] + + # os.kill(int(pid), signal.SIGINT) + # time.sleep(3) + # print("taosBenchmark be killed on purpose") + # except: + # tdLog.exit("failed to kill taosBenchmark") def stop(self): tdSql.close() diff --git a/tests/taosbenchmark/v3/query_json-kill-slow-query.py b/tests/taosbenchmark/v3/query_json-kill-slow-query.py index 9b37abb5..cc2075c8 100644 --- a/tests/taosbenchmark/v3/query_json-kill-slow-query.py +++ b/tests/taosbenchmark/v3/query_json-kill-slow-query.py @@ -11,7 +11,6 @@ # -*- coding: utf-8 -*- import os -import re import subprocess from util.log import *