Merge branch 'main' of github.com:taosdata/driver-go into 3.0

# Conflicts: # taosWS/connection.go
i-Things · Sep 3, 2024 · 54d9c02 · 54d9c02
2 parents cf89a10 + 84b60e0
commit 54d9c02
Show file tree

Hide file tree

Showing 73 changed files with 10,383 additions and 1,887 deletions.
diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
@@ -0,0 +1,140 @@
+name: compatibility
+
+on:
+  pull_request:
+    branches:
+      - '3.1'
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        td_version: [ 'main', '3.0' ]
+    name: Build ${{ matrix.td_version }}
+    outputs:
+      commit_id: ${{ steps.get_commit_id.outputs.commit_id }}
+    steps:
+      - name: checkout TDengine by pr
+        if: github.event_name == 'pull_request'
+        uses: actions/checkout@v3
+        with:
+          repository: 'taosdata/TDengine'
+          path: 'TDengine'
+          ref: ${{ matrix.td_version }}
+
+      - name: get_commit_id
+        id: get_commit_id
+        run: |
+          cd TDengine
+          echo "commit_id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+
+
+      - name: Cache server by pr
+        if: github.event_name == 'pull_request'
+        id: cache-server-pr
+        uses: actions/cache@v3
+        with:
+          path: server.tar.gz
+          key: ${{ runner.os }}-build-${{ matrix.td_version }}-${{ steps.get_commit_id.outputs.commit_id }}
+
+      - name: prepare install
+        if: >
+          (github.event_name == 'pull_request' && steps.cache-server-pr.outputs.cache-hit != 'true')
+        run: sudo apt install -y libgeos-dev
+
+      - name: install TDengine
+        if: >
+          (github.event_name == 'pull_request' && steps.cache-server-pr.outputs.cache-hit != 'true')
+        run: |
+          cd TDengine
+          mkdir debug
+          cd debug
+          cmake .. -DBUILD_TEST=off -DBUILD_HTTP=false -DVERNUMBER=3.9.9.9 
+          make -j 4
+
+      - name: package
+        if: >
+          (github.event_name == 'pull_request' && steps.cache-server-pr.outputs.cache-hit != 'true')
+        run: |
+          mkdir -p ./release
+          cp ./TDengine/debug/build/bin/taos ./release/
+          cp ./TDengine/debug/build/bin/taosd ./release/
+          cp ./TDengine/tools/taosadapter/taosadapter ./release/
+          cp ./TDengine/debug/build/lib/libtaos.so.3.9.9.9 ./release/
+          cp ./TDengine/debug/build/lib/librocksdb.so.8.1.1 ./release/ ||:
+          cp ./TDengine/include/client/taos.h ./release/
+          cat >./release/install.sh<<EOF 
+          chmod +x ./taos
+          chmod +x ./taosd
+          chmod +x ./taosadapter
+          cp ./taos /bin/
+          cp ./taosd /bin/
+          cp ./taosadapter /bin/
+          cp ./libtaos.so.3.9.9.9 /usr/lib
+          cp ./librocksdb.so.8.1.1 /usr/lib ||:
+          ln -sf /usr/lib/libtaos.so.3.9.9.9 /usr/lib/libtaos.so.1
+          ln -sf /usr/lib/libtaos.so.1 /usr/lib/libtaos.so
+          ln -sf /usr/lib/librocksdb.so.8.1.1 /usr/lib/librocksdb.so.8 ||:
+          ln -sf /usr/lib/librocksdb.so.8 /usr/lib/librocksdb.so ||:
+          cp ./taos.h /usr/include
+          EOF
+          tar -zcvf server.tar.gz ./release
+
+  test:
+    runs-on: ubuntu-22.04
+    needs: build
+    strategy:
+      matrix:
+        go: [ '1.14', 'stable' ]
+        td_version: [ 'main', '3.0' ]
+    name: Go ${{ matrix.td_version }} ${{ matrix.go }}
+    steps:
+      - name: get cache server by pr
+        if: github.event_name == 'pull_request'
+        id: get-cache-server-pr
+        uses: actions/cache@v3
+        with:
+          path: server.tar.gz
+          key: ${{ runner.os }}-build-${{ matrix.td_version }}-${{ needs.build.outputs.commit_id }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ matrix.td_version }}-
+
+
+      - name: prepare install
+        run: sudo apt install -y libgeos-dev
+
+      - name: install
+        run: |
+          tar -zxvf server.tar.gz
+          cd release && sudo sh install.sh
+
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: copy taos cfg
+        run: |
+          sudo mkdir -p /etc/taos
+          sudo cp ./.github/workflows/taos.cfg /etc/taos/taos.cfg
+          sudo cp ./.github/workflows/taosadapter.toml /etc/taos/taosadapter.toml
+
+      - name: shell
+        run: |
+          cat >start.sh<<EOF 
+          ulimit -n 65535 && TAOS_SUPPORT_VNODES=256 taosd
+          EOF
+
+      - name: taosd
+        run: nohup sudo sh ./start.sh &
+
+      - name: start taosadapter
+        run: sudo taosadapter &
+
+      - name: Set up Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go }}
+          cache-dependency-path: go.sum
+
+      - name: Test
+        run: sudo go test -v --count=1 -coverprofile=coverage.txt -covermode=atomic ./...
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -5,15 +5,14 @@ on:
     branches:
       - 'main'
       - '3.0'
