fix: taosbenchmark handle mem better (#562)

taosdata · Feb 1, 2023 · a0234fe · a0234fe
1 parent 181bcac
commit a0234fe
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/3.0-coveralls.yml b/.github/workflows/3.0-coveralls.yml
@@ -70,7 +70,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if:

diff --git a/.github/workflows/3.0-macos-debug.yml b/.github/workflows/3.0-macos-debug.yml
@@ -64,7 +64,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if: |

diff --git a/.github/workflows/3.0-macos-release.yml b/.github/workflows/3.0-macos-release.yml
@@ -64,7 +64,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if: |

diff --git a/.github/workflows/3.0-non-x64.yml b/.github/workflows/3.0-non-x64.yml
@@ -134,7 +134,7 @@ jobs:
 
             echo "clone TDengine 3.0 on ${{ steps.setup.outputs.uname }}"
 
-            git clone --branch fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine --depth 1 https://github.com/taosdata/TDengine > /dev/null || exit 1
+            git clone --branch fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better --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
@@ -61,7 +61,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if: |

diff --git a/.github/workflows/3.0-taosBenchmark-release.yml b/.github/workflows/3.0-taosBenchmark-release.yml
@@ -61,7 +61,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if: |

diff --git a/.github/workflows/3.0-taosdump-debug.yml b/.github/workflows/3.0-taosdump-debug.yml
@@ -65,7 +65,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if:

diff --git a/.github/workflows/3.0-taosdump-release-ws.yml b/.github/workflows/3.0-taosdump-release-ws.yml
@@ -65,7 +65,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if:

diff --git a/.github/workflows/3.0-taosdump-release.yml b/.github/workflows/3.0-taosdump-release.yml
@@ -65,7 +65,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: Change time zone
         if:

diff --git a/.github/workflows/3.0-windows-build.yml b/.github/workflows/3.0-windows-build.yml
@@ -62,7 +62,7 @@ jobs:
         with:
           repository: 'taosdata/TDengine'
           path: 'TDengine'
-          ref: 'fix/sangshuduo/TD-21932-taosbenchmark-schemaless-refine'
+          ref: 'fix/sangshuduo/TS-2526-taosbenchmark-handle-mem-better'
 
       - name: create debug directory
         if: |

diff --git a/src/benchMain.c b/src/benchMain.c
@@ -37,8 +37,8 @@ void* benchCancelHandler(void* arg) {
     toolsMsleep(10);
 
     if (g_arguments->in_prompt || INSERT_TEST != g_arguments->test_mode) {
+        toolsMsleep(100);
         postFreeResource();
-        toolsMsleep(10);
         exit(EXIT_SUCCESS);
     }
     return NULL;

diff --git a/src/benchUtilDs.c b/src/benchUtilDs.c
@@ -14,6 +14,7 @@
 
 static dstr * ds_header(char *s)
 {
+    if (NULL == s) return NULL;
     dstr *ds = (dstr *)(s - DS_HEADER_SIZE);
 
     if (ds->magic != MAGIC_NUMBER)
@@ -29,7 +30,7 @@ char * new_ds(size_t cap)
     ds = malloc(DS_HEADER_SIZE + cap + 1);
     if (ds == NULL)
     {
-        perror("newds()->malloc()");
+        errorPrint("%s()->malloc()\n", __func__);
         exit(1);
     }
 
@@ -48,7 +49,7 @@ void free_ds(char **ps)
 
     if (ds == NULL)
     {
-        printf("freeds(): not a dynamic string");
+        debugPrint("%s(): not a dynamic string\n", __func__);
         exit(1);
     }
 
@@ -124,7 +125,7 @@ char * ds_resize(char **ps, size_t cap)
     s = realloc(s - DS_HEADER_SIZE, DS_HEADER_SIZE + cap + 1);
     if (s == NULL)
     {
-        perror("resizeds()->realloc()");
+        errorPrint("%s()->realloc()\n", __func__);
         exit(1);
     }
     s += DS_HEADER_SIZE;