From 50c259cadf96051bed43ae2ca3d777a0f15aa726 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Fri, 9 Jun 2023 11:33:39 +0800 Subject: [PATCH] fix: taosdump remove unused --yes (#673) (#674) * fix: taosdump remove unused --yes * test: change workflow branch * fix: taosdump old test * fix: 3.0-windows-build.yml jom concurrent Co-authored-by: Hui Li <52318143+plum-lihui@users.noreply.github.com> Co-authored-by: wade zhang <95411902+gccgdb1234@users.noreply.github.com> --- .github/workflows/2.x-archlinux-release.yml | 2 -- .github/workflows/2.x-centos-release.yml | 2 -- .github/workflows/3.0-alpine.yml | 15 ++++++++---- .github/workflows/3.0-archlinux-release.yml | 16 +++++++++---- .github/workflows/3.0-coveralls.yml | 18 ++++++++++----- .github/workflows/3.0-macos-debug.yml | 16 +++++++++---- .github/workflows/3.0-macos-release.yml | 16 +++++++++---- .github/workflows/3.0-non-x64.yml | 16 +++++++++---- .github/workflows/3.0-taosbenchmark-debug.yml | 16 +++++++++---- .../workflows/3.0-taosbenchmark-release.yml | 16 +++++++++---- .github/workflows/3.0-taosdump-debug.yml | 16 +++++++++---- .github/workflows/3.0-taosdump-release-ws.yml | 14 +++++++---- .github/workflows/3.0-taosdump-release.yml | 16 +++++++++---- .github/workflows/3.0-windows-build.yml | 23 ++++++++++++++----- .github/workflows/codeql.yml | 16 +++++++++---- .github/workflows/cppcheck.yml | 10 ++++++-- VERSION | 4 ++-- src/taosdump.c | 7 ------ tests/taosdump/old/taosdumpTest.py | 6 ++--- tests/taosdump/old/taosdumpTest2.py | 6 ++--- tests/taosdump/old/taosdumpTestNanoSupport.py | 18 +++++++-------- 21 files changed, 173 insertions(+), 96 deletions(-) diff --git a/.github/workflows/2.x-archlinux-release.yml b/.github/workflows/2.x-archlinux-release.yml index b982846a..62e6e1fb 100644 --- a/.github/workflows/2.x-archlinux-release.yml +++ b/.github/workflows/2.x-archlinux-release.yml @@ -16,8 +16,6 @@ jobs: check-changed: runs-on: ubuntu-latest outputs: - output1: ${{ steps.step1.outputs.test }} - output2: ${{ steps.step2.outputs.test }} changedflag: ${{ steps.changedflag.outputs.changedflag }} steps: - name: Step that prints name of pull request's base branch diff --git a/.github/workflows/2.x-centos-release.yml b/.github/workflows/2.x-centos-release.yml index 337803a3..36f8dae9 100644 --- a/.github/workflows/2.x-centos-release.yml +++ b/.github/workflows/2.x-centos-release.yml @@ -16,8 +16,6 @@ jobs: check-changed: runs-on: ubuntu-latest outputs: - output1: ${{ steps.step1.outputs.test }} - output2: ${{ steps.step2.outputs.test }} changedflag: ${{ steps.changedflag.outputs.changedflag }} steps: - name: Step that prints name of pull request's base branch diff --git a/.github/workflows/3.0-alpine.yml b/.github/workflows/3.0-alpine.yml index 5b99b1b1..77101f60 100644 --- a/.github/workflows/3.0-alpine.yml +++ b/.github/workflows/3.0-alpine.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Release @@ -90,7 +96,7 @@ jobs: || github.event_name == 'schedule' run: | cat /etc/alpine-release - apk add argp-standalone bash curl cmake gcc g++ geos-dev git go procps lsof make valgrind linux-headers libunwind libunwind-dev tzdata wget jansson-dev snappy-dev xz-dev zlib-dev + apk add argp-standalone bash curl cmake gcc g++ git go procps lsof make valgrind linux-headers libunwind libunwind-dev tzdata wget jansson-dev snappy-dev xz-dev zlib-dev shell: alpine.sh --root {0} - name: Build & Install TDengine @@ -101,8 +107,7 @@ jobs: || 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 + git clone --branch ${{ github.event.pull_request.base.ref }} --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 -j2 && make install if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taos ]] then diff --git a/.github/workflows/3.0-archlinux-release.yml b/.github/workflows/3.0-archlinux-release.yml index 5099c3fd..9b31a57e 100644 --- a/.github/workflows/3.0-archlinux-release.yml +++ b/.github/workflows/3.0-archlinux-release.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Release @@ -85,9 +91,9 @@ jobs: || github.event_name == 'schedule' run: | pacman -Syu --noconfirm > /dev/null - pacman -Sy git geos --noconfirm > /dev/null + pacman -Sy git --noconfirm > /dev/null - - name: Checkout TDengine 3.0 branch + - name: Checkout TDengine if: | (needs.check-changed.outputs.changedflag == 'true' && github.event_name == 'pull_request') @@ -98,7 +104,7 @@ jobs: submodules: recursive repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: | diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml index 8c064d37..4faf2de1 100644 --- a/.github/workflows/3.0-coveralls.yml +++ b/.github/workflows/3.0-coveralls.yml @@ -1,9 +1,15 @@ name: Coveralls (3.0) on: push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Debug @@ -61,7 +67,7 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout TDengine 3.0 + - name: Checkout TDengine if: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -71,7 +77,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: @@ -112,7 +118,7 @@ jobs: TDengine/tools/taosws-rs/target/ key: ${{ runner.os }}-cargo-target-${{ steps.setup-rust.outputs.rustc_hash }} - - name: first build TDengine 3.0 + - name: first build TDengine if: | (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -121,7 +127,7 @@ jobs: run: | whoami sudo apt update > /dev/null - sudo apt install libgflags2.2 libgflags-dev libgeos-dev -y > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug ||: cd debug diff --git a/.github/workflows/3.0-macos-debug.yml b/.github/workflows/3.0-macos-debug.yml index 9514b448..354896b9 100644 --- a/.github/workflows/3.0-macos-debug.yml +++ b/.github/workflows/3.0-macos-debug.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Debug @@ -57,7 +63,7 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout TDengine 3.0 + - name: Checkout TDengine if: | (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -67,7 +73,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: | @@ -87,7 +93,7 @@ jobs: || github.event_name == 'schedule' run: | brew update - brew install argp-standalone pkg-config geos + brew install argp-standalone pkg-config brew info argp-standalone - name: Set up Go diff --git a/.github/workflows/3.0-macos-release.yml b/.github/workflows/3.0-macos-release.yml index 1fda8b12..42ea3642 100644 --- a/.github/workflows/3.0-macos-release.yml +++ b/.github/workflows/3.0-macos-release.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Release @@ -57,7 +63,7 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout TDengine 3.0 + - name: Checkout TDengine if: | (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -67,7 +73,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: | @@ -87,7 +93,7 @@ jobs: || github.event_name == 'schedule' run: | brew update - brew install argp-standalone pkg-config geos + brew install argp-standalone pkg-config brew info argp-standalone - name: Set up Go diff --git a/.github/workflows/3.0-non-x64.yml b/.github/workflows/3.0-non-x64.yml index ed645232..6ba0881a 100644 --- a/.github/workflows/3.0-non-x64.yml +++ b/.github/workflows/3.0-non-x64.yml @@ -8,9 +8,15 @@ on: - cron: "10 16 * * *" # Triggers the workflow on push or pull request events but only for the develop branch push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -135,11 +141,11 @@ jobs: echo "Install packages on ${{ steps.setup.outputs.uname }}" apt update -y > /dev/null apt install -y cmake build-essential git libjansson-dev libsnappy-dev liblzma-dev libz-dev zlib1g pkg-config libssl-dev > /dev/null - apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null + apt install libgflags2.2 libgflags-dev -y > /dev/null - echo "clone TDengine 3.0 on ${{ steps.setup.outputs.uname }}" + echo "clone TDengine ${{ github.event.pull_request.base.ref }} on ${{ steps.setup.outputs.uname }}" - git clone --branch 3.0 --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1 + git clone --branch ${{ github.event.pull_request.base.ref }} --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1 echo "build TDengine 3.0 on ${{ steps.setup.outputs.uname }}" cd TDengine || exit 1 diff --git a/.github/workflows/3.0-taosbenchmark-debug.yml b/.github/workflows/3.0-taosbenchmark-debug.yml index ba31ec4d..651130aa 100644 --- a/.github/workflows/3.0-taosbenchmark-debug.yml +++ b/.github/workflows/3.0-taosbenchmark-debug.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Debug @@ -58,12 +64,12 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout TDengine 3.0 + - name: Checkout TDengine uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: | @@ -113,7 +119,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /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 \ diff --git a/.github/workflows/3.0-taosbenchmark-release.yml b/.github/workflows/3.0-taosbenchmark-release.yml index e870eeae..26a6a585 100644 --- a/.github/workflows/3.0-taosbenchmark-release.yml +++ b/.github/workflows/3.0-taosbenchmark-release.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Release @@ -58,12 +64,12 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout TDengine 3.0 + - name: Checkout TDengine uses: actions/checkout@v2 with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: | @@ -113,7 +119,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /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 \ diff --git a/.github/workflows/3.0-taosdump-debug.yml b/.github/workflows/3.0-taosdump-debug.yml index 7498acf5..374f20b1 100644 --- a/.github/workflows/3.0-taosdump-debug.yml +++ b/.github/workflows/3.0-taosdump-debug.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Debug @@ -58,7 +64,7 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout tdengine + - name: Checkout TDengine if: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -68,7 +74,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: @@ -98,7 +104,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug && cd debug cmake .. -DBUILD_HTTP=false > /dev/null diff --git a/.github/workflows/3.0-taosdump-release-ws.yml b/.github/workflows/3.0-taosdump-release-ws.yml index 63932437..94f0c8e3 100644 --- a/.github/workflows/3.0-taosdump-release-ws.yml +++ b/.github/workflows/3.0-taosdump-release-ws.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Release @@ -68,7 +74,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: @@ -125,7 +131,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug cd debug diff --git a/.github/workflows/3.0-taosdump-release.yml b/.github/workflows/3.0-taosdump-release.yml index f1d2c5f2..75ab2491 100644 --- a/.github/workflows/3.0-taosdump-release.yml +++ b/.github/workflows/3.0-taosdump-release.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Release @@ -58,7 +64,7 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout tdengine + - name: Checkout TDengine if: (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -68,7 +74,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: '3.0' + ref: ${{ github.event.pull_request.base.ref }} - name: Change time zone if: @@ -98,7 +104,7 @@ jobs: || github.event_name == 'schedule' run: | sudo apt update > /dev/null - sudo apt install libgeos-dev libgflags2.2 libgflags-dev -y > /dev/null + sudo apt install libgflags2.2 libgflags-dev -y > /dev/null cd TDengine mkdir debug && cd debug cmake .. -DBUILD_HTTP=false > /dev/null diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml index 0d782e0c..8bc58fad 100644 --- a/.github/workflows/3.0-windows-build.yml +++ b/.github/workflows/3.0-windows-build.yml @@ -4,9 +4,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main env: TOOLS_BUILD_TYPE: Debug @@ -55,7 +61,7 @@ jobs: run: | echo "One or more files listed above has changed." - - name: Checkout TDengine 3.0 + - name: Checkout TDengine if: | (steps.changed-files-specific.outputs.any_changed == 'true' && github.event_name == 'pull_request') @@ -65,7 +71,7 @@ jobs: with: repository: 'taosdata/TDengine' path: 'TDengine' - ref: 'main' + ref: ${{ github.event.pull_request.base.ref }} - name: create debug directory if: | @@ -79,6 +85,7 @@ jobs: mkdir debug - uses: ilammy/msvc-dev-cmd@v1 + - name: cmake first TDengine if: | (steps.changed-files-specific.outputs.any_changed == 'true' @@ -86,8 +93,9 @@ jobs: || github.event_name == 'push' || github.event_name == 'schedule' run: | + cl.exe cd TDengine/debug - cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} && jom -j 8 && jom install + cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true && jom /j 2 - name: Checkout TDengine's taos-tools to PR number if: | @@ -115,6 +123,7 @@ jobs: toolchain: stable - uses: ilammy/msvc-dev-cmd@v1 + - name: Build & Install TDengine if: (steps.changed-files-specific.outputs.any_changed == 'true' @@ -122,8 +131,10 @@ jobs: || github.event_name == 'push' || github.event_name == 'schedule' run: | + cl.exe 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 + cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true && jom /j 2 && jom install + #cmake .. -G "NMake Makefiles" -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true && nmake && nmake install # - name: taosdump codec Test # if: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 02ac9f01..81c30c25 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,10 +13,16 @@ name: "CodeQL" on: push: - branches: [ "develop", master ] + branches: + - develop + - 3.0 + - main pull_request: # The branches below must be a subset of the branches above - branches: [ "develop" ] + branches: + - develop + - 3.0 + - main schedule: - cron: '15 16 * * 1' @@ -57,12 +63,12 @@ jobs: run: | sudo apt update -y > /dev/null sudo apt install -y cmake build-essential git \ - libgeos-dev libgflags2.2 libgflags-dev \ + libgflags2.2 libgflags-dev \ libjansson-dev libsnappy-dev liblzma-dev libz-dev pkg-config \ libssl-dev > /dev/null - echo "clone TDengine 3.0 on ${{ steps.setup.outputs.uname }}" - git clone --branch 3.0 --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1 + echo "clone TDengine ${{ github.event.pull_request.base.ref }} on ${{ steps.setup.outputs.uname }}" + git clone --branch ${{ github.event.pull_request.base.ref }} --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1 echo "build TDengine 3.0" cd TDengine || exit 1 diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 6b8bb56a..6076758b 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -3,9 +3,15 @@ on: schedule: - cron: "10 16 * * *" push: - branches: [ develop ] + branches: + - develop + - 3.0 + - main pull_request: - branches: [ develop ] + branches: + - develop + - 3.0 + - main jobs: build: diff --git a/VERSION b/VERSION index 94933678..0857b7f9 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ taosbenchmark-3.2.1 -taosdump-2.5.1 -2.5.1 +taosdump-2.5.2 +2.5.2 diff --git a/src/taosdump.c b/src/taosdump.c index 03213102..d35b12d8 100644 --- a/src/taosdump.c +++ b/src/taosdump.c @@ -514,7 +514,6 @@ typedef struct arguments { // dump format option bool schemaonly; bool with_property; - bool answer_yes; bool avro; int avro_codec; int64_t start_time; @@ -580,7 +579,6 @@ struct arguments g_args = { // dump format option false, // schemaonly true, // with_property - false, // answer_yes true, // avro AVRO_CODEC_SNAPPY, // avro_codec DEFAULT_START_TIME, // start_time @@ -897,10 +895,6 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) { g_args.with_property = false; break; - case 'y': - g_args.answer_yes = true; - break; - case 'S': // parse time here. break; @@ -9421,7 +9415,6 @@ static void printArgs(FILE *file) { fprintf(file, "databasesSeq: %s\n", g_args.databasesSeq); fprintf(file, "schemaonly: %s\n", g_args.schemaonly?"true":"false"); fprintf(file, "with_property: %s\n", g_args.with_property?"true":"false"); - fprintf(file, "answer_yes: %s\n", g_args.answer_yes?"true":"false"); fprintf(file, "avro codec: %s\n", g_avro_codec[g_args.avro_codec]); if (strlen(g_args.humanStartTime)) { diff --git a/tests/taosdump/old/taosdumpTest.py b/tests/taosdump/old/taosdumpTest.py index 6d24babe..3f4dad35 100644 --- a/tests/taosdump/old/taosdumpTest.py +++ b/tests/taosdump/old/taosdumpTest.py @@ -99,8 +99,8 @@ def run(self): else: tdLog.info("taosdump found: %s" % binPath) - os.system("%s -y --databases db -o ./taosdumptest/tmp1" % binPath) - os.system("%s -y --databases db1 -o ./taosdumptest/tmp2" % binPath) + os.system("%s --databases db -o ./taosdumptest/tmp1" % binPath) + os.system("%s --databases db1 -o ./taosdumptest/tmp2" % binPath) tdSql.execute("drop database db") tdSql.execute("drop database db1") @@ -190,7 +190,7 @@ def run(self): tdSql.query("show stables") tdSql.checkRows(2) os.system( - "%s -y --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" + "%s --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" % binPath ) tdSql.execute("drop database db12312313231231321312312312_323") diff --git a/tests/taosdump/old/taosdumpTest2.py b/tests/taosdump/old/taosdumpTest2.py index f78d5044..9618ac41 100644 --- a/tests/taosdump/old/taosdumpTest2.py +++ b/tests/taosdump/old/taosdumpTest2.py @@ -105,7 +105,7 @@ def run(self): tdSql.query("show databases") tdSql.checkRows(2) - os.system("%s -i ./taosdumptest/tmp -y" % binPath) + os.system("%s -i ./taosdumptest/tmp " % binPath) tdSql.query("show databases") tdSql.checkRows(3) @@ -137,13 +137,13 @@ def run(self): os.system("rm ./taosdumptest/tmp/*.sql") os.system("rm ./taosdumptest/tmp/*.avro*") os.system("rm -rf ./taosdumptest/tmp/taosdump.*") - os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath) + os.system("%s -D test -o ./taosdumptest/tmp " % binPath) tdSql.execute("drop database test") tdSql.query("show databases") tdSql.checkRows(3) - os.system("%s -i ./taosdumptest/tmp -y" % binPath) + os.system("%s -i ./taosdumptest/tmp " % binPath) tdSql.execute("use test") tdSql.query("show stables") diff --git a/tests/taosdump/old/taosdumpTestNanoSupport.py b/tests/taosdump/old/taosdumpTestNanoSupport.py index 66702820..f76d2d77 100644 --- a/tests/taosdump/old/taosdumpTestNanoSupport.py +++ b/tests/taosdump/old/taosdumpTestNanoSupport.py @@ -144,15 +144,15 @@ def run(self): # dump all data - os.system("%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) + os.system("%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) # dump part data with -S -E os.system( - "%s -y -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000 -o ./taosdumptest/dumptmp2 " + "%s -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000 -o ./taosdumptest/dumptmp2 " % binPath ) os.system( - "%s -y -g --databases timedb1 -S 1625068810000000000 -o ./taosdumptest/dumptmp3 " + "%s -g --databases timedb1 -S 1625068810000000000 -o ./taosdumptest/dumptmp3 " % binPath ) @@ -203,14 +203,14 @@ def run(self): self.createdb(precision="us") - os.system("%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) + os.system("%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) os.system( - "%s -y -g --databases timedb1 -S 1625068810000000 -E 1625068860000000 -o ./taosdumptest/dumptmp2 " + "%s -g --databases timedb1 -S 1625068810000000 -E 1625068860000000 -o ./taosdumptest/dumptmp2 " % binPath ) os.system( - "%s -y -g --databases timedb1 -S 1625068810000000 -o ./taosdumptest/dumptmp3 " + "%s -g --databases timedb1 -S 1625068810000000 -o ./taosdumptest/dumptmp3 " % binPath ) @@ -265,14 +265,14 @@ def run(self): self.createdb(precision="ms") - os.system("%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) + os.system("%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) os.system( - "%s -y -g --databases timedb1 -S 1625068810000 -E 1625068860000 -o ./taosdumptest/dumptmp2 " + "%s -g --databases timedb1 -S 1625068810000 -E 1625068860000 -o ./taosdumptest/dumptmp2 " % binPath ) os.system( - "%s -y -g --databases timedb1 -S 1625068810000 -o ./taosdumptest/dumptmp3 " + "%s -g --databases timedb1 -S 1625068810000 -o ./taosdumptest/dumptmp3 " % binPath )