merge with master branch.

Jenkinsfile

@@ -171,6 +171,7 @@ def pre_test_win(){
       } 
     }
     bat '''
+    taskkill /f /t /im python.exe
     cd C:\\workspace\\TDinternal
     git pull 
 
@@ -180,9 +181,9 @@ def pre_test_win(){
     cd debug
     call "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
     cmake ../ -G "NMake Makefiles" 
-    nmake
-    nmake install 
-    xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32
+    nmake || exit 8
+    nmake install || exit 8
+    xcopy /e/y/i/f C:\\workspace\\TDinternal\\debug\\build\\lib\\taos.dll C:\\Windows\\System32 || exit 8
     cd C:\\workspace\\TDinternal\\community\\src\\connector\\python
     python -m pip install .
     
@@ -466,11 +467,13 @@ pipeline {
             
             catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                 pre_test_win()
+                timeout(time: 20, unit: 'MINUTES'){
                 bat'''
                 cd C:\\workspace\\TDinternal\\community\\tests\\pytest
                 .\\test-all.bat Wintest
                 '''
                 }
+            }     
             script{
               win_stop=1
             }

src/client/src/tscSQLParser.c

@@ -2029,6 +2029,7 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
   const char* msg6 = "not support distinct mixed with join"; 
   const char* msg7 = "not support distinct mixed with groupby";
   const char* msg8 = "not support distinct in nest query";
+  const char* msg9 = "not support group by in block func";
 
   // too many result columns not support order by in query
   if (taosArrayGetSize(pSelNodeList) > TSDB_MAX_COLUMNS) {
@@ -2064,6 +2065,10 @@ int32_t validateSelectNodeList(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SArray* pS
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
+      if (pItem->pNode->functionId == TSDB_FUNC_BLKINFO && pQueryInfo->groupbyExpr.numOfGroupCols > 0) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg9);
+      }
+
       SUdfInfo* pUdfInfo = NULL;
       if (pItem->pNode->functionId < 0) {
         pUdfInfo = isValidUdf(pQueryInfo->pUdfInfo, pItem->pNode->Expr.operand.z, pItem->pNode->Expr.operand.n);

src/kit/taosdump/taosdump.c

@@ -1020,25 +1020,25 @@ static void dumpCreateMTableClause(
                     strcasecmp(tableDes->cols[counter].type, "nchar") == 0) {
                 //pstr += sprintf(pstr, ", \'%s\'", tableDes->cols[counter].note);
                 if (tableDes->cols[counter].var_value) {
-                    pstr += sprintf(pstr, ", %s",
+                    pstr += sprintf(pstr, ", \'%s\'",
                             tableDes->cols[counter].var_value);
                 } else {
-                    pstr += sprintf(pstr, ", %s", tableDes->cols[counter].value);
+                    pstr += sprintf(pstr, ", \'%s\'", tableDes->cols[counter].value);
                 }
             } else {
-                pstr += sprintf(pstr, ", %s", tableDes->cols[counter].value);
+                pstr += sprintf(pstr, ", \'%s\'", tableDes->cols[counter].value);
             }
         } else {
             if (strcasecmp(tableDes->cols[counter].type, "binary") == 0 ||
                     strcasecmp(tableDes->cols[counter].type, "nchar") == 0) {
                 //pstr += sprintf(pstr, "\'%s\'", tableDes->cols[counter].note);
                 if (tableDes->cols[counter].var_value) {
-                    pstr += sprintf(pstr, "%s", tableDes->cols[counter].var_value);
+                    pstr += sprintf(pstr, "\'%s\'", tableDes->cols[counter].var_value);
                 } else {
-                    pstr += sprintf(pstr, "%s", tableDes->cols[counter].value);
+                    pstr += sprintf(pstr, "\'%s\'", tableDes->cols[counter].value);
                 }
             } else {
-                pstr += sprintf(pstr, "%s", tableDes->cols[counter].value);
+                pstr += sprintf(pstr, "\'%s\'", tableDes->cols[counter].value);
             }
             /* pstr += sprintf(pstr, "%s", tableDes->cols[counter].note); */
         }
@@ -1149,6 +1149,10 @@ static int64_t dumpNormalTable(
         colCount = getTableDes(dbName, tbName, tableDes, false);
 
         if (colCount < 0) {
+            errorPrint("%s() LN%d, failed to get table[%s] schema\n",
+                    __func__,
+                    __LINE__,
+                    tbName);
             free(tableDes);
             return -1;
         }
@@ -1159,6 +1163,10 @@ static int64_t dumpNormalTable(
         colCount = getTableDes(dbName, tbName, tableDes, false);
 
         if (colCount < 0) {
+            errorPrint("%s() LN%d, failed to get table[%s] schema\n",
+                    __func__,
+                    __LINE__,
+                    tbName);
             free(tableDes);
             return -1;
         }
@@ -1171,20 +1179,21 @@ static int64_t dumpNormalTable(
     if (g_args.avro) {
         if (0 != convertTbDesToAvroSchema(
                     dbName, tbName, tableDes, colCount, &jsonAvroSchema)) {
+            errorPrint("%s() LN%d, convertTbDesToAvroSchema failed\n",
+                    __func__,
+                    __LINE__);
             freeTbDes(tableDes);
             return -1;
         }
     }
 
-    tfree(tableDes);
-
     int64_t ret = 0;
     if (!g_args.schemaonly) {
         ret = dumpTableData(fp, tbName, dbName, precision,
             jsonAvroSchema);
     }
 
-    tfree(jsonAvroSchema);
+    freeTbDes(tableDes);
     return ret;
 }
 
@@ -1281,20 +1290,23 @@ static void *dumpNtbOfDb(void *arg) {
         return NULL;
     }
 
+    int64_t count;
     for (int64_t i = 0; i < pThreadInfo->tablesOfDumpOut; i++) {
         debugPrint("[%d] No.\t%"PRId64" table name: %s\n",
                 pThreadInfo->threadIndex, i,
                 ((TableInfo *)(g_tablesList + pThreadInfo->tableFrom+i))->name);
-        dumpNormalTable(
+        count = dumpNormalTable(
                 pThreadInfo->dbName,
                 ((TableInfo *)(g_tablesList + pThreadInfo->tableFrom+i))->stable,
                 ((TableInfo *)(g_tablesList + pThreadInfo->tableFrom+i))->name,
                 pThreadInfo->precision,
                 fp);
+        if (count < 0) {
+            break;
+        }
     }
 
     fclose(fp);
-
     return NULL;
 }
 
@@ -1340,16 +1352,20 @@ static void *dumpNormalTablesOfStb(void *arg) {
 
     TAOS_ROW row = NULL;
     int64_t i = 0;
+    int64_t count;
     while((row = taos_fetch_row(res)) != NULL) {
         debugPrint("[%d] sub table %"PRId64": name: %s\n",
                 pThreadInfo->threadIndex, i++, (char *)row[TSDB_SHOW_TABLES_NAME_INDEX]);
 
-        dumpNormalTable(
+        count = dumpNormalTable(
                 pThreadInfo->dbName,
                 pThreadInfo->stbName,
                 (char *)row[TSDB_SHOW_TABLES_NAME_INDEX],
                 pThreadInfo->precision,
                 fp);
+        if (count < 0) {
+            break;
+        }
     }
 
     fclose(fp);
@@ -2006,9 +2022,9 @@ static int getTableDes(
 
         if (row[TSDB_SHOW_TABLES_NAME_INDEX] == NULL) {
             sprintf(tableDes->cols[i].note, "%s", "NUL");
+            sprintf(tableDes->cols[i].value, "%s", "NULL");
             taos_free_result(res);
             res = NULL;
-            taos_close(taos);
             continue;
         }
 
@@ -2050,26 +2066,22 @@ static int getTableDes(
                 int len = strlen((char *)row[0]);
                 // FIXME for long value
                 if (len < (COL_VALUEBUF_LEN - 2)) {
-                    tableDes->cols[i].value[0] = '\'';
                     converStringToReadable(
                             (char *)row[0],
                             length[0],
-                            tableDes->cols[i].value + 1,
+                            tableDes->cols[i].value,
                             len);
-                    tableDes->cols[i].value[len+1] = '\'';
                 } else {
-                    tableDes->cols[i].var_value = calloc(1, len + 2);
+                    tableDes->cols[i].var_value = calloc(1, len * 2);
                     if (tableDes->cols[i].var_value == NULL) {
                         errorPrint("%s() LN%d, memory alalocation failed!\n",
                                 __func__, __LINE__);
                         taos_free_result(res);
                         return -1;
                     }
-                    tableDes->cols[i].var_value[0] = '\'';
                     converStringToReadable((char *)row[0],
                             length[0],
-                            (char *)(tableDes->cols[i].var_value + 1), len);
-                    tableDes->cols[i].var_value[len+1] = '\'';
+                            (char *)(tableDes->cols[i].var_value), len);
                 }
                 break;
 

src/os/src/detail/osTime.c

@@ -374,8 +374,10 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
           return time;
       }
     } //end from nano
-    default:
+    default: {
       assert(0);
+      return time;  // only to pass windows compilation
+    }
   } //end switch fromPrecision
 }
 

tests/pytest/crash_gen/valgrind_taos.supp

@@ -18231,3 +18231,20 @@
    obj:/usr/bin/python3.8
    obj:/usr/bin/python3.8
 }
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   obj:/usr/bin/python3.8
+   fun:_PyObject_MakeTpCall
+   fun:_PyEval_EvalFrameDefault
+   obj:/usr/bin/python3.8
+   fun:_PyObject_MakeTpCall
+   fun:_PyEval_EvalFrameDefault
+   obj:/usr/bin/python3.8
+   fun:_PyEval_EvalFrameDefault
+   obj:/usr/bin/python3.8
+   fun:_PyEval_EvalFrameDefault
+   fun:_PyEval_EvalCodeWithName
+}
\ No newline at end of file

tests/pytest/fulltest.sh

@@ -45,7 +45,7 @@ python3 ./test.py -f table/del_stable.py
 
 #stable
 python3 ./test.py -f stable/insert.py
-# python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py 
+python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJsonStmt.py 
 
 # tag
 python3 ./test.py -f tag_lite/filter.py
@@ -211,7 +211,7 @@ python3 ./test.py -f perfbenchmark/bug3433.py
 python3 ./test.py -f perfbenchmark/taosdemoInsert.py
 
 #taosdemo
-# python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py 
+python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py 
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
 
 #query

tests/pytest/tools/insert-interlace.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/insert-tblimit-tboffset-createdb.json

@@ -21,7 +21,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/insert-tblimit-tboffset-insertrec.json

@@ -21,7 +21,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/insert-tblimit-tboffset.json

@@ -21,7 +21,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/insert-tblimit-tboffset0.json

@@ -21,7 +21,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/insert-tblimit1-tboffset.json

@@ -21,7 +21,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-1s1tnt1r.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-1s1tntmr.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-disorder.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-illegal.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-interlace-row.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-interval-speed.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-newdb.json

@@ -22,7 +22,7 @@
             "cache": 16,    
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-newtable.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-nodbnodrop.json

@@ -22,7 +22,7 @@
             "cache": 16,    
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-offset.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-renewdb.json

@@ -22,7 +22,7 @@
             "cache": 16,    
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-sample.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insert-timestep.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertBinaryLenLarge16374AllcolLar49151.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertChildTab0.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertChildTabLess0.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertColumnsAndTagNum4096.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertColumnsAndTagNumLarge4096.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertColumnsNum0.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertInterlaceRowsLarge1M.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertNumOfrecordPerReq0.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertNumOfrecordPerReqless0.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertRestful.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertSigcolumnsNum4096.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/insertTagsNumLarge128.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit1.json

@@ -23,7 +23,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit5.json

@@ -23,7 +23,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/moredemo-offset-limit94.json

@@ -23,7 +23,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/moredemo-offset-newdb.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/query-interrupt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/queryInsertdata.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/queryInsertrestdata.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-1s1tnt1r-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-1s1tntmr-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-disorder-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-interlace-row-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-interval-speed-stmt.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-newdb-stmt.json

@@ -22,7 +22,7 @@
             "cache": 16,    
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-newtable-stmt.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-nodbnodrop-stmt.json

@@ -22,7 +22,7 @@
             "cache": 16,    
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-offset-stmt.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-renewdb-stmt.json

@@ -22,7 +22,7 @@
             "cache": 16,    
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-sample-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insert-timestep-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertBinaryLenLarge16374AllcolLar49151-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertChildTab0-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertChildTabLess0-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertColumnsAndTagNum4096-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertColumnsNum0-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertInterlaceRowsLarge1M-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertNumOfrecordPerReq0-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertNumOfrecordPerReqless0-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertSigcolumnsNum4096-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/insertTagsNumLarge128-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/stmt/nsertColumnsAndTagNumLarge4096-stmt.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/subInsertdata.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/subInsertdataMaxsql100.json

@@ -22,7 +22,7 @@
             "cache": 16,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,