fix: taosbenchmark stb rest socket (#651)

* fix: convert server addr in stb section * test: change test branch
taosdata · Apr 23, 2023 · 4378702 · 4378702
1 parent ffc2e6f
commit 4378702
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/3.0-alpine.yml b/.github/workflows/3.0-alpine.yml
@@ -99,7 +99,7 @@ jobs:
         shell: alpine.sh --root {0}
         run: |
 
-          git clone --branch fix/sangshuduo/TS-3072-escape --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1
+          git clone --branch fix/sangshuduo/taosbenchmark-stb-rest-socket-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
           if [[ ! -f /usr/local/taos/bin/taosd ]] || [[ ! -f /usr/local/taos/bin/taos ]]
           then

diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml
@@ -64,7 +64,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TS-3072-escape'
+          ref: 'fix/sangshuduo/taosbenchmark-stb-rest-socket-main'
 
       - name: create debug directory
         if: |

diff --git a/src/benchInsert.c b/src/benchInsert.c
@@ -150,6 +150,10 @@ static int queryDbExec(SDataBase *database,
                        SSuperTable *stbInfo, char *command) {
     int ret = 0;
     if (REST_IFACE == stbInfo->iface) {
+        if (0 != convertServAddr(stbInfo->iface, false, 1)) {
+            errorPrint("%s", "Failed to convert server address\n");
+            return -1;
+        }
         int sockfd = createSockFd();
         if (sockfd < 0) {
             ret = -1;