+      - '3.1'
   workflow_dispatch:
     inputs:
       tbBranch:
         description: 'TDengine branch'
         required: true
         type: string
 
-env:
-  SCCACHE_GHA_ENABLED: "true"
 
 jobs:
   build:
@@ -44,8 +43,6 @@ jobs:
           cd TDengine
           echo "commit_id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
-      - name: Run sccache-cache
-        uses: mozilla-actions/[email protected]
 
       - name: Cache server by pr
         if: github.event_name == 'pull_request'
@@ -77,7 +74,7 @@ jobs:
           cd TDengine
           mkdir debug
           cd debug
-          cmake .. -DBUILD_TEST=off -DBUILD_HTTP=false -DVERNUMBER=3.9.9.9 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+          cmake .. -DBUILD_TEST=off -DBUILD_HTTP=false -DVERNUMBER=3.9.9.9 
           make -j 4
 
       - name: package
@@ -114,7 +111,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        go: [ '1.14', '1.19' ]
+        go: [ '1.14', 'stable' ]
     name: Go ${{ matrix.go }}
     steps:
       - name: get cache server by pr
@@ -137,11 +134,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-build-${{ inputs.tbBranch }}-
 
-      - name: checkout
-        uses: actions/checkout@v3
-        with:
-          path: 'driver-go'
-
       - name: prepare install
         run: sudo apt install -y libgeos-dev
 
@@ -150,6 +142,15 @@ jobs:
           tar -zxvf server.tar.gz
           cd release && sudo sh install.sh
 
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: copy taos cfg
+        run: |
+          sudo mkdir -p /etc/taos
+          sudo cp ./.github/workflows/taos.cfg /etc/taos/taos.cfg
+          sudo cp ./.github/workflows/taosadapter.toml /etc/taos/taosadapter.toml
+
       - name: shell
         run: |
           cat >start.sh<<EOF 
@@ -166,7 +167,15 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
-          cache-dependency-path: driver-go/go.sum
+          cache-dependency-path: go.sum
 
       - name: Test
-        run: cd ./driver-go && go test -v ./...
+        run: sudo go test -v --count=1 -coverprofile=coverage.txt -covermode=atomic ./...
+
+      - name: Upload coverage to Codecov
+        if: ${{ matrix.go }} == 'stable'
+        uses: codecov/codecov-action@v4-beta
+        with:
+          files: ./coverage.txt
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -5,9 +5,8 @@ on:
     branches:
       - 'main'
       - '3.0'
+      - '3.1'
 
-env:
-  SCCACHE_GHA_ENABLED: "true"
 
 jobs:
   build:
@@ -29,8 +28,6 @@ jobs:
           cd TDengine
           echo "commit_id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
-      - name: Run sccache-cache
-        uses: mozilla-actions/[email protected]
 
       - name: Cache server
         id: cache-server
@@ -43,16 +40,14 @@ jobs:
         if: steps.cache-server.outputs.cache-hit != 'true'
         run: sudo apt install -y libgeos-dev
 
-      - name: Run sccache-cache
-        uses: mozilla-actions/[email protected]
 
       - name: install TDengine
         if: steps.cache-server.outputs.cache-hit != 'true'
         run: |
           cd TDengine
           mkdir debug
           cd debug
-          cmake .. -DBUILD_JDBC=false -DBUILD_TEST=off -DBUILD_HTTP=false -DVERNUMBER=3.9.9.9 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+          cmake .. -DBUILD_JDBC=false -DBUILD_TEST=off -DBUILD_HTTP=false -DVERNUMBER=3.9.9.9
           make -j 4
 
       - name: package
@@ -87,7 +82,7 @@ jobs:
     needs: build
     strategy:
       matrix:
-        go: [ '1.14', '1.19' ]
+        go: [ '1.14', 'stable' ]
     name: Go ${{ matrix.go }}
     steps:
       - name: get cache server
@@ -99,11 +94,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-build-${{ github.ref_name }}-
 
-      - name: checkout
-        uses: actions/checkout@v3
-        with:
-          path: 'driver-go'
-
       - name: prepare install
         run: sudo apt install -y libgeos-dev
 
@@ -112,6 +102,15 @@ jobs:
           tar -zxvf server.tar.gz
           cd release && sudo sh install.sh
 
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: copy taos cfg
+        run: |
+          sudo mkdir -p /etc/taos
+          sudo cp ./.github/workflows/taos.cfg /etc/taos/taos.cfg
+          sudo cp ./.github/workflows/taosadapter.toml /etc/taos/taosadapter.toml
+
       - name: shell
         run: |
           cat >start.sh<<EOF 
@@ -128,7 +127,15 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
-          cache-dependency-path: driver-go/go.sum
+          cache-dependency-path: go.sum
 
       - name: Test
-        run: cd ./driver-go && go test -v ./...
+        run: sudo go test -v --count=1 -coverprofile=coverage.txt -covermode=atomic ./...
+
+      - name: Upload coverage to Codecov
+        if: ${{ matrix.go }} == 'stable'
+        uses: codecov/codecov-action@v4-beta
+        with:
+          files: ./coverage.txt
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_ORG_TOKEN }}
diff --git a/.github/workflows/taos.cfg b/.github/workflows/taos.cfg
@@ -0,0 +1,5 @@
+fqdn localhost
+firstEp localhost:6030
+asyncLog 0
+debugFlag 143
+supportVnodes 256