Merge pull request #820 from taosdata/merge/new_3.0_to_main

New merge 3.0 to main from branch
taosdata · Nov 21, 2024 · 1b3bafd · 1b3bafd
2 parents 5a7814f + 589923f
commit 1b3bafd
Show file tree

Hide file tree

Showing 46 changed files with 1,711 additions and 379 deletions.
diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml
@@ -131,7 +131,7 @@ jobs:
           cd TDengine
           mkdir debug ||:
           cd debug
-          cmake .. -DBUILD_JDBC=false -DBUILD_HTTP=false -DWEBSOCKET=true > /dev/null
+          cmake .. -DBUILD_JDBC=false -DBUILD_HTTP=false -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /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

diff --git a/.github/workflows/3.0-macos-debug.yml b/.github/workflows/3.0-macos-debug.yml
@@ -5,12 +5,10 @@ on:
     - cron: "10 16 * * *"
   push:
     branches:
-      - develop
       - 3.0
       - main
   pull_request:
     branches:
-      - develop
       - 3.0
       - main
 
@@ -65,8 +63,7 @@ jobs:
 
       - name: Checkout TDengine
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         uses: actions/checkout@v2
@@ -76,9 +73,8 @@ jobs:
           ref: ${{ github.event.pull_request.base.ref }}
 
       - name: Change time zone
-        if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+        if: |          
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
@@ -87,8 +83,7 @@ jobs:
 
       - name: Set up homebrew
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
@@ -98,8 +93,7 @@ jobs:
 
       - name: Set up Go
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         uses: actions/setup-go@v3
@@ -108,8 +102,7 @@ jobs:
 
       - name: Set up Rust
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         uses: actions-rs/toolchain@v1.0.6
@@ -118,8 +111,7 @@ jobs:
 
       - uses: actions/cache@v3
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         id: cache-rust
@@ -133,12 +125,11 @@ jobs:
 
       - name: Build & Install TDengine
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          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 -j2 > /dev/null && sudo make install > /dev/null
+          cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /dev/null && make -j12 > /dev/null && sudo make install > /dev/null
           if [[ ! -f /usr/local/bin/taosd ]] || [[ ! -f /usr/local/bin/taosadapter ]]
           then
             echo "TDengine build failure"
@@ -147,35 +138,38 @@ jobs:
 
       - name: Install packages for build taos-tools
         if:
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
           echo "install package for taos-tools"
 
       - name: Checkout taos-tools to PR number
         if:
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
         run: |
           git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
           git checkout -qf FETCH_HEAD
 
       - name: Build taos-tools
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
-          mkdir debug ||:
+          pwd
+          find ./ -name libtaosws.dylib
+          find ./ -name libtaos.dylib
+          mkdir debug
+          mkdir debug/build
+          mkdir debug/build/lib/
+          cp ./TDengine/debug/build/lib/libtaosws.dylib debug/build/lib/
+          cp ./TDengine/debug/build/lib/libtaos.dylib debug/build/lib/          
           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
           #if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]]
           if [[ ! -f /usr/local/bin/taosBenchmark ]]
           then
             echo "taos-tools build failure"
             exit 1
-          fi
-
+          fi
diff --git a/.github/workflows/3.0-macos-release.yml b/.github/workflows/3.0-macos-release.yml
@@ -65,8 +65,7 @@ jobs:
 
       - name: Checkout TDengine
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         uses: actions/checkout@v2
@@ -77,8 +76,7 @@ jobs:
 
       - name: Change time zone
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
@@ -87,8 +85,7 @@ jobs:
 
       - name: Set up homebrew
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
@@ -98,8 +95,7 @@ jobs:
 
       - name: Set up Go
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         uses: actions/setup-go@v3
@@ -108,8 +104,7 @@ jobs:
 
       - name: Set up Rust
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         uses: actions-rs/toolchain@v1.0.6
@@ -118,8 +113,7 @@ jobs:
 
       - uses: actions/cache@v3
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         id: cache-rust
@@ -133,12 +127,11 @@ jobs:
 
       - name: Build & Install TDengine
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          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 -j2 > /dev/null && sudo make install > /dev/null
+          cd TDengine && mkdir debug && cd debug && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /dev/null && make -j12 > /dev/null && sudo make install > /dev/null
           if [[ ! -f /usr/local/bin/taosd ]] || [[ ! -f /usr/local/bin/taosadapter ]]
           then
             echo "TDengine build failure"
@@ -147,29 +140,33 @@ jobs:
 
       - name: Install packages for build taos-tools
         if:
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
           echo "install package for taos-tools"
 
       - name: Checkout taos-tools to PR number
         if:
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
         run: |
           git fetch origin +refs/pull/${{env.PR_NUMBER}}/merge
           git checkout -qf FETCH_HEAD
 
       - name: Build taos-tools
         if: |
-          (steps.changed-files-specific.outputs.any_changed == 'true'
-          && github.event_name == 'pull_request')
+          github.event_name == 'pull_request'
           || github.event_name == 'push'
           || github.event_name == 'schedule'
         run: |
-          mkdir debug ||:
+          pwd
+          find ./ -name libtaosws.dylib
+          find ./ -name libtaos.dylib
+          mkdir debug
+          mkdir debug/build
+          mkdir debug/build/lib/
+          cp ./TDengine/debug/build/lib/libtaosws.dylib debug/build/lib/
+          cp ./TDengine/debug/build/lib/libtaos.dylib debug/build/lib/                    
           cd debug
           cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true > /dev/null && make -j8 > /dev/null && sudo make install > /dev/null
           #if [[ ! -f /usr/local/taos/bin/taosdump ]] || [[ ! -f /usr/local/taos/bin/taosBenchmark ]]

diff --git a/.github/workflows/3.0-taosbenchmark-debug.yml b/.github/workflows/3.0-taosbenchmark-debug.yml
@@ -119,7 +119,7 @@ jobs:
           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 \
+            && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /dev/null \
             && make -j8 > /dev/null && sudo make install > /dev/null \
             && cd .. && rm -rf debug
           if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taosadapter ]]
@@ -155,7 +155,7 @@ jobs:
         run: |
           mkdir debug ||:
           cd debug
-          cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZE=true -DWEBSOCKET=true > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null
+          cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZE=true -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /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/3.0-taosbenchmark-release.yml b/.github/workflows/3.0-taosbenchmark-release.yml
@@ -119,8 +119,8 @@ jobs:
           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 -j8 > /dev/null && sudo make install > /dev/null \
+            && cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /dev/null \
+            && make -j10 > /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
@@ -155,7 +155,7 @@ jobs:
         run: |
           mkdir debug ||:
           cd debug
-          cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true > /dev/null && make -j2 > /dev/null && sudo make install > /dev/null
+          cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /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/3.0-taosdump-debug.yml b/.github/workflows/3.0-taosdump-debug.yml
@@ -107,8 +107,8 @@ jobs:
           sudo apt install libgflags2.2 libgflags-dev -y > /dev/null
           cd TDengine
           mkdir debug && cd debug
-          cmake .. -DBUILD_HTTP=false > /dev/null
-          make -j2 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug
+          cmake .. -DBUILD_HTTP=false -DBUILD_DEPENDENCY_TESTS=false > /dev/null
+          make -j10 > /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"
@@ -141,7 +141,7 @@ jobs:
           mkdir debug ||:
           cd debug
           cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZE=true > /dev/null
-          make -j2 > /dev/null && sudo make install > /dev/null
+          make -j10 > /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/3.0-taosdump-release-ws.yml b/.github/workflows/3.0-taosdump-release-ws.yml
@@ -135,8 +135,8 @@ jobs:
           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
+          cmake .. -DBUILD_HTTP=false -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /dev/null
+          make -j10 > /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"
@@ -176,8 +176,8 @@ jobs:
         run: |
           mkdir debug ||:
           cd debug
-          cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true > /dev/null
-          make -j2 > /dev/null && sudo make install > /dev/null
+          cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DWEBSOCKET=true -DBUILD_DEPENDENCY_TESTS=false > /dev/null
+          make -j10 > /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/3.0-taosdump-release.yml b/.github/workflows/3.0-taosdump-release.yml
@@ -107,8 +107,8 @@ jobs:
           sudo apt install libgflags2.2 libgflags-dev -y > /dev/null
           cd TDengine
           mkdir debug && cd debug
-          cmake .. -DBUILD_HTTP=false > /dev/null
-          make -j2 > /dev/null && sudo make install > /dev/null && cd .. && rm -rf debug
+          cmake .. -DBUILD_HTTP=false -DBUILD_DEPENDENCY_TESTS=false > /dev/null
+          make -j10 > /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"
@@ -141,7 +141,7 @@ jobs:
           mkdir debug ||:
           cd debug
           cmake .. -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} > /dev/null
-          make -j2 > /dev/null && sudo make install > /dev/null
+          make -j10 > /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/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml
@@ -121,6 +121,11 @@ jobs:
           toolchain: stable
 
       - name : Delete TDengine/debug folder
+        if:
+          (steps.changed-files-specific.outputs.any_changed == 'true'
+          && github.event_name == 'pull_request')
+          || github.event_name == 'push'
+          || github.event_name == 'schedule'
         run: |
           Get-ChildItem -Path "TDengine/debug" -Recurse -Force | Remove-Item -Force -Recurse
 
@@ -135,7 +140,7 @@ jobs:
         run: |
           cl.exe
           cd TDengine/debug
-          cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true && jom /j 8 && jom install
+          cmake .. -G "NMake Makefiles JOM" -DBUILD_TOOLS=true -DBUILD_DEPENDENCY_TESTS=false && jom /j 8 && jom install
           #cmake .. -G "NMake Makefiles" -DBUILD_HTTP=false -DBUILD_TOOLS=true -DWEBSOCKET=true && nmake && nmake install
 
           #      - name: taosdump codec Test

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -67,7 +67,7 @@ jobs:
           cd TDengine
           mkdir debug
           cd debug
-          cmake .. -DBUILD_JDBC=false -DBUILD_HTTP=true -DBUILD_TOOLS=true -DTOOLS_COVER=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZER=true
+          cmake .. -DBUILD_JDBC=false -DBUILD_HTTP=true -DBUILD_TOOLS=true -DTOOLS_COVER=true -DTOOLS_BUILD_TYPE=${{env.TOOLS_BUILD_TYPE}} -DTOOLS_SANITIZER=true -DBUILD_DEPENDENCY_TESTS=false
           make > /dev/null
           sudo make install > /dev/null
           if [[ ! -f /usr/local/bin/taosdump ]] && [[ ! -f /usr/local/bin/taosBenchmark ]]