From 1cba56860434f9053026523b132aeaa236b7afe6 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 11 Nov 2022 15:22:00 +0800
Subject: [PATCH 01/85] fix(query): report error if certain function query
 stable has duplicate timestamps

TD-19892
---
 source/libs/executor/src/executorimpl.c |  6 +++-
 source/libs/function/src/builtins.c     |  4 +--
 source/libs/function/src/builtinsimpl.c | 41 +++++++++++++++++++------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/source/libs/executor/src/executorimpl.c b/source/libs/executor/src/executorimpl.c
index 7d662f8784..5d4986186e 100644
--- a/source/libs/executor/src/executorimpl.c
+++ b/source/libs/executor/src/executorimpl.c
@@ -653,7 +653,11 @@ int32_t projectApplyFunctions(SExprInfo* pExpr, SSDataBlock* pResult, SSDataBloc
           pfCtx->pDstBlock = pResult;
         }
 
-        numOfRows = pfCtx->fpSet.process(pfCtx);
+        int32_t code = pfCtx->fpSet.process(pfCtx);
+        if (code != TSDB_CODE_SUCCESS) {
+          return code;
+        }
+        numOfRows = pResInfo->numOfRes;
       } else if (fmIsAggFunc(pfCtx->functionId)) {
         // selective value output should be set during corresponding function execution
         if (fmIsSelectValueFunc(pfCtx->functionId)) {
diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index d3f03e8e9c..69b0ff1096 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -2640,8 +2640,8 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "diff",
     .type = FUNCTION_TYPE_DIFF,
-    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_KEEP_ORDER_FUNC | 
-                      FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_CUMULATIVE_FUNC,
+    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_IMPLICIT_TS_FUNC |
+                      FUNC_MGT_KEEP_ORDER_FUNC | FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_CUMULATIVE_FUNC,
     .translateFunc = translateDiff,
     .getEnvFunc   = getDiffFuncEnv,
     .initFunc     = diffFunctionSetup,
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 6eb57c1a18..3f9fe46acd 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -3325,6 +3325,7 @@ bool diffFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo) {
   SDiffInfo* pDiffInfo = GET_ROWCELL_INTERBUF(pResInfo);
   pDiffInfo->hasPrev = false;
   pDiffInfo->prev.i64 = 0;
+  pDiffInfo->prevTs = -1;
   if (pCtx->numOfParams > 1) {
     pDiffInfo->ignoreNegative = pCtx->param[1].param.i;  // TODO set correct param
   } else {
@@ -3335,7 +3336,7 @@ bool diffFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResInfo) {
   return true;
 }
 
-static void doSetPrevVal(SDiffInfo* pDiffInfo, int32_t type, const char* pv) {
+static void doSetPrevVal(SDiffInfo* pDiffInfo, int32_t type, const char* pv, int64_t ts) {
   switch (type) {
     case TSDB_DATA_TYPE_BOOL:
       pDiffInfo->prev.i64 = *(bool*)pv ? 1 : 0;
@@ -3362,11 +3363,13 @@ static void doSetPrevVal(SDiffInfo* pDiffInfo, int32_t type, const char* pv) {
     default:
       ASSERT(0);
   }
+  pDiffInfo->prevTs = ts;
 }
 
 static void doHandleDiff(SDiffInfo* pDiffInfo, int32_t type, const char* pv, SColumnInfoData* pOutput, int32_t pos,
-                         int32_t order) {
+                         int32_t order, int64_t ts) {
   int32_t factor = (order == TSDB_ORDER_ASC) ? 1 : -1;
+  pDiffInfo->prevTs = ts;
   switch (type) {
     case TSDB_DATA_TYPE_INT: {
       int32_t v = *(int32_t*)pv;
@@ -3450,6 +3453,8 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
 
   SColumnInfoData* pInputCol = pInput->pData[0];
 
+  TSKEY* tsList = (int64_t*)pInput->pPTS->pData;
+
   int32_t numOfElems = 0;
   int32_t startOffset = pCtx->offset;
 
@@ -3471,7 +3476,10 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
       char* pv = colDataGetData(pInputCol, i);
 
       if (pDiffInfo->hasPrev) {
-        doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order);
+        if (tsList[i] == pDiffInfo->prevTs) {
+          return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+        }
+        doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order, tsList[i]);
         // handle selectivity
         if (pCtx->subsidiaries.num > 0) {
           appendSelectivityValue(pCtx, i, pos);
@@ -3479,7 +3487,7 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
 
         numOfElems++;
       } else {
-        doSetPrevVal(pDiffInfo, pInputCol->info.type, pv);
+        doSetPrevVal(pDiffInfo, pInputCol->info.type, pv, tsList[i]);
       }
 
       pDiffInfo->hasPrev = true;
@@ -3501,7 +3509,10 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
 
       // there is a row of previous data block to be handled in the first place.
       if (pDiffInfo->hasPrev) {
-        doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order);
+        if (tsList[i] == pDiffInfo->prevTs) {
+          return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+        }
+        doHandleDiff(pDiffInfo, pInputCol->info.type, pv, pOutput, pos, pCtx->order, tsList[i]);
         // handle selectivity
         if (pCtx->subsidiaries.num > 0) {
           appendSelectivityValue(pCtx, i, pos);
@@ -3509,15 +3520,15 @@ int32_t diffFunction(SqlFunctionCtx* pCtx) {
 
         numOfElems++;
       } else {
-        doSetPrevVal(pDiffInfo, pInputCol->info.type, pv);
+        doSetPrevVal(pDiffInfo, pInputCol->info.type, pv, tsList[i]);
       }
 
       pDiffInfo->hasPrev = true;
     }
   }
 
-  // initial value is not set yet
-  return numOfElems;
+  pResInfo->numOfRes = numOfElems;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t getTopBotInfoSize(int64_t numOfItems) { return sizeof(STopBotRes) + numOfItems * sizeof(STopBotResItem); }
@@ -6137,6 +6148,9 @@ int32_t derivativeFunction(SqlFunctionCtx* pCtx) {
       if (!pDerivInfo->valueSet) {  // initial value is not set yet
         pDerivInfo->valueSet = true;
       } else {
+        if (tsList[i] == pDerivInfo->prevTs) {
+          return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+        }
         double r = ((v - pDerivInfo->prevValue) * pDerivInfo->tsWindow) / (tsList[i] - pDerivInfo->prevTs);
         if (pDerivInfo->ignoreNegative && r < 0) {
         } else {
@@ -6175,6 +6189,9 @@ int32_t derivativeFunction(SqlFunctionCtx* pCtx) {
       if (!pDerivInfo->valueSet) {  // initial value is not set yet
         pDerivInfo->valueSet = true;
       } else {
+        if (tsList[i] == pDerivInfo->prevTs) {
+          return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+        }
         double r = ((pDerivInfo->prevValue - v) * pDerivInfo->tsWindow) / (pDerivInfo->prevTs - tsList[i]);
         if (pDerivInfo->ignoreNegative && r < 0) {
         } else {
@@ -6202,7 +6219,9 @@ int32_t derivativeFunction(SqlFunctionCtx* pCtx) {
     }
   }
 
-  return numOfElems;
+  pResInfo->numOfRes = numOfElems;
+
+  return TSDB_CODE_SUCCESS;
 }
 
 bool getIrateFuncEnv(struct SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
@@ -6267,11 +6286,15 @@ int32_t irateFunction(SqlFunctionCtx* pCtx) {
       pRateInfo->lastKey = tsList[i];
 
       continue;
+    } else if (tsList[i] == pRateInfo->lastKey) {
+      return TSDB_CODE_FUNC_DUP_TIMESTAMP;
     }
 
     if ((INT64_MIN == pRateInfo->firstKey) || tsList[i] > pRateInfo->firstKey) {
       pRateInfo->firstValue = v;
       pRateInfo->firstKey = tsList[i];
+    } else if (tsList[i] == pRateInfo->firstKey) {
+      return TSDB_CODE_FUNC_DUP_TIMESTAMP;
     }
   }
 

From eec1b0bfb0bfe8d2417d3cd3d4302169e0c2f169 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 11 Nov 2022 15:22:00 +0800
Subject: [PATCH 02/85] fix(query): report error if certain function query
 stable has duplicate timestamps

TD-19892
---
 source/libs/function/src/builtins.c     |  8 +++++---
 source/libs/function/src/builtinsimpl.c | 27 ++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 69b0ff1096..38c022fc6f 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -2653,7 +2653,8 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "statecount",
     .type = FUNCTION_TYPE_STATE_COUNT,
-    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_FORBID_STREAM_FUNC,
+    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_IMPLICIT_TS_FUNC |
+                      FUNC_MGT_FORBID_STREAM_FUNC,
     .translateFunc = translateStateCount,
     .getEnvFunc   = getStateFuncEnv,
     .initFunc     = functionSetup,
@@ -2664,7 +2665,8 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "stateduration",
     .type = FUNCTION_TYPE_STATE_DURATION,
-    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_IMPLICIT_TS_FUNC | FUNC_MGT_FORBID_STREAM_FUNC,
+    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_IMPLICIT_TS_FUNC |
+                      FUNC_MGT_FORBID_STREAM_FUNC,
     .translateFunc = translateStateDuration,
     .getEnvFunc   = getStateFuncEnv,
     .initFunc     = functionSetup,
@@ -2675,7 +2677,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "csum",
     .type = FUNCTION_TYPE_CSUM,
-    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | 
+    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC |
                       FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_CUMULATIVE_FUNC | FUNC_MGT_KEEP_ORDER_FUNC,
     .translateFunc = translateCsum,
     .getEnvFunc   = getCsumFuncEnv,
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 3f9fe46acd..60befbfba8 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -190,6 +190,8 @@ typedef struct SStateInfo {
     int64_t count;
     int64_t durationStart;
   };
+  int64_t prevTs;
+  bool    isPrevTsSet;
 } SStateInfo;
 
 typedef enum {
@@ -4879,6 +4881,7 @@ int32_t stateCountFunction(SqlFunctionCtx* pCtx) {
   SStateInfo*          pInfo = GET_ROWCELL_INTERBUF(pResInfo);
 
   SInputColumnInfoData* pInput = &pCtx->input;
+  TSKEY*                tsList = (int64_t*)pInput->pPTS->pData;
 
   SColumnInfoData* pInputCol = pInput->pData[0];
 
@@ -4891,7 +4894,15 @@ int32_t stateCountFunction(SqlFunctionCtx* pCtx) {
   }
 
   for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; i += 1) {
+    if (pInfo->isPrevTsSet == true && tsList[i] == pInfo->prevTs) {
+      return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+    } else {
+      pInfo->prevTs = tsList[i];
+    }
+
+    pInfo->isPrevTsSet = true;
     numOfElems++;
+
     if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
       colDataAppendNULL(pOutput, i);
       // handle selectivity
@@ -4917,7 +4928,8 @@ int32_t stateCountFunction(SqlFunctionCtx* pCtx) {
     }
   }
 
-  return numOfElems;
+  pResInfo->numOfRes = numOfElems;
+  return TSDB_CODE_SUCCESS;
 }
 
 int32_t stateDurationFunction(SqlFunctionCtx* pCtx) {
@@ -4940,11 +4952,19 @@ int32_t stateDurationFunction(SqlFunctionCtx* pCtx) {
 
   int8_t op = getStateOpType(varDataVal(pCtx->param[1].param.pz));
   if (STATE_OPER_INVALID == op) {
-    return 0;
+    return TSDB_CODE_INVALID_PARA;
   }
 
   for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; i += 1) {
+    if (pInfo->isPrevTsSet == true && tsList[i] == pInfo->prevTs) {
+      return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+    } else {
+      pInfo->prevTs = tsList[i];
+    }
+
+    pInfo->isPrevTsSet = true;
     numOfElems++;
+
     if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
       colDataAppendNULL(pOutput, i);
       // handle selectivity
@@ -4974,7 +4994,8 @@ int32_t stateDurationFunction(SqlFunctionCtx* pCtx) {
     }
   }
 
-  return numOfElems;
+  pResInfo->numOfRes = numOfElems;
+  return TSDB_CODE_SUCCESS;
 }
 
 bool getCsumFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {

From 2b53f7be8417c95bcfb2daab201063b90c1fcaf4 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Fri, 11 Nov 2022 15:22:00 +0800
Subject: [PATCH 03/85] fix(query): report error if certain function query
 stable has duplicate timestamps

TD-19892
---
 source/libs/function/src/builtins.c     |  5 +++--
 source/libs/function/src/builtinsimpl.c | 29 +++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/source/libs/function/src/builtins.c b/source/libs/function/src/builtins.c
index 38c022fc6f..cfd94479cb 100644
--- a/source/libs/function/src/builtins.c
+++ b/source/libs/function/src/builtins.c
@@ -2677,7 +2677,7 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "csum",
     .type = FUNCTION_TYPE_CSUM,
-    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC |
+    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_IMPLICIT_TS_FUNC |
                       FUNC_MGT_FORBID_STREAM_FUNC | FUNC_MGT_CUMULATIVE_FUNC | FUNC_MGT_KEEP_ORDER_FUNC,
     .translateFunc = translateCsum,
     .getEnvFunc   = getCsumFuncEnv,
@@ -2690,7 +2690,8 @@ const SBuiltinFuncDefinition funcMgtBuiltins[] = {
   {
     .name = "mavg",
     .type = FUNCTION_TYPE_MAVG,
-    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_FORBID_STREAM_FUNC,
+    .classification = FUNC_MGT_INDEFINITE_ROWS_FUNC | FUNC_MGT_SELECT_FUNC | FUNC_MGT_TIMELINE_FUNC | FUNC_MGT_IMPLICIT_TS_FUNC |
+                      FUNC_MGT_FORBID_STREAM_FUNC,
     .translateFunc = translateMavg,
     .getEnvFunc   = getMavgFuncEnv,
     .initFunc     = mavgFunctionSetup,
diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 60befbfba8..f23333a6d8 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -48,6 +48,9 @@ typedef struct SSumRes {
     double   dsum;
   };
   int16_t type;
+  int64_t prevTs; // used for csum only
+  bool    isPrevTsSet; //used for csum only
+
 } SSumRes;
 
 typedef struct SAvgRes {
@@ -207,6 +210,8 @@ typedef enum {
 typedef struct SMavgInfo {
   int32_t pos;
   double  sum;
+  int64_t prevTs;
+  bool    isPrevTsSet;
   int32_t numOfPoints;
   bool    pointsMeet;
   double  points[];
@@ -5008,6 +5013,7 @@ int32_t csumFunction(SqlFunctionCtx* pCtx) {
   SSumRes*             pSumRes = GET_ROWCELL_INTERBUF(pResInfo);
 
   SInputColumnInfoData* pInput = &pCtx->input;
+  TSKEY*                tsList = (int64_t*)pInput->pPTS->pData;
 
   SColumnInfoData* pInputCol = pInput->pData[0];
   SColumnInfoData* pOutput = (SColumnInfoData*)pCtx->pOutput;
@@ -5016,6 +5022,13 @@ int32_t csumFunction(SqlFunctionCtx* pCtx) {
   int32_t type = pInputCol->info.type;
   int32_t startOffset = pCtx->offset;
   for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; i += 1) {
+    if (pSumRes->isPrevTsSet == true && tsList[i] == pSumRes->prevTs) {
+      return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+    } else {
+      pSumRes->prevTs = tsList[i];
+    }
+    pSumRes->isPrevTsSet = true;
+
     int32_t pos = startOffset + numOfElems;
     if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
       // colDataAppendNULL(pOutput, i);
@@ -5053,7 +5066,8 @@ int32_t csumFunction(SqlFunctionCtx* pCtx) {
     numOfElems++;
   }
 
-  return numOfElems;
+  pResInfo->numOfRes = numOfElems;
+  return TSDB_CODE_SUCCESS;
 }
 
 bool getMavgFuncEnv(SFunctionNode* UNUSED_PARAM(pFunc), SFuncExecEnv* pEnv) {
@@ -5069,6 +5083,8 @@ bool mavgFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
   SMavgInfo* pInfo = GET_ROWCELL_INTERBUF(pResultInfo);
   pInfo->pos = 0;
   pInfo->sum = 0;
+  pInfo->prevTs = -1;
+  pInfo->isPrevTsSet = false;
   pInfo->numOfPoints = pCtx->param[1].param.i;
   if (pInfo->numOfPoints < 1 || pInfo->numOfPoints > MAVG_MAX_POINTS_NUM) {
     return false;
@@ -5083,6 +5099,7 @@ int32_t mavgFunction(SqlFunctionCtx* pCtx) {
   SMavgInfo*           pInfo = GET_ROWCELL_INTERBUF(pResInfo);
 
   SInputColumnInfoData* pInput = &pCtx->input;
+  TSKEY*                tsList = (int64_t*)pInput->pPTS->pData;
 
   SColumnInfoData* pInputCol = pInput->pData[0];
   SColumnInfoData* pTsOutput = pCtx->pTsOutput;
@@ -5092,6 +5109,13 @@ int32_t mavgFunction(SqlFunctionCtx* pCtx) {
   int32_t type = pInputCol->info.type;
   int32_t startOffset = pCtx->offset;
   for (int32_t i = pInput->startRowIndex; i < pInput->numOfRows + pInput->startRowIndex; i += 1) {
+    if (pInfo->isPrevTsSet == true && tsList[i] == pInfo->prevTs) {
+      return TSDB_CODE_FUNC_DUP_TIMESTAMP;
+    } else {
+      pInfo->prevTs = tsList[i];
+    }
+    pInfo->isPrevTsSet = true;
+
     int32_t pos = startOffset + numOfElems;
     if (colDataIsNull_f(pInputCol->nullbitmap, i)) {
       // colDataAppendNULL(pOutput, i);
@@ -5136,7 +5160,8 @@ int32_t mavgFunction(SqlFunctionCtx* pCtx) {
     }
   }
 
-  return numOfElems;
+  pResInfo->numOfRes = numOfElems;
+  return TSDB_CODE_SUCCESS;
 }
 
 static SSampleInfo* getSampleOutputInfo(SqlFunctionCtx* pCtx) {

From cf021b433011be4e8f8daba7c526fd9e25fddf0d Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao@163.com>
Date: Tue, 15 Nov 2022 09:11:26 +0800
Subject: [PATCH 04/85] fix:applying non-zero offset in tqSink.c

---
 source/dnode/vnode/src/tq/tqSink.c  |  6 ++++-
 tests/script/tsim/stream/basic1.sim | 35 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tq/tqSink.c b/source/dnode/vnode/src/tq/tqSink.c
index f782411084..b2624d1bc1 100644
--- a/source/dnode/vnode/src/tq/tqSink.c
+++ b/source/dnode/vnode/src/tq/tqSink.c
@@ -31,7 +31,11 @@ int32_t tqBuildDeleteReq(SVnode* pVnode, const char* stbFullName, const SSDataBl
     int64_t ts = *(int64_t*)colDataGetData(pTsCol, row);
     int64_t groupId = *(int64_t*)colDataGetData(pGidCol, row);
     char*   name;
-    void*   varTbName = colDataGetVarData(pTbNameCol, row);
+    void*   varTbName = NULL;
+    if (!colDataIsNull(pTbNameCol, totRow, row, NULL)) {
+      varTbName = colDataGetVarData(pTbNameCol, row);
+    }
+
     if (varTbName != NULL && varTbName != (void*)-1) {
       name = taosMemoryCalloc(1, TSDB_TABLE_NAME_LEN);
       memcpy(name, varDataVal(varTbName), varDataLen(varTbName));
diff --git a/tests/script/tsim/stream/basic1.sim b/tests/script/tsim/stream/basic1.sim
index bb6604687c..bc076a194b 100644
--- a/tests/script/tsim/stream/basic1.sim
+++ b/tests/script/tsim/stream/basic1.sim
@@ -751,5 +751,40 @@ if $rows != 0 then
 endi
 
 
+sql insert into t1 values(1648791223000,2,2,3,1.0);
+sql insert into t1 values(1648791223000,10,2,3,1.0);
+sql insert into t1 values(1648791233000,10,2,3,1.0);
+
+$loop_count = 0
+loop16:
+sleep 200
+sql select * from streamt4;
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+if $rows != 2 then
+  print =====rows=$rows
+  goto loop16
+endi
+
+sql insert into t1 values(1648791233000,2,2,3,1.0);
+
+$loop_count = 0
+loop17:
+sleep 200
+sql select * from streamt4;
+
+$loop_count = $loop_count + 1
+if $loop_count == 10 then
+  return -1
+endi
+
+if $rows != 1 then
+  print =====rows=$rows
+  goto loop17
+endi
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

From 4ae870bd81d78040f074a969d0c050a96133ac37 Mon Sep 17 00:00:00 2001
From: Pan YANG <arielyang@gmail.com>
Date: Tue, 15 Nov 2022 09:24:20 +0800
Subject: [PATCH 05/85] docs: resolve ambiguous taosadapter heading

---
 docs/zh/14-reference/04-taosadapter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/14-reference/04-taosadapter.md b/docs/zh/14-reference/04-taosadapter.md
index ec023afd71..4e1e7b7ace 100644
--- a/docs/zh/14-reference/04-taosadapter.md
+++ b/docs/zh/14-reference/04-taosadapter.md
@@ -32,7 +32,7 @@ taosAdapter 提供以下功能：
 
 taosAdapter 是 TDengine 服务端软件 的一部分，如果您使用 TDengine server 您不需要任何额外的步骤来安装 taosAdapter。您可以从[涛思数据官方网站](https://taosdata.com/cn/all-downloads/)下载 TDengine server 安装包。如果需要将 taosAdapter 分离部署在 TDengine server 之外的服务器上，则应该在该服务器上安装完整的 TDengine 来安装 taosAdapter。如果您需要使用源代码编译生成 taosAdapter，您可以参考[构建 taosAdapter](https://github.com/taosdata/taosadapter/blob/3.0/BUILD-CN.md)文档。
 
-### start/stop taosAdapter
+### 启动/停止 taosAdapter
 
 在 Linux 系统上 taosAdapter 服务默认由 systemd 管理。使用命令 `systemctl start taosadapter` 可以启动 taosAdapter 服务。使用命令 `systemctl stop taosadapter` 可以停止 taosAdapter 服务。
 

From 14b4adc6ce79038ba9890c1f451fce260d57ff17 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Tue, 15 Nov 2022 09:39:17 +0800
Subject: [PATCH 06/85] fix: memory leak

---
 source/libs/scalar/src/filter.c |  24 ++---
 source/libs/scalar/src/scalar.c | 149 +++++++++++++++++---------------
 2 files changed, 91 insertions(+), 82 deletions(-)

diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index df9a818fee..f5376eaf9e 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -248,9 +248,9 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) {
     }
   }
 
-//  if (optr == OP_TYPE_JSON_CONTAINS && type == TSDB_DATA_TYPE_JSON) {
-//    return 28;
-//  }
+  //  if (optr == OP_TYPE_JSON_CONTAINS && type == TSDB_DATA_TYPE_JSON) {
+  //    return 28;
+  //  }
 
   switch (type) {
     case TSDB_DATA_TYPE_BOOL:
@@ -1087,7 +1087,7 @@ int32_t filterAddUnitImpl(SFilterInfo *info, uint8_t optr, SFilterFieldId *left,
     if (tmp == NULL) {
       return TSDB_CODE_OUT_OF_MEMORY;
     }
-    info->units = (SFilterUnit*)tmp;
+    info->units = (SFilterUnit *)tmp;
     memset(info->units + psize, 0, sizeof(*info->units) * FILTER_DEFAULT_UNIT_SIZE);
   }
 
@@ -1169,7 +1169,7 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) {
 
     SScalarParam out = {.columnData = taosMemoryCalloc(1, sizeof(SColumnInfoData))};
     out.columnData->info.type = type;
-    out.columnData->info.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes; //reserved space for simple_copy
+    out.columnData->info.bytes = tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes;  // reserved space for simple_copy
 
     for (int32_t i = 0; i < listNode->pNodeList->length; ++i) {
       SValueNode *valueNode = (SValueNode *)cell->pNode;
@@ -1191,7 +1191,7 @@ int32_t fltAddGroupUnitFromNode(SFilterInfo *info, SNode *tree, SArray *group) {
         filterAddField(info, NULL, (void **)&out.columnData->pData, FLD_TYPE_VALUE, &right, len, true);
         out.columnData->pData = NULL;
       } else {
-        void *data = taosMemoryCalloc(1, tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes); //reserved space for simple_copy
+        void *data = taosMemoryCalloc(1, tDataTypes[TSDB_DATA_TYPE_BIGINT].bytes);  // reserved space for simple_copy
         if (NULL == data) {
           FLT_ERR_RET(TSDB_CODE_QRY_OUT_OF_MEMORY);
         }
@@ -1633,11 +1633,11 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options)
 
           SValueNode *var = (SValueNode *)field->desc;
           SDataType  *dType = &var->node.resType;
-          //if (dType->type == TSDB_DATA_TYPE_VALUE_ARRAY) {
-          //  qDebug("VAL%d => [type:TS][val:[%" PRIi64 "] - [%" PRId64 "]]", i, *(int64_t *)field->data,
-          //         *(((int64_t *)field->data) + 1));
-          //} else {
-            qDebug("VAL%d => [type:%d][val:%" PRIx64 "]", i, dType->type, var->datum.i);  // TODO
+          // if (dType->type == TSDB_DATA_TYPE_VALUE_ARRAY) {
+          //   qDebug("VAL%d => [type:TS][val:[%" PRIi64 "] - [%" PRId64 "]]", i, *(int64_t *)field->data,
+          //          *(((int64_t *)field->data) + 1));
+          // } else {
+          qDebug("VAL%d => [type:%d][val:%" PRIx64 "]", i, dType->type, var->datum.i);  // TODO
           //}
         } else if (field->data) {
           qDebug("VAL%d => [type:NIL][val:NIL]", i);  // TODO
@@ -1719,7 +1719,7 @@ void filterDumpInfoToString(SFilterInfo *info, const char *msg, int32_t options)
                ctx->isrange);
         if (ctx->isrange) {
           SFilterRangeNode *r = ctx->rs;
-          int32_t tlen = 0;
+          int32_t           tlen = 0;
           while (r) {
             char str[256] = {0};
             if (FILTER_GET_FLAG(r->ra.sflag, RANGE_FLG_NULL)) {
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index fa71009365..00d6ea21a4 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -23,12 +23,13 @@ int32_t scalarGetOperatorParamNum(EOperatorType type) {
 
 int32_t sclConvertToTsValueNode(int8_t precision, SValueNode *valueNode) {
   char   *timeStr = valueNode->datum.p;
-  int32_t code =
-      convertStringToTimestamp(valueNode->node.resType.type, valueNode->datum.p, precision, &valueNode->datum.i);
+  int64_t value = 0;
+  int32_t code = convertStringToTimestamp(valueNode->node.resType.type, valueNode->datum.p, precision, &value);
   if (code != TSDB_CODE_SUCCESS) {
     return code;
   }
   taosMemoryFree(timeStr);
+  valueNode->datum.i = value;
   valueNode->typeData = valueNode->datum.i;
 
   valueNode->node.resType.type = TSDB_DATA_TYPE_TIMESTAMP;
@@ -61,7 +62,7 @@ int32_t sclCreateColumnInfoData(SDataType *pType, int32_t numOfRows, SScalarPara
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t sclConvertValueToSclParam(SValueNode* pValueNode, SScalarParam* out, int32_t* overflow) {
+int32_t sclConvertValueToSclParam(SValueNode *pValueNode, SScalarParam *out, int32_t *overflow) {
   SScalarParam in = {.numOfRows = 1};
   int32_t      code = sclCreateColumnInfoData(&pValueNode->node.resType, 1, &in);
   if (code != TSDB_CODE_SUCCESS) {
@@ -78,7 +79,7 @@ int32_t sclConvertValueToSclParam(SValueNode* pValueNode, SScalarParam* out, int
 }
 
 int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockList) {
-  SSDataBlock* pb = taosArrayGetP(pBlockList, 0);
+  SSDataBlock  *pb = taosArrayGetP(pBlockList, 0);
   SScalarParam *pLeft = taosMemoryCalloc(1, sizeof(SScalarParam));
   if (NULL == pLeft) {
     sclError("calloc %d failed", (int32_t)sizeof(SScalarParam));
@@ -90,7 +91,7 @@ int32_t sclExtendResRows(SScalarParam *pDst, SScalarParam *pSrc, SArray *pBlockL
   if (pDst->numOfRows < pb->info.rows) {
     colInfoDataEnsureCapacity(pDst->columnData, pb->info.rows, true);
   }
-  
+
   _bin_scalar_fn_t OperatorFn = getBinScalarOperatorFn(OP_TYPE_ASSIGN);
   OperatorFn(pLeft, pSrc, pDst, TSDB_ORDER_ASC);
 
@@ -566,7 +567,7 @@ _return:
   SCL_RET(code);
 }
 
-int32_t sclGetNodeRes(SNode* node, SScalarCtx *ctx, SScalarParam **res) {
+int32_t sclGetNodeRes(SNode *node, SScalarCtx *ctx, SScalarParam **res) {
   if (NULL == node) {
     return TSDB_CODE_SUCCESS;
   }
@@ -576,48 +577,53 @@ int32_t sclGetNodeRes(SNode* node, SScalarCtx *ctx, SScalarParam **res) {
   if (NULL == *res) {
     SCL_ERR_RET(TSDB_CODE_OUT_OF_MEMORY);
   }
-  
+
   SCL_ERR_RET(sclInitParam(node, *res, ctx, &rowNum));
 
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell* pCell, SScalarParam *pCase, SScalarParam *pElse, SScalarParam *pComp, SScalarParam *output, int32_t rowIdx, int32_t totalRows, bool *complete) {
-  SNode *node = NULL;
-  SWhenThenNode* pWhenThen = NULL;
-  SScalarParam *pWhen = NULL;
-  SScalarParam *pThen = NULL;
-  int32_t code = 0;
+int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCell, SScalarParam *pCase,
+                            SScalarParam *pElse, SScalarParam *pComp, SScalarParam *output, int32_t rowIdx,
+                            int32_t totalRows, bool *complete) {
+  SNode         *node = NULL;
+  SWhenThenNode *pWhenThen = NULL;
+  SScalarParam  *pWhen = NULL;
+  SScalarParam  *pThen = NULL;
+  int32_t        code = 0;
+
+  for (SListCell *cell = pCell; (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false));
+       cell = cell->pNext) {
+    pWhenThen = (SWhenThenNode *)node;
 
-  for (SListCell* cell = pCell; (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false)); cell = cell->pNext) {
-    pWhenThen = (SWhenThenNode*)node;
-    
     SCL_ERR_RET(sclGetNodeRes(pWhenThen->pWhen, ctx, &pWhen));
     SCL_ERR_RET(sclGetNodeRes(pWhenThen->pThen, ctx, &pThen));
-    
+
     vectorCompareImpl(pCase, pWhen, pComp, rowIdx, 1, TSDB_ORDER_ASC, OP_TYPE_EQUAL);
-    
-    bool *equal = (bool*)colDataGetData(pComp->columnData, rowIdx);
+
+    bool *equal = (bool *)colDataGetData(pComp->columnData, rowIdx);
     if (*equal) {
-      colDataAppend(output->columnData, rowIdx, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)));
+      colDataAppend(output->columnData, rowIdx, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)),
+                    colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)));
 
       if (0 == rowIdx && 1 == pCase->numOfRows && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && totalRows > 1) {
         SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
         *complete = true;
       }
-      
+
       goto _return;
     }
   }
 
   if (pElse) {
-    colDataAppend(output->columnData, rowIdx, colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)));
+    colDataAppend(output->columnData, rowIdx, colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)),
+                  colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)));
 
     if (0 == rowIdx && 1 == pCase->numOfRows && 1 == pElse->numOfRows && totalRows > 1) {
       SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
       *complete = true;
     }
-      
+
     goto _return;
   }
 
@@ -629,7 +635,7 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell*
   }
 
 _return:
-  
+
   sclFreeParam(pWhen);
   sclFreeParam(pThen);
   taosMemoryFree(pWhen);
@@ -638,32 +644,34 @@ _return:
   SCL_RET(code);
 }
 
-int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell* pCell, SScalarParam *pElse, SScalarParam *output, 
-                             int32_t rowIdx, int32_t totalRows, bool *complete, bool preSingle) {
-  SNode *node = NULL;
-  SWhenThenNode* pWhenThen = NULL;
-  SScalarParam *pWhen = NULL;
-  SScalarParam *pThen = NULL;
-  int32_t code = 0;
+int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList *pList, struct SListCell *pCell, SScalarParam *pElse,
+                        SScalarParam *output, int32_t rowIdx, int32_t totalRows, bool *complete, bool preSingle) {
+  SNode         *node = NULL;
+  SWhenThenNode *pWhenThen = NULL;
+  SScalarParam  *pWhen = NULL;
+  SScalarParam  *pThen = NULL;
+  int32_t        code = 0;
 
-  for (SListCell* cell = pCell; (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false)); cell = cell->pNext) {
-    pWhenThen = (SWhenThenNode*)node;
+  for (SListCell *cell = pCell; (NULL != cell ? (node = cell->pNode, true) : (node = NULL, false));
+       cell = cell->pNext) {
+    pWhenThen = (SWhenThenNode *)node;
     pWhen = NULL;
     pThen = NULL;
-    
+
     SCL_ERR_JRET(sclGetNodeRes(pWhenThen->pWhen, ctx, &pWhen));
     SCL_ERR_JRET(sclGetNodeRes(pWhenThen->pThen, ctx, &pThen));
 
-    bool *whenValue = (bool*)colDataGetData(pWhen->columnData, (pWhen->numOfRows > 1 ? rowIdx : 0));
-    
+    bool *whenValue = (bool *)colDataGetData(pWhen->columnData, (pWhen->numOfRows > 1 ? rowIdx : 0));
+
     if (*whenValue) {
-      colDataAppend(output->columnData, rowIdx, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)));
+      colDataAppend(output->columnData, rowIdx, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)),
+                    colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)));
 
       if (preSingle && 0 == rowIdx && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && totalRows > 1) {
         SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
         *complete = true;
       }
-      
+
       goto _return;
     }
 
@@ -674,13 +682,14 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell* pCe
   }
 
   if (pElse) {
-    colDataAppend(output->columnData, rowIdx, colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)));
+    colDataAppend(output->columnData, rowIdx, colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)),
+                  colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)));
 
     if (preSingle && 0 == rowIdx && 1 == pElse->numOfRows && totalRows > 1) {
       SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
       *complete = true;
     }
-      
+
     goto _return;
   }
 
@@ -860,14 +869,14 @@ _return:
 }
 
 int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *output) {
-  int32_t code = 0;
+  int32_t       code = 0;
   SScalarParam *pCase = NULL;
   SScalarParam *pElse = NULL;
   SScalarParam *pWhen = NULL;
   SScalarParam *pThen = NULL;
   SScalarParam  comp = {0};
-  int32_t rowNum = 1;
-  bool complete = false;
+  int32_t       rowNum = 1;
+  bool          complete = false;
 
   if (NULL == node->pWhenThenList || node->pWhenThenList->length <= 0) {
     sclError("invalid whenThen list");
@@ -875,24 +884,24 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp
   }
 
   if (ctx->pBlockList) {
-    SSDataBlock* pb = taosArrayGetP(ctx->pBlockList, 0);
+    SSDataBlock *pb = taosArrayGetP(ctx->pBlockList, 0);
     rowNum = pb->info.rows;
     output->numOfRows = pb->info.rows;
   }
 
   SCL_ERR_JRET(sclCreateColumnInfoData(&node->node.resType, rowNum, output));
-  
+
   SCL_ERR_JRET(sclGetNodeRes(node->pCase, ctx, &pCase));
   SCL_ERR_JRET(sclGetNodeRes(node->pElse, ctx, &pElse));
 
   SDataType compType = {0};
   compType.type = TSDB_DATA_TYPE_BOOL;
   compType.bytes = tDataTypes[compType.type].bytes;
-  
+
   SCL_ERR_JRET(sclCreateColumnInfoData(&compType, rowNum, &comp));
 
-  SNode* tnode = NULL;
-  SWhenThenNode* pWhenThen = (SWhenThenNode*)node->pWhenThenList->pHead->pNode;
+  SNode         *tnode = NULL;
+  SWhenThenNode *pWhenThen = (SWhenThenNode *)node->pWhenThenList->pHead->pNode;
 
   SCL_ERR_JRET(sclGetNodeRes(pWhenThen->pWhen, ctx, &pWhen));
   SCL_ERR_JRET(sclGetNodeRes(pWhenThen->pThen, ctx, &pThen));
@@ -903,17 +912,19 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp
 
   if (pCase) {
     vectorCompare(pCase, pWhen, &comp, TSDB_ORDER_ASC, OP_TYPE_EQUAL);
-    
+
     for (int32_t i = 0; i < rowNum; ++i) {
-      bool *equal = (bool*)colDataGetData(comp.columnData, (comp.numOfRows > 1 ? i : 0));
+      bool *equal = (bool *)colDataGetData(comp.columnData, (comp.numOfRows > 1 ? i : 0));
       if (*equal) {
-        colDataAppend(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)));
+        colDataAppend(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)),
+                      colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)));
         if (0 == i && 1 == pCase->numOfRows && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && rowNum > 1) {
           SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
           break;
         }
       } else {
-        SCL_ERR_JRET(sclWalkCaseWhenList(ctx, node->pWhenThenList, node->pWhenThenList->pHead->pNext, pCase, pElse, &comp, output, i, rowNum, &complete));
+        SCL_ERR_JRET(sclWalkCaseWhenList(ctx, node->pWhenThenList, node->pWhenThenList->pHead->pNext, pCase, pElse,
+                                         &comp, output, i, rowNum, &complete));
         if (complete) {
           break;
         }
@@ -921,15 +932,17 @@ int32_t sclExecCaseWhen(SCaseWhenNode *node, SScalarCtx *ctx, SScalarParam *outp
     }
   } else {
     for (int32_t i = 0; i < rowNum; ++i) {
-      bool *whenValue = (bool*)colDataGetData(pWhen->columnData, (pWhen->numOfRows > 1 ? i : 0));
+      bool *whenValue = (bool *)colDataGetData(pWhen->columnData, (pWhen->numOfRows > 1 ? i : 0));
       if (*whenValue) {
-        colDataAppend(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)));
+        colDataAppend(output->columnData, i, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)),
+                      colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? i : 0)));
         if (0 == i && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && rowNum > 1) {
           SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
           break;
         }
       } else {
-        SCL_ERR_JRET(sclWalkWhenList(ctx, node->pWhenThenList, node->pWhenThenList->pHead->pNext, pElse, output, i, rowNum, &complete, (pWhen->numOfRows == 1 && pThen->numOfRows == 1)));
+        SCL_ERR_JRET(sclWalkWhenList(ctx, node->pWhenThenList, node->pWhenThenList->pHead->pNext, pElse, output, i,
+                                     rowNum, &complete, (pWhen->numOfRows == 1 && pThen->numOfRows == 1)));
         if (complete) {
           break;
         }
@@ -965,7 +978,6 @@ _return:
   SCL_RET(code);
 }
 
-
 EDealRes sclRewriteNullInOptr(SNode **pNode, SScalarCtx *ctx, EOperatorType opType) {
   if (opType <= OP_TYPE_CALC_MAX) {
     SValueNode *res = (SValueNode *)nodesMakeNode(QUERY_NODE_VALUE);
@@ -1089,8 +1101,7 @@ EDealRes sclRewriteNonConstOperator(SNode **pNode, SScalarCtx *ctx) {
 EDealRes sclRewriteFunction(SNode **pNode, SScalarCtx *ctx) {
   SFunctionNode *node = (SFunctionNode *)*pNode;
   SNode         *tnode = NULL;
-  if ((!fmIsScalarFunc(node->funcId) && (!ctx->dual)) ||
-      fmIsUserDefinedFunc(node->funcId)) {
+  if ((!fmIsScalarFunc(node->funcId) && (!ctx->dual)) || fmIsUserDefinedFunc(node->funcId)) {
     return DEAL_RES_CONTINUE;
   }
 
@@ -1229,20 +1240,20 @@ EDealRes sclRewriteOperator(SNode **pNode, SScalarCtx *ctx) {
   return DEAL_RES_CONTINUE;
 }
 
-EDealRes sclRewriteCaseWhen(SNode** pNode, SScalarCtx *ctx) {
+EDealRes sclRewriteCaseWhen(SNode **pNode, SScalarCtx *ctx) {
   SCaseWhenNode *node = (SCaseWhenNode *)*pNode;
 
   if ((!SCL_IS_CONST_NODE(node->pCase)) || (!SCL_IS_CONST_NODE(node->pElse))) {
     return DEAL_RES_CONTINUE;
   }
 
-  SNode* tnode = NULL;
+  SNode *tnode = NULL;
   FOREACH(tnode, node->pWhenThenList) {
-    SWhenThenNode* pWhenThen = (SWhenThenNode*)tnode;
+    SWhenThenNode *pWhenThen = (SWhenThenNode *)tnode;
     if (!SCL_IS_CONST_NODE(pWhenThen->pWhen) || !SCL_IS_CONST_NODE(pWhenThen->pThen)) {
       return DEAL_RES_CONTINUE;
     }
-  }  
+  }
 
   SScalarParam output = {0};
   ctx->code = sclExecCaseWhen(node, ctx, &output);
@@ -1275,13 +1286,12 @@ EDealRes sclRewriteCaseWhen(SNode** pNode, SScalarCtx *ctx) {
   }
 
   nodesDestroyNode(*pNode);
-  *pNode = (SNode*)res;
+  *pNode = (SNode *)res;
 
   sclFreeParam(&output);
   return DEAL_RES_CONTINUE;
 }
 
-
 EDealRes sclConstantsRewriter(SNode **pNode, void *pContext) {
   SScalarCtx *ctx = (SScalarCtx *)pContext;
 
@@ -1408,9 +1418,9 @@ EDealRes sclWalkTarget(SNode *pNode, SScalarCtx *ctx) {
   return DEAL_RES_CONTINUE;
 }
 
-EDealRes sclWalkCaseWhen(SNode* pNode, SScalarCtx *ctx) {
+EDealRes sclWalkCaseWhen(SNode *pNode, SScalarCtx *ctx) {
   SCaseWhenNode *node = (SCaseWhenNode *)pNode;
-  SScalarParam output = {0};
+  SScalarParam   output = {0};
 
   ctx->code = sclExecCaseWhen(node, ctx, &output);
   if (ctx->code) {
@@ -1425,11 +1435,10 @@ EDealRes sclWalkCaseWhen(SNode* pNode, SScalarCtx *ctx) {
   return DEAL_RES_CONTINUE;
 }
 
-
 EDealRes sclCalcWalker(SNode *pNode, void *pContext) {
-  if (QUERY_NODE_VALUE == nodeType(pNode) || QUERY_NODE_NODE_LIST == nodeType(pNode) 
-   || QUERY_NODE_COLUMN == nodeType(pNode) || QUERY_NODE_LEFT_VALUE == nodeType(pNode)
-   || QUERY_NODE_WHEN_THEN == nodeType(pNode)) {
+  if (QUERY_NODE_VALUE == nodeType(pNode) || QUERY_NODE_NODE_LIST == nodeType(pNode) ||
+      QUERY_NODE_COLUMN == nodeType(pNode) || QUERY_NODE_LEFT_VALUE == nodeType(pNode) ||
+      QUERY_NODE_WHEN_THEN == nodeType(pNode)) {
     return DEAL_RES_CONTINUE;
   }
 

From 3b1cd27367bc730c4b1a6f351bd572a3d88a3fc1 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Tue, 15 Nov 2022 09:52:34 +0800
Subject: [PATCH 07/85] test:add test case for future timestamp insert

---
 tests/system-test/1-insert/InsertFuturets.py | 106 +++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 tests/system-test/1-insert/InsertFuturets.py

diff --git a/tests/system-test/1-insert/InsertFuturets.py b/tests/system-test/1-insert/InsertFuturets.py
new file mode 100644
index 0000000000..a2f335e626
--- /dev/null
+++ b/tests/system-test/1-insert/InsertFuturets.py
@@ -0,0 +1,106 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+
+import math
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.common import *
+from util.sqlset import *
+import time
+import datetime
+class TDTestCase:
+    def init(self, conn, logSql, replicaVar=1):
+        self.replicaVar = int(replicaVar)
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor())
+        self.timestamp_ms = int(round(time.time()*1000))
+        self.timestamp_us = int(round(time.time()*1000000))
+        self.timestamp_ns = int(time.time_ns())
+        self.ms_boundary = 31556995200000
+        self.us_boundary = 31556995200000000
+        self.ns_boundary = 9214646400000000000
+        self.ntbname = 'ntb'
+        self.stbname = 'stb'
+        self.ctbname = 'ctb'
+    def insert_check(self,timestamp,tbname):
+        tdSql.execute(f'insert into {tbname} values({timestamp},1)')
+        tdSql.query(f'select * from {tbname} where ts = {timestamp}')
+        tdSql.checkEqual(tdSql.queryResult[0][1],1)
+        tdSql.execute('flush database db')
+        tdSql.query(f'select * from {tbname} where ts = {timestamp}')
+        tdSql.checkEqual(tdSql.queryResult[0][1],1)
+        tdSql.execute(f'insert into {tbname} values({timestamp},2)')
+        tdSql.query(f'select * from {tbname} where ts = {timestamp}')
+        tdSql.checkEqual(tdSql.queryResult[0][1],2)
+        tdSql.execute('flush database db')
+        tdSql.query(f'select * from {tbname} where ts = {timestamp}')
+        tdSql.checkEqual(tdSql.queryResult[0][1],2)
+        tdSql.execute(f'delete from {tbname} where ts = {timestamp}')
+        tdSql.query(f'select * from {tbname} where ts = {timestamp}')
+        tdSql.checkRows(0)
+        tdSql.execute('flush database db')
+        tdSql.query(f'select * from {tbname} where ts = {timestamp}')
+        tdSql.checkRows(0)
+        
+    def insert_ms(self):
+        tdSql.prepare()
+        tdSql.execute('use db')
+        tdSql.execute(f'create table {self.ntbname} (ts timestamp,c0 int)')
+        timestamp = random.randint(self.timestamp_ms,self.ms_boundary-1)
+        self.insert_check(timestamp,self.ntbname)
+        self.insert_check(self.ms_boundary,self.ntbname)
+        tdSql.error(f'insert into {self.ntbname} values({self.ms_boundary+1},1)')
+        tdSql.execute(f'create table {self.stbname} (ts timestamp,c0 int) tags(t0 int)')
+        tdSql.execute(f'create table {self.ctbname} using {self.stbname} tags (1)')
+        self.insert_check(timestamp,self.ctbname)
+        self.insert_check(self.ms_boundary,self.ctbname)
+        tdSql.error(f'insert into {self.ctbname} values({self.ms_boundary+1},1)')
+    def insert_us(self):
+        tdSql.execute('create database db1 precision "us"')
+        tdSql.execute('use db1')
+        tdSql.execute(f'create table {self.ntbname} (ts timestamp,c0 int)')
+        timestamp = random.randint(self.timestamp_us,self.us_boundary-1)
+        self.insert_check(timestamp,self.ntbname)
+        self.insert_check(self.us_boundary,self.ntbname)
+        tdSql.error(f'insert into {self.ntbname} values({self.us_boundary+1},1)')
+        tdSql.execute(f'create table {self.stbname} (ts timestamp,c0 int) tags(t0 int)')
+        tdSql.execute(f'create table {self.ctbname} using {self.stbname} tags (1)')
+        self.insert_check(timestamp,self.ctbname)
+        self.insert_check(self.us_boundary,self.ctbname)
+        tdSql.error(f'insert into {self.ctbname} values({self.us_boundary+1},1)')
+    def insert_ns(self):
+        tdSql.execute('create database db2 precision "ns"')
+        tdSql.execute('use db2')
+        tdSql.execute(f'create table {self.ntbname} (ts timestamp,c0 int)')
+        timestamp = random.randint(self.timestamp_ns,self.ns_boundary-1)
+        self.insert_check(timestamp,self.ntbname)
+        self.insert_check(self.ns_boundary,self.ntbname)
+        tdSql.error(f'insert into {self.ntbname} values({self.ns_boundary+1},1)')
+        tdSql.execute(f'create table {self.stbname} (ts timestamp,c0 int) tags(t0 int)')
+        tdSql.execute(f'create table {self.ctbname} using {self.stbname} tags (1)')
+        self.insert_check(timestamp,self.ctbname)
+        self.insert_check(self.ns_boundary,self.ctbname)
+        tdSql.error(f'insert into {self.ctbname} values({self.ns_boundary+1},1)')
+    def run(self):
+        self.insert_ms()
+        self.insert_us()
+        self.insert_ns()
+        pass
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

From f59318a1f1e4ec10e83eb6b03b00c7fd188a99b5 Mon Sep 17 00:00:00 2001
From: Pan YANG <arielyang@gmail.com>
Date: Tue, 15 Nov 2022 09:57:10 +0800
Subject: [PATCH 08/85] fix: skip bug of Docusaurus

---
 docs/zh/05-get-started/01-docker.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/zh/05-get-started/01-docker.md b/docs/zh/05-get-started/01-docker.md
index e772447db0..c6ae07c7c1 100644
--- a/docs/zh/05-get-started/01-docker.md
+++ b/docs/zh/05-get-started/01-docker.md
@@ -4,6 +4,9 @@ title: 通过 Docker 快速体验 TDengine
 description: 使用 Docker 快速体验 TDengine 的高效写入和查询
 ---
 
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+
 本节首先介绍如何通过 Docker 快速体验 TDengine，然后介绍如何在 Docker 环境下体验 TDengine 的写入和查询功能。如果你不熟悉 Docker，请使用[安装包的方式快速体验](../../get-started/package/)。如果您希望为 TDengine 贡献代码或对内部技术实现感兴趣，请参考 [TDengine GitHub 主页](https://github.com/taosdata/TDengine)下载源码构建和安装。
 
 ## 启动 TDengine

From 32550be9b6ca20848f47749a9d5095fc12ff1f33 Mon Sep 17 00:00:00 2001
From: jiacy-jcy <714897623@qq.com>
Date: Tue, 15 Nov 2022 09:59:10 +0800
Subject: [PATCH 09/85] test:add test case into ci

---
 tests/parallel_test/cases.task | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index fac4210d88..52bd3bb852 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -432,6 +432,7 @@
 ,,,system-test,python3 ./test.py -f 1-insert/update_data_muti_rows.py
 ,,,system-test,python3 ./test.py -f 1-insert/db_tb_name_check.py
 ,,,system-test,python3 ./test.py -f 1-insert/database_pre_suf.py
+,,,system-test,python3 ./test.py -f 1-insert/InsertFuturets.py
 ,,,system-test,python3 ./test.py -f 0-others/show.py
 ,,,system-test,python3 ./test.py -f 2-query/abs.py
 ,,,system-test,python3 ./test.py -f 2-query/abs.py -R

From 3562011b93edec561180bd8547d3a10e0aeea08d Mon Sep 17 00:00:00 2001
From: wade zhang <95411902+gccgdb1234@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:27:45 +0800
Subject: [PATCH 10/85] Update 02-database.md

---
 docs/zh/12-taos-sql/02-database.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh/12-taos-sql/02-database.md b/docs/zh/12-taos-sql/02-database.md
index c76311f008..f1e7b0a385 100644
--- a/docs/zh/12-taos-sql/02-database.md
+++ b/docs/zh/12-taos-sql/02-database.md
@@ -142,7 +142,7 @@ SHOW CREATE DATABASE db_name;
 ### 查看数据库参数
 
 ```sql
-SHOW DATABASES \G;
+select * from information_schema.ins_databases \G;
 ```
 
 会列出系统中所有数据库的配置参数，并且每行只显示一个参数。

From 5b8d0ae83715b59239efa608c741f3877fa966c2 Mon Sep 17 00:00:00 2001
From: wade zhang <95411902+gccgdb1234@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:28:09 +0800
Subject: [PATCH 11/85] Update 02-database.md

---
 docs/en/12-taos-sql/02-database.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/12-taos-sql/02-database.md b/docs/en/12-taos-sql/02-database.md
index 5a84bbf370..1aab3971e5 100644
--- a/docs/en/12-taos-sql/02-database.md
+++ b/docs/en/12-taos-sql/02-database.md
@@ -142,7 +142,7 @@ The preceding SQL statement can be used in migration scenarios. This command can
 ### View Database Configuration
 
 ```sql
-SHOW DATABASES \G;
+select * from information_schema.ins_databases \G;
 ```
 
 The preceding SQL statement shows the value of each parameter for the specified database. One value is displayed per line.

From 0d003bbb5d23d11854f03fdcc8492f314bb392ef Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 10:30:54 +0800
Subject: [PATCH 12/85] fix: memory in smworker.c

---
 source/dnode/mgmt/mgmt_snode/src/smWorker.c |  1 +
 tests/parallel_test/cases.task              | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_snode/src/smWorker.c b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
index 1381d4c391..f6942c8114 100644
--- a/source/dnode/mgmt/mgmt_snode/src/smWorker.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
@@ -122,6 +122,7 @@ void smStopWorker(SSnodeMgmt *pMgmt) {
   for (int32_t i = 0; i < taosArrayGetSize(pMgmt->writeWroker); i++) {
     SMultiWorker *pWorker = taosArrayGetP(pMgmt->writeWroker, i);
     tMultiWorkerCleanup(pWorker);
+    taosMemoryFree(pWorker);
   }
   taosArrayDestroy(pMgmt->writeWroker);
   tSingleWorkerCleanup(&pMgmt->streamWorker);
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index fac4210d88..bb2e101c06 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -98,7 +98,7 @@
 ,,y,script,./test.sh -f tsim/parser/columnValue_int.sim
 ,,y,script,./test.sh -f tsim/parser/columnValue_smallint.sim
 ,,y,script,./test.sh -f tsim/parser/columnValue_tinyint.sim
-,,,script,./test.sh -f tsim/parser/columnValue_unsign.sim
+,,y,script,./test.sh -f tsim/parser/columnValue_unsign.sim
 ,,y,script,./test.sh -f tsim/parser/commit.sim
 ,,y,script,./test.sh -f tsim/parser/condition.sim
 ,,y,script,./test.sh -f tsim/parser/constCol.sim
@@ -172,7 +172,7 @@
 ,,,script,./test.sh -f tsim/query/session.sim
 ,,,script,./test.sh -f tsim/query/udf.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
-,,,script,./test.sh -f tsim/snode/basic1.sim
+,,y,script,./test.sh -f tsim/snode/basic1.sim
 ,,,script,./test.sh -f tsim/mnode/basic1.sim
 ,,,script,./test.sh -f tsim/mnode/basic2.sim
 ,,,script,./test.sh -f tsim/mnode/basic3.sim
@@ -208,12 +208,12 @@
 ,,y,script,./test.sh -f tsim/table/tinyint.sim
 ,,y,script,./test.sh -f tsim/table/vgroup.sim
 ,,,script,./test.sh -f tsim/stream/basic0.sim -g
-,,,script,./test.sh -f tsim/stream/basic1.sim
+,,y,script,./test.sh -f tsim/stream/basic1.sim
 ,,y,script,./test.sh -f tsim/stream/basic2.sim
 ,,,script,./test.sh -f tsim/stream/drop_stream.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic1.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
-,,,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
+,,y,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
 ,,y,script,./test.sh -f tsim/stream/distributeInterval0.sim
 ,,,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
 ,,,script,./test.sh -f tsim/stream/distributeSession0.sim
@@ -222,11 +222,11 @@
 ,,,script,./test.sh -f tsim/stream/state0.sim
 ,,,script,./test.sh -f tsim/stream/triggerInterval0.sim
 ,,,script,./test.sh -f tsim/stream/triggerSession0.sim
-,,,script,./test.sh -f tsim/stream/partitionby.sim
-,,,script,./test.sh -f tsim/stream/partitionby1.sim
+,,y,script,./test.sh -f tsim/stream/partitionby.sim
+,,y,script,./test.sh -f tsim/stream/partitionby1.sim
 ,,y,script,./test.sh -f tsim/stream/schedSnode.sim
 ,,,script,./test.sh -f tsim/stream/windowClose.sim
-,,,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
+,,y,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
 ,,y,script,./test.sh -f tsim/stream/sliding.sim
 ,,,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim
 ,,,script,./test.sh -f tsim/stream/partitionbyColumnSession.sim

From 6fdaa442ada74ea72968eeb67b28e96ca7869e1a Mon Sep 17 00:00:00 2001
From: wade zhang <95411902+gccgdb1234@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:32:21 +0800
Subject: [PATCH 13/85] Update 02-database.md

---
 docs/en/12-taos-sql/02-database.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/12-taos-sql/02-database.md b/docs/en/12-taos-sql/02-database.md
index 1aab3971e5..a12406fe43 100644
--- a/docs/en/12-taos-sql/02-database.md
+++ b/docs/en/12-taos-sql/02-database.md
@@ -142,7 +142,7 @@ The preceding SQL statement can be used in migration scenarios. This command can
 ### View Database Configuration
 
 ```sql
-select * from information_schema.ins_databases \G;
+SELECT * FROM INFORMATION_SCHEMA.INS_DATABASES WHERE NAME='DBNAME' \G;
 ```
 
 The preceding SQL statement shows the value of each parameter for the specified database. One value is displayed per line.

From 49b6b8752d42ed091cf03a7fe16b10065585a1b0 Mon Sep 17 00:00:00 2001
From: wade zhang <95411902+gccgdb1234@users.noreply.github.com>
Date: Tue, 15 Nov 2022 10:32:56 +0800
Subject: [PATCH 14/85] Update 02-database.md

---
 docs/zh/12-taos-sql/02-database.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh/12-taos-sql/02-database.md b/docs/zh/12-taos-sql/02-database.md
index f1e7b0a385..3918f240b4 100644
--- a/docs/zh/12-taos-sql/02-database.md
+++ b/docs/zh/12-taos-sql/02-database.md
@@ -142,10 +142,10 @@ SHOW CREATE DATABASE db_name;
 ### 查看数据库参数
 
 ```sql
-select * from information_schema.ins_databases \G;
+SELECT * FROM INFORMATION_SCHEMA.INS_DATABASES WHERE NAME='DBNAME' \G;
 ```
 
-会列出系统中所有数据库的配置参数，并且每行只显示一个参数。
+会列出指定数据库的配置参数，并且每行只显示一个参数。
 
 ## 删除过期数据
 

From 18eec5f351ece19d1573d2ab65068ff651905dd4 Mon Sep 17 00:00:00 2001
From: Pan YANG <arielyang@gmail.com>
Date: Tue, 15 Nov 2022 10:35:04 +0800
Subject: [PATCH 15/85] fix: skip bug of Docusaurus

---
 docs/en/05-get-started/01-docker.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/en/05-get-started/01-docker.md b/docs/en/05-get-started/01-docker.md
index ac273daba4..0f9d79d34f 100644
--- a/docs/en/05-get-started/01-docker.md
+++ b/docs/en/05-get-started/01-docker.md
@@ -3,6 +3,9 @@ sidebar_label: Docker
 title: Quick Install on Docker
 ---
 
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+
 This document describes how to install TDengine in a Docker container and perform queries and inserts.
 
 - The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com).

From a6a76adcbdd23738e336439f0bed6a2429c337fc Mon Sep 17 00:00:00 2001
From: Pan YANG <arielyang@gmail.com>
Date: Tue, 15 Nov 2022 11:34:06 +0800
Subject: [PATCH 16/85] docs: fix bugs of style and import

---
 docs/en/05-get-started/01-docker.md         |  3 --
 docs/en/05-get-started/index.md             | 10 +++----
 docs/zh/05-get-started/01-docker.md         |  3 --
 docs/zh/05-get-started/index.md             | 12 ++++----
 docs/zh/14-reference/07-tdinsight/index.mdx | 33 ++++++++++++---------
 5 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/docs/en/05-get-started/01-docker.md b/docs/en/05-get-started/01-docker.md
index 0f9d79d34f..ac273daba4 100644
--- a/docs/en/05-get-started/01-docker.md
+++ b/docs/en/05-get-started/01-docker.md
@@ -3,9 +3,6 @@ sidebar_label: Docker
 title: Quick Install on Docker
 ---
 
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
 This document describes how to install TDengine in a Docker container and perform queries and inserts.
 
 - The easiest way to explore TDengine is through [TDengine Cloud](http://cloud.tdengine.com).
diff --git a/docs/en/05-get-started/index.md b/docs/en/05-get-started/index.md
index fec734b64d..373fa6e811 100644
--- a/docs/en/05-get-started/index.md
+++ b/docs/en/05-get-started/index.md
@@ -24,10 +24,10 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 
 <table width="100%">
 <tr align="center">
-<td width="20%" style="border:0"><a href="https://github.com/taosdata/TDengine" target="_blank"><img src={github} alt="Star GitHub" width="50" /><p>Star GitHub</p></a></td>
-<td width="20%" style="border:0"><a href="https://discord.com/invite/VZdSuUg4pS" target="_blank"><img src={discord} alt="Join Discord" width="50" /><p>Join Discord</p></a></td>
-<td width="20%" style="border:0"><a href="https://twitter.com/TDengineDB" target="_blank"><img src={twitter} alt="Follow Twitter" width="50" /><p>Follow Twitter</p></a></td>
-<td width="20%" style="border:0"><a href="https://www.youtube.com/@tdengine" target="_blank"><img src={youtube} alt="Subscribe YouTube" width="50" /><p>Subscribe YouTube</p></a></td>
-<td width="20%" style="border:0"><a href="https://www.linkedin.com/company/tdengine" target="_blank"><img src={linkedin} alt="Follow LinkedIn" width="50" /><p>Follow LinkedIn</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://github.com/taosdata/TDengine" target="_blank"><img src={github} alt="Star GitHub" width="50" /><p>Star GitHub</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://discord.com/invite/VZdSuUg4pS" target="_blank"><img src={discord} alt="Join Discord" width="50" /><p>Join Discord</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://twitter.com/TDengineDB" target="_blank"><img src={twitter} alt="Follow Twitter" width="50" /><p>Follow Twitter</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://www.youtube.com/@tdengine" target="_blank"><img src={youtube} alt="Subscribe YouTube" width="50" /><p>Subscribe YouTube</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://www.linkedin.com/company/tdengine" target="_blank"><img src={linkedin} alt="Follow LinkedIn" width="50" /><p>Follow LinkedIn</p></a></td>
 </tr>
 </table>
diff --git a/docs/zh/05-get-started/01-docker.md b/docs/zh/05-get-started/01-docker.md
index c6ae07c7c1..e772447db0 100644
--- a/docs/zh/05-get-started/01-docker.md
+++ b/docs/zh/05-get-started/01-docker.md
@@ -4,9 +4,6 @@ title: 通过 Docker 快速体验 TDengine
 description: 使用 Docker 快速体验 TDengine 的高效写入和查询
 ---
 
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
 本节首先介绍如何通过 Docker 快速体验 TDengine，然后介绍如何在 Docker 环境下体验 TDengine 的写入和查询功能。如果你不熟悉 Docker，请使用[安装包的方式快速体验](../../get-started/package/)。如果您希望为 TDengine 贡献代码或对内部技术实现感兴趣，请参考 [TDengine GitHub 主页](https://github.com/taosdata/TDengine)下载源码构建和安装。
 
 ## 启动 TDengine
diff --git a/docs/zh/05-get-started/index.md b/docs/zh/05-get-started/index.md
index 092523a556..253eeeac01 100644
--- a/docs/zh/05-get-started/index.md
+++ b/docs/zh/05-get-started/index.md
@@ -24,13 +24,13 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 
 <table width="100%">
 <tr align="center">
-<td style="padding:1em;border:0"><img src={xiaot} alt="小 T 的二维码" width="200" /></td>
-<td style="padding:1em;border:0"><img src={channel} alt="TDengine 微信视频号" width="200" /></td>
-<td style="padding:1em;border:0"><img src={official_account} alt="TDengine 微信公众号" width="200" /></td>
+<td style={{padding:'1em',border:0}}><img src={xiaot} alt="小 T 的二维码" width="200" /></td>
+<td style={{padding:'1em',border:0}}><img src={channel} alt="TDengine 微信视频号" width="200" /></td>
+<td style={{padding:'1em',border:0}}><img src={official_account} alt="TDengine 微信公众号" width="200" /></td>
 </tr>
 <tr align="center">
-<td style="padding:1em;border:0">加入“物联网大数据技术前沿群”<br/>与大家进行技术交流</td>
-<td style="padding:1em;border:0">关注 TDengine 微信视频号<br/>收看技术直播与教学视频</td>
-<td style="padding:1em;border:0">关注 TDengine 微信公众号<br/>阅读核心技术与行业案例文章</td>
+<td style={{padding:'1em',border:0}}>加入“物联网大数据技术前沿群”<br/>与大家进行技术交流</td>
+<td style={{padding:'1em',border:0}}>关注 TDengine 微信视频号<br/>收看技术直播与教学视频</td>
+<td style={{padding:'1em',border:0}}>关注 TDengine 微信公众号<br/>阅读核心技术与行业案例文章</td>
 </tr>
 </table>
diff --git a/docs/zh/14-reference/07-tdinsight/index.mdx b/docs/zh/14-reference/07-tdinsight/index.mdx
index ecd6362143..7f4c46a636 100644
--- a/docs/zh/14-reference/07-tdinsight/index.mdx
+++ b/docs/zh/14-reference/07-tdinsight/index.mdx
@@ -4,6 +4,9 @@ sidebar_label: TDinsight
 description: 基于Grafana的TDengine零依赖监控解决方案
 ---
 
+import Tabs from '@theme/Tabs'
+import TabItem from '@theme/TabItem'
+
 TDinsight 是使用监控数据库和 [Grafana] 对 TDengine 进行监控的解决方案。
 
 TDengine 通过 [taosKeeper](../taosKeeper) 将服务器的 CPU、内存、硬盘空间、带宽、请求数、磁盘读写速度、慢查询等信息定时写入指定数据库，并对重要的系统操作（比如登录、创建、删除数据库等）以及各种错误报警信息进行记录。通过 [Grafana] 和 [TDengine 数据源插件](https://github.com/taosdata/grafanaplugin/releases)，TDinsight 将集群状态、节点信息、插入及查询请求、资源使用情况等进行可视化展示，同时还支持 vnode、dnode、mnode 节点状态异常告警，为开发者实时监控 TDengine 集群运行状态提供了便利。本文将指导用户安装 Grafana 服务器并通过 `TDinsight.sh` 安装脚本自动安装 TDengine 数据源插件及部署 TDinsight 可视化面板。
@@ -41,6 +44,7 @@ sudo apt-get install grafana
 ```
 
 ### 在 CentOS / RHEL 上安装 Grafana
+
 </TabItem>
 <TabItem label="redhat" value="基于 CentOS / RHEL 系统">
 
@@ -127,20 +131,20 @@ Install and configure TDinsight dashboard in Grafana on Ubuntu 18.04/20.04 syste
 
 大多数命令行选项都可以通过环境变量获得同样的效果。
 
-| 短选项 | 长选项                     | 环境变量                     | 说明                                                                        |
-| ------ | -------------------------- | ---------------------------- | --------------------------------------------------------------------------- |
-| -v     | --plugin-version           | TDENGINE_PLUGIN_VERSION      | TDengine 数据源插件版本，默认使用最新版。                                   |
-| -P     | --grafana-provisioning-dir | GF_PROVISIONING_DIR          | Grafana 配置目录，默认为`/etc/grafana/provisioning/`                        |
-| -G     | --grafana-plugins-dir      | GF_PLUGINS_DIR               | Grafana 插件目录，默认为`/var/lib/grafana/plugins`。                        |
-| -O     | --grafana-org-id           | GF_ORG_ID                    | Grafana 组织 ID，默认为 1。                                                 |
-| -n     | --tdengine-ds-name         | TDENGINE_DS_NAME             | TDengine 数据源名称，默认为 TDengine。                                      |
-| -a     | --tdengine-api             | TDENGINE_API                 | TDengine REST API 端点。默认为`http://127.0.0.1:6041`。                     |
-| -u     | --tdengine-user            | TDENGINE_USER                | TDengine 用户名。 [默认值：root]                                            |
-| -p     | --tdengine-密码            | TDENGINE_PASSWORD            | TDengine 密码。 [默认：taosdata]                                            |
-| -i     | --tdinsight-uid            | TDINSIGHT_DASHBOARD_UID      | TDinsight 仪表盘`uid`。 [默认值：tdinsight]                                 |
-| -t     | --tdinsight-title          | TDINSIGHT_DASHBOARD_TITLE    | TDinsight 仪表盘标题。 [默认：TDinsight]                                    |
-| -e     | --tdinsight-可编辑         | TDINSIGHT_DASHBOARD_EDITABLE | 如果配置仪表盘可以编辑。 [默认值：false]                                    |
-| -E     | --external-notifier        | EXTERNAL_NOTIFIER            | 将外部通知程序 uid 应用于 TDinsight 仪表盘。                                |
+| 短选项 | 长选项                     | 环境变量                     | 说明                                                    |
+| ------ | -------------------------- | ---------------------------- | ------------------------------------------------------- |
+| -v     | --plugin-version           | TDENGINE_PLUGIN_VERSION      | TDengine 数据源插件版本，默认使用最新版。               |
+| -P     | --grafana-provisioning-dir | GF_PROVISIONING_DIR          | Grafana 配置目录，默认为`/etc/grafana/provisioning/`    |
+| -G     | --grafana-plugins-dir      | GF_PLUGINS_DIR               | Grafana 插件目录，默认为`/var/lib/grafana/plugins`。    |
+| -O     | --grafana-org-id           | GF_ORG_ID                    | Grafana 组织 ID，默认为 1。                             |
+| -n     | --tdengine-ds-name         | TDENGINE_DS_NAME             | TDengine 数据源名称，默认为 TDengine。                  |
+| -a     | --tdengine-api             | TDENGINE_API                 | TDengine REST API 端点。默认为`http://127.0.0.1:6041`。 |
+| -u     | --tdengine-user            | TDENGINE_USER                | TDengine 用户名。 [默认值：root]                        |
+| -p     | --tdengine-密码            | TDENGINE_PASSWORD            | TDengine 密码。 [默认：taosdata]                        |
+| -i     | --tdinsight-uid            | TDINSIGHT_DASHBOARD_UID      | TDinsight 仪表盘`uid`。 [默认值：tdinsight]             |
+| -t     | --tdinsight-title          | TDINSIGHT_DASHBOARD_TITLE    | TDinsight 仪表盘标题。 [默认：TDinsight]                |
+| -e     | --tdinsight-可编辑         | TDINSIGHT_DASHBOARD_EDITABLE | 如果配置仪表盘可以编辑。 [默认值：false]                |
+| -E     | --external-notifier        | EXTERNAL_NOTIFIER            | 将外部通知程序 uid 应用于 TDinsight 仪表盘。            |
 
 假设您在主机 `tdengine` 上启动 TDengine 数据库，HTTP API 端口为 `6041`，用户为 `root1`，密码为 `pass5ord`。执行脚本：
 
@@ -196,6 +200,7 @@ sudo grafana-cli \
 [plugins]
 allow_loading_unsigned_plugins = tdengine-datasource
 ```
+
 :::
 
 ### 启动 Grafana 服务

From d985cb714f86e91a844c557eaca3fd3e5b87de71 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 15 Nov 2022 11:38:01 +0800
Subject: [PATCH 17/85] fix: fix asan issues

---
 source/libs/scalar/src/filter.c |  4 ++++
 source/libs/scalar/src/scalar.c | 16 ++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/source/libs/scalar/src/filter.c b/source/libs/scalar/src/filter.c
index be085e6cbd..0f67947b1c 100644
--- a/source/libs/scalar/src/filter.c
+++ b/source/libs/scalar/src/filter.c
@@ -336,6 +336,10 @@ int8_t filterGetCompFuncIdx(int32_t type, int32_t optr) {
 __compar_fn_t filterGetCompFunc(int32_t type, int32_t optr) { return gDataCompare[filterGetCompFuncIdx(type, optr)]; }
 
 __compar_fn_t filterGetCompFuncEx(int32_t lType, int32_t rType, int32_t optr) {
+  if (TSDB_DATA_TYPE_NULL == rType) {
+    return NULL;
+  }
+  
   switch (lType) {
     case TSDB_DATA_TYPE_TINYINT: {
       if (IS_SIGNED_NUMERIC_TYPE(rType) || IS_FLOAT_TYPE(rType)) {
diff --git a/source/libs/scalar/src/scalar.c b/source/libs/scalar/src/scalar.c
index fa71009365..3644855094 100644
--- a/source/libs/scalar/src/scalar.c
+++ b/source/libs/scalar/src/scalar.c
@@ -599,7 +599,9 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell*
     
     bool *equal = (bool*)colDataGetData(pComp->columnData, rowIdx);
     if (*equal) {
-      colDataAppend(output->columnData, rowIdx, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)));
+      bool isNull = colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0));
+      char *pData = isNull ? NULL : colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0));
+      colDataAppend(output->columnData, rowIdx, pData, isNull);
 
       if (0 == rowIdx && 1 == pCase->numOfRows && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && totalRows > 1) {
         SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
@@ -611,7 +613,9 @@ int32_t sclWalkCaseWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell*
   }
 
   if (pElse) {
-    colDataAppend(output->columnData, rowIdx, colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)));
+    bool isNull = colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0));
+    char *pData = isNull ? NULL : colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0));
+    colDataAppend(output->columnData, rowIdx, pData, isNull);
 
     if (0 == rowIdx && 1 == pCase->numOfRows && 1 == pElse->numOfRows && totalRows > 1) {
       SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
@@ -657,7 +661,9 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell* pCe
     bool *whenValue = (bool*)colDataGetData(pWhen->columnData, (pWhen->numOfRows > 1 ? rowIdx : 0));
     
     if (*whenValue) {
-      colDataAppend(output->columnData, rowIdx, colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0)));
+      bool isNull = colDataIsNull_s(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0));
+      char *pData = isNull ? NULL : colDataGetData(pThen->columnData, (pThen->numOfRows > 1 ? rowIdx : 0));
+      colDataAppend(output->columnData, rowIdx, pData, isNull);
 
       if (preSingle && 0 == rowIdx && 1 == pWhen->numOfRows && 1 == pThen->numOfRows && totalRows > 1) {
         SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));
@@ -674,7 +680,9 @@ int32_t sclWalkWhenList(SScalarCtx *ctx, SNodeList* pList, struct SListCell* pCe
   }
 
   if (pElse) {
-    colDataAppend(output->columnData, rowIdx, colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)), colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0)));
+    bool isNull = colDataIsNull_s(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0));
+    char *pData = isNull ? NULL : colDataGetData(pElse->columnData, (pElse->numOfRows > 1 ? rowIdx : 0));
+    colDataAppend(output->columnData, rowIdx, pData, isNull);
 
     if (preSingle && 0 == rowIdx && 1 == pElse->numOfRows && totalRows > 1) {
       SCL_ERR_JRET(sclExtendResRows(output, output, ctx->pBlockList));

From efde22f081ada7ac5f2e8ab07f0278c847a433fb Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 15 Nov 2022 11:59:29 +0800
Subject: [PATCH 18/85] fix: memory leak

---
 include/common/tmsg.h                      |  1 +
 source/common/src/tmsg.c                   |  1 +
 source/dnode/mnode/impl/src/mndSubscribe.c |  1 +
 source/dnode/vnode/src/inc/tq.h            |  3 +--
 source/dnode/vnode/src/tq/tq.c             |  8 +++++---
 source/dnode/vnode/src/tq/tqMeta.c         |  4 ++--
 source/libs/executor/src/executor.c        | 18 ++++++++++--------
 source/libs/wal/src/walMgmt.c              |  8 ++++++++
 source/libs/wal/src/walWrite.c             |  2 +-
 9 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 3281bca96a..afe54bce0b 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -2627,6 +2627,7 @@ typedef struct {
 
 int32_t tEncodeSTqCheckInfo(SEncoder* pEncoder, const STqCheckInfo* pInfo);
 int32_t tDecodeSTqCheckInfo(SDecoder* pDecoder, STqCheckInfo* pInfo);
+void    tDeleteSTqCheckInfo(STqCheckInfo* pInfo);
 
 typedef struct {
   char topic[TSDB_TOPIC_FNAME_LEN];
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index bd8e34a395..fd445ff2ae 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -5903,6 +5903,7 @@ int32_t tDecodeSTqCheckInfo(SDecoder *pDecoder, STqCheckInfo *pInfo) {
   }
   return 0;
 }
+void tDeleteSTqCheckInfo(STqCheckInfo *pInfo) { taosArrayDestroy(pInfo->colIdList); }
 
 int32_t tEncodeDeleteRes(SEncoder *pCoder, const SDeleteRes *pRes) {
   int32_t nUid = taosArrayGetSize(pRes->uidList);
diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index 71e0b09e02..14adeb0080 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -235,6 +235,7 @@ static int32_t mndDoRebalance(SMnode *pMnode, const SMqRebInputObj *pInput, SMqR
         taosHashPut(pHash, &pVgEp->vgId, sizeof(int32_t), &outputVg, sizeof(SMqRebOutputVg));
         mInfo("mq rebalance: remove vgId:%d from consumer:%" PRId64, pVgEp->vgId, consumerId);
       }
+      taosArrayDestroy(pConsumerEp->vgs);
       taosHashRemove(pOutput->pSub->consumerHash, &consumerId, sizeof(int64_t));
       // put into removed
       taosArrayPush(pOutput->removedConsumers, &consumerId);
diff --git a/source/dnode/vnode/src/inc/tq.h b/source/dnode/vnode/src/inc/tq.h
index ef54adf0d6..8ae1c8720c 100644
--- a/source/dnode/vnode/src/inc/tq.h
+++ b/source/dnode/vnode/src/inc/tq.h
@@ -88,8 +88,7 @@ typedef struct {
     STqExecTb  execTb;
     STqExecDb  execDb;
   };
-  int32_t         numOfCols;       // number of out pout column, temporarily used
-  SSchemaWrapper* pSchemaWrapper;  // columns that are involved in query
+  int32_t numOfCols;  // number of out pout column, temporarily used
 } STqExecHandle;
 
 typedef struct {
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index f75dce8231..eafbd8464d 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -55,6 +55,7 @@ static void destroySTqHandle(void* data) {
   STqHandle* pData = (STqHandle*)data;
   qDestroyTask(pData->execHandle.task);
   if (pData->execHandle.subType == TOPIC_SUB_TYPE__COLUMN) {
+    taosMemoryFreeClear(pData->execHandle.execCol.qmsg);
   } else if (pData->execHandle.subType == TOPIC_SUB_TYPE__DB) {
     tqCloseReader(pData->execHandle.pExecReader);
     walCloseReader(pData->pWalReader);
@@ -80,7 +81,6 @@ STQ* tqOpen(const char* path, SVnode* pVnode) {
   pTq->pVnode = pVnode;
 
   pTq->pHandle = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK);
-
   taosHashSetFreeFp(pTq->pHandle, destroySTqHandle);
 
   taosInitRWLatch(&pTq->pushLock);
@@ -88,6 +88,7 @@ STQ* tqOpen(const char* path, SVnode* pVnode) {
   taosHashSetFreeFp(pTq->pPushMgr, tqPushEntryFree);
 
   pTq->pCheckInfo = taosHashInit(64, MurmurHash3_32, true, HASH_ENTRY_LOCK);
+  taosHashSetFreeFp(pTq->pCheckInfo, (FDelete)tDeleteSTqCheckInfo);
 
   if (tqMetaOpen(pTq) < 0) {
     ASSERT(0);
@@ -779,6 +780,7 @@ int32_t tqProcessSubscribeReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
     }
     if (req.newConsumerId == -1) {
       tqError("vgId:%d, tq invalid rebalance request, new consumerId %" PRId64 "", req.vgId, req.newConsumerId);
+      taosMemoryFree(req.qmsg);
       return 0;
     }
     STqHandle tqHandle = {0};
@@ -815,8 +817,7 @@ int32_t tqProcessSubscribeReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
       req.qmsg = NULL;
 
       pHandle->execHandle.task =
-          qCreateQueueExecTaskInfo(pHandle->execHandle.execCol.qmsg, &handle, &pHandle->execHandle.numOfCols,
-                                   &pHandle->execHandle.pSchemaWrapper);
+          qCreateQueueExecTaskInfo(pHandle->execHandle.execCol.qmsg, &handle, &pHandle->execHandle.numOfCols, NULL);
       ASSERT(pHandle->execHandle.task);
       void* scanner = NULL;
       qExtractStreamScanner(pHandle->execHandle.task, &scanner);
@@ -864,6 +865,7 @@ int32_t tqProcessSubscribeReq(STQ* pTq, int64_t version, char* msg, int32_t msgL
     atomic_store_32(&pHandle->epoch, -1);
     atomic_store_64(&pHandle->consumerId, req.newConsumerId);
     atomic_add_fetch_32(&pHandle->epoch, 1);
+    taosMemoryFree(req.qmsg);
     if (tqMetaSaveHandle(pTq, req.subKey, pHandle) < 0) {
       // TODO
       ASSERT(0);
diff --git a/source/dnode/vnode/src/tq/tqMeta.c b/source/dnode/vnode/src/tq/tqMeta.c
index 27c491c86b..b021c5ee7f 100644
--- a/source/dnode/vnode/src/tq/tqMeta.c
+++ b/source/dnode/vnode/src/tq/tqMeta.c
@@ -305,8 +305,8 @@ int32_t tqMetaRestoreHandle(STQ* pTq) {
     };
 
     if (handle.execHandle.subType == TOPIC_SUB_TYPE__COLUMN) {
-      handle.execHandle.task = qCreateQueueExecTaskInfo(
-          handle.execHandle.execCol.qmsg, &reader, &handle.execHandle.numOfCols, &handle.execHandle.pSchemaWrapper);
+      handle.execHandle.task =
+          qCreateQueueExecTaskInfo(handle.execHandle.execCol.qmsg, &reader, &handle.execHandle.numOfCols, NULL);
       ASSERT(handle.execHandle.task);
       void* scanner = NULL;
       qExtractStreamScanner(handle.execHandle.task, &scanner);
diff --git a/source/libs/executor/src/executor.c b/source/libs/executor/src/executor.c
index 428af19a6c..e561b6e124 100644
--- a/source/libs/executor/src/executor.c
+++ b/source/libs/executor/src/executor.c
@@ -246,7 +246,9 @@ qTaskInfo_t qCreateQueueExecTaskInfo(void* msg, SReadHandle* readers, int32_t* n
     }
   }
 
-  *pSchema = tCloneSSchemaWrapper(((SExecTaskInfo*)pTaskInfo)->schemaInfo.qsw);
+  if (pSchema) {
+    *pSchema = tCloneSSchemaWrapper(((SExecTaskInfo*)pTaskInfo)->schemaInfo.qsw);
+  }
   return pTaskInfo;
 }
 
@@ -659,7 +661,7 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t* useconds) {
   return pTaskInfo->code;
 }
 
-int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo *pInfo) {
+int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo* pInfo) {
   taosWLockLatch(&pTaskInfo->stopInfo.lock);
   taosArrayPush(pTaskInfo->stopInfo.pStopInfo, pInfo);
   taosWUnLockLatch(&pTaskInfo->stopInfo.lock);
@@ -680,7 +682,7 @@ int32_t stopInfoComp(void const* lp, void const* rp) {
   return 0;
 }
 
-void qRemoveTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo *pInfo) {
+void qRemoveTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo* pInfo) {
   taosWLockLatch(&pTaskInfo->stopInfo.lock);
   int32_t idx = taosArraySearchIdx(pTaskInfo->stopInfo.pStopInfo, pInfo, stopInfoComp, TD_EQ);
   if (idx >= 0) {
@@ -696,8 +698,8 @@ void qStopTaskOperators(SExecTaskInfo* pTaskInfo) {
 
   int32_t num = taosArrayGetSize(pTaskInfo->stopInfo.pStopInfo);
   for (int32_t i = 0; i < num; ++i) {
-    SExchangeOpStopInfo *pStop = taosArrayGet(pTaskInfo->stopInfo.pStopInfo, i);
-    SExchangeInfo* pExchangeInfo = taosAcquireRef(exchangeObjRefPool, pStop->refId);
+    SExchangeOpStopInfo* pStop = taosArrayGet(pTaskInfo->stopInfo.pStopInfo, i);
+    SExchangeInfo*       pExchangeInfo = taosAcquireRef(exchangeObjRefPool, pStop->refId);
     if (pExchangeInfo) {
       tsem_post(&pExchangeInfo->ready);
       taosReleaseRef(exchangeObjRefPool, pStop->refId);
@@ -715,11 +717,11 @@ int32_t qAsyncKillTask(qTaskInfo_t qinfo) {
   }
 
   qDebug("%s execTask async killed", GET_TASKID(pTaskInfo));
-  
+
   setTaskKilled(pTaskInfo);
 
   qStopTaskOperators(pTaskInfo);
-  
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -1178,4 +1180,4 @@ void qProcessRspMsg(void* parent, SRpcMsg* pMsg, SEpSet* pEpSet) {
   pSendInfo->fp(pSendInfo->param, &buf, pMsg->code);
   rpcFreeCont(pMsg->pCont);
   destroySendMsgInfo(pSendInfo);
-}
\ No newline at end of file
+}
diff --git a/source/libs/wal/src/walMgmt.c b/source/libs/wal/src/walMgmt.c
index 1a70a3038f..b78d5ca6c1 100644
--- a/source/libs/wal/src/walMgmt.c
+++ b/source/libs/wal/src/walMgmt.c
@@ -203,6 +203,14 @@ void walClose(SWal *pWal) {
   pWal->pIdxFile = NULL;
   taosArrayDestroy(pWal->fileInfoSet);
   pWal->fileInfoSet = NULL;
+
+  void *pIter = NULL;
+  while (1) {
+    pIter = taosHashIterate(pWal->pRefHash, pIter);
+    if (pIter == NULL) break;
+    SWalRef *pRef = *(SWalRef **)pIter;
+    taosMemoryFree(pRef);
+  }
   taosHashCleanup(pWal->pRefHash);
   taosThreadMutexUnlock(&pWal->mutex);
 
diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 216dd5fcb1..7c3b4cba30 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -26,7 +26,7 @@ int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
   while (1) {
     pIter = taosHashIterate(pWal->pRefHash, pIter);
     if (pIter == NULL) break;
-    SWalRef *pRef = (SWalRef *)pIter;
+    SWalRef *pRef = *(SWalRef **)pIter;
     if (pRef->refVer != -1 && pRef->refVer <= ver) {
       taosHashCancelIterate(pWal->pRefHash, pIter);
       taosThreadMutexUnlock(&pWal->mutex);

From 3bc7916ba3917daecde2550edbacba7bcd4dbaed Mon Sep 17 00:00:00 2001
From: Pan YANG <arielyang@gmail.com>
Date: Tue, 15 Nov 2022 12:19:56 +0800
Subject: [PATCH 19/85] docs: optimize media icons

---
 docs/en/05-get-started/discord.svg  |  2 +-
 docs/en/05-get-started/github.svg   |  4 ++--
 docs/en/05-get-started/index.md     | 22 +++++++++++-----------
 docs/en/05-get-started/linkedin.svg |  2 +-
 docs/en/05-get-started/twitter.svg  |  2 +-
 docs/en/05-get-started/youtube.svg  |  2 +-
 docs/zh/05-get-started/index.md     | 12 ++++++------
 7 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/docs/en/05-get-started/discord.svg b/docs/en/05-get-started/discord.svg
index 8218e3c3ca..99c02b6fb0 100644
--- a/docs/en/05-get-started/discord.svg
+++ b/docs/en/05-get-started/discord.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.5 -1 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.5 -1 32 32" width="50" height="50">
   <g fill="#5865f2">
     <path
       d="M26.0015 6.9529C24.0021 6.03845 21.8787 5.37198 19.6623 5C19.3833 5.48048 19.0733 6.13144 18.8563 6.64292C16.4989 6.30193 14.1585 6.30193 11.8336 6.64292C11.6166 6.13144 11.2911 5.48048 11.0276 5C8.79575 5.37198 6.67235 6.03845 4.6869 6.9529C0.672601 12.8736 -0.41235 18.6548 0.130124 24.3585C2.79599 26.2959 5.36889 27.4739 7.89682 28.2489C8.51679 27.4119 9.07477 26.5129 9.55525 25.5675C8.64079 25.2265 7.77283 24.808 6.93587 24.312C7.15286 24.1571 7.36986 23.9866 7.57135 23.8161C12.6241 26.1255 18.0969 26.1255 23.0876 23.8161C23.3046 23.9866 23.5061 24.1571 23.7231 24.312C22.8861 24.808 22.0182 25.2265 21.1037 25.5675C21.5842 26.5129 22.1422 27.4119 22.7621 28.2489C25.2885 27.4739 27.8769 26.2959 30.5288 24.3585C31.1952 17.7559 29.4733 12.0212 26.0015 6.9529ZM10.2527 20.8402C8.73376 20.8402 7.49382 19.4608 7.49382 17.7714C7.49382 16.082 8.70276 14.7025 10.2527 14.7025C11.7871 14.7025 13.0425 16.082 13.0115 17.7714C13.0115 19.4608 11.7871 20.8402 10.2527 20.8402ZM20.4373 20.8402C18.9183 20.8402 17.6768 19.4608 17.6768 17.7714C17.6768 16.082 18.8873 14.7025 20.4373 14.7025C21.9717 14.7025 23.2271 16.082 23.1961 17.7714C23.1961 19.4608 21.9872 20.8402 20.4373 20.8402Z"
diff --git a/docs/en/05-get-started/github.svg b/docs/en/05-get-started/github.svg
index 493832ceb7..c546b325c8 100644
--- a/docs/en/05-get-started/github.svg
+++ b/docs/en/05-get-started/github.svg
@@ -1,6 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -2 18 18">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -2 18 18" width="50" height="50">
   <path
-    fill="currentColor"
+    fill="#000"
     d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0016 8c0-4.42-3.58-8-8-8z"
   ></path>
 </svg>
diff --git a/docs/en/05-get-started/index.md b/docs/en/05-get-started/index.md
index 373fa6e811..d80ec02268 100644
--- a/docs/en/05-get-started/index.md
+++ b/docs/en/05-get-started/index.md
@@ -3,11 +3,11 @@ title: Get Started
 description: This article describes how to install TDengine and test its performance.
 ---
 
-import github from './github.svg'
-import discord from './discord.svg'
-import twitter from './twitter.svg'
-import youtube from './youtube.svg'
-import linkedin from './linkedin.svg'
+import GitHubSVG from './github.svg'
+import DiscordSVG from './discord.svg'
+import TwitterSVG from './twitter.svg'
+import YouTubeSVG from './youtube.svg'
+import LinkedInSVG from './linkedin.svg'
 
 You can install and run TDengine on Linux/Windows/macOS machines as well as Docker containers. You can also deploy TDengine as a managed service with TDengine Cloud.
 
@@ -23,11 +23,11 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 ### Join TDengine Community
 
 <table width="100%">
-<tr align="center">
-<td width="20%" style={{border:0}}><a href="https://github.com/taosdata/TDengine" target="_blank"><img src={github} alt="Star GitHub" width="50" /><p>Star GitHub</p></a></td>
-<td width="20%" style={{border:0}}><a href="https://discord.com/invite/VZdSuUg4pS" target="_blank"><img src={discord} alt="Join Discord" width="50" /><p>Join Discord</p></a></td>
-<td width="20%" style={{border:0}}><a href="https://twitter.com/TDengineDB" target="_blank"><img src={twitter} alt="Follow Twitter" width="50" /><p>Follow Twitter</p></a></td>
-<td width="20%" style={{border:0}}><a href="https://www.youtube.com/@tdengine" target="_blank"><img src={youtube} alt="Subscribe YouTube" width="50" /><p>Subscribe YouTube</p></a></td>
-<td width="20%" style={{border:0}}><a href="https://www.linkedin.com/company/tdengine" target="_blank"><img src={linkedin} alt="Follow LinkedIn" width="50" /><p>Follow LinkedIn</p></a></td>
+<tr align="center" style={{border:0}}>
+<td width="20%" style={{border:0}}><a href="https://github.com/taosdata/TDengine" target="_blank"><GitHubSVG /><p>Star GitHub</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://discord.com/invite/VZdSuUg4pS" target="_blank"><DiscordSVG /><p>Join Discord</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://twitter.com/TDengineDB" target="_blank"><TwitterSVG /><p>Follow Twitter</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://www.youtube.com/@tdengine" target="_blank"><YouTubeSVG /><p>Subscribe YouTube</p></a></td>
+<td width="20%" style={{border:0}}><a href="https://www.linkedin.com/company/tdengine" target="_blank"><LinkedInSVG /><p>Follow LinkedIn</p></a></td>
 </tr>
 </table>
diff --git a/docs/en/05-get-started/linkedin.svg b/docs/en/05-get-started/linkedin.svg
index 969c6f03af..1eb6754f63 100644
--- a/docs/en/05-get-started/linkedin.svg
+++ b/docs/en/05-get-started/linkedin.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -2 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -2 24 24" width="50" height="50">
   <path
     fill="rgb(10, 102, 194)"
     d="M20.5 2h-17A1.5 1.5 0 002 3.5v17A1.5 1.5 0 003.5 22h17a1.5 1.5 0 001.5-1.5v-17A1.5 1.5 0 0020.5 2zM8 19H5v-9h3zM6.5 8.25A1.75 1.75 0 118.3 6.5a1.78 1.78 0 01-1.8 1.75zM19 19h-3v-4.74c0-1.42-.6-1.93-1.38-1.93A1.74 1.74 0 0013 14.19a.66.66 0 000 .14V19h-3v-9h2.9v1.3a3.11 3.11 0 012.7-1.4c1.55 0 3.36.86 3.36 3.66z"
diff --git a/docs/en/05-get-started/twitter.svg b/docs/en/05-get-started/twitter.svg
index 4825aa4ed0..9147ca9272 100644
--- a/docs/en/05-get-started/twitter.svg
+++ b/docs/en/05-get-started/twitter.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -2 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -2 24 24" width="50" height="50">
   <g fill="rgb(29, 155, 240)">
     <path
       d="M23.643 4.937c-.835.37-1.732.62-2.675.733.962-.576 1.7-1.49 2.048-2.578-.9.534-1.897.922-2.958 1.13-.85-.904-2.06-1.47-3.4-1.47-2.572 0-4.658 2.086-4.658 4.66 0 .364.042.718.12 1.06-3.873-.195-7.304-2.05-9.602-4.868-.4.69-.63 1.49-.63 2.342 0 1.616.823 3.043 2.072 3.878-.764-.025-1.482-.234-2.11-.583v.06c0 2.257 1.605 4.14 3.737 4.568-.392.106-.803.162-1.227.162-.3 0-.593-.028-.877-.082.593 1.85 2.313 3.198 4.352 3.234-1.595 1.25-3.604 1.995-5.786 1.995-.376 0-.747-.022-1.112-.065 2.062 1.323 4.51 2.093 7.14 2.093 8.57 0 13.255-7.098 13.255-13.254 0-.2-.005-.402-.014-.602.91-.658 1.7-1.477 2.323-2.41z"
diff --git a/docs/en/05-get-started/youtube.svg b/docs/en/05-get-started/youtube.svg
index 20747b8b6a..ef86ed1427 100644
--- a/docs/en/05-get-started/youtube.svg
+++ b/docs/en/05-get-started/youtube.svg
@@ -1,4 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -8 32 32">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -8 32 32" width="50" height="50">
   <g>
     <g>
       <path
diff --git a/docs/zh/05-get-started/index.md b/docs/zh/05-get-started/index.md
index 253eeeac01..6faa7fed01 100644
--- a/docs/zh/05-get-started/index.md
+++ b/docs/zh/05-get-started/index.md
@@ -24,13 +24,13 @@ import {useCurrentSidebarCategory} from '@docusaurus/theme-common';
 
 <table width="100%">
 <tr align="center">
-<td style={{padding:'1em',border:0}}><img src={xiaot} alt="小 T 的二维码" width="200" /></td>
-<td style={{padding:'1em',border:0}}><img src={channel} alt="TDengine 微信视频号" width="200" /></td>
-<td style={{padding:'1em',border:0}}><img src={official_account} alt="TDengine 微信公众号" width="200" /></td>
+<td style={{padding:'1em 3em',border:0}}><img src={xiaot} alt="小 T 的二维码" width="200" /></td>
+<td style={{padding:'1em 3em',border:0}}><img src={channel} alt="TDengine 微信视频号" width="200" /></td>
+<td style={{padding:'1em 3em',border:0}}><img src={official_account} alt="TDengine 微信公众号" width="200" /></td>
 </tr>
 <tr align="center">
-<td style={{padding:'1em',border:0}}>加入“物联网大数据技术前沿群”<br/>与大家进行技术交流</td>
-<td style={{padding:'1em',border:0}}>关注 TDengine 微信视频号<br/>收看技术直播与教学视频</td>
-<td style={{padding:'1em',border:0}}>关注 TDengine 微信公众号<br/>阅读核心技术与行业案例文章</td>
+<td style={{padding:'1em 3em',border:0}}>加入“物联网大数据技术前沿群”<br/>与大家进行技术交流</td>
+<td style={{padding:'1em 3em',border:0}}>关注 TDengine 微信视频号<br/>收看技术直播与教学视频</td>
+<td style={{padding:'1em 3em',border:0}}>关注 TDengine 微信公众号<br/>阅读核心技术与行业案例文章</td>
 </tr>
 </table>

From 2da3cabd58526bc60c12a102ec05f18153762474 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 10:30:54 +0800
Subject: [PATCH 20/85] fix: memory in smworker.c

---
 source/dnode/mgmt/mgmt_snode/src/smWorker.c |  1 +
 tests/parallel_test/cases.task              | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_snode/src/smWorker.c b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
index 1381d4c391..f6942c8114 100644
--- a/source/dnode/mgmt/mgmt_snode/src/smWorker.c
+++ b/source/dnode/mgmt/mgmt_snode/src/smWorker.c
@@ -122,6 +122,7 @@ void smStopWorker(SSnodeMgmt *pMgmt) {
   for (int32_t i = 0; i < taosArrayGetSize(pMgmt->writeWroker); i++) {
     SMultiWorker *pWorker = taosArrayGetP(pMgmt->writeWroker, i);
     tMultiWorkerCleanup(pWorker);
+    taosMemoryFree(pWorker);
   }
   taosArrayDestroy(pMgmt->writeWroker);
   tSingleWorkerCleanup(&pMgmt->streamWorker);
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index fac4210d88..2e9b942df4 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -98,7 +98,7 @@
 ,,y,script,./test.sh -f tsim/parser/columnValue_int.sim
 ,,y,script,./test.sh -f tsim/parser/columnValue_smallint.sim
 ,,y,script,./test.sh -f tsim/parser/columnValue_tinyint.sim
-,,,script,./test.sh -f tsim/parser/columnValue_unsign.sim
+,,y,script,./test.sh -f tsim/parser/columnValue_unsign.sim
 ,,y,script,./test.sh -f tsim/parser/commit.sim
 ,,y,script,./test.sh -f tsim/parser/condition.sim
 ,,y,script,./test.sh -f tsim/parser/constCol.sim
@@ -140,7 +140,7 @@
 ,,,script,./test.sh -f tsim/parser/nestquery.sim
 ,,y,script,./test.sh -f tsim/parser/null_char.sim
 ,,y,script,./test.sh -f tsim/parser/precision_ns.sim
-,,,script,./test.sh -f tsim/parser/projection_limit_offset.sim
+,,y,script,./test.sh -f tsim/parser/projection_limit_offset.sim
 ,,y,script,./test.sh -f tsim/parser/regex.sim
 ,,y,script,./test.sh -f tsim/parser/select_across_vnodes.sim
 ,,y,script,./test.sh -f tsim/parser/select_distinct_tag.sim
@@ -172,7 +172,7 @@
 ,,,script,./test.sh -f tsim/query/session.sim
 ,,,script,./test.sh -f tsim/query/udf.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
-,,,script,./test.sh -f tsim/snode/basic1.sim
+,,y,script,./test.sh -f tsim/snode/basic1.sim
 ,,,script,./test.sh -f tsim/mnode/basic1.sim
 ,,,script,./test.sh -f tsim/mnode/basic2.sim
 ,,,script,./test.sh -f tsim/mnode/basic3.sim
@@ -208,12 +208,12 @@
 ,,y,script,./test.sh -f tsim/table/tinyint.sim
 ,,y,script,./test.sh -f tsim/table/vgroup.sim
 ,,,script,./test.sh -f tsim/stream/basic0.sim -g
-,,,script,./test.sh -f tsim/stream/basic1.sim
+,,y,script,./test.sh -f tsim/stream/basic1.sim
 ,,y,script,./test.sh -f tsim/stream/basic2.sim
 ,,,script,./test.sh -f tsim/stream/drop_stream.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic1.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
-,,,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
+,,y,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
 ,,y,script,./test.sh -f tsim/stream/distributeInterval0.sim
 ,,,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
 ,,,script,./test.sh -f tsim/stream/distributeSession0.sim
@@ -222,11 +222,11 @@
 ,,,script,./test.sh -f tsim/stream/state0.sim
 ,,,script,./test.sh -f tsim/stream/triggerInterval0.sim
 ,,,script,./test.sh -f tsim/stream/triggerSession0.sim
-,,,script,./test.sh -f tsim/stream/partitionby.sim
-,,,script,./test.sh -f tsim/stream/partitionby1.sim
+,,y,script,./test.sh -f tsim/stream/partitionby.sim
+,,y,script,./test.sh -f tsim/stream/partitionby1.sim
 ,,y,script,./test.sh -f tsim/stream/schedSnode.sim
 ,,,script,./test.sh -f tsim/stream/windowClose.sim
-,,,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
+,,y,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
 ,,y,script,./test.sh -f tsim/stream/sliding.sim
 ,,,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim
 ,,,script,./test.sh -f tsim/stream/partitionbyColumnSession.sim

From a57efc49b4520a566f539a6e3c139023e017c82a Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 13:43:30 +0800
Subject: [PATCH 21/85] fix: memory leak of sync timer

---
 source/dnode/mnode/impl/src/mndSync.c |  1 +
 source/libs/sync/inc/syncInt.h        |  2 +-
 source/libs/sync/src/syncMain.c       | 34 ++++++++-------------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndSync.c b/source/dnode/mnode/impl/src/mndSync.c
index 450d7a30ed..4dd7e070b3 100644
--- a/source/dnode/mnode/impl/src/mndSync.c
+++ b/source/dnode/mnode/impl/src/mndSync.c
@@ -349,6 +349,7 @@ int32_t mndSyncPropose(SMnode *pMnode, SSdbRaw *pRaw, int32_t transId) {
   }
 
   rpcFreeCont(req.pCont);
+  req.pCont = NULL;
   if (code != 0) {
     mError("trans:%d, failed to propose, code:0x%x", pMgmt->transId, code);
     return code;
diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index e81f63d871..485186fda6 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -70,7 +70,7 @@ typedef struct SSyncTimer {
   uint64_t          counter;
   int32_t           timerMS;
   SRaftId           destId;
-  void*             pData;
+  SSyncHbTimerData  hbData;
 } SSyncTimer;
 
 typedef struct SElectTimer {
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index e802f60f30..4fa4b7e49f 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -385,7 +385,7 @@ bool syncIsReadyForRead(int64_t rid) {
       if (!pSyncNode->pLogStore->syncLogIsEmpty(pSyncNode->pLogStore)) {
         SSyncRaftEntry* pEntry = NULL;
         int32_t         code = pSyncNode->pLogStore->syncLogGetEntry(
-            pSyncNode->pLogStore, pSyncNode->pLogStore->syncLogLastIndex(pSyncNode->pLogStore), &pEntry);
+                    pSyncNode->pLogStore, pSyncNode->pLogStore->syncLogLastIndex(pSyncNode->pLogStore), &pEntry);
         if (code == 0 && pEntry != NULL) {
           if (pEntry->originalRpcType == TDMT_SYNC_NOOP && pEntry->term == pSyncNode->pRaftStore->currentTerm) {
             ready = true;
@@ -442,7 +442,9 @@ int32_t syncNodeLeaderTransferTo(SSyncNode* pSyncNode, SNodeInfo newLeader) {
   pMsg->newLeaderId.vgId = pSyncNode->vgId;
   pMsg->newNodeInfo = newLeader;
 
-  return syncNodePropose(pSyncNode, &rpcMsg, false);
+  int32_t ret = syncNodePropose(pSyncNode, &rpcMsg, false);
+  rpcFreeCont(rpcMsg.pCont);
+  return ret;
 }
 
 SSyncState syncGetState(int64_t rid) {
@@ -645,13 +647,12 @@ static int32_t syncHbTimerInit(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer, SRa
 static int32_t syncHbTimerStart(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
   int32_t ret = 0;
   if (syncIsInit()) {
-    SSyncHbTimerData* pData = taosMemoryMalloc(sizeof(SSyncHbTimerData));
+    SSyncHbTimerData* pData = &pSyncTimer->hbData;
     pData->pSyncNode = pSyncNode;
     pData->pTimer = pSyncTimer;
     pData->destId = pSyncTimer->destId;
     pData->logicClock = pSyncTimer->logicClock;
 
-    pSyncTimer->pData = pData;
     taosTmrReset(pSyncTimer->timerCb, pSyncTimer->timerMS, pData, syncEnv()->pTimerManager, &pSyncTimer->pTimer);
   } else {
     sError("vgId:%d, start ctrl hb timer error, sync env is stop", pSyncNode->vgId);
@@ -664,7 +665,6 @@ static int32_t syncHbTimerStop(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
   atomic_add_fetch_64(&pSyncTimer->logicClock, 1);
   taosTmrStop(pSyncTimer->pTimer);
   pSyncTimer->pTimer = NULL;
-  // taosMemoryFree(pSyncTimer->pData);
   return ret;
 }
 
@@ -1086,15 +1086,8 @@ int32_t syncNodeStartElectTimer(SSyncNode* pSyncNode, int32_t ms) {
   int32_t ret = 0;
   if (syncIsInit()) {
     pSyncNode->electTimerMS = ms;
-
-    SElectTimer* pElectTimer = taosMemoryMalloc(sizeof(SElectTimer));
-    pElectTimer->logicClock = pSyncNode->electTimerLogicClock;
-    pElectTimer->pSyncNode = pSyncNode;
-    pElectTimer->pData = NULL;
-
-    taosTmrReset(pSyncNode->FpElectTimerCB, pSyncNode->electTimerMS, pElectTimer, syncEnv()->pTimerManager,
+    taosTmrReset(pSyncNode->FpElectTimerCB, pSyncNode->electTimerMS, pSyncNode, syncEnv()->pTimerManager,
                  &pSyncNode->pElectTimer);
-
   } else {
     sError("vgId:%d, start elect timer error, sync env is stop", pSyncNode->vgId);
   }
@@ -1827,20 +1820,17 @@ static void syncNodeEqPingTimer(void* param, void* tmrId) {
 }
 
 static void syncNodeEqElectTimer(void* param, void* tmrId) {
+  SSyncNode* pNode = param;
+
   if (!syncIsInit()) return;
-
-  SElectTimer* pElectTimer = param;
-  SSyncNode*   pNode = pElectTimer->pSyncNode;
-
   if (pNode == NULL) return;
   if (pNode->syncEqMsg == NULL) return;
 
   SRpcMsg rpcMsg = {0};
-  int32_t code = syncBuildTimeout(&rpcMsg, SYNC_TIMEOUT_ELECTION, pElectTimer->logicClock, pNode->electTimerMS, pNode);
-
+  int32_t code =
+      syncBuildTimeout(&rpcMsg, SYNC_TIMEOUT_ELECTION, pNode->electTimerLogicClock, pNode->electTimerMS, pNode);
   if (code != 0) {
     sError("failed to build elect msg");
-    taosMemoryFree(pElectTimer);
     return;
   }
 
@@ -1851,12 +1841,8 @@ static void syncNodeEqElectTimer(void* param, void* tmrId) {
   if (code != 0) {
     sError("failed to sync enqueue elect msg since %s", terrstr());
     rpcFreeCont(rpcMsg.pCont);
-    taosMemoryFree(pElectTimer);
-    return;
   }
 
-  taosMemoryFree(pElectTimer);
-
 #if 0
   // reset timer ms
   if (syncIsInit() && pNode->electBaseLine > 0) {

From 6c1361ef80e436aa3ecc03526d700e93a0833e69 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Tue, 15 Nov 2022 13:59:00 +0800
Subject: [PATCH 22/85] fix: null pointer check when invoke memcpy

---
 source/libs/executor/src/tsimplehash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/executor/src/tsimplehash.c b/source/libs/executor/src/tsimplehash.c
index 9fbe94200c..484d917069 100644
--- a/source/libs/executor/src/tsimplehash.c
+++ b/source/libs/executor/src/tsimplehash.c
@@ -93,7 +93,7 @@ static SHNode *doCreateHashNode(const void *key, size_t keyLen, const void *data
   pNewNode->keyLen = keyLen;
   pNewNode->dataLen = dataLen;
   pNewNode->next = NULL;
-  memcpy(GET_SHASH_NODE_DATA(pNewNode), data, dataLen);
+  if (data) memcpy(GET_SHASH_NODE_DATA(pNewNode), data, dataLen);
   memcpy(GET_SHASH_NODE_KEY(pNewNode, dataLen), key, keyLen);
   return pNewNode;
 }
@@ -203,7 +203,7 @@ int32_t tSimpleHashPut(SSHashObj *pHashObj, const void *key, size_t keyLen, cons
     pNewNode->next = pHashObj->hashList[slot];
     pHashObj->hashList[slot] = pNewNode;
     atomic_add_fetch_64(&pHashObj->size, 1);
-  } else {  // update data
+  } else if (data) {  // update data
     memcpy(GET_SHASH_NODE_DATA(pNode), data, dataLen);
   }
 

From b0ea0c0d7939e00fab03129dd034a92bd91162ce Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 14:04:44 +0800
Subject: [PATCH 23/85] test: add asan case

---
 tests/parallel_test/cases.task | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 2e9b942df4..2369b238ea 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -242,8 +242,8 @@
 ,,y,script,./test.sh -f tsim/stream/fillIntervalValue.sim
 ,,y,script,./test.sh -f tsim/trans/lossdata1.sim
 ,,y,script,./test.sh -f tsim/trans/create_db.sim
-,,,script,./test.sh -f tsim/tmq/basic1.sim
-,,,script,./test.sh -f tsim/tmq/basic2.sim
+,,y,script,./test.sh -f tsim/tmq/basic1.sim
+,,y,script,./test.sh -f tsim/tmq/basic2.sim
 ,,,script,./test.sh -f tsim/tmq/basic3.sim
 ,,,script,./test.sh -f tsim/tmq/basic4.sim
 ,,,script,./test.sh -f tsim/tmq/basic1Of2Cons.sim

From ccd3bb20a74aa56efbf6f01844b0248f66885bd4 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 15 Nov 2022 14:10:46 +0800
Subject: [PATCH 24/85] fix: reset cache when table is dropped

---
 source/dnode/vnode/src/tq/tqRead.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index 48e69f8f4d..45873f2744 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -425,6 +425,7 @@ int32_t tqRetrieveDataBlock(SSDataBlock* pBlock, STqReader* pReader) {
       tqWarn("cannot found tsschema for table: uid:%" PRId64 " (suid:%" PRId64 "), version %d, possibly dropped table",
              pReader->msgIter.uid, pReader->msgIter.suid, pReader->cachedSchemaVer);
       /*ASSERT(0);*/
+      pReader->cachedSchemaSuid = 0;
       terrno = TSDB_CODE_TQ_TABLE_SCHEMA_NOT_FOUND;
       return -1;
     }
@@ -435,6 +436,7 @@ int32_t tqRetrieveDataBlock(SSDataBlock* pBlock, STqReader* pReader) {
       tqWarn("cannot found schema wrapper for table: suid:%" PRId64 ", version %d, possibly dropped table",
              pReader->msgIter.uid, pReader->cachedSchemaVer);
       /*ASSERT(0);*/
+      pReader->cachedSchemaSuid = 0;
       terrno = TSDB_CODE_TQ_TABLE_SCHEMA_NOT_FOUND;
       return -1;
     }

From 76cd3122d1e848ce12cc78ac3a8e6f945e666b00 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 15 Nov 2022 14:28:20 +0800
Subject: [PATCH 25/85] fix: memory leak

---
 source/common/src/tmsg.c                   | 4 ++++
 source/dnode/mnode/impl/src/mndSubscribe.c | 4 ++++
 source/dnode/vnode/src/tq/tq.c             | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index fd445ff2ae..4485e8df0c 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -6027,9 +6027,13 @@ int32_t tDecodeSMqDataRsp(SDecoder *pDecoder, SMqDataRsp *pRsp) {
 
 void tDeleteSMqDataRsp(SMqDataRsp *pRsp) {
   taosArrayDestroy(pRsp->blockDataLen);
+  pRsp->blockDataLen = NULL;
   taosArrayDestroyP(pRsp->blockData, (FDelete)taosMemoryFree);
+  pRsp->blockData = NULL;
   taosArrayDestroyP(pRsp->blockSchema, (FDelete)tDeleteSSchemaWrapper);
+  pRsp->blockSchema = NULL;
   taosArrayDestroyP(pRsp->blockTbName, (FDelete)taosMemoryFree);
+  pRsp->blockTbName = NULL;
 }
 
 int32_t tEncodeSTaosxRsp(SEncoder *pEncoder, const STaosxRsp *pRsp) {
diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index 14adeb0080..fd79846104 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -471,8 +471,12 @@ static int32_t mndPersistRebResult(SMnode *pMnode, SRpcMsg *pMsg, const SMqRebOu
     pConsumerNew->updateType = CONSUMER_UPDATE__TOUCH;
     mndReleaseConsumer(pMnode, pConsumerOld);
     if (mndSetConsumerCommitLogs(pMnode, pTrans, pConsumerNew) != 0) {
+      tDeleteSMqConsumerObj(pConsumerNew);
+      taosMemoryFree(pConsumerNew);
       goto REB_FAIL;
     }
+    tDeleteSMqConsumerObj(pConsumerNew);
+    taosMemoryFree(pConsumerNew);
   }
   // 3.2 set new consumer
   consumerNum = taosArrayGetSize(pOutput->newConsumers);
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index eafbd8464d..1cc771dbb4 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -68,6 +68,7 @@ static void destroySTqHandle(void* data) {
 
 static void tqPushEntryFree(void* data) {
   STqPushEntry* p = *(void**)data;
+  tDeleteSMqDataRsp(&p->dataRsp);
   taosMemoryFree(p);
 }
 
@@ -576,8 +577,8 @@ int32_t tqProcessPollReq(STQ* pTq, SRpcMsg* pMsg) {
         return 0;
       }
     }
-    taosWUnLockLatch(&pTq->pushLock);
 #endif
+    taosWUnLockLatch(&pTq->pushLock);
 
     if (tqSendDataRsp(pTq, pMsg, pReq, &dataRsp) < 0) {
       code = -1;

From 82baf3aa76a4b30733b2a7ae6ff171e2a4d6be17 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 15 Nov 2022 14:37:10 +0800
Subject: [PATCH 26/85] fix test cases

---
 tests/system-test/2-query/csum.py          |   32 +-
 tests/system-test/2-query/function_diff.py |   26 +-
 tests/system-test/2-query/irate.py         |    2 +-
 tests/system-test/2-query/mavg.py          |   21 +-
 tests/system-test/2-query/max_partition.py |   12 +-
 tests/system-test/2-query/nestedQuery.py   | 3924 ++++++++++----------
 tests/system-test/2-query/stablity.py      | 3072 +++++++--------
 tests/system-test/2-query/stablity_1.py    |   58 +-
 8 files changed, 3574 insertions(+), 3573 deletions(-)

diff --git a/tests/system-test/2-query/csum.py b/tests/system-test/2-query/csum.py
index e933eb54cb..1e6b26ada0 100644
--- a/tests/system-test/2-query/csum.py
+++ b/tests/system-test/2-query/csum.py
@@ -24,7 +24,7 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
-
+msec_per_min=60 * 1000
 class TDTestCase:
     def init(self, conn, logSql, replicaVar=1):
         self.replicaVar = int(replicaVar)
@@ -54,7 +54,7 @@ class TDTestCase:
 
         if tdSql.queryRows == 0:
             tdSql.query(self.csum_query_form(
-                col=col, alias=alias, table_expr=table_expr, condition=condition
+                col=col, alias=alias, table_expr=table_expr.replace("csum", "ts, csum"), condition=condition
             ))
             print(f"case in {line}: ", end='')
             tdSql.checkRows(0)
@@ -132,7 +132,7 @@ class TDTestCase:
                 pre_result = np.array(pre_result, dtype = 'int64')
             pre_csum = np.cumsum(pre_result)[offset_val:]
             tdSql.query(self.csum_query_form(
-                col=col, alias=alias, table_expr=table_expr, condition=condition
+                col=col, alias=alias, table_expr=table_expr.replace("csum", "ts,csum"), condition=condition
             ))
 
             for i in range(tdSql.queryRows):
@@ -163,7 +163,7 @@ class TDTestCase:
         self.checkcsum(**case6)
 
         # case7~8: nested query
-        case7 = {"table_expr": "(select c1 from db.stb1 order by ts, tbname )"}
+        case7 = {"table_expr": "(select ts,c1 from db.stb1 order by ts, tbname )"}
         self.checkcsum(**case7)
         case8 = {"table_expr": "(select csum(c1) c1 from db.t1)"}
         self.checkcsum(**case8)
@@ -315,19 +315,19 @@ class TDTestCase:
             for j in range(data_row):
                 tdSql.execute(
                     f"insert into t{i} values ("
-                    f"{basetime + (j+1)*10}, {random.randint(-200, -1)}, {random.uniform(200, -1)}, {basetime + random.randint(-200, -1)}, "
+                    f"{basetime + (j+1)*10 + i * msec_per_min}, {random.randint(-200, -1)}, {random.uniform(200, -1)}, {basetime + random.randint(-200, -1)}, "
                     f"'binary_{j}', {random.uniform(-200, -1)}, {random.choice([0,1])}, {random.randint(-200,-1)}, "
                     f"{random.randint(-200, -1)}, {random.randint(-127, -1)}, 'nchar_{j}' )"
                 )
 
                 tdSql.execute(
                     f"insert into t{i} values ("
-                    f"{basetime - (j+1) * 10}, {random.randint(1, 200)}, {random.uniform(1, 200)}, {basetime - random.randint(1, 200)}, "
+                    f"{basetime - (j+1) * 10 + i * msec_per_min}, {random.randint(1, 200)}, {random.uniform(1, 200)}, {basetime - random.randint(1, 200)}, "
                     f"'binary_{j}_1', {random.uniform(1, 200)}, {random.choice([0, 1])}, {random.randint(1,200)}, "
                     f"{random.randint(1,200)}, {random.randint(1,127)}, 'nchar_{j}_1' )"
                 )
                 tdSql.execute(
-                    f"insert into tt{i} values ( {basetime-(j+1) * 10}, {random.randint(1, 200)} )"
+                    f"insert into tt{i} values ( {basetime-(j+1) * 10 + i * msec_per_min}, {random.randint(1, 200)} )"
                 )
 
         pass
@@ -366,26 +366,26 @@ class TDTestCase:
 
         tdLog.printNoPrefix("######## insert only NULL test:")
         for i in range(tbnum):
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime - 5})")
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime + 5})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime - 5 + i * msec_per_min})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime + 5 + i * msec_per_min})")
         self.csum_current_query()
         self.csum_error_query()
 
         tdLog.printNoPrefix("######## insert data in the range near the max(bigint/double):")
         self.csum_test_table(tbnum)
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 1) * 10}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
+                      f"({nowtime - (per_table_rows + 1) * 10 + i * msec_per_min}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 2) * 10}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
+                      f"({nowtime - (per_table_rows + 2) * 10 + i * msec_per_min}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
         self.csum_current_query()
         self.csum_error_query()
 
         tdLog.printNoPrefix("######## insert data in the range near the min(bigint/double):")
         self.csum_test_table(tbnum)
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 1) * 10}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {1-2**63})")
+                      f"({nowtime - (per_table_rows + 1) * 10 + i * msec_per_min}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {1-2**63})")
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 2) * 10}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {512-2**63})")
+                      f"({nowtime - (per_table_rows + 2) * 10 + i * msec_per_min}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {512-2**63})")
         self.csum_current_query()
         self.csum_error_query()
 
@@ -398,9 +398,9 @@ class TDTestCase:
 
         tdLog.printNoPrefix("######## insert data mix with NULL test:")
         for i in range(tbnum):
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime})")
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime-(per_table_rows+3)*10})")
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime+(per_table_rows+3)*10})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime + i * msec_per_min})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime-(per_table_rows+3)*10 + i * msec_per_min})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime+(per_table_rows+3)*10 + i * msec_per_min})")
         self.csum_current_query()
         self.csum_error_query()
 
diff --git a/tests/system-test/2-query/function_diff.py b/tests/system-test/2-query/function_diff.py
index 4abef03037..c3f3789a69 100644
--- a/tests/system-test/2-query/function_diff.py
+++ b/tests/system-test/2-query/function_diff.py
@@ -24,7 +24,7 @@ from util.cases import *
 from util.sql import *
 from util.dnodes import *
 
-
+msec_per_min=60*1000
 class TDTestCase:
     def init(self, conn, logSql, replicaVar=1):
         self.replicaVar = int(replicaVar)
@@ -312,19 +312,19 @@ class TDTestCase:
             for j in range(data_row):
                 tdSql.execute(
                     f"insert into db.t{i} values ("
-                    f"{basetime + (j+1)*10}, {random.randint(-200, -1)}, {random.uniform(200, -1)}, {basetime + random.randint(-200, -1)}, "
+                    f"{basetime + (j+1)*10 + i* msec_per_min}, {random.randint(-200, -1)}, {random.uniform(200, -1)}, {basetime + random.randint(-200, -1)}, "
                     f"'binary_{j}', {random.uniform(-200, -1)}, {random.choice([0,1])}, {random.randint(-200,-1)}, "
                     f"{random.randint(-200, -1)}, {random.randint(-127, -1)}, 'nchar_{j}' )"
                 )
 
                 tdSql.execute(
                     f"insert into db.t{i} values ("
-                    f"{basetime - (j+1) * 10}, {random.randint(1, 200)}, {random.uniform(1, 200)}, {basetime - random.randint(1, 200)}, "
+                    f"{basetime - (j+1) * 10 + i* msec_per_min}, {random.randint(1, 200)}, {random.uniform(1, 200)}, {basetime - random.randint(1, 200)}, "
                     f"'binary_{j}_1', {random.uniform(1, 200)}, {random.choice([0, 1])}, {random.randint(1,200)}, "
                     f"{random.randint(1,200)}, {random.randint(1,127)}, 'nchar_{j}_1' )"
                 )
                 tdSql.execute(
-                    f"insert into db.tt{i} values ( {basetime-(j+1) * 10}, {random.randint(1, 200)} )"
+                    f"insert into db.tt{i} values ( {basetime-(j+1) * 10 + i* msec_per_min}, {random.randint(1, 200)} )"
                 )
 
         pass
@@ -394,26 +394,26 @@ class TDTestCase:
 
         tdLog.printNoPrefix("######## insert only NULL test:")
         for i in range(tbnum):
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime - 5})")
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime + 5})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime - 5 + i* msec_per_min})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime + 5 + i* msec_per_min})")
         self.diff_current_query()
         self.diff_error_query()
 
         tdLog.printNoPrefix("######## insert data in the range near the max(bigint/double):")
         self.diff_test_table(tbnum)
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 1) * 10}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
+                      f"({nowtime - (per_table_rows + 1) * 10 + i* msec_per_min}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 2) * 10}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
+                      f"({nowtime - (per_table_rows + 2) * 10 + i* msec_per_min}, {2**31-1}, {3.4*10**38}, {1.7*10**308}, {2**63-1})")
         self.diff_current_query()
         self.diff_error_query()
 
         tdLog.printNoPrefix("######## insert data in the range near the min(bigint/double):")
         self.diff_test_table(tbnum)
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 1) * 10}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {1-2**63})")
+                      f"({nowtime - (per_table_rows + 1) * 10 + i* msec_per_min}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {1-2**63})")
         tdSql.execute(f"insert into db.t1(ts, c1,c2,c5,c7) values "
-                      f"({nowtime - (per_table_rows + 2) * 10}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {512-2**63})")
+                      f"({nowtime - (per_table_rows + 2) * 10 + i* msec_per_min}, {1-2**31}, {-3.4*10**38}, {-1.7*10**308}, {512-2**63})")
         self.diff_current_query()
         self.diff_error_query()
 
@@ -426,9 +426,9 @@ class TDTestCase:
 
         tdLog.printNoPrefix("######## insert data mix with NULL test:")
         for i in range(tbnum):
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime})")
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime-(per_table_rows+3)*10})")
-            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime+(per_table_rows+3)*10})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime + i* msec_per_min})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime-(per_table_rows+3)*10 + i* msec_per_min})")
+            tdSql.execute(f"insert into db.t{i}(ts) values ({nowtime+(per_table_rows+3)*10 + i* msec_per_min})")
         self.diff_current_query()
         self.diff_error_query()
 
diff --git a/tests/system-test/2-query/irate.py b/tests/system-test/2-query/irate.py
index cee595d186..8aa2b3d420 100644
--- a/tests/system-test/2-query/irate.py
+++ b/tests/system-test/2-query/irate.py
@@ -34,7 +34,7 @@ class TDTestCase:
 
             ts = self.ts
             for row in range(rownums):
-                ts = self.ts + time_step*row
+                ts = self.ts + (time_step) * row + tbnum * 60 * 1000
                 c1 = random.randint(0,1000)
                 c2 = random.randint(0,100000)
                 c3 = random.randint(0,125)
diff --git a/tests/system-test/2-query/mavg.py b/tests/system-test/2-query/mavg.py
index ec4a087a8e..f76980106d 100644
--- a/tests/system-test/2-query/mavg.py
+++ b/tests/system-test/2-query/mavg.py
@@ -26,6 +26,7 @@ from util.sql import *
 from util.dnodes import *
 
 dbname = 'db'
+msec_per_min = 60 * 1000
 class TDTestCase:
     def init(self, conn, logSql, replicaVar=1):
         self.replicaVar = int(replicaVar)
@@ -327,7 +328,7 @@ class TDTestCase:
         self.checkmavg(**case6)
 
         # case7~8: nested query
-        case7 = {"table_expr": f"(select c1 from {dbname}.stb1)"}
+        case7 = {"table_expr": f"(select ts, c1 from {dbname}.stb1)"}
         self.checkmavg(**case7)
         # case8 = {"table_expr": f"(select _c0, mavg(c1, 1) c1 from {dbname}.stb1 group by tbname)"}
         # self.checkmavg(**case8)
@@ -568,19 +569,19 @@ class TDTestCase:
             for j in range(data_row):
                 tdSql.execute(
                     f"insert into {dbname}.t{i} values ("
-                    f"{basetime + (j+1)*10}, {random.randint(-200, -1)}, {random.uniform(200, -1)}, {basetime + random.randint(-200, -1)}, "
+                    f"{basetime + (j+1)*10 + i * msec_per_min}, {random.randint(-200, -1)}, {random.uniform(200, -1)}, {basetime + random.randint(-200, -1)}, "
                     f"'binary_{j}', {random.uniform(-200, -1)}, {random.choice([0,1])}, {random.randint(-200,-1)}, "
                     f"{random.randint(-200, -1)}, {random.randint(-127, -1)}, 'nchar_{j}' )"
                 )
 
                 tdSql.execute(
                     f"insert into {dbname}.t{i} values ("
-                    f"{basetime - (j+1) * 10}, {random.randint(1, 200)}, {random.uniform(1, 200)}, {basetime - random.randint(1, 200)}, "
+                    f"{basetime - (j+1) * 10 + i * msec_per_min}, {random.randint(1, 200)}, {random.uniform(1, 200)}, {basetime - random.randint(1, 200)}, "
                     f"'binary_{j}_1', {random.uniform(1, 200)}, {random.choice([0, 1])}, {random.randint(1,200)}, "
                     f"{random.randint(1,200)}, {random.randint(1,127)}, 'nchar_{j}_1' )"
                 )
                 tdSql.execute(
-                    f"insert into {dbname}.tt{i} values ( {basetime-(j+1) * 10}, {random.randint(1, 200)} )"
+                    f"insert into {dbname}.tt{i} values ( {basetime-(j+1) * 10 + i * msec_per_min}, {random.randint(1, 200)} )"
                 )
 
         pass
@@ -619,8 +620,8 @@ class TDTestCase:
 
         tdLog.printNoPrefix("######## insert only NULL test:")
         for i in range(tbnum):
-            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime - 5})")
-            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime + 5})")
+            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime - 5 + i * msec_per_min})")
+            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime + 5 + i * msec_per_min})")
         self.mavg_current_query()
         self.mavg_error_query()
 
@@ -651,9 +652,9 @@ class TDTestCase:
 
         tdLog.printNoPrefix("######## insert data mix with NULL test:")
         for i in range(tbnum):
-            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime})")
-            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime-(per_table_rows+3)*10})")
-            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime+(per_table_rows+3)*10})")
+            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime + i * msec_per_min})")
+            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime-(per_table_rows+3)*10 + i * msec_per_min})")
+            tdSql.execute(f"insert into {dbname}.t{i}(ts) values ({nowtime+(per_table_rows+3)*10 + i * msec_per_min})")
         self.mavg_current_query()
         self.mavg_error_query()
 
@@ -676,7 +677,7 @@ class TDTestCase:
         tdSql.checkRows(4)
 
     def mavg_support_stable(self):
-        tdSql.query(f" select mavg(1,3) from {dbname}.stb1 ")
+        tdSql.query(f"select mavg(1,3) from {dbname}.stb1 ")
         tdSql.checkRows(68)
         tdSql.checkData(0,0,1.000000000)
         tdSql.query(f"select mavg(c1,3) from {dbname}.stb1 partition by tbname ")
diff --git a/tests/system-test/2-query/max_partition.py b/tests/system-test/2-query/max_partition.py
index a9b7a14eb0..b14bc649dd 100644
--- a/tests/system-test/2-query/max_partition.py
+++ b/tests/system-test/2-query/max_partition.py
@@ -20,15 +20,15 @@ class TDTestCase:
 
         for i in range(tb_nums):
             tbname = f"{dbname}.sub_{stb_name}_{i}"
-            ts = self.ts + i*10000
+            ts = self.ts + i*1000*120
             tdSql.execute(f"create table {tbname} using {dbname}.{stb_name} tags ({ts} , {i} , {i}*10 ,{i}*1.0,{i}*1.0 , 1 , 2, 'true', 'binary_{i}' ,'nchar_{i}',{i},{i},10,20 )")
 
             for row in range(row_nums):
-                ts = self.ts + row*1000
+                ts = ts + row*1000
                 tdSql.execute(f"insert into {tbname} values({ts} , {row} , {row} , {row} , {row} , 1 , 2 , 'true' , 'binary_{row}' , 'nchar_{row}' , {row} , {row} , 1 ,2 )")
 
             for null in range(5):
-                ts =  self.ts + row_nums*1000 + null*1000
+                ts = ts + row_nums*1000 + null*1000
                 tdSql.execute(f"insert into {tbname} values({ts} , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL , NULL )")
 
     def basic_query(self, dbname="db"):
@@ -160,13 +160,13 @@ class TDTestCase:
         tdSql.query(f"select tbname , count(c1) from {dbname}.stb partition by tbname interval(10s) slimit 5 soffset 1 ")
 
         tdSql.query(f"select tbname , max(c1) from {dbname}.stb partition by tbname interval(10s)")
-        tdSql.checkRows(self.row_nums*2)
+        tdSql.checkRows(self.row_nums*10)
 
         tdSql.query(f"select unique(c1) from {dbname}.stb partition  by tbname order by tbname")
 
         tdSql.query(f"select tbname , count(c1) from {dbname}.sub_stb_1 partition by tbname interval(10s)")
         tdSql.checkData(0,0,'sub_stb_1')
-        tdSql.checkData(0,1,self.row_nums)
+        tdSql.checkData(0,1, 4)
 
         tdSql.query(f"select c1 , mavg(c1 ,2 ) from {dbname}.stb partition by c1")
         tdSql.checkRows(90)
@@ -193,7 +193,7 @@ class TDTestCase:
         tdSql.query(f"select c1 , DERIVATIVE(c1,2,1) from {dbname}.stb partition by c1 order by c1")
         tdSql.checkRows(90)
         # bug need fix
-        tdSql.checkData(0,1,None)
+        tdSql.checkData(0,1,0.0)
 
 
         tdSql.query(f"select tbname , max(c1) from {dbname}.stb partition by tbname order by tbname slimit 5 soffset 0 ")
diff --git a/tests/system-test/2-query/nestedQuery.py b/tests/system-test/2-query/nestedQuery.py
index b1008efa86..034ab8dcdc 100755
--- a/tests/system-test/2-query/nestedQuery.py
+++ b/tests/system-test/2-query/nestedQuery.py
@@ -24,10 +24,10 @@ from util.dnodes import tdDnodes
 from util.dnodes import *
 
 class TDTestCase:
-    updatecfgDict = {'maxSQLLength':1048576,'debugFlag': 143 ,"cDebugFlag":143,"uDebugFlag":143 ,"rpcDebugFlag":143 , "tmrDebugFlag":143 , 
+    updatecfgDict = {'maxSQLLength':1048576,'debugFlag': 143 ,"cDebugFlag":143,"uDebugFlag":143 ,"rpcDebugFlag":143 , "tmrDebugFlag":143 ,
     "jniDebugFlag":143 ,"simDebugFlag":143,"dDebugFlag":143, "dDebugFlag":143,"vDebugFlag":143,"mDebugFlag":143,"qDebugFlag":143,
     "wDebugFlag":143,"sDebugFlag":143,"tsdbDebugFlag":143,"tqDebugFlag":143 ,"fsDebugFlag":143 ,"fnDebugFlag":143}
-    
+
     def init(self, conn, logSql, replicaVar=1):
         self.replicaVar = int(replicaVar)
         tdLog.debug("start to execute %s" % __file__)
@@ -36,13 +36,13 @@ class TDTestCase:
         self.testcasePath = os.path.split(__file__)[0]
         self.testcaseFilename = os.path.split(__file__)[-1]
         os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
-        
+
         self.num = 10
         self.fornum = 15
-        
+
         self.db_nest = "nest"
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         # regular column select
         #q_select= ['ts' , '*' , 'q_int', 'q_bigint' , 'q_bigint' , 'q_smallint' , 'q_tinyint' , 'q_bool' , 'q_binary' , 'q_nchar' ,'q_float' , 'q_double' ,'q_ts ']
         self.q_select= ['q_int', 'q_bigint' , 'q_bigint' , 'q_smallint' , 'q_tinyint' , 'q_bool' , 'q_binary' , 'q_nchar' ,'q_float' , 'q_double' ,'q_ts ', 'q_int_null ', 'q_bigint_null ' , 'q_bigint_null ' , 'q_smallint_null ' , 'q_tinyint_null ' , 'q_bool_null ' , 'q_binary_null ' , 'q_nchar_null ' ,'q_float_null ' , 'q_double_null ' ,'q_ts_null ']
@@ -55,11 +55,11 @@ class TDTestCase:
         self.qt_select=  self.q_select + self.t_select
 
         # distinct regular column select
-        self.dq_select= ['distinct q_int', 'distinct q_bigint' , 'distinct q_smallint' , 'distinct q_tinyint' , 
+        self.dq_select= ['distinct q_int', 'distinct q_bigint' , 'distinct q_smallint' , 'distinct q_tinyint' ,
                 'distinct q_bool' , 'distinct q_binary' , 'distinct q_nchar' ,'distinct q_float' , 'distinct q_double' ,'distinct q_ts ']
 
         # distinct tag column select
-        self.dt_select= ['distinct loc', 'distinct t_int', 'distinct t_bigint'  , 'distinct t_smallint' , 'distinct t_tinyint' , 
+        self.dt_select= ['distinct loc', 'distinct t_int', 'distinct t_bigint'  , 'distinct t_smallint' , 'distinct t_tinyint' ,
                 'distinct t_bool' , 'distinct t_binary' , 'distinct t_nchar' ,'distinct t_float' , 'distinct t_double' ,'distinct t_ts ']
 
         # distinct regular and tag column select
@@ -70,13 +70,13 @@ class TDTestCase:
         self.s_s_select= ['tbname' , '_rowts' , '_c0', '_C0' ]
         self.unionall_or_union= [ ' union ' , ' union all ' ]
 
-        # regular column where 
+        # regular column where
         self.q_where = ['ts < now +1s','q_bigint >= -9223372036854775807 and q_bigint <= 9223372036854775807', 'q_int <= 2147483647 and q_int >= -2147483647',
-        'q_smallint >= -32767 and q_smallint <= 32767','q_tinyint >= -127 and q_tinyint <= 127','q_float >= -1.7E308 and q_float <= 1.7E308', 
-        'q_double >= -1.7E308 and q_double <= 1.7E308', 'q_binary like \'binary%\'  or q_binary = \'0\' ' , 'q_nchar like \'nchar%\' or q_nchar = \'0\' ' , 
+        'q_smallint >= -32767 and q_smallint <= 32767','q_tinyint >= -127 and q_tinyint <= 127','q_float >= -1.7E308 and q_float <= 1.7E308',
+        'q_double >= -1.7E308 and q_double <= 1.7E308', 'q_binary like \'binary%\'  or q_binary = \'0\' ' , 'q_nchar like \'nchar%\' or q_nchar = \'0\' ' ,
         'q_bool = true or  q_bool = false' , 'q_bool in (0 , 1)' , 'q_bool in ( true , false)' , 'q_bool = 0 or q_bool = 1',
-        'q_bigint between  -9223372036854775807 and 9223372036854775807',' q_int between -2147483647 and 2147483647','q_smallint between -32767 and 32767', 
-        'q_bigint not between  9223372036854775807 and -9223372036854775807','q_int not between 2147483647 and -2147483647','q_smallint not between 32767 and -32767', 
+        'q_bigint between  -9223372036854775807 and 9223372036854775807',' q_int between -2147483647 and 2147483647','q_smallint between -32767 and 32767',
+        'q_bigint not between  9223372036854775807 and -9223372036854775807','q_int not between 2147483647 and -2147483647','q_smallint not between 32767 and -32767',
         'q_tinyint between -127 and 127 ','q_float >= -3.4E38  ','q_float <= 3.4E38  ','q_double >= -1.7E308  ',
         'q_double <= 1.7E308  ','q_float between -3.4E38 and 3.4E38  ','q_double between -1.7E308 and 1.7E308  ' ,'q_float not between 3.4E38 and -3.4E38  ','q_double not between 1.7E308 and -1.7E308  ',
         'q_float is not null  ' ,'q_double is not null  ' ,'q_binary match \'binary\' ','q_binary nmatch \'binarynchar\' ','q_nchar match \'nchar\' ','q_nchar nmatch \'binarynchar\' ',
@@ -89,38 +89,38 @@ class TDTestCase:
         't1.q_smallint >= -32767 and t1.q_smallint <= 32767 and t2.q_smallint >= -32767 and t2.q_smallint <= 32767',
         't1.q_tinyint >= -127 and t1.q_tinyint <= 127 and t2.q_tinyint >= -127 and t2.q_tinyint <= 127',
         't1.q_float >= - 1.7E308 and t1.q_float <=  1.7E308 and t2.q_float >= - 1.7E308 and t2.q_float <=  1.7E308',
-        't1.q_double >= - 1.7E308 and t1.q_double <=  1.7E308 and t2.q_double >= - 1.7E308 and t2.q_double <=  1.7E308', 
-        't1.q_binary like \'binary%\'  and t2.q_binary like \'binary%\'  ' , 
-        't1.q_nchar like \'nchar%\' and t2.q_nchar like \'nchar%\' ' , 
-        't1.q_bool in (0 , 1) and t2.q_bool in (0 , 1)' , 't1.q_bool in ( true , false) and t2.q_bool in ( true , false)' , 
+        't1.q_double >= - 1.7E308 and t1.q_double <=  1.7E308 and t2.q_double >= - 1.7E308 and t2.q_double <=  1.7E308',
+        't1.q_binary like \'binary%\'  and t2.q_binary like \'binary%\'  ' ,
+        't1.q_nchar like \'nchar%\' and t2.q_nchar like \'nchar%\' ' ,
+        't1.q_bool in (0 , 1) and t2.q_bool in (0 , 1)' , 't1.q_bool in ( true , false) and t2.q_bool in ( true , false)' ,
         't1.q_bigint between  -9223372036854775807 and 9223372036854775807 and t2.q_bigint between  -9223372036854775807 and 9223372036854775807',
         't1.q_int between -2147483647 and 2147483647 and t2.q_int between -2147483647 and 2147483647',
-        't1.q_smallint between -32767 and 32767 and t2.q_smallint between -32767 and 32767', 
+        't1.q_smallint between -32767 and 32767 and t2.q_smallint between -32767 and 32767',
         't1.q_tinyint between -127 and 127 and t2.q_tinyint between -127 and 127 ','t1.q_float between -1.7E308 and  1.7E308 and t2.q_float between -1.7E308 and  1.7E308',
         't1.q_double between -1.7E308 and  1.7E308 and t2.q_double between -1.7E308 and  1.7E308',
         't1.q_bigint not between  9223372036854775807 and -9223372036854775807 and t2.q_bigint not between  9223372036854775807 and -9223372036854775807',
         't1.q_int not between 2147483647 and -2147483647 and t2.q_int not between 2147483647 and -2147483647',
-        't1.q_smallint not between 32767 and -32767 and t2.q_smallint not between 32767 and -32767', 
+        't1.q_smallint not between 32767 and -32767 and t2.q_smallint not between 32767 and -32767',
         't1.q_tinyint not between 127 and -127 and t2.q_tinyint not between 127 and -127 ','t1.q_float not between -1.7E308 and  -1.7E308 and t2.q_float not between 1.7E308 and  -1.7E308',
         't1.q_double not between 1.7E308 and  -1.7E308 and t2.q_double not between 1.7E308 and  -1.7E308']
         #TD-6201 ,'t1.q_bool between 0 and 1 or t2.q_bool between 0 and 1']
         #'t1.q_bool = true and  t1.q_bool = false and t2.q_bool = true and  t2.q_bool = false' , 't1.q_bool = 0 and t1.q_bool = 1 and t2.q_bool = 0 and t2.q_bool = 1' ,
 
-        self.q_u_or_where = ['(t1.q_binary like \'binary%\'  or t1.q_binary = \'0\'  or t2.q_binary like \'binary%\'  or t2.q_binary = \'0\' )' , 
-        '(t1.q_nchar like \'nchar%\' or t1.q_nchar = \'0\' or t2.q_nchar like \'nchar%\' or t2.q_nchar = \'0\' )' , '(t1.q_bool = true or  t1.q_bool = false or t2.q_bool = true or  t2.q_bool = false)' , 
+        self.q_u_or_where = ['(t1.q_binary like \'binary%\'  or t1.q_binary = \'0\'  or t2.q_binary like \'binary%\'  or t2.q_binary = \'0\' )' ,
+        '(t1.q_nchar like \'nchar%\' or t1.q_nchar = \'0\' or t2.q_nchar like \'nchar%\' or t2.q_nchar = \'0\' )' , '(t1.q_bool = true or  t1.q_bool = false or t2.q_bool = true or  t2.q_bool = false)' ,
         '(t1.q_bool in (0 , 1) or t2.q_bool in (0 , 1))' , '(t1.q_bool in ( true , false) or t2.q_bool in ( true , false))' , '(t1.q_bool = 0 or t1.q_bool = 1 or t2.q_bool = 0 or t2.q_bool = 1)' ,
         '(t1.q_bigint between  -9223372036854775807 and 9223372036854775807 or t2.q_bigint between  -9223372036854775807 and 9223372036854775807)',
         '(t1.q_int between -2147483647 and 2147483647 or t2.q_int between -2147483647 and 2147483647)',
-        '(t1.q_smallint between -32767 and 32767 or t2.q_smallint between -32767 and 32767)', 
+        '(t1.q_smallint between -32767 and 32767 or t2.q_smallint between -32767 and 32767)',
         '(t1.q_tinyint between -127 and 127 or t2.q_tinyint between -127 and 127 )','(t1.q_float between -1.7E308 and 1.7E308 or t2.q_float between -1.7E308 and 1.7E308)',
         '(t1.q_double between -1.7E308 and 1.7E308 or t2.q_double between -1.7E308 and 1.7E308)']
 
         # tag column where
         self.t_where = ['ts < now +1s','t_bigint >= -9223372036854775807 and t_bigint <= 9223372036854775807','t_int <= 2147483647 and t_int >= -2147483647',
         't_smallint >= -32767 and t_smallint <= 32767','q_tinyint >= -127 and t_tinyint <= 127','t_float >= -1.7E308 and t_float <= 1.7E308',
-        't_double >= -1.7E308 and t_double <= 1.7E308', 't_binary like \'binary%\'   or t_binary = \'0\' ' , 't_nchar like \'nchar%\' or t_nchar = \'0\'' , 
+        't_double >= -1.7E308 and t_double <= 1.7E308', 't_binary like \'binary%\'   or t_binary = \'0\' ' , 't_nchar like \'nchar%\' or t_nchar = \'0\'' ,
         't_bool = true or  t_bool = false' , 't_bool in (0 , 1)' , 't_bool in ( true , false)' , 't_bool = 0 or t_bool = 1',
-        't_bigint between  -9223372036854775807 and 9223372036854775807',' t_int between -2147483647 and 2147483647','t_smallint between -32767 and 32767', 
+        't_bigint between  -9223372036854775807 and 9223372036854775807',' t_int between -2147483647 and 2147483647','t_smallint between -32767 and 32767',
         't_tinyint between -127 and 127 ','t_float between -1.7E308 and 1.7E308','t_double between -1.7E308 and 1.7E308',
         't_binary match \'binary\' ','t_binary nmatch \'binarynchar\' ','t_nchar match \'nchar\' ','t_nchar nmatch \'binarynchar\' ',
         't_binary like \'binary%\' ','t_nchar like \'nchar%\' ','(t_binary like \'binary%\'  or t_nchar = \'0\' ) ','(t_nchar like \'nchar%\' or t_binary = \'0\' ) ',]
@@ -132,30 +132,30 @@ class TDTestCase:
         't1.t_smallint >= -32767 and t1.t_smallint <= 32767 and t2.t_smallint >= -32767 and t2.t_smallint <= 32767',
         't1.t_tinyint >= -127 and t1.t_tinyint <= 127 and t2.t_tinyint >= -127 and t2.t_tinyint <= 127',
         't1.t_float >= -1.7E308 and t1.t_float <= 1.7E308 and t2.t_float >= -1.7E308 and t2.t_float <= 1.7E308',
-        't1.t_double >= -1.7E308 and t1.t_double <= 1.7E308 and t2.t_double >= -1.7E308 and t2.t_double <= 1.7E308', 
-        '(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\') ' , 
-        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' , 
+        't1.t_double >= -1.7E308 and t1.t_double <= 1.7E308 and t2.t_double >= -1.7E308 and t2.t_double <= 1.7E308',
+        '(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\') ' ,
+        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' ,
         't1.t_bool in (0 , 1) and t2.t_bool in (0 , 1)' , 't1.t_bool in ( true , false) and t2.t_bool in ( true , false)' , '(t1.t_bool = 0 or t1.t_bool = 1 or t2.t_bool = 0 or t2.t_bool = 1)',
         't1.t_bigint between  -9223372036854775807 and 9223372036854775807 and t2.t_bigint between  -9223372036854775807 and 9223372036854775807',
         't1.t_int between -2147483647 and 2147483647 and t2.t_int between -2147483647 and 2147483647',
-        't1.t_smallint between -32767 and 32767 and t2.t_smallint between -32767 and 32767', 
+        't1.t_smallint between -32767 and 32767 and t2.t_smallint between -32767 and 32767',
         '(t1.t_tinyint between -127 and 127 and t2.t_tinyint between -127 and 127) ','t1.t_float between -1.7E308 and 1.7E308 and t2.t_float between -1.7E308 and 1.7E308',
         '(t1.t_double between -1.7E308 and 1.7E308 and t2.t_double between -1.7E308 and 1.7E308)']
         #TD-6201,'t1.t_bool between 0 and 1 or t2.q_bool between 0 and 1']
 
-        self.t_u_or_where = ['(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\' )' , 
-        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' , 
+        self.t_u_or_where = ['(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\' )' ,
+        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' ,
         '(t1.t_bool in (0 , 1) or t2.t_bool in (0 , 1))' , '(t1.t_bool in ( true , false) or t2.t_bool in ( true , false))' , '(t1.t_bool = 0 or t1.t_bool = 1 or t2.t_bool = 0 or t2.t_bool = 1)',
         '(t1.t_bigint between  -9223372036854775807 and 9223372036854775807 or t2.t_bigint between  -9223372036854775807 and 9223372036854775807)',
         '(t1.t_int between -2147483647 and 2147483647 or t2.t_int between -2147483647 and 2147483647)',
-        '(t1.t_smallint between -32767 and 32767 or t2.t_smallint between -32767 and 32767)', 
+        '(t1.t_smallint between -32767 and 32767 or t2.t_smallint between -32767 and 32767)',
         '(t1.t_tinyint between -127 and 127 or t2.t_tinyint between -127 and 127 )','(t1.t_float between -1.7E308 and 1.7E308 or t2.t_float between -1.7E308 and 1.7E308)',
         '(t1.t_double between -1.7E308 and 1.7E308 or t2.t_double between -1.7E308 and 1.7E308)']
-        
+
         # self.t_u_where = ['t1.ts < now +1s'] # 超级表tag不支持，暂时注掉
         # self.t_u_or_where = ['(t1.q_bool in (0 , 1))'] #超级表tag不支持，暂时注掉
 
-        # regular and tag column where 
+        # regular and tag column where
         self.qt_where = self.q_where + self.t_where
         #self.qt_where = self.q_where #超级表tag不支持，暂时注掉
         self.qt_u_where = self.q_u_where + self.t_u_where
@@ -171,88 +171,88 @@ class TDTestCase:
         self.session_where = ['session(ts,10a)' , 'session(ts,10s)', 'session(ts,10m)' , 'session(ts,10h)','session(ts,10d)' , 'session(ts,10w)']
         self.session_u_where = ['session(t1.ts,10a)' , 'session(t1.ts,10s)', 'session(t1.ts,10m)' , 'session(t1.ts,10h)','session(t1.ts,10d)' , 'session(t1.ts,10w)',
                     'session(t2.ts,10a)' , 'session(t2.ts,10s)', 'session(t2.ts,10m)' , 'session(t2.ts,10h)','session(t2.ts,10d)' , 'session(t2.ts,10w)']
-        
+
         self.fill_where = ['FILL(NONE)','FILL(PREV)','FILL(NULL)','FILL(LINEAR)','FILL(NEXT)','FILL(VALUE, 1.23)']
-        
+
         self.state_window = ['STATE_WINDOW(q_tinyint)','STATE_WINDOW(q_bigint)','STATE_WINDOW(q_int)','STATE_WINDOW(q_bool)','STATE_WINDOW(q_smallint)']
         self.state_u_window = ['STATE_WINDOW(t1.q_tinyint)','STATE_WINDOW(t1.q_bigint)','STATE_WINDOW(t1.q_int)','STATE_WINDOW(t1.q_bool)','STATE_WINDOW(t1.q_smallint)',
                     'STATE_WINDOW(t2.q_tinyint)','STATE_WINDOW(t2.q_bigint)','STATE_WINDOW(t2.q_int)','STATE_WINDOW(t2.q_bool)','STATE_WINDOW(t2.q_smallint)']
 
-        # order by where 
+        # order by where
         self.order_where = ['order by ts' , 'order by ts asc']
         self.order_u_where = ['order by t1.ts' , 'order by t1.ts asc' , 'order by t2.ts' , 'order by t2.ts asc']
         self.order_desc_where = ['order by ts' , 'order by ts asc' , 'order by ts desc' ]
         self.orders_desc_where = ['order by ts' , 'order by ts asc' , 'order by ts desc' , 'order by ts,loc' , 'order by ts,loc asc' , 'order by ts,loc desc']
- 
-        self.group_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint', 
+
+        self.group_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint',
                     'group by tbname,t_float', 'group by tbname,t_double' , 'group by tbname,t_binary', 'group by tbname,t_nchar', 'group by tbname,t_bool' ,'group by tbname ,loc ,t_bigint',
                     'group by tbname,t_binary ,t_nchar ,t_bool' , 'group by tbname,t_int ,t_smallint ,t_tinyint' , 'group by tbname,t_float ,t_double ' ,
-                    'PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint', 
+                    'PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint',
                     'PARTITION BY tbname,t_float', 'PARTITION BY tbname,t_double' , 'PARTITION BY tbname,t_binary', 'PARTITION BY tbname,t_nchar', 'PARTITION BY tbname,t_bool' ,'PARTITION BY tbname ,loc ,t_bigint',
                     'PARTITION BY tbname,t_binary ,t_nchar ,t_bool' , 'PARTITION BY tbname,t_int ,t_smallint ,t_tinyint' , 'PARTITION BY tbname,t_float ,t_double ']
-        self.group_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint', 
+        self.group_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint',
                     'group by t1.t_float', 'group by t1.t_double' , 'group by t1.t_binary', 'group by t1.t_nchar', 'group by t1.t_bool' ,'group by t1.loc ,t1.t_bigint',
                     'group by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'group by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'group by t1.t_float ,t1.t_double ' ,
-                    'PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint', 
+                    'PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint',
                     'PARTITION by t1.t_float', 'PARTITION by t1.t_double' , 'PARTITION by t1.t_binary', 'PARTITION by t1.t_nchar', 'PARTITION by t1.t_bool' ,'PARTITION BY t1.loc ,t1.t_bigint',
                     'PARTITION by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'PARTITION by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'PARTITION by t1.t_float ,t1.t_double ',
-                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint', 
+                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint',
                     'group by t2.t_float', 'group by t2.t_double' , 'group by t2.t_binary', 'group by t2.t_nchar', 'group by t2.t_bool' ,'group by t2.loc ,t2.t_bigint',
                     'group by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'group by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'group by t2.t_float ,t2.t_double ' ,
-                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint', 
+                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint',
                     'PARTITION by t2.t_float', 'PARTITION by t2.t_double' , 'PARTITION by t2.t_binary', 'PARTITION by t2.t_nchar', 'PARTITION by t2.t_bool' ,'PARTITION BY t2.loc ,t2.t_bigint',
-                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double ']  
-              
-        self.group_only_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint', 
+                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double ']
+
+        self.group_only_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint',
                     'group by tbname,t_float', 'group by tbname,t_double' , 'group by tbname,t_binary', 'group by tbname,t_nchar', 'group by tbname,t_bool' ,'group by tbname ,loc ,t_bigint',
                     'group by tbname,t_binary ,t_nchar ,t_bool' , 'group by tbname,t_int ,t_smallint ,t_tinyint' , 'group by tbname,t_float ,t_double ' ]
-        self.group_only_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint', 
+        self.group_only_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint',
                     'group by t1.t_float', 'group by t1.t_double' , 'group by t1.t_binary', 'group by t1.t_nchar', 'group by t1.t_bool' ,'group by t1.loc ,t1.t_bigint',
                     'group by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'group by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'group by t1.t_float ,t1.t_double ' ,
-                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint', 
+                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint',
                     'group by t2.t_float', 'group by t2.t_double' , 'group by t2.t_binary', 'group by t2.t_nchar', 'group by t2.t_bool' ,'group by t2.loc ,t2.t_bigint',
-                    'group by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'group by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'group by t2.t_float ,t2.t_double ' ]  
-        
-        self.partiton_where = ['PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint', 
+                    'group by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'group by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'group by t2.t_float ,t2.t_double ' ]
+
+        self.partiton_where = ['PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint',
                     'PARTITION BY tbname,t_float', 'PARTITION BY tbname,t_double' , 'PARTITION BY tbname,t_binary', 'PARTITION BY tbname,t_nchar', 'PARTITION BY tbname,t_bool' ,'PARTITION BY tbname ,loc ,t_bigint',
                     'PARTITION BY tbname,t_binary ,t_nchar ,t_bool' , 'PARTITION BY tbname,t_int ,t_smallint ,t_tinyint' , 'PARTITION BY tbname,t_float ,t_double ']
-        self.partiton_where_j = ['PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint', 
+        self.partiton_where_j = ['PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint',
                     'PARTITION by t1.t_float', 'PARTITION by t1.t_double' , 'PARTITION by t1.t_binary', 'PARTITION by t1.t_nchar', 'PARTITION by t1.t_bool' ,'PARTITION BY t1.loc ,t1.t_bigint',
                     'PARTITION by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'PARTITION by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'PARTITION by t1.t_float ,t1.t_double ',
-                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint', 
+                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint',
                     'PARTITION by t2.t_float', 'PARTITION by t2.t_double' , 'PARTITION by t2.t_binary', 'PARTITION by t2.t_nchar', 'PARTITION by t2.t_bool' ,'PARTITION BY t2.loc ,t2.t_bigint',
-                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double '] 
+                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double ']
 
- 
-        self.group_where_regular = ['group by tbname ' , 'group by tbname', 'group by tbname, q_bigint', 'group by tbname,q_int', 'group by tbname, q_smallint', 'group by tbname,q_tinyint', 
+
+        self.group_where_regular = ['group by tbname ' , 'group by tbname', 'group by tbname, q_bigint', 'group by tbname,q_int', 'group by tbname, q_smallint', 'group by tbname,q_tinyint',
                     'group by tbname,q_float', 'group by tbname,q_double' , 'group by tbname,q_binary', 'group by tbname,q_nchar', 'group by tbname,q_bool' ,'group by tbname ,q_bigint',
                     'group by tbname,q_binary ,q_nchar ,q_bool' , 'group by tbname,q_int ,q_smallint ,q_tinyint' , 'group by tbname,q_float ,q_double ' ,
-                    'PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint', 
+                    'PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint',
                     'PARTITION BY tbname,q_float', 'PARTITION BY tbname,q_double' , 'PARTITION BY tbname,q_binary', 'PARTITION BY tbname,q_nchar', 'PARTITION BY tbname,q_bool' ,'PARTITION BY tbname ,q_bigint',
                     'PARTITION BY tbname,q_binary ,q_nchar ,q_bool' , 'PARTITION BY tbname,q_int ,q_smallint ,q_tinyint' , 'PARTITION BY tbname,q_float ,q_double ']
-        self.group_where_regular_j = ['group by t1.q_bigint', 'group by t1.q_int', 'group by t1.q_smallint', 'group by t1.q_tinyint', 
+        self.group_where_regular_j = ['group by t1.q_bigint', 'group by t1.q_int', 'group by t1.q_smallint', 'group by t1.q_tinyint',
                     'group by t1.q_float', 'group by t1.q_double' , 'group by t1.q_binary', 'group by t1.q_nchar', 'group by t1.q_bool' ,'group by t1.q_bigint',
                     'group by t1.q_binary ,t1.q_nchar ,t1.q_bool' , 'group by t1.q_int ,t1.q_smallint ,t1.q_tinyint' , 'group by t1.q_float ,t1.q_double ' ,
-                    'PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint', 
+                    'PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint',
                     'PARTITION by t1.q_float', 'PARTITION by t1.q_double' , 'PARTITION by t1.q_binary', 'PARTITION by t1.q_nchar', 'PARTITION by t1.q_bool' ,'PARTITION BY t1.q_bigint',
                     'PARTITION by t1.q_binary ,t1.q_nchar ,t1.q_bool' , 'PARTITION by t1.q_int ,t1.q_smallint ,t1.q_tinyint' , 'PARTITION by t1.q_float ,t1.q_double ',
-                    'group by t2.q_bigint', 'group by t2.q_int', 'group by t2.q_smallint', 'group by t2.q_tinyint', 
+                    'group by t2.q_bigint', 'group by t2.q_int', 'group by t2.q_smallint', 'group by t2.q_tinyint',
                     'group by t2.q_float', 'group by t2.q_double' , 'group by t2.q_binary', 'group by t2.q_nchar', 'group by t2.q_bool' ,'group by t2.q_bigint',
                     'group by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'group by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'group by t2.q_float ,t2.q_double ' ,
-                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint', 
+                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint',
                     'PARTITION by t2.q_float', 'PARTITION by t2.q_double' , 'PARTITION by t2.q_binary', 'PARTITION by t2.q_nchar', 'PARTITION by t2.q_bool' ,'PARTITION BY t2.q_bigint',
-                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']   
- 
-        self.partiton_where_regular = ['PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint', 
+                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']
+
+        self.partiton_where_regular = ['PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint',
                     'PARTITION BY tbname,q_float', 'PARTITION BY tbname,q_double' , 'PARTITION BY tbname,q_binary', 'PARTITION BY tbname,q_nchar', 'PARTITION BY tbname,q_bool' ,'PARTITION BY tbname ,q_bigint',
                     'PARTITION BY tbname,q_binary ,q_nchar ,q_bool' , 'PARTITION BY tbname,q_int ,q_smallint ,q_tinyint' , 'PARTITION BY tbname,q_float ,q_double ']
-        self.partiton_where_regular_j = ['PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint', 
+        self.partiton_where_regular_j = ['PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint',
                     'PARTITION by t1.q_float', 'PARTITION by t1.q_double' , 'PARTITION by t1.q_binary', 'PARTITION by t1.q_nchar', 'PARTITION by t1.q_bool' ,'PARTITION BY t1.q_bigint',
                     'PARTITION by t1.q_binary ,t1.q_nchar ,t1.q_bool' , 'PARTITION by t1.q_int ,t1.q_smallint ,t1.q_tinyint' , 'PARTITION by t1.q_float ,t1.q_double ',
-                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint', 
+                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint',
                     'PARTITION by t2.q_float', 'PARTITION by t2.q_double' , 'PARTITION by t2.q_binary', 'PARTITION by t2.q_nchar', 'PARTITION by t2.q_bool' ,'PARTITION BY t2.q_bigint',
-                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']           
-                
+                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']
+
         self.having_support = ['having count(q_int) > 0','having count(q_bigint) > 0','having count(q_smallint) > 0','having count(q_tinyint) > 0','having count(q_float) > 0','having count(q_double) > 0','having count(q_bool) > 0',
                     'having avg(q_int) > 0','having avg(q_bigint) > 0','having avg(q_smallint) > 0','having avg(q_tinyint) > 0','having avg(q_float) > 0','having avg(q_double) > 0',
                     'having sum(q_int) > 0','having sum(q_bigint) > 0','having sum(q_smallint) > 0','having sum(q_tinyint) > 0','having sum(q_float) > 0','having sum(q_double) > 0',
@@ -278,15 +278,15 @@ class TDTestCase:
         self.having_not_support = ['having TOP(q_int,10) > 0','having TOP(q_bigint,10) > 0','having TOP(q_smallint,10) > 0','having TOP(q_tinyint,10) > 0','having TOP(q_float,10) > 0','having TOP(q_double,10) > 0','having TOP(q_bool,10) > 0',
                     'having BOTTOM(q_int,10) > 0','having BOTTOM(q_bigint,10) > 0','having BOTTOM(q_smallint,10) > 0','having BOTTOM(q_tinyint,10) > 0','having BOTTOM(q_float,10) > 0','having BOTTOM(q_double,10) > 0','having BOTTOM(q_bool,10) > 0',
                     'having LEASTSQUARES(q_int) > 0','having  LEASTSQUARES(q_bigint) > 0','having  LEASTSQUARES(q_smallint) > 0','having  LEASTSQUARES(q_tinyint) > 0','having  LEASTSQUARES(q_float) > 0','having  LEASTSQUARES(q_double) > 0','having  LEASTSQUARES(q_bool) > 0',
-                    'having FIRST(q_bool) > 0','having IRATE(q_bool) > 0','having PERCENTILE(q_bool,10) > 0','having avg(q_bool) > 0','having LAST_ROW(q_bool) > 0','having sum(q_bool) > 0','having STDDEV(q_bool) > 0','having APERCENTILE(q_bool,10) > 0','having  TWA(q_bool) > 0','having LAST(q_bool) > 0',                    
+                    'having FIRST(q_bool) > 0','having IRATE(q_bool) > 0','having PERCENTILE(q_bool,10) > 0','having avg(q_bool) > 0','having LAST_ROW(q_bool) > 0','having sum(q_bool) > 0','having STDDEV(q_bool) > 0','having APERCENTILE(q_bool,10) > 0','having  TWA(q_bool) > 0','having LAST(q_bool) > 0',
                     'having PERCENTILE(q_int,10) > 0','having PERCENTILE(q_bigint,10) > 0','having PERCENTILE(q_smallint,10) > 0','having PERCENTILE(q_tinyint,10) > 0','having PERCENTILE(q_float,10) > 0','having PERCENTILE(q_double,10) > 0',
                     'having TOP(q_int_null,10) > 0','having TOP(q_bigint_null,10) > 0','having TOP(q_smallint_null,10) > 0','having TOP(q_tinyint_null,10) > 0','having TOP(q_float_null,10) > 0','having TOP(q_double_null,10) > 0','having TOP(q_bool_null,10) > 0',
                     'having BOTTOM(q_int_null,10) > 0','having BOTTOM(q_bigint_null,10) > 0','having BOTTOM(q_smallint_null,10) > 0','having BOTTOM(q_tinyint_null,10) > 0','having BOTTOM(q_float_null,10) > 0','having BOTTOM(q_double_null,10) > 0','having BOTTOM(q_bool_null,10) > 0',
                     'having LEASTSQUARES(q_int_null) > 0','having  LEASTSQUARES(q_bigint_null) > 0','having  LEASTSQUARES(q_smallint_null) > 0','having  LEASTSQUARES(q_tinyint_null) > 0','having  LEASTSQUARES(q_float_null) > 0','having  LEASTSQUARES(q_double_null) > 0','having  LEASTSQUARES(q_bool_null) > 0',
-                    'having FIRST(q_bool_null) > 0','having IRATE(q_bool_null) > 0','having PERCENTILE(q_bool_null,10) > 0','having avg(q_bool_null) > 0','having LAST_ROW(q_bool_null) > 0','having sum(q_bool_null) > 0','having STDDEV(q_bool_null) > 0','having APERCENTILE(q_bool_null,10) > 0','having  TWA(q_bool_null) > 0','having LAST(q_bool_null) > 0',                    
+                    'having FIRST(q_bool_null) > 0','having IRATE(q_bool_null) > 0','having PERCENTILE(q_bool_null,10) > 0','having avg(q_bool_null) > 0','having LAST_ROW(q_bool_null) > 0','having sum(q_bool_null) > 0','having STDDEV(q_bool_null) > 0','having APERCENTILE(q_bool_null,10) > 0','having  TWA(q_bool_null) > 0','having LAST(q_bool_null) > 0',
                     'having PERCENTILE(q_int_null,10) > 0','having PERCENTILE(q_bigint_null,10) > 0','having PERCENTILE(q_smallint_null,10) > 0','having PERCENTILE(q_tinyint_null,10) > 0','having PERCENTILE(q_float_null,10) > 0','having PERCENTILE(q_double_null,10) > 0']
         self.having_tagnot_support = ['having LAST_ROW(q_int) > 0','having LAST_ROW(q_bigint) > 0','having LAST_ROW(q_smallint) > 0','having LAST_ROW(q_tinyint) > 0','having LAST_ROW(q_float) > 0','having LAST_ROW(q_double) > 0',
-                                      'having LAST_ROW(q_int_null) > 0','having LAST_ROW(q_bigint_null) > 0','having LAST_ROW(q_smallint_null) > 0','having LAST_ROW(q_tinyint_null) > 0','having LAST_ROW(q_float_null) > 0','having LAST_ROW(q_double_null) > 0']    
+                                      'having LAST_ROW(q_int_null) > 0','having LAST_ROW(q_bigint_null) > 0','having LAST_ROW(q_smallint_null) > 0','having LAST_ROW(q_tinyint_null) > 0','having LAST_ROW(q_float_null) > 0','having LAST_ROW(q_double_null) > 0']
 
         self.having_support_j = ['having count(t1.q_int) > 0','having count(t1.q_bigint) > 0','having count(t1.q_smallint) > 0','having count(t1.q_tinyint) > 0','having count(t1.q_float) > 0','having count(t1.q_double) > 0','having count(t1.q_bool) > 0',
                     'having avg(t1.q_int) > 0','having avg(t1.q_bigint) > 0','having avg(t1.q_smallint) > 0','having avg(t1.q_tinyint) > 0','having avg(t1.q_float) > 0','having avg(t1.q_double) > 0',
@@ -299,7 +299,7 @@ class TDTestCase:
                     'having FIRST(t1.q_int) > 0','having FIRST(t1.q_bigint) > 0','having FIRST(t1.q_smallint) > 0','having FIRST(t1.q_tinyint) > 0','having FIRST(t1.q_float) > 0','having FIRST(t1.q_double) > 0',
                     'having LAST(t1.q_int) > 0','having LAST(t1.q_bigint) > 0','having LAST(t1.q_smallint) > 0','having LAST(t1.q_tinyint) > 0','having LAST(t1.q_float) > 0','having LAST(t1.q_double) > 0',
                     'having APERCENTILE(t1.q_int,10) > 0','having APERCENTILE(t1.q_bigint,10) > 0','having APERCENTILE(t1.q_smallint,10) > 0','having APERCENTILE(t1.q_tinyint,10) > 0','having APERCENTILE(t1.q_float,10) > 0','having APERCENTILE(t1.q_double,10) > 0']
-        
+
         # limit offset where
         self.limit_where = ['limit 1 offset 1' , 'limit 1' , 'limit 2 offset 1' , 'limit 2', 'limit 12 offset 1' , 'limit 20', 'limit 20 offset 10' , 'limit 200']
         self.limit1_where = ['limit 1 offset 1' , 'limit 1' ]
@@ -308,8 +308,8 @@ class TDTestCase:
         # slimit soffset where
         self.slimit_where = ['slimit 1 soffset 1' , 'slimit 1' , 'slimit 2 soffset 1' , 'slimit 2']
         self.slimit1_where = ['slimit 2 soffset 1' , 'slimit 1' ]
-        
-        # aggregate function include [all:count(*)\avg\sum\stddev ||regualr:twa\irate\leastsquares ||group by tbname:twa\irate\]       
+
+        # aggregate function include [all:count(*)\avg\sum\stddev ||regualr:twa\irate\leastsquares ||group by tbname:twa\irate\]
         # select function include [all: min\max\first(*)\last(*)\top\bottom\apercentile\last_row(*)(not with interval)\interp(*)(FILL) ||regualr: percentile]
         # calculation function include [all:spread\+-*/ ||regualr:diff\derivative ||group by tbname:diff\derivative\]
         # **_ns_**  express is not support stable, therefore, separated from regular tables
@@ -319,7 +319,7 @@ class TDTestCase:
 
         # calc_select_all   calc_select_regular  calc_select_in_ts  calc_select_fill  calc_select_not_interval
         # select function include [all: min\max\first(*)\last(*)\top\bottom\apercentile\last_row(*)(not with interval)\interp(*)(FILL) ||regualr: percentile]
-        
+
         self.calc_select_all = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
                     'top(q_int,20)' , 'top(q_bigint,20)' , 'top(q_smallint,20)' ,'top(q_tinyint,20)' ,'top(q_float,20)' ,'top(q_double,20)' ,
                     'first(q_int)' , 'first(q_bigint)' , 'first(q_smallint)' , 'first(q_tinyint)' , 'first(q_float)' ,'first(q_double)' ,'first(q_binary)' ,'first(q_nchar)' ,'first(q_bool)' ,'first(q_ts)' ,
@@ -327,7 +327,7 @@ class TDTestCase:
                     'min(q_int)' , 'min(q_bigint)' , 'min(q_smallint)' , 'min(q_tinyint)' , 'min(q_float)' ,'min(q_double)' ,
                     'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)' ,
                     'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)' ,
-                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' ,
                     'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)',
                     'bottom(q_int_null,20)' , 'bottom(q_bigint_null,20)' , 'bottom(q_smallint_null,20)' , 'bottom(q_tinyint_null,20)' ,'bottom(q_float_null,20)' , 'bottom(q_double_null,20)' ,
                     'top(q_int_null,20)' , 'top(q_bigint_null,20)' , 'top(q_smallint_null,20)' ,'top(q_tinyint_null,20)' ,'top(q_float_null,20)' ,'top(q_double_null,20)' ,
@@ -335,8 +335,8 @@ class TDTestCase:
                     'last(q_int_null)' ,  'last(q_bigint_null)' , 'last(q_smallint_null)'  , 'last(q_tinyint_null)' , 'last(q_float_null)'  ,'last(q_double_null)' , 'last(q_binary_null)' ,'last(q_nchar_null)' ,'last(q_bool_null)' ,'last(q_ts_null)' ,
                     'min(q_int_null)' , 'min(q_bigint_null)' , 'min(q_smallint_null)' , 'min(q_tinyint_null)' , 'min(q_float_null)' ,'min(q_double_null)' ,
                     'max(q_int_null)' ,  'max(q_bigint_null)' , 'max(q_smallint_null)' , 'max(q_tinyint_null)' ,'max(q_float_null)' ,'max(q_double_null)' ,
-                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' , 
-                    'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)',                    
+                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' ,
+                    'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)',
                     'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)' ,]
 
         self.calc_select_in_ts = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
@@ -351,25 +351,25 @@ class TDTestCase:
         self.calc_select_in = ['min(q_int)' , 'min(q_bigint)' , 'min(q_smallint)' , 'min(q_tinyint)' , 'min(q_float)' ,'min(q_double)' ,
                     'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)' ,
                     'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)' ,
-                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' ,
                     'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)',
                     'min(q_int_null)' , 'min(q_bigint_null)' , 'min(q_smallint_null)' , 'min(q_tinyint_null)' , 'min(q_float_null)' ,'min(q_double_null)' ,
                     'max(q_int_null)' ,  'max(q_bigint_null)' , 'max(q_smallint_null)' , 'max(q_tinyint_null)' ,'max(q_float_null)' ,'max(q_double_null)' ,
                     'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)' ,
-                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' , 
+                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' ,
                     'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)']
-        
+
         self.calc_select_not_support_ts = ['first(q_int)' , 'first(q_bigint)' , 'first(q_smallint)' , 'first(q_tinyint)' , 'first(q_float)' ,'first(q_double)' ,'first(q_binary)' ,'first(q_nchar)' ,'first(q_bool)' ,'first(q_ts)' ,
                     'last(q_int)' ,  'last(q_bigint)' , 'last(q_smallint)'  , 'last(q_tinyint)' , 'last(q_float)'  ,'last(q_double)' , 'last(q_binary)' ,'last(q_nchar)' ,'last(q_bool)' ,'last(q_ts)' ,
-                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' ,
                     'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)',
                     'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)',
                     'first(q_int_null)' , 'first(q_bigint_null)' , 'first(q_smallint_null)' , 'first(q_tinyint_null)' , 'first(q_float_null)' ,'first(q_double_null)' ,'first(q_binary_null)' ,'first(q_nchar_null)' ,'first(q_bool_null)' ,'first(q_ts_null)' ,
                     'last(q_int_null)' ,  'last(q_bigint_null)' , 'last(q_smallint_null)'  , 'last(q_tinyint_null)' , 'last(q_float_null)'  ,'last(q_double_null)' , 'last(q_binary_null)' ,'last(q_nchar_null)' ,'last(q_bool_null)' ,'last(q_ts_null)' ,
-                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' , 
+                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' ,
                     'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)',
-                    'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)']  
-              
+                    'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)']
+
         self.calc_select_support_ts = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
                     'top(q_int,20)' , 'top(q_bigint,20)' , 'top(q_smallint,20)' ,'top(q_tinyint,20)' ,'top(q_float,20)' ,'top(q_double,20)' ,
                     'bottom(q_int_null,20)' , 'bottom(q_bigint_null,20)' , 'bottom(q_smallint_null,20)' , 'bottom(q_tinyint_null,20)' ,'bottom(q_float_null,20)' , 'bottom(q_double_null,20)' ,
@@ -378,11 +378,11 @@ class TDTestCase:
                     'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)'  ,
                     'min(q_int_null)' , 'min(q_bigint_null)' , 'min(q_smallint_null)' , 'min(q_tinyint_null)' , 'min(q_float_null)' ,'min(q_double_null)' ,
                     'max(q_int_null)' ,  'max(q_bigint_null)' , 'max(q_smallint_null)' , 'max(q_tinyint_null)' ,'max(q_float_null)' ,'max(q_double_null)']
-        
+
         self.calc_select_regular = [ 'PERCENTILE(q_int,10)' ,'PERCENTILE(q_bigint,20)' , 'PERCENTILE(q_smallint,30)' ,'PERCENTILE(q_tinyint,40)' ,'PERCENTILE(q_float,50)' ,'PERCENTILE(q_double,60)',
                                     'PERCENTILE(q_int_null,10)' ,'PERCENTILE(q_bigint_null,20)' , 'PERCENTILE(q_smallint_null,30)' ,'PERCENTILE(q_tinyint_null,40)' ,'PERCENTILE(q_float_null,50)' ,'PERCENTILE(q_double_null,60)']
 
-                    
+
         self.calc_select_fill = ['INTERP(q_int)' ,'INTERP(q_bigint)' ,'INTERP(q_smallint)' ,'INTERP(q_tinyint)', 'INTERP(q_float)' ,'INTERP(q_double)']
         self.interp_where = ['ts = now' , 'ts = \'2020-09-13 20:26:40.000\'' , 'ts = \'2020-09-13 20:26:40.009\'' ,'tbname in (\'table_1\') and ts = now' ,'tbname in (\'table_0\' ,\'table_1\',\'table_2\',\'table_3\',\'table_4\',\'table_5\') and ts =  \'2020-09-13 20:26:40.000\'','tbname like \'table%\'  and ts =  \'2020-09-13 20:26:40.002\'']
 
@@ -417,21 +417,21 @@ class TDTestCase:
                     'bottom(t2.q_int_null,20)' , 'bottom(t2.q_bigint_null,20)' , 'bottom(t2.q_smallint_null,20)' , 'bottom(t2.q_tinyint_null,20)' ,'bottom(t2.q_float_null,20)' , 'bottom(t2.q_double_null,20)' ,
                     'top(t2.q_int_null,20)' , 'top(t2.q_bigint_null,20)' , 'top(t2.q_smallint_null,20)' ,'top(t2.q_tinyint_null,20)' ,'top(t2.q_float_null,20)' ,'top(t2.q_double_null,20)' ,
                     'min(t1.q_int_null)' , 'min(t1.q_bigint_null)' , 'min(t1.q_smallint_null)' , 'min(t1.q_tinyint_null)' , 'min(t1.q_float_null)' ,'min(t1.q_double_null)' ,
-                    'max(t1.q_int_null)' ,  'max(t1.q_bigint_null)' , 'max(t1.q_smallint_null)' , 'max(t1.q_tinyint_null)' ,'max(t1.q_float_null)' ,'max(t1.q_double_null)' ,        
+                    'max(t1.q_int_null)' ,  'max(t1.q_bigint_null)' , 'max(t1.q_smallint_null)' , 'max(t1.q_tinyint_null)' ,'max(t1.q_float_null)' ,'max(t1.q_double_null)' ,
                     'min(t2.q_int_null)' , 'min(t2.q_bigint_null)' , 'min(t2.q_smallint_null)' , 'min(t2.q_tinyint_null)' , 'min(t2.q_float_null)' ,'min(t2.q_double_null)' ,
                     'max(t2.q_int_null)' ,  'max(t2.q_bigint_null)' , 'max(t2.q_smallint_null)' , 'max(t2.q_tinyint_null)' ,'max(t2.q_float_null)' ,'max(t2.q_double_null)' ]
 
         self.calc_select_in_not_support_ts_j = ['apercentile(t1.q_int,20)' ,  'apercentile(t1.q_bigint,20)'  ,'apercentile(t1.q_smallint,20)'  ,'apercentile(t1.q_tinyint,20)' ,'apercentile(t1.q_float,20)'  ,'apercentile(t1.q_double,20)' ,
                     'apercentile(t1.q_int_null,20)' ,  'apercentile(t1.q_bigint_null,20)'  ,'apercentile(t1.q_smallint_null,20)'  ,'apercentile(t1.q_tinyint_null,20)' ,'apercentile(t1.q_float_null,20)'  ,'apercentile(t1.q_double_null,20)' ,
-                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' , 
+                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' ,
                     'last_row(t1.q_double)' , 'last_row(t1.q_bool)' ,'last_row(t1.q_binary)' ,'last_row(t1.q_nchar)' ,'last_row(t1.q_ts)' ,
-                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' , 
+                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' ,
                     'last_row(t1.q_double_null)' , 'last_row(t1.q_bool_null)' ,'last_row(t1.q_binary_null)' ,'last_row(t1.q_nchar_null)' ,'last_row(t1.q_ts_null)' ,
                     'apercentile(t2.q_int,20)' ,  'apercentile(t2.q_bigint,20)'  ,'apercentile(t2.q_smallint,20)'  ,'apercentile(t2.q_tinyint,20)' ,'apercentile(t2.q_float,20)'  ,'apercentile(t2.q_double,20)' ,
                     'apercentile(t2.q_int_null,20)' ,  'apercentile(t2.q_bigint_null,20)'  ,'apercentile(t2.q_smallint_null,20)'  ,'apercentile(t2.q_tinyint_null,20)' ,'apercentile(t2.q_float_null,20)'  ,'apercentile(t2.q_double_null,20)' ,
-                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' , 
+                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' ,
                     'last_row(t2.q_double)' , 'last_row(t2.q_bool)' ,'last_row(t2.q_binary)' ,'last_row(t2.q_nchar)' ,'last_row(t2.q_ts)',
-                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' , 
+                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' ,
                     'last_row(t2.q_double_null)' , 'last_row(t2.q_bool_null)' ,'last_row(t2.q_binary_null)' ,'last_row(t2.q_nchar_null)' ,'last_row(t2.q_ts_null)']
 
         self.calc_select_in_j = ['min(t1.q_int)' , 'min(t1.q_bigint)' , 'min(t1.q_smallint)' , 'min(t1.q_tinyint)' , 'min(t1.q_float)' ,'min(t1.q_double)' ,
@@ -440,20 +440,20 @@ class TDTestCase:
                     'min(t1.q_int_null)' , 'min(t1.q_bigint_null)' , 'min(t1.q_smallint_null)' , 'min(t1.q_tinyint_null)' , 'min(t1.q_float_null)' ,'min(t1.q_double_null)' ,
                     'max(t1.q_int_null)' ,  'max(t1.q_bigint_null)' , 'max(t1.q_smallint_null)' , 'max(t1.q_tinyint_null)' ,'max(t1.q_float_null)' ,'max(t1.q_double_null)' ,
                     'apercentile(t1.q_int_null,20)' ,  'apercentile(t1.q_bigint_null,20)'  ,'apercentile(t1.q_smallint_null,20)'  ,'apercentile(t1.q_tinyint_null,20)' ,'apercentile(t1.q_float_null,20)'  ,'apercentile(t1.q_double_null,20)' ,
-                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' , 
+                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' ,
                     'last_row(t1.q_double)' , 'last_row(t1.q_bool)' ,'last_row(t1.q_binary)' ,'last_row(t1.q_nchar)' ,'last_row(t1.q_ts)' ,
                     'min(t2.q_int)' , 'min(t2.q_bigint)' , 'min(t2.q_smallint)' , 'min(t2.q_tinyint)' , 'min(t2.q_float)' ,'min(t2.q_double)' ,
                     'max(t2.q_int)' ,  'max(t2.q_bigint)' , 'max(t2.q_smallint)' , 'max(t2.q_tinyint)' ,'max(t2.q_float)' ,'max(t2.q_double)' ,
-                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' , 
+                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' ,
                     'last_row(t1.q_double_null)' , 'last_row(t1.q_bool_null)' ,'last_row(t1.q_binary_null)' ,'last_row(t1.q_nchar_null)' ,'last_row(t1.q_ts_null)' ,
                     'min(t2.q_int_null)' , 'min(t2.q_bigint_null)' , 'min(t2.q_smallint_null)' , 'min(t2.q_tinyint_null)' , 'min(t2.q_float_null)' ,'min(t2.q_double_null)' ,
                     'max(t2.q_int_null)' ,  'max(t2.q_bigint_null)' , 'max(t2.q_smallint_null)' , 'max(t2.q_tinyint_null)' ,'max(t2.q_float_null)' ,'max(t2.q_double_null)' ,
                     'apercentile(t2.q_int,20)' ,  'apercentile(t2.q_bigint,20)'  ,'apercentile(t2.q_smallint,20)'  ,'apercentile(t2.q_tinyint,20)' ,'apercentile(t2.q_float,20)'  ,'apercentile(t2.q_double,20)' ,
                     'apercentile(t2.q_int_null,20)' ,  'apercentile(t2.q_bigint_null,20)'  ,'apercentile(t2.q_smallint_null,20)'  ,'apercentile(t2.q_tinyint_null,20)' ,'apercentile(t2.q_float_null,20)'  ,'apercentile(t2.q_double_null,20)' ,
-                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' , 
+                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' ,
                     'last_row(t2.q_double)' , 'last_row(t2.q_bool)' ,'last_row(t2.q_binary)' ,'last_row(t2.q_nchar)' ,'last_row(t2.q_ts)',
-                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' , 
-                    'last_row(t2.q_double_null)' , 'last_row(t2.q_bool_null)' ,'last_row(t2.q_binary_null)' ,'last_row(t2.q_nchar_null)' ,'last_row(t2.q_ts_null)']        
+                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' ,
+                    'last_row(t2.q_double_null)' , 'last_row(t2.q_bool_null)' ,'last_row(t2.q_binary_null)' ,'last_row(t2.q_nchar_null)' ,'last_row(t2.q_ts_null)']
         self.calc_select_all_j = self.calc_select_in_ts_j + self.calc_select_in_j
 
         self.calc_select_regular_j = [ 'PERCENTILE(t1.q_int,10)' ,'PERCENTILE(t1.q_bigint,20)' , 'PERCENTILE(t1.q_smallint,30)' ,'PERCENTILE(t1.q_tinyint,40)' ,'PERCENTILE(t1.q_float,50)' ,'PERCENTILE(t1.q_double,60)' ,
@@ -461,7 +461,7 @@ class TDTestCase:
                     'PERCENTILE(t1.q_int_null,10)' ,'PERCENTILE(t1.q_bigint_null,20)' , 'PERCENTILE(t1.q_smallint_null,30)' ,'PERCENTILE(t1.q_tinyint_null,40)' ,'PERCENTILE(t1.q_float_null,50)' ,'PERCENTILE(t1.q_double_null,60)' ,
                     'PERCENTILE(t2.q_int_null,10)' ,'PERCENTILE(t2.q_bigint_null,20)' , 'PERCENTILE(t2.q_smallint_null,30)' ,'PERCENTILE(t2.q_tinyint_null,40)' ,'PERCENTILE(t2.q_float_null,50)' ,'PERCENTILE(t2.q_double_null,60)']
 
-                    
+
         self.calc_select_fill_j = ['INTERP(t1.q_int)' ,'INTERP(t1.q_bigint)' ,'INTERP(t1.q_smallint)' ,'INTERP(t1.q_tinyint)', 'INTERP(t1.q_float)' ,'INTERP(t1.q_double)' ,
                     'INTERP(t2.q_int)' ,'INTERP(t2.q_bigint)' ,'INTERP(t2.q_smallint)' ,'INTERP(t2.q_tinyint)', 'INTERP(t2.q_float)' ,'INTERP(t2.q_double)']
         self.interp_where_j = ['t1.ts = now' , 't1.ts = \'2020-09-13 20:26:40.000\'' , 't1.ts = \'2020-09-13 20:26:40.009\'' ,'t2.ts = now' , 't2.ts = \'2020-09-13 20:26:40.000\'' , 't2.ts = \'2020-09-13 20:26:40.009\'' ,
@@ -495,7 +495,7 @@ class TDTestCase:
         self.calc_aggregate_groupbytbname = ['twa(q_int)' ,'twa(q_bigint)' , 'twa(q_smallint)' ,'twa(q_tinyint)' ,'twa (q_float)' ,'twa(q_double)' ,
                     'IRATE(q_int)' ,'IRATE(q_bigint)' , 'IRATE(q_smallint)' ,'IRATE(q_tinyint)' ,'IRATE (q_float)' ,'IRATE(q_double)',
                     'twa(q_int_null)' ,'twa(q_bigint_null)' , 'twa(q_smallint_null)' ,'twa(q_tinyint_null)' ,'twa (q_float_null)' ,'twa(q_double_null)' ,
-                    'IRATE(q_int_null)' ,'IRATE(q_bigint_null)' , 'IRATE(q_smallint_null)' ,'IRATE(q_tinyint_null)' ,'IRATE (q_float_null)' ,'IRATE(q_double_null)'] 
+                    'IRATE(q_int_null)' ,'IRATE(q_bigint_null)' , 'IRATE(q_smallint_null)' ,'IRATE(q_tinyint_null)' ,'IRATE (q_float_null)' ,'IRATE(q_double_null)']
 
         #two table join
         self.calc_aggregate_all_j = ['count(t1.*)' , 'count(t1.q_int)' ,'count(t1.q_bigint)' , 'count(t1.q_smallint)' ,'count(t1.q_tinyint)' ,'count(t1.q_float)' ,
@@ -543,13 +543,13 @@ class TDTestCase:
                     'twa(t1.q_int_null)' ,'twa(t1.q_bigint_null)' , 'twa(t1.q_smallint_null)' ,'twa(t1.q_tinyint_null)' ,'twa (t1.q_float_null)' ,'twa(t1.q_double_null)' ,
                     'IRATE(t1.q_int_null)' ,'IRATE(t1.q_bigint_null)' , 'IRATE(t1.q_smallint_null)' ,'IRATE(t1.q_tinyint_null)' ,'IRATE (t1.q_float_null)' ,'IRATE(t1.q_double_null)' ,
                     'twa(t2.q_int_null)' ,'twa(t2.q_bigint_null)' , 'twa(t2.q_smallint_null)' ,'twa(t2.q_tinyint_null)' ,'twa (t2.q_float_null)' ,'twa(t2.q_double_null)' ,
-                    'IRATE(t2.q_int_null)' ,'IRATE(t2.q_bigint_null)' , 'IRATE(t2.q_smallint_null)' ,'IRATE(t2.q_tinyint_null)' ,'IRATE (t2.q_float_null)' ,'IRATE(t2.q_double_null)'  ] 
-        
+                    'IRATE(t2.q_int_null)' ,'IRATE(t2.q_bigint_null)' , 'IRATE(t2.q_smallint_null)' ,'IRATE(t2.q_tinyint_null)' ,'IRATE (t2.q_float_null)' ,'IRATE(t2.q_double_null)'  ]
+
         # calc_calculate_all   calc_calculate_regular   calc_calculate_groupbytbname
         # calculation function include [all:spread\+-*/ ||regualr:diff\derivative ||group by tbname:diff\derivative\]
-        self.calc_calculate_all = ['SPREAD(ts)'  , 'SPREAD(q_ts)'  , 'SPREAD(q_int)' ,'SPREAD(q_bigint)' , 'SPREAD(q_smallint)' ,'SPREAD(q_tinyint)' ,'SPREAD(q_float)' ,'SPREAD(q_double)' , 
+        self.calc_calculate_all = ['SPREAD(ts)'  , 'SPREAD(q_ts)'  , 'SPREAD(q_int)' ,'SPREAD(q_bigint)' , 'SPREAD(q_smallint)' ,'SPREAD(q_tinyint)' ,'SPREAD(q_float)' ,'SPREAD(q_double)' ,
                      '(SPREAD(q_int) + SPREAD(q_bigint))' , '(SPREAD(q_smallint) - SPREAD(q_float))', '(SPREAD(q_double) * SPREAD(q_tinyint))' , '(SPREAD(q_double) / SPREAD(q_float))',
-                     'SPREAD(q_ts_null)'  , 'SPREAD(q_int_null)' ,'SPREAD(q_bigint_null)' , 'SPREAD(q_smallint_null)' ,'SPREAD(q_tinyint_null)' ,'SPREAD(q_float_null)' ,'SPREAD(q_double_null)' , 
+                     'SPREAD(q_ts_null)'  , 'SPREAD(q_int_null)' ,'SPREAD(q_bigint_null)' , 'SPREAD(q_smallint_null)' ,'SPREAD(q_tinyint_null)' ,'SPREAD(q_float_null)' ,'SPREAD(q_double_null)' ,
                      '(SPREAD(q_int_null) + SPREAD(q_bigint_null))' , '(SPREAD(q_smallint_null) - SPREAD(q_float_null))', '(SPREAD(q_double_null) * SPREAD(q_tinyint_null))' , '(SPREAD(q_double_null) / SPREAD(q_float_null))']
         self.calc_calculate_regular = ['DIFF(q_int)' ,'DIFF(q_bigint)' , 'DIFF(q_smallint)' ,'DIFF(q_tinyint)' ,'DIFF(q_float)' ,'DIFF(q_double)' ,
                                 'DIFF(q_int,0)' ,'DIFF(q_bigint,0)' , 'DIFF(q_smallint,0)' ,'DIFF(q_tinyint,0)' ,'DIFF(q_float,0)' ,'DIFF(q_double,0)' ,
@@ -560,7 +560,7 @@ class TDTestCase:
                                 'DIFF(q_int_null,1)' ,'DIFF(q_bigint_null,1)' , 'DIFF(q_smallint_null,1)' ,'DIFF(q_tinyint_null,1)' ,'DIFF(q_float_null,1)' ,'DIFF(q_double_null,1)' ,
                                 'DERIVATIVE(q_int_null,15s,0)' , 'DERIVATIVE(q_bigint_null,10s,1)' , 'DERIVATIVE(q_smallint_null,20s,0)' ,'DERIVATIVE(q_tinyint_null,10s,1)' ,'DERIVATIVE(q_float_null,6s,0)' ,'DERIVATIVE(q_double_null,3s,1)']
         self.calc_calculate_groupbytbname = self.calc_calculate_regular
-        
+
         #two table join
         self.calc_calculate_all_j = ['SPREAD(t1.ts)'  , 'SPREAD(t1.q_ts)'  , 'SPREAD(t1.q_int)' ,'SPREAD(t1.q_bigint)' , 'SPREAD(t1.q_smallint)' ,'SPREAD(t1.q_tinyint)' ,'SPREAD(t1.q_float)' ,'SPREAD(t1.q_double)' ,
                     'SPREAD(t2.ts)'  , 'SPREAD(t2.q_ts)'  , 'SPREAD(t2.q_int)' ,'SPREAD(t2.q_bigint)' , 'SPREAD(t2.q_smallint)' ,'SPREAD(t2.q_tinyint)' ,'SPREAD(t2.q_float)' ,'SPREAD(t2.q_double)' ,
@@ -597,17 +597,17 @@ class TDTestCase:
                     'interval(1y,1n) ','interval(1n,1w) ','interval(1w,1d) ','interval(1d,1h) ','interval(1h,1m) ','interval(1m,1s) ','interval(1s,10a) ' ,'interval(100a,30a)']
 
         self.conn1 = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos/")
-        self.cur1 = self.conn1.cursor()  
-        print(self.cur1)      
+        self.cur1 = self.conn1.cursor()
+        print(self.cur1)
         self.cur1.execute("use %s ;" %self.db_nest)
         sql = 'select * from stable_1 limit 5;'
         self.cur1.execute(sql)
 
-    
+
     def data_matrix_equal(self, sql1,row1_s,row1_e,col1_s,col1_e, sql2,row2_s,row2_e,col2_s,col2_e):
         #  ----row1_start----col1_start----
-        #  - - - - 是一个矩阵内的数据相等- - - 
-        #  - - - - - - - - - - - - - - - - 
+        #  - - - - 是一个矩阵内的数据相等- - -
+        #  - - - - - - - - - - - - - - - -
         #  ----row1_end------col1_end------
         self.sql1 = sql1
         list1 =[]
@@ -619,9 +619,9 @@ class TDTestCase:
                 #print("data=%s" %(tdSql.getData(i1,j1)))
                 list1.append(tdSql.getData(i1,j1))
         print("=====list1-------list1---=%s" %set(list1))
-        
+
         tdSql.execute("reset query cache;")
-        self.sql2 = sql2  
+        self.sql2 = sql2
         list2 =[]
         tdSql.query(sql2)
         for i2 in range(row2_s-1,row2_e):
@@ -630,8 +630,8 @@ class TDTestCase:
                 #print("jjjj222=%d"%j2)
                 #print("data=%s" %(tdSql.getData(i2,j2)))
                 list2.append(tdSql.getData(i2,j2))
-        print("=====list2-------list2---=%s" %set(list2)) 
-       
+        print("=====list2-------list2---=%s" %set(list2))
+
         if  (list1 == list2) and len(list2)>0:
             # print(("=====matrix===sql1.list1:'%s',sql2.list2:'%s'") %(list1,list2))
             tdLog.info(("===matrix===sql1:'%s' matrix_result = sql2:'%s' matrix_result") %(sql1,sql2))
@@ -657,7 +657,7 @@ class TDTestCase:
             print(("=====matrix_error===sql1.list1:'%s',sql2.list2:'%s'") %(list1,list2))
             tdLog.info(("sql1:'%s' matrix_result != sql2:'%s' matrix_result") %(sql1,sql2))
             return tdSql.checkEqual(list1,list2)
-            
+
     def restartDnodes(self):
         pass
         # tdDnodes.stop(1)
@@ -681,7 +681,7 @@ class TDTestCase:
                 q_binary5 binary(100) , q_nchar5 nchar(100) ,q_binary6 binary(100) , q_nchar6 nchar(100) ,q_binary7 binary(100) , q_nchar7 nchar(100) ,q_binary8 binary(100) , q_nchar8 nchar(100) ,\
                 q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
                 tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
-        
+
         tdSql.execute('''create stable stable_null_data (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
                 q_binary1 binary(100) , q_nchar1 nchar(100) ,q_binary2 binary(100) , q_nchar2 nchar(100) ,q_binary3 binary(100) , q_nchar3 nchar(100) ,q_binary4 binary(100) , q_nchar4 nchar(100) ,\
                 q_binary5 binary(100) , q_nchar5 nchar(100) ,q_binary6 binary(100) , q_nchar6 nchar(100) ,q_binary7 binary(100) , q_nchar7 nchar(100) ,q_binary8 binary(100) , q_nchar8 nchar(100) ,\
@@ -693,35 +693,35 @@ class TDTestCase:
                 q_binary5 binary(100) , q_nchar5 nchar(100) ,q_binary6 binary(100) , q_nchar6 nchar(100) ,q_binary7 binary(100) , q_nchar7 nchar(100) ,q_binary8 binary(100) , q_nchar8 nchar(100) ,\
                 q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
                 tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
-        
+
         #tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '0' , '0' , '0' , '0' , 0 , 'binary1' , 'nchar1' , '0' , '0' ,'0') ;''')
-        tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '%d' , '%d', '%d' , '%d' , 0 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))  
+        tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '%d' , '%d', '%d' , '%d' , 0 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
         tdSql.execute('''create table stable_1_2 using stable_1 tags('stable_1_2', '2147483647' , '9223372036854775807' , '32767' , '127' , 1 , 'binary2' , 'nchar2' , '2' , '22' , \'1999-09-09 09:09:09.090\') ;''')
         tdSql.execute('''create table stable_1_3 using stable_1 tags('stable_1_3', '-2147483647' , '-9223372036854775807' , '-32767' , '-127' , false , 'binary3' , 'nchar3nchar3' , '-3.3' , '-33.33' , \'2099-09-09 09:09:09.090\') ;''')
         #tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0') ;''')
-        tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+        tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
 
         # tdSql.execute('''create table stable_2_1 using stable_2 tags('stable_2_1' , '0' , '0' , '0' , '0' , 0 , 'binary21' , 'nchar21' , '0' , '0' ,'0') ;''')
         # tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0') ;''')
 
         # tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '0' , '0' , '0' , '0' , 0 , '0' , '0' , '0' , '0' ,'0') ;''')
-        
-        tdSql.execute('''create table stable_2_1 using stable_2 tags('stable_2_1' , '0' , '0' , '0' , '0' , 0 , 'binary21' , 'nchar21' , '0' , '0' ,\'2099-09-09 09:09:09.090\') ;''')
-        tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '%d' , '%d', '%d' , '%d' , 0 , 'binary2.%s' , 'nchar2.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
 
-        tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+        tdSql.execute('''create table stable_2_1 using stable_2 tags('stable_2_1' , '0' , '0' , '0' , '0' , 0 , 'binary21' , 'nchar21' , '0' , '0' ,\'2099-09-09 09:09:09.090\') ;''')
+        tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '%d' , '%d', '%d' , '%d' , 0 , 'binary2.%s' , 'nchar2.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
+
+        tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
 
         #regular table
         tdSql.execute('''create table regular_table_1 \
@@ -747,106 +747,106 @@ class TDTestCase:
                     q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) ;''')
 
 
-        for i in range(num_random*n):        
+        for i in range(1, num_random*n + 1):
             tdSql.execute('''insert into stable_1_1  (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double , q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1), 
-                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1),
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
             tdSql.execute('''insert into  regular_table_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1) , 
-                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1) , 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1) ,
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1) ,
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_1_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8)\
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1), 
-                        fake.random_int(min=0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*2, fake.random_int(min=0, max=2147483647, step=1),
+                        fake.random_int(min=0, max=9223372036854775807, step=1),
+                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
             tdSql.execute('''insert into regular_table_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1), 
-                        fake.random_int(min=0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1),
+                        fake.random_int(min=0, max=9223372036854775807, step=1),
+                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
-            
+
             tdSql.execute('''insert into stable_1_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1), 
-                        fake.random_int(min=-9223372036854775807, max=0, step=1), 
-                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*2 +1, fake.random_int(min=-2147483647, max=0, step=1),
+                        fake.random_int(min=-9223372036854775807, max=0, step=1),
+                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
             tdSql.execute('''insert into regular_table_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1), 
-                        fake.random_int(min=-9223372036854775807, max=0, step=1), 
-                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1),
+                        fake.random_int(min=-9223372036854775807, max=0, step=1),
+                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=-0, max=2147483647, step=1), 
-                        fake.random_int(min=-0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*4, fake.random_int(min=-0, max=2147483647, step=1),
+                        fake.random_int(min=-0, max=9223372036854775807, step=1),
+                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +1, fake.random_int(min=-0, max=2147483647, step=1), 
-                        fake.random_int(min=-0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*4 +1, fake.random_int(min=-0, max=2147483647, step=1),
+                        fake.random_int(min=-0, max=9223372036854775807, step=1),
+                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +10, fake.random_int(min=-0, max=2147483647, step=1), 
-                        fake.random_int(min=-0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*4 +10, fake.random_int(min=-0, max=2147483647, step=1),
+                        fake.random_int(min=-0, max=9223372036854775807, step=1),
+                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
         tdSql.query("select count(*) from stable_1;")
         tdSql.checkData(0,0,3*num_random*n)
         tdSql.query("select count(*) from regular_table_1;")
         tdSql.checkData(0,0,num_random*n)
-        
-    def explain_sql(self,sql):   
-        # #执行sql解析     
-        sql = "explain " + sql 
-        tdLog.info(sql) 
+
+    def explain_sql(self,sql):
+        # #执行sql解析
+        sql = "explain " + sql
+        tdLog.info(sql)
         tdSql.query(sql)
         #pass
-        
+
     def data_check(self,sql,mark='mark') :
         tdLog.info("========mark==%s==="% mark);
         try:
@@ -854,60 +854,60 @@ class TDTestCase:
         except:
             tdLog.info("sql is not support :=====%s; " %sql)
             tdSql.error(sql)
-        
-             
+
+
     def math_nest(self,mathlist):
-                
-        print("==========%s===start=============" %mathlist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %mathlist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (mathlist == ['ABS','SQRT']) or (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['FLOOR','CEIL','ROUND']) \
             or (mathlist == ['CSUM']) :
-            math_functions = mathlist          
-            fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)']        
+            math_functions = mathlist
+            fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_bigint)','(t1.q_smallint)','(t1.q_tinyint)','(t1.q_int)','(t1.q_float)','(t1.q_double)','(t1.q_bigint_null)','(t1.q_smallint_null)','(t1.q_tinyint_null)','(t1.q_int_null)','(t1.q_float_null)','(t1.q_double_null)',
-                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)']        
+                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
         elif (mathlist == ['UNIQUE']) or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['MODE'])  :
-            math_functions = mathlist          
+            math_functions = mathlist
             fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_binary)','(q_nchar)','(q_bool)','(q_ts)',
-                '(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)','(q_binary_null)','(q_nchar_null)','(q_bool_null)','(q_ts_null)']        
+                '(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)','(q_binary_null)','(q_nchar_null)','(q_bool_null)','(q_ts_null)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_bigint)','(t1.q_smallint)','(t1.q_tinyint)','(t1.q_int)','(t1.q_float)','(t1.q_double)','(t1.q_bigint_null)','(t1.q_smallint_null)','(t1.q_tinyint_null)','(t1.q_int_null)','(t1.q_float_null)','(t1.q_double_null)','(t1.q_ts)','(t1.q_ts_null)',
-                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)','(t2.q_ts)','(t2.q_ts_null)']        
+                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)','(t2.q_ts)','(t2.q_ts_null)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (mathlist == ['TAIL']):
-            math_functions = mathlist  
-            num = random.randint(1, 100)  
-            offset_rows = random.randint(0, 100)           
+            math_functions = mathlist
+            num = random.randint(1, 100)
+            offset_rows = random.randint(0, 100)
             fun_fix_column = ['(q_bigint,num)','(q_smallint,num)','(q_tinyint,num)','(q_int,num)','(q_float,num)','(q_double,num)','(q_binary,num)','(q_nchar,num)','(q_bool,num)','(q_ts,num)',
                 '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)','(q_binary_null,num)','(q_nchar_null,num)','(q_bool_null,num)','(q_ts_null,num)',
                 '(q_bigint,num,offset_rows)','(q_smallint,num,offset_rows)','(q_tinyint,num,offset_rows)','(q_int,num,offset_rows)','(q_float,num,offset_rows)','(q_double,num,offset_rows)','(q_binary,num,offset_rows)','(q_nchar,num,offset_rows)','(q_bool,num,offset_rows)','(q_ts,num,offset_rows)',
-                '(q_bigint_null,num,offset_rows)','(q_smallint_null,num,offset_rows)','(q_tinyint_null,num,offset_rows)','(q_int_null,num,offset_rows)','(q_float_null,num,offset_rows)','(q_double_null,num,offset_rows)','(q_binary_null,num,offset_rows)','(q_nchar_null,num,offset_rows)','(q_bool_null,num,offset_rows)','(q_ts_null,num,offset_rows)']        
+                '(q_bigint_null,num,offset_rows)','(q_smallint_null,num,offset_rows)','(q_tinyint_null,num,offset_rows)','(q_int_null,num,offset_rows)','(q_float_null,num,offset_rows)','(q_double_null,num,offset_rows)','(q_binary_null,num,offset_rows)','(q_nchar_null,num,offset_rows)','(q_bool_null,num,offset_rows)','(q_ts_null,num,offset_rows)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
-            
+
             fun_fix_column_j = ['(t1.q_bigint,num)','(t1.q_smallint,num)','(t1.q_tinyint,num)','(t1.q_int,num)','(t1.q_float,num)','(t1.q_double,num)','(t1.q_binary,num)','(t1.q_nchar,num)','(t1.q_bool,num)','(t1.q_ts,num)',
                     '(t1.q_bigint_null,num)','(t1.q_smallint_null,num)','(t1.q_tinyint_null,num)','(t1.q_int_null,num)','(t1.q_float_null,num)','(t1.q_double_null,num)','(t1.q_binary_null,num)','(t1.q_nchar_null,num)','(t1.q_bool_null,num)','(t1.q_ts_null,num)',
                     '(t2.q_bigint,num)','(t2.q_smallint,num)','(t2.q_tinyint,num)','(t2.q_int,num)','(t2.q_float,num)','(t2.q_double,num)','(t2.q_binary,num)','(t2.q_nchar,num)','(t2.q_bool,num)','(t2.q_ts,num)',
@@ -915,224 +915,224 @@ class TDTestCase:
                     '(t1.q_bigint,num,offset_rows)','(t1.q_smallint,num,offset_rows)','(t1.q_tinyint,num,offset_rows)','(t1.q_int,num,offset_rows)','(t1.q_float,num,offset_rows)','(t1.q_double,num,offset_rows)','(t1.q_binary,num,offset_rows)','(t1.q_nchar,num,offset_rows)','(t1.q_bool,num,offset_rows)','(t1.q_ts,num,offset_rows)',
                     '(t1.q_bigint_null,num,offset_rows)','(t1.q_smallint_null,num,offset_rows)','(t1.q_tinyint_null,num,offset_rows)','(t1.q_int_null,num,offset_rows)','(t1.q_float_null,num,offset_rows)','(t1.q_double_null,num,offset_rows)','(t1.q_binary_null,num,offset_rows)','(t1.q_nchar_null,num,offset_rows)','(t1.q_bool_null,num,offset_rows)','(t1.q_ts_null,num,offset_rows)',
                     '(t2.q_bigint,num,offset_rows)','(t2.q_smallint,num,offset_rows)','(t2.q_tinyint,num,offset_rows)','(t2.q_int,num,offset_rows)','(t2.q_float,num,offset_rows)','(t2.q_double,num,offset_rows)','(t2.q_binary,num,offset_rows)','(t2.q_nchar,num,offset_rows)','(t2.q_bool,num,offset_rows)','(t2.q_ts,num,offset_rows)',
-                    '(t2.q_bigint_null,num,offset_rows)','(t2.q_smallint_null,num,offset_rows)','(t2.q_tinyint_null,num,offset_rows)','(t2.q_int_null,num,offset_rows)','(t2.q_float_null,num,offset_rows)','(t2.q_double_null,num,offset_rows)','(t2.q_binary_null,num,offset_rows)','(t2.q_nchar_null,num,offset_rows)','(t2.q_bool_null,num,offset_rows)','(t2.q_ts_null,num,offset_rows)']        
+                    '(t2.q_bigint_null,num,offset_rows)','(t2.q_smallint_null,num,offset_rows)','(t2.q_tinyint_null,num,offset_rows)','(t2.q_int_null,num,offset_rows)','(t2.q_float_null,num,offset_rows)','(t2.q_double_null,num,offset_rows)','(t2.q_binary_null,num,offset_rows)','(t2.q_nchar_null,num,offset_rows)','(t2.q_bool_null,num,offset_rows)','(t2.q_ts_null,num,offset_rows)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
-            
+
         elif (mathlist == ['POW','LOG']) or (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) :
-            math_functions = mathlist       
-            num = random.randint(1, 1000)  
+            math_functions = mathlist
+            num = random.randint(1, 1000)
             fun_fix_column = ['(q_bigint,num)','(q_smallint,num)','(q_tinyint,num)','(q_int,num)','(q_float,num)','(q_double,num)',
-                              '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)']        
+                              '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
-            
+
             fun_fix_column_j = ['(t1.q_bigint,num)','(t1.q_smallint,num)','(t1.q_tinyint,num)','(t1.q_int,num)','(t1.q_float,num)','(t1.q_double,num)',
                     '(t1.q_bigint_null,num)','(t1.q_smallint_null,num)','(t1.q_tinyint_null,num)','(t1.q_int_null,num)','(t1.q_float_null,num)','(t1.q_double_null,num)',
                     '(t2.q_bigint,num)','(t2.q_smallint,num)','(t2.q_tinyint,num)','(t2.q_int,num)','(t2.q_float,num)','(t2.q_double,num)',
-                    '(t2.q_bigint_null,num)','(t2.q_smallint_null,num)','(t2.q_tinyint_null,num)','(t2.q_int_null,num)','(t2.q_float_null,num)','(t2.q_double_null,num)']        
+                    '(t2.q_bigint_null,num)','(t2.q_smallint_null,num)','(t2.q_tinyint_null,num)','(t2.q_int_null,num)','(t2.q_float_null,num)','(t2.q_double_null,num)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
 
         elif (mathlist == ['statecount','stateduration']):
-            math_functions = mathlist  
-            num = random.randint(-1000, 1000) 
-            
-            operator = ['LT' , 'GT' ,'GE','NE','EQ']  
-            oper = str(random.sample(operator,1)).replace("[","").replace("]","")#.replace("'","")  
-             
+            math_functions = mathlist
+            num = random.randint(-1000, 1000)
+
+            operator = ['LT' , 'GT' ,'GE','NE','EQ']
+            oper = str(random.sample(operator,1)).replace("[","").replace("]","")#.replace("'","")
+
             fun_fix_column = ['(q_bigint,oper,num,time)','(q_smallint,oper,num,time)','(q_tinyint,oper,num,time)','(q_int,oper,num,time)','(q_float,oper,num,time)','(q_double,oper,num,time)',
-                              '(q_bigint_null,oper,num,time)','(q_smallint_null,oper,num,time)','(q_tinyint_null,oper,num,time)','(q_int_null,oper,num,time)','(q_float_null,oper,num,time)','(q_double_null,oper,num,time)']        
-            
+                              '(q_bigint_null,oper,num,time)','(q_smallint_null,oper,num,time)','(q_tinyint_null,oper,num,time)','(q_int_null,oper,num,time)','(q_float_null,oper,num,time)','(q_double_null,oper,num,time)']
+
             hanshu_select1 = random.sample(math_functions,1)
             fun_column_1 = random.sample(hanshu_select1,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-                       
+
             if str(hanshu_select1).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_1 = math_fun_1.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select1).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
                 math_fun_1 = math_fun_1.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
-                
-            hanshu_select2 = random.sample(math_functions,1)            
+
+            hanshu_select2 = random.sample(math_functions,1)
             fun_column_2 = random.sample(hanshu_select2,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             if str(hanshu_select2).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_2 = math_fun_2.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select2).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
-                math_fun_2 = math_fun_2.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))           
-            
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
+                math_fun_2 = math_fun_2.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
+
             fun_fix_column_j = ['(t1.q_bigint,oper,num,time)','(t1.q_smallint,oper,num,time)','(t1.q_tinyint,oper,num,time)','(t1.q_int,oper,num,time)','(t1.q_float,oper,num,time)','(t1.q_double,oper,num,time)',
                               '(t1.q_bigint_null,oper,num,time)','(t1.q_smallint_null,oper,num,time)','(t1.q_tinyint_null,oper,num,time)','(t1.q_int_null,oper,num,time)','(t1.q_float_null,oper,num,time)','(t1.q_double_null,oper,num,time)',
                               '(t2.q_bigint,oper,num,time)','(t2.q_smallint,oper,num,time)','(t2.q_tinyint,oper,num,time)','(t2.q_int,oper,num,time)','(t2.q_float,oper,num,time)','(t2.q_double,oper,num,time)',
-                              '(t2.q_bigint_null,oper,num,time)','(t2.q_smallint_null,oper,num,time)','(t2.q_tinyint_null,oper,num,time)','(t2.q_int_null,oper,num,time)','(t2.q_float_null,oper,num,time)','(t2.q_double_null,oper,num,time)']        
-            
+                              '(t2.q_bigint_null,oper,num,time)','(t2.q_smallint_null,oper,num,time)','(t2.q_tinyint_null,oper,num,time)','(t2.q_int_null,oper,num,time)','(t2.q_float_null,oper,num,time)','(t2.q_double_null,oper,num,time)']
+
             hanshu_select_join_1 = random.sample(math_functions,1)
             fun_column_join_1 = random.sample(hanshu_select_join_1,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             if str(hanshu_select_join_1).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_join_1 = math_fun_join_1.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select_join_1).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
                 math_fun_join_1 = math_fun_join_1.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
-            
+
             hanshu_select_join_2 = random.sample(math_functions,1)
             fun_column_join_2 = random.sample(hanshu_select_join_2,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             if str(hanshu_select_join_2).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_join_2 = math_fun_join_2.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select_join_2).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
                 math_fun_join_2 = math_fun_join_2.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
 
         elif(mathlist == ['HISTOGRAM']) :
-            math_functions = mathlist          
-            fun_fix_column = ['(q_bigint','(q_smallint','(q_tinyint','(q_int','(q_float','(q_double','(q_bigint_null','(q_smallint_null','(q_tinyint_null','(q_int_null','(q_float_null','(q_double_null'] 
-            
+            math_functions = mathlist
+            fun_fix_column = ['(q_bigint','(q_smallint','(q_tinyint','(q_int','(q_float','(q_double','(q_bigint_null','(q_smallint_null','(q_tinyint_null','(q_int_null','(q_float_null','(q_double_null']
+
             fun_fix_column_j = ['(t1.q_bigint','(t1.q_smallint','(t1.q_tinyint','(t1.q_int','(t1.q_float','(t1.q_double','(t1.q_bigint_null','(t1.q_smallint_null','(t1.q_tinyint_null','(t1.q_int_null','(t1.q_float_null','(t1.q_double_null',
                              '(t2.q_bigint','(t2.q_smallint','(t2.q_tinyint','(t2.q_int','(t2.q_float','(t2.q_double','(t2.q_bigint_null','(t2.q_smallint_null','(t2.q_tinyint_null','(t2.q_int_null','(t2.q_float_null','(t2.q_double_null']
-            
-            normalized = random.randint(0, 1)        
-            
+
+            normalized = random.randint(0, 1)
+
             i = random.randint(1,3)
             if i == 1:
-                bin_type = 'user_input'                
+                bin_type = 'user_input'
                 bin_description = {-11111119395555977777}  #9一会转译成，
                 fun_column_1 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                
+
                 fun_column_2 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                
+
                 fun_column_join_1 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                
+
                 fun_column_join_2 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                            
+
             elif i == 2:
-                bin_type = 'linear_bin'   
-                true_false = random.randint(10, 11)             
+                bin_type = 'linear_bin'
+                true_false = random.randint(10, 11)
                 bin_description = {"ZstartZ": -333339, "ZwidthZ":559, "ZcountZ":59, "ZinfinityZ":'%d' %true_false}  #Z一会转译成" ，9一会转译成 ，
                 fun_column_1 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
-                
+
                 fun_column_2 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
 
                 fun_column_join_1 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
-                
+
                 fun_column_join_2 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
-                                    
+
             elif i == 3:
-                bin_type = 'log_bin'   
-                true_false = random.randint(10, 11)             
+                bin_type = 'log_bin'
+                true_false = random.randint(10, 11)
                 bin_description = {"ZstartZ": -333339, "ZfactorZ":559, "ZcountZ":59, "ZinfinityZ":'%d' %true_false}  #Z一会转译成" ，9一会转译成 ，
                 fun_column_1 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")  
-                
+                math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
                 fun_column_2 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")           
-                
+                math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
                 fun_column_join_1 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")  
-                
+                math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
                 fun_column_join_2 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")         
-                                 
+                math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
         tdSql.query("select 1-1 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']):
-                sql = "select  ts1 , floor(asct1)  from  ( select  " 
-                sql += "%s as asct1, " % math_fun_1 
-                sql += "%s as asct2, " % math_fun_2 
+                sql = "select  ts1 , floor(asct1)  from  ( select  "
+                sql += "%s as asct1, " % math_fun_1
+                sql += "%s as asct2, " % math_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as ts1 from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or  (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
-                sql = "select   count(asct1)  from  ( select  " 
-                sql += "%s as asct1 " % math_fun_1 
+                sql = "select   count(asct1)  from  ( select  "
+                sql += "%s as asct1 " % math_fun_1
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-2 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts , abs(asct1) from  ( select  "
-                sql += "%s as asct1,  " % math_fun_1 
+                sql += "%s as asct1,  " % math_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts , asct2 from  ( select  "
-                sql += "%s as asct2,  " % math_fun_2 
+                sql += "%s as asct2,  " % math_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
-                self.explain_sql(sql) 
+                self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
-                or (mathlist == ['HYPERLOGLOG'])  or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']):  
+                or (mathlist == ['HYPERLOGLOG'])  or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']):
                 sql = "select  count(asct1) from  ( select  "
-                sql += "%s as asct1  " % math_fun_1 
+                sql += "%s as asct1  " % math_fun_1
                 sql += "from regular_table_1 where "
                 sql += "%s )" % random.choice(self.q_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select   count(asct2) from  ( select  "
-                sql += "%s as asct2  " % math_fun_2 
+                sql += "%s as asct2  " % math_fun_2
                 sql += " from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)      
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
-                self.cur1.execute(sql)    
-                self.explain_sql(sql)       
-            
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-3 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
@@ -1141,20 +1141,20 @@ class TDTestCase:
                 sql += "%s as asct1, ts ," % math_fun_1
                 sql += "%s as asct2, " % math_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2, ts ," % math_fun_2
                 sql += "%s as asct1, " % math_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += " from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -1164,14 +1164,14 @@ class TDTestCase:
                 sql += "%s as asct2 " % math_fun_2
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 ," % math_fun_2
-                sql += "%s as asct1 " % math_fun_1 
+                sql += "%s as asct1 " % math_fun_1
                 sql += " from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -1181,35 +1181,35 @@ class TDTestCase:
                 sql += "%s as asct1 " % math_fun_1
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 " % math_fun_2
                 sql += " from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += " order by asct1 asc " 
+                sql += " order by asct1 asc "
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-4 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1 from  ( select  t1.ts as ts1,"
-                sql += "%s as asct0, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2           
-                sql += "%s as asct2, " % math_fun_join_1             
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct22, " % random.choice(self.q_select)         
+                sql += "%s as asct0, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "%s as asct2, " % math_fun_join_1
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct22, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2 from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
@@ -1217,32 +1217,32 @@ class TDTestCase:
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  count(asct1) from  ( select  "
-                sql += "%s as asct1 " % math_fun_join_2                
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-5 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts ,"
-                sql += "%s, " % math_fun_1 
+                sql += "%s, " % math_fun_1
                 sql += "%s as asct1, " % random.choice(self.q_select)
-                sql += "%s as asct2, " % random.choice(self.q_select) 
+                sql += "%s as asct2, " % random.choice(self.q_select)
                 sql += "%s  " % math_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
@@ -1254,9 +1254,9 @@ class TDTestCase:
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
 
@@ -1265,32 +1265,32 @@ class TDTestCase:
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1 ,timediff(ts1,ts2), max(asct1) from  ( select  t1.ts,t1.ts as ts1,"
-                sql += "%s as asct0, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2           
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
-                sql += "%s as asct13, " % math_fun_join_1              
+                sql += "%s as asct0, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % math_fun_join_1
                 sql += "t2.ts as ts2 from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  count(asct1) from  ( select "
-                sql += "%s as asct1 " % math_fun_join_2           
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
 
@@ -1301,13 +1301,13 @@ class TDTestCase:
                 sql = "select  ts1,ts2 , abs(asct1) from  ( select  "
                 sql += "%s as asct1, ts as ts1," % math_fun_1
                 sql += "%s as asct2, " % math_fun_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
@@ -1320,12 +1320,12 @@ class TDTestCase:
                 sql += "from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-8 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
@@ -1335,13 +1335,13 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as ts1," % math_fun_1
                 sql += "%s as asct2, " % math_fun_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
@@ -1355,7 +1355,7 @@ class TDTestCase:
                 sql += " from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
@@ -1366,12 +1366,12 @@ class TDTestCase:
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2) , max(asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct22, " % random.choice(self.q_select) 
+                sql += "%s, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "t2.%s as asct22, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -1379,27 +1379,27 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
-                sql = "select  count(asct1) from  ( select  " 
-                sql += "%s as asct1 " % math_fun_join_2 
+                sql = "select  count(asct1) from  ( select  "
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-    
+
         self.restartDnodes()
         tdSql.query("select 1-10 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -1424,8 +1424,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -1442,12 +1442,12 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)               
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -1471,10 +1471,10 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
-                self.cur1.execute(sql)              
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
@@ -1489,8 +1489,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -1500,78 +1500,78 @@ class TDTestCase:
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), max(asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct111, " % random.choice(self.q_select)            
+                sql += "%s, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "t2.%s as asct111, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
-                sql = "select count(asct1) from  ( select  " 
-                sql += "%s as asct1 " % math_fun_join_2            
+                sql = "select count(asct1) from  ( select  "
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-13 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts ,"
-                sql += "%s as asct11, " % math_fun_1 
+                sql += "%s as asct11, " % math_fun_1
                 sql += "%s as asct12, " % random.choice(self.q_select)
-                sql += "%s as asct13, " % random.choice(self.q_select) 
+                sql += "%s as asct13, " % random.choice(self.q_select)
                 sql += "%s  as asct14, " % math_fun_2
-                sql += "%s  as asct15 " % random.choice(self.t_select) 
+                sql += "%s  as asct15 " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  "
                 sql += "%s  " % math_fun_2
-                sql += "%s  " % random.choice(self.t_select) 
+                sql += "%s  " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-14 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  avg(asct1),count(asct2) from ( select "
-                sql += "%s as asct1, " % math_fun_1 
+                sql += "%s as asct1, " % math_fun_1
                 sql += "%s as asct2" % math_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -1579,67 +1579,67 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  count(asct1) from ( select "
-                sql += "%s as asct1 " % math_fun_1 
+                sql += "%s as asct1 " % math_fun_1
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.partiton_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-                  
+
         tdSql.query("select 1-15 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts ,timediff(ts1,ts), max(asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts   from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
-                or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :   
-                sql = "select  count(asct1) from  ( select  " 
-                sql += "%s as asct1 " % math_fun_join_2 
+                or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
+                sql = "select  count(asct1) from  ( select  "
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-        
+
         #taos -f sql
         # startTime_taosf = time.time()
         print("taos -f %s sql start!" %mathlist)
@@ -1648,274 +1648,274 @@ class TDTestCase:
         _ = subprocess.check_output(taos_cmd1, shell=True)
         print("taos -f %s sql over!" %mathlist)
         # endTime_taosf = time.time()
-        # print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))      
-                                        
-        print("=========%s====over=============" %mathlist) 
+        # print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
+
+        print("=========%s====over=============" %mathlist)
 
 
     def str_nest(self,strlist):
-                
-        print("==========%s===start=============" %strlist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %strlist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['LENGTH','CHAR_LENGTH'])  \
             or (strlist == ['']):
-            str_functions = strlist          
-            fun_fix_column = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)']        
+            str_functions = strlist
+            fun_fix_column = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)']
             fun_column_1 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_nchar)','(t1.q_binary)','(t1.q_nchar_null)','(t1.q_binary_null)',
-                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)']        
+                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)']
             fun_column_join_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
-            fun_fix_column_s = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)','(loc)','(tbname)']        
+
+            fun_fix_column_s = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)','(loc)','(tbname)']
             fun_column_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_1 = str(fun_column_s_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_2 = str(fun_column_s_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar)','(t1.q_binary)','(t1.q_nchar_null)','(t1.q_binary_null)','(t1.loc)','(t1.tbname)',
-                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)','(t2.loc)','(t2.tbname)']        
+                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)','(t2.loc)','(t2.tbname)']
             fun_column_join_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_s_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_s_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
         elif (strlist == ['SUBSTR']) :
-            str_functions = strlist       
-            pos = random.randint(1, 20)  
-            sub_len = random.randint(1, 10)  
+            str_functions = strlist
+            pos = random.randint(1, 20)
+            sub_len = random.randint(1, 10)
             fun_fix_column = ['(q_nchar,pos)','(q_binary,pos)','(q_nchar_null,pos)','(q_binary_null,pos)',
-                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)',]        
+                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)',]
             fun_column_1 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_2 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
             fun_fix_column_j = ['(t1.q_nchar,pos)','(t1.q_binary,pos)','(t1.q_nchar_null,pos)','(t1.q_binary_null,pos)',
                     '(t1.q_nchar,pos,sub_len)','(t1.q_binary,pos,sub_len)','(t1.q_nchar_null,pos,sub_len)','(t1.q_binary_null,pos,sub_len)',
                     '(t2.q_nchar,pos)','(t2.q_binary,pos)','(t2.q_nchar_null,pos)','(t2.q_binary_null,pos)',
-                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)']        
+                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)']
             fun_column_join_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_join_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
             fun_fix_column_s = ['(q_nchar,pos)','(q_binary,pos)','(q_nchar_null,pos)','(q_binary_null,pos)','(loc,pos)',
-                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)','(loc,pos,sub_len)',]        
+                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)','(loc,pos,sub_len)',]
             fun_column_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar,pos)','(t1.q_binary,pos)','(t1.q_nchar_null,pos)','(t1.q_binary_null,pos)','(t1.loc,pos)',
                     '(t1.q_nchar,pos,sub_len)','(t1.q_binary,pos,sub_len)','(t1.q_nchar_null,pos,sub_len)','(t1.q_binary_null,pos,sub_len)','(t1.loc,pos,sub_len)',
                     '(t2.q_nchar,pos)','(t2.q_binary,pos)','(t2.q_nchar_null,pos)','(t2.q_binary_null,pos)','(t2.loc,pos)',
-                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)','(t2.loc,pos,sub_len)']        
+                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)','(t2.loc,pos,sub_len)']
             fun_column_join_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_s_j,1)
             str_fun_join_s_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_join_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_s_j,1)
             str_fun_join_s_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
         elif (strlist == ['CONCAT']) :
-            str_functions = strlist       
-            i = random.randint(2,4) 
+            str_functions = strlist
+            i = random.randint(2,4)
             fun_fix_column = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']     
-            
-            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
+            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+column1+')'
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
-            
+
             column2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+column2+')'
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
-                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)'] 
-            
-            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
+
+            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+column_j1+')'
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-            
-            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+column_j2+')'
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','loc','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']    
-            
-            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
+            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_1 = str(random.sample(str_functions,1))+'('+column_s1+')'
             str_fun_s_1 = str(fun_column_s_1).replace("[","").replace("]","").replace("'","")
-                
-            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+
+            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_2 = str(random.sample(str_functions,1))+'('+column_s2+')'
             str_fun_s_2 = str(fun_column_s_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)','(t1.loc)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)','(t2.loc)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
                     '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
-            
-            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_1 = str(random.sample(str_functions,1))+'('+column_j_s1+')'
             str_fun_join_s_1 = str(fun_column_join_s_1).replace("[","").replace("]","").replace("'","")
-                    
-            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_2 = str(random.sample(str_functions,1))+'('+column_j_s2+')'
             str_fun_join_s_2 = str(fun_column_join_s_2).replace("[","").replace("]","").replace("'","")
- 
+
         elif (strlist == ['CONCAT_WS']):
-            str_functions = strlist       
-            i = random.randint(2,4) 
+            str_functions = strlist
+            i = random.randint(2,4)
             fun_fix_column = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']     
-            
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
             separators = ['',' ','abc','123','!','@','#','$','%','^','&','*','(',')','-','_','+','=','{',
                         '[','}',']','|',';',':',',','.','<','>','?','/','~','`','taos','涛思']
-            separator = str(random.sample(separators,i)).replace("[","").replace("]","") 
-        
-            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+            separator = str(random.sample(separators,i)).replace("[","").replace("]","")
+
+            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column1+')'
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
-            
+
             column2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column2+')'
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
-                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)'] 
-            
-            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
+
+            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j1+')'
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-            
-            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j2+')'
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','loc','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']    
-            
-            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
+            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_s1+')'
             str_fun_s_1 = str(fun_column_s_1).replace("[","").replace("]","").replace("'","")
-                
-            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+
+            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_s2+')'
             str_fun_s_2 = str(fun_column_s_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)','(t1.loc)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)','(t2.loc)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
                     '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
-            
-            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j_s1+')'
             str_fun_join_s_1 = str(fun_column_join_s_1).replace("[","").replace("]","").replace("'","")
-                    
-            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j_s2+')'
             str_fun_join_s_2 = str(fun_column_join_s_2).replace("[","").replace("]","").replace("'","")
-            
-            
+
+
         tdSql.query("select 1-1 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']) :
-                sql = "select  t1s , LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  " 
-                sql += "%s as asct1, " % str_fun_1 
-                sql += "%s as asct2, " % str_fun_2 
+                sql = "select  t1s , LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  "
+                sql += "%s as asct1, " % str_fun_1
+                sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as t1s from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
-                self.cur1.execute(sql)               
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
-                sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  " 
-                sql += "%s as asct1, " % str_fun_1 
-                sql += "%s as asct2, " % str_fun_2 
+                sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
+                sql += "%s as asct1, " % str_fun_1
+                sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-2 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']) :
                 sql = "select  ts ,  asct1  from  ( select  "
-                sql += "%s as asct1,  " % str_fun_1 
+                sql += "%s as asct1,  " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts , asct2 from  ( select  "
-                sql += "%s as asct2,  " % str_fun_2 
+                sql += "%s as asct2,  " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)           
+                sql += "%s " % random.choice(self.q_where)
                 #sql += "%s " % random.choice(having_support)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
-                self.explain_sql(sql)  
-            elif (strlist == ['LENGTH','CHAR_LENGTH']): 
+                self.explain_sql(sql)
+            elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1)  from  ( select  "
-                sql += "%s as asct1,  " % str_fun_1 
+                sql += "%s as asct1,  " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  sum(asct2), min(asct2) from  ( select  "
-                sql += "%s as asct2,  " % str_fun_2 
+                sql += "%s as asct2,  " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)        
-            
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-3 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
@@ -1923,20 +1923,20 @@ class TDTestCase:
                 sql += "%s as asct1 ," % str_fun_1
                 sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 ," % str_fun_2
                 sql += "%s as asct1, " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 #tdSql.query(sql) #'unexpected end of data'
                 # self.cur1.execute(sql)
                 # self.explain_sql(sql)
@@ -1945,92 +1945,92 @@ class TDTestCase:
                 sql += "%s as asct1 ," % str_fun_1
                 sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 ," % str_fun_2
                 sql += "%s as asct1, " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-4 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "%s, " % str_fun_join_1             
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "%s, " % str_fun_join_1
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "%s, " % str_fun_join_1             
-                sql += "t1.%s as asct21, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct22, " % random.choice(self.q_select)         
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "%s, " % str_fun_join_1
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t2.%s as asct22, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-5 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts ,"
-                sql += "%s, " % str_fun_1 
+                sql += "%s, " % str_fun_1
                 sql += "%s as asct21, " % random.choice(self.q_select)
-                sql += "%s as asct22, " % random.choice(self.q_select) 
+                sql += "%s as asct22, " % random.choice(self.q_select)
                 sql += "%s  " % str_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  ts ,"
-                sql += "%s, " % str_fun_1 
+                sql += "%s, " % str_fun_1
                 sql += "%s as asct22, " % random.choice(self.q_select)
-                sql += "%s as asct21, " % random.choice(self.q_select) 
+                sql += "%s as asct21, " % random.choice(self.q_select)
                 sql += "%s  " % str_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
@@ -2040,35 +2040,35 @@ class TDTestCase:
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts ,timediff(ts1,ts),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)         
-                sql += "%s, " % str_fun_join_1              
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "%s, " % str_fun_join_1
                 sql += "t2.ts  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)         
-                sql += "%s, " % str_fun_join_1              
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "%s, " % str_fun_join_1
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
 
@@ -2078,13 +2078,13 @@ class TDTestCase:
                 sql = "select  t1s ,ts1,  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  "
                 sql += "%s as asct1, ts as t1s," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
@@ -2094,18 +2094,18 @@ class TDTestCase:
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1, ts as ts1," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as t1s from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-8 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
@@ -2114,13 +2114,13 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as st1," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
@@ -2132,13 +2132,13 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as ts1," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as st1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
@@ -2148,12 +2148,12 @@ class TDTestCase:
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select) 
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -2161,32 +2161,32 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
-                tdSql.query(sql)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)
-            elif (strlist == ['LENGTH','CHAR_LENGTH']):
-                sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select) 
-                sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
-                sql += "%s " % random.choice(self.t_join_where)
-                sql += "and %s " % random.choice(self.t_u_where)
-                sql += "and %s " % random.choice(self.t_u_or_where)
-                sql += "%s " % random.choice(self.order_u_where)
-                sql += "%s " % random.choice(self.limit1_where)
-                sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-    
+            elif (strlist == ['LENGTH','CHAR_LENGTH']):
+                sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
+                sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
+                sql += "%s " % random.choice(self.t_join_where)
+                sql += "and %s " % random.choice(self.t_u_where)
+                sql += "and %s " % random.choice(self.t_u_or_where)
+                sql += "%s " % random.choice(self.order_u_where)
+                sql += "%s " % random.choice(self.limit1_where)
+                sql += ") ;"
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+
         self.restartDnodes()
         tdSql.query("select 1-10 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -2210,11 +2210,11 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
-                self.explain_sql(sql)  
+                self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1 ," % str_fun_s_1
@@ -2235,12 +2235,12 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -2263,11 +2263,11 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
-                self.explain_sql(sql)  
+                self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1 ," % str_fun_s_1
@@ -2287,8 +2287,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -2297,85 +2297,85 @@ class TDTestCase:
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select)            
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select)            
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-13 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts ,"
-                sql += "%s as asct10, " % str_fun_1 
+                sql += "%s as asct10, " % str_fun_1
                 sql += "%s as asct1, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % str_fun_2
-                sql += "%s  as asct14 " % random.choice(self.t_select) 
+                sql += "%s  as asct14 " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql)
-                tdSql.checkRows(300)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)
-            elif (strlist == ['LENGTH','CHAR_LENGTH']):
-                sql = "select  ts ,"
-                sql += "%s as asct1, " % str_fun_1 
-                sql += "%s as asct11, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
-                sql += "%s as asct13, " % str_fun_2
-                sql += "%s as asct14  " % random.choice(self.t_select) 
-                sql += " from  ( select  * from stable_1 where "
-                sql += "%s " % random.choice(self.qt_where)
-                sql += "%s " % random.choice(self.order_where)
-                sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+            elif (strlist == ['LENGTH','CHAR_LENGTH']):
+                sql = "select  ts ,"
+                sql += "%s as asct1, " % str_fun_1
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % str_fun_2
+                sql += "%s as asct14  " % random.choice(self.t_select)
+                sql += " from  ( select  * from stable_1 where "
+                sql += "%s " % random.choice(self.qt_where)
+                sql += "%s " % random.choice(self.order_where)
+                sql += ") ;"
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
+                tdSql.checkRows(300)
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-14 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select   LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from ( select "
-                sql += "%s as asct1, " % str_fun_s_1 
+                sql += "%s as asct1, " % str_fun_s_1
                 sql += "%s as asct2" % str_fun_s_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -2383,14 +2383,14 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select   sum(asct1), min(asct1), max(asct2), avg(asct2)  from ( select "
-                sql += "%s as asct1, " % str_fun_s_1 
+                sql += "%s as asct1, " % str_fun_s_1
                 sql += "%s as asct2" % str_fun_s_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -2398,56 +2398,56 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-                  
+
         tdSql.query("select 1-15 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts,ts2 ,timediff(ts,ts2), LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts ,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)    
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14 " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14 " % random.choice(self.q_select)
                 sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-        
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f %s sql start!" %strlist)
@@ -2456,215 +2456,215 @@ class TDTestCase:
         _ = subprocess.check_output(taos_cmd1, shell=True)
         print("taos -f %s sql over!" %strlist)
         endTime_taos_f = time.time()
-        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))       
-                                        
-        print("=========%s====over=============" %strlist) 
-                
+        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
+
+        print("=========%s====over=============" %strlist)
+
     def time_nest(self,timelist):
-                
-        print("==========%s===start=============" %timelist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %timelist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (timelist == ['NOW','TODAY']) or (timelist == ['TIMEZONE']):
-            time_functions = timelist          
-            fun_fix_column = ['()']        
+            time_functions = timelist
+            fun_fix_column = ['()']
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
-            fun_fix_column_j = ['()']        
+
+            fun_fix_column_j = ['()']
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (timelist == ['TIMETRUNCATE']):
-            time_functions = timelist     
-            
-            t = time.time()  
-            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t)) 
+            time_functions = timelist
+
+            t = time.time()
+            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
             fun_fix_column = ['q_ts','ts','_c0','_C0','_rowts','1600000000000','1600000000000000','1600000000000000000',
-                        '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            timeunits = ['1a' ,'1s', '1m' ,'1h', '1d']  
-            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","") 
-            
-            column_1 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))]             
+                        '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            timeunits = ['1a' ,'1s', '1m' ,'1h', '1d']
+            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","")
+
+            column_1 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))]
             fun_column_1 = random.sample(time_functions,1)+random.sample(column_1,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
-            
-            column_2 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))] 
+
+            column_2 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))]
             fun_column_2 = random.sample(time_functions,1)+random.sample(column_2,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
-            
-            
+
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','(1600000000000)','(1600000000000000)','(1600000000000000000)',
-                        '(%d)' %t, '(%d000)' %t, '(%d000000)' %t,'t_to_s'] 
-            
-            column_j1 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]             
+                        '(%d)' %t, '(%d000)' %t, '(%d000000)' %t,'t_to_s']
+
+            column_j1 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(column_j1,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
-                   
-            column_j2 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]             
+
+            column_j2 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(column_j2,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
 
         elif (timelist == ['TO_ISO8601']):
-            time_functions = timelist   
-            
-            t = time.time()             
+            time_functions = timelist
+
+            t = time.time()
             fun_fix_column = ['(now())','(ts)','(q_ts)','(_rowts)','(_c0)','(_C0)',
                               '(1600000000000)','(1600000000000000)','(1600000000000000000)',
-                              '(%d)' %t, '(%d000)' %t, '(%d000000)' %t]  
-                      
+                              '(%d)' %t, '(%d000)' %t, '(%d000000)' %t]
+
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-                       
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','(1600000000000)','(1600000000000000)','(1600000000000000000)','(now())',
-                                '(%d)' %t, '(%d000)' %t, '(%d000000)' %t] 
-                     
+                                '(%d)' %t, '(%d000)' %t, '(%d000000)' %t]
+
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-                       
+
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (timelist == ['TO_UNIXTIMESTAMP']):
-            time_functions = timelist   
-            
-            t = time.time()     
-            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))       
-            fun_fix_column = ['(q_nchar)','(q_nchar1)','(q_nchar2)','(q_nchar3)','(q_nchar4)','(q_nchar_null)','(q_binary)','(q_binary5)','(q_binary6)','(q_binary7)','(q_binary8)','(q_binary_null)','(t_to_s)']  
-                      
+            time_functions = timelist
+
+            t = time.time()
+            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
+            fun_fix_column = ['(q_nchar)','(q_nchar1)','(q_nchar2)','(q_nchar3)','(q_nchar4)','(q_nchar_null)','(q_binary)','(q_binary5)','(q_binary6)','(q_binary7)','(q_binary8)','(q_binary_null)','(t_to_s)']
+
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("t_to_s","%s" %t_to_s)
-            
+
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("t_to_s","%s" %t_to_s)
-                       
-            fun_fix_column_j = ['(t1.q_nchar)','(t1.q_binary)', '(t2.q_nchar)','(t2.q_binary)','(t_to_s)'] 
-                     
+
+            fun_fix_column_j = ['(t1.q_nchar)','(t1.q_binary)', '(t2.q_nchar)','(t2.q_binary)','(t_to_s)']
+
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("t_to_s","%s" %t_to_s)
-                       
+
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("t_to_s","%s" %t_to_s)
 
         elif (timelist == ['TIMEDIFF_1']):
-            time_functions = timelist    
-            
-            t = time.time()     
+            time_functions = timelist
+
+            t = time.time()
             t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
             timeunits = [ '1a' ,'1s', '1m' ,'1h', '1d']
-            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","") 
-                   
+            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","")
+
             fun_fix_column = ['q_ts','ts','_c0','_C0','_rowts','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_12 = ['(%s,%s,timeutil)'%(column_1,column_2)]
             fun_column_1 = random.sample(time_functions,1)+random.sample(column_12,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
-            
-            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+
+            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_34 = ['(%s,%s,timeutil)'%(column_3,column_4)]
             fun_column_2 = random.sample(time_functions,1)+random.sample(column_34,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
-                       
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
             column_j12 = ['(%s,%s,timeutil)'%(column_j1,column_j2)]
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(column_j12,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
-                
-            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
-            column_j34 = ['(%s,%s,timeutil)'%(column_j3,column_j4)]           
+
+            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
+            column_j34 = ['(%s,%s,timeutil)'%(column_j3,column_j4)]
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(column_j34,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
 
         elif (timelist == ['TIMEDIFF_2']):
-            time_functions = timelist    
-            
-            t = time.time()     
+            time_functions = timelist
+
+            t = time.time()
             t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
-                   
+
             fun_fix_column = ['q_ts','ts','_c0','_C0','_rowts','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_12 = ['(%s,%s)'%(column_1,column_2)]
             fun_column_1 = random.sample(time_functions,1)+random.sample(column_12,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("t_to_s","%s" %t_to_s).replace("_2","")
-            
-            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+
+            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_34 = ['(%s,%s)'%(column_3,column_4)]
             fun_column_2 = random.sample(time_functions,1)+random.sample(column_34,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("t_to_s","%s" %t_to_s).replace("_2","")
-                       
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
             column_j12 = ['(%s,%s)'%(column_j1,column_j2)]
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(column_j12,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("t_to_s","%s" %t_to_s).replace("_2","")
-                
-            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
-            column_j34 = ['(%s,%s)'%(column_j3,column_j4)]           
+
+            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
+            column_j34 = ['(%s,%s)'%(column_j3,column_j4)]
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(column_j34,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("t_to_s","%s" %t_to_s).replace("_2","")
-            
+
         elif (timelist == ['ELAPSED']):
-            time_functions = timelist   
-                  
-            fun_fix_column = ['(ts)','(_c0)','(_C0)','(_rowts)','(ts,time_unit)','(_c0,time_unit)','(_C0,time_unit)','(_rowts,time_unit)']  
-            
-            time_units = ['1s','1m','1h','1d','1a']      
-            time_unit1 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","")   
-            time_unit2 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","") 
-                      
+            time_functions = timelist
+
+            fun_fix_column = ['(ts)','(_c0)','(_C0)','(_rowts)','(ts,time_unit)','(_c0,time_unit)','(_C0,time_unit)','(_rowts,time_unit)']
+
+            time_units = ['1s','1m','1h','1d','1a']
+            time_unit1 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","")
+            time_unit2 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","")
+
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit1)
-            
+
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit2)
-           
-                       
-            fun_fix_column_j = ['(t1.ts)', '(t2.ts)','(t1.ts,time_unit)','(t1.ts,time_unit)','(t2.ts,time_unit)','(t2.ts,time_unit)'] 
-                     
+
+
+            fun_fix_column_j = ['(t1.ts)', '(t2.ts)','(t1.ts,time_unit)','(t1.ts,time_unit)','(t2.ts,time_unit)','(t2.ts,time_unit)']
+
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit1)
-                       
+
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit2)
-            
-                                                            
+
+
         elif (timelist == ['CAST']) :
-            str_functions = timelist                                
+            str_functions = timelist
             #下面的4个是全的，这个只是1个
             i = random.randint(1,4)
             if i ==1:
@@ -2672,33 +2672,33 @@ class TDTestCase:
                 fun_fix_column = ['q_bool','q_bool_null','q_bigint','q_bigint_null','q_smallint','q_smallint_null',
                 'q_tinyint','q_tinyint_null','q_int','q_int_null','q_float','q_float_null','q_double','q_double_null']
                 type_names = ['BIGINT','BINARY(100)','TIMESTAMP','NCHAR(100)','BIGINT UNSIGNED']
-                
-                type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
                 time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","") 
+
+                type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
                 time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-                
+
                 fun_fix_column_j = ['t1.q_bool','t1.q_bool_null','t1.q_bigint','t1.q_bigint_null','t1.q_smallint','t1.q_smallint_null',
                 't1.q_tinyint','t1.q_tinyint_null','t1.q_int','t1.q_int_null','t1.q_float','t1.q_float_null','t1.q_double','t1.q_double_null',
                 't2.q_bool','t2.q_bool_null','t2.q_bigint','t2.q_bigint_null','t2.q_smallint','t2.q_smallint_null',
-                't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")              
-                            
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
             elif i==2:
                 print('===========cast_2===========')
                 fun_fix_column = ['q_binary','q_binary_null','q_binary1','q_binary2','q_binary3','q_binary4']
                 type_names = ['BIGINT','BINARY(100)','NCHAR(100)','BIGINT UNSIGNED']
-                
+
                 type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
                 time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
@@ -2706,285 +2706,285 @@ class TDTestCase:
                 type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
                 time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-                
+
                 fun_fix_column_j = ['t1.q_binary','t1.q_binary_null','t1.q_binary1','t1.q_binary2','t1.q_binary3','t1.q_binary4',
-                        't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                        't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")  
-                                
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
             elif i==3:
                 print('===========cast_3===========')
                 fun_fix_column = ['q_nchar','q_nchar_null','q_nchar5','q_nchar6','q_nchar7','q_nchar8']
                 type_names = ['BIGINT','NCHAR(100)','BIGINT UNSIGNED']
-                
+
                 type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")                
+                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
 
                 type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")  
-                
+                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
+
                 fun_fix_column_j = ['t1.q_nchar','t1.q_nchar_null','t1.q_nchar5','t1.q_nchar6','t1.q_nchar7','t1.q_nchar8',
-                        't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                        't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")  
-                            
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
             elif i==4:
                 print('===========cast_4===========')
                 fun_fix_column = ['q_ts','q_ts_null','_C0','_c0','ts','_rowts']
                 type_names = ['BIGINT','TIMESTAMP','BIGINT UNSIGNED']
-                
+
                 type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")  
-                
+                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
+
                 type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")  
-                
-                fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
+
+                fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")  
-                            
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
         elif (timelist == ['CAST_1']) :
-            str_functions = timelist                               
-            
+            str_functions = timelist
+
             print('===========cast_1===========')
             fun_fix_column = ['q_bool','q_bool_null','q_bigint','q_bigint_null','q_smallint','q_smallint_null',
             'q_tinyint','q_tinyint_null','q_int','q_int_null','q_float','q_float_null','q_double','q_double_null']
             type_names = ['BIGINT','BINARY(100)','TIMESTAMP','NCHAR(100)','BIGINT UNSIGNED']
-            
-            type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")               
+
+            type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_1","")  
-            
-            type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")  
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_1","")
+
+            type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_1","")  
-            
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_1","")
+
             fun_fix_column_j = ['t1.q_bool','t1.q_bool_null','t1.q_bigint','t1.q_bigint_null','t1.q_smallint','t1.q_smallint_null',
             't1.q_tinyint','t1.q_tinyint_null','t1.q_int','t1.q_int_null','t1.q_float','t1.q_float_null','t1.q_double','t1.q_double_null',
             't2.q_bool','t2.q_bool_null','t2.q_bigint','t2.q_bigint_null','t2.q_smallint','t2.q_smallint_null',
-            't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                  
+            't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_1","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                 
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_1","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_1","")               
-                                
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_1","")
+
         elif (timelist == ['CAST_2']) :
-            str_functions = timelist  
+            str_functions = timelist
             print('===========cast_2===========')
             fun_fix_column = ['q_binary','q_binary_null','q_binary1','q_binary2','q_binary3','q_binary4']
             type_names = ['BIGINT','BINARY(100)','NCHAR(100)','BIGINT UNSIGNED']
-            
+
             type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_2","")  
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_2","")
 
             type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_2","")  
-            
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_2","")
+
             fun_fix_column_j = ['t1.q_binary','t1.q_binary_null','t1.q_binary1','t1.q_binary2','t1.q_binary3','t1.q_binary4',
-                    't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                    't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_2","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_2","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_2","")   
-                                
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_2","")
+
         elif (timelist == ['CAST_3']) :
-            str_functions = timelist  
+            str_functions = timelist
             print('===========cast_3===========')
             fun_fix_column = ['q_nchar','q_nchar_null','q_nchar5','q_nchar6','q_nchar7','q_nchar8']
             type_names = ['BIGINT','NCHAR(100)','BIGINT UNSIGNED']
-            
+
             type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_3","")                  
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_3","")
 
             type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_3","")    
-            
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_3","")
+
             fun_fix_column_j = ['t1.q_nchar','t1.q_nchar_null','t1.q_nchar5','t1.q_nchar6','t1.q_nchar7','t1.q_nchar8',
-                    't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                    't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_3","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_3","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_3","")    
-                            
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_3","")
+
         elif (timelist == ['CAST_4']) :
-            str_functions = timelist  
+            str_functions = timelist
             print('===========cast_4===========')
             fun_fix_column = ['q_ts','q_ts_null','_C0','_c0','ts','_rowts']
             type_names = ['BIGINT','TIMESTAMP','BIGINT UNSIGNED']
-            
+
             type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_4","")    
-            
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_4","")
+
             type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_4","")    
-            
-            fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_4","")
+
+            fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_4","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_4","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_4","")    
-                                          
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_4","")
+
         tdSql.query("select 1-1 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
-                sql = "select  ts1 , timediff(asct1,now)  from  ( select  " 
-                sql += "%s as asct1, " % time_fun_1 
-                sql += "%s as asct2, " % time_fun_2 
+                sql = "select  ts1 , timediff(asct1,now)  from  ( select  "
+                sql += "%s as asct1, " % time_fun_1
+                sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as ts1 from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) \
                 or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
-                sql = "select  ts2 , asct1,now(),today(),timezone()  from  ( select  " 
-                sql += "%s as asct1, " % time_fun_1 
-                sql += "%s as asct2, " % time_fun_2 
+                sql = "select  ts2 , asct1,now(),today(),timezone()  from  ( select  "
+                sql += "%s as asct1, " % time_fun_1
+                sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as ts2 from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
-                sql = "select  max(asct1),now(),today(),timezone()  from  ( select  " 
-                sql += "%s as asct1, " % time_fun_1 
-                sql += "%s as asct2 " % time_fun_2 
+                sql = "select  max(asct1),now(),today(),timezone()  from  ( select  "
+                sql += "%s as asct1, " % time_fun_1
+                sql += "%s as asct2 " % time_fun_2
                 sql += "from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-2 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts , timediff(asct1,now),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct1,  " % time_fun_1 
+                sql += "%s as asct1,  " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts ,  timediff(asct2,now),now(),today(),timezone() from  ( select  "
-                sql += "%s as asct2,  " % time_fun_2 
+                sql += "%s as asct2,  " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)           
+                sql += "%s " % random.choice(self.q_where)
                 #sql += "%s " % random.choice(having_support)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)  
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts , (asct1),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct1,  " % time_fun_1 
+                sql += "%s as asct1,  " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts , asct2,now(),today(),timezone() from  ( select  "
-                sql += "%s as asct2,  " % time_fun_2 
+                sql += "%s as asct2,  " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)           
-            elif (timelist == ['ELAPSED']) :  
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+            elif (timelist == ['ELAPSED']) :
                 sql = "select  min(asct1),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct1  " % time_fun_1 
+                sql += "%s as asct1  " % time_fun_1
                 sql += " from regular_table_1 where "
                 sql += "%s )" % random.choice(self.q_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select   avg(asct2),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct2  " % time_fun_2 
+                sql += "%s as asct2  " % time_fun_2
                 sql += " from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)        
-            
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-3 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
@@ -2993,20 +2993,20 @@ class TDTestCase:
                 sql += "%s as asct1, ts ," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += "from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2, ts ," % time_fun_2
                 sql += "%s as asct1, " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += "from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " order by asct1 desc  "
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3015,176 +3015,176 @@ class TDTestCase:
                 sql += "%s as asct1, ts ," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2, ts ," % time_fun_2
                 sql += "%s as asct1, " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += "from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " order by asct1 desc  "
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            elif (timelist == ['ELAPSED']) :  
+            elif (timelist == ['ELAPSED']) :
                 sql = "select  abs(asct1),now(),today(),timezone()  from  ( select  "
                 sql += "%s as asct1," % time_fun_1
                 sql += "%s as asct2 " % time_fun_2
                 sql += "from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2," % time_fun_2
                 sql += "%s as asct1  " % time_fun_1
                 sql += "from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += " order by asct1 asc " 
+                sql += " order by asct1 asc "
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-4 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct11, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "%s as asct12, " % time_fun_join_1             
-                sql += "t1.%s as asct111, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct121, " % random.choice(self.q_select)         
+                sql += "%s as asct11, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct12, " % time_fun_join_1
+                sql += "t1.%s as asct111, " % random.choice(self.q_select)
+                sql += "t2.%s as asct121, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), (asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct10, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "%s as asct11, " % time_fun_join_1             
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)         
+                sql += "%s as asct10, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct11, " % time_fun_join_1
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            elif (timelist == ['ELAPSED']) :  
+            elif (timelist == ['ELAPSED']) :
                 sql = "select  floor(asct1) from  ( select "
-                sql += "%s as asct10, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "%s as asct11" % time_fun_join_1                  
+                sql += "%s as asct10, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct11" % time_fun_join_1
                 sql += " from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-5 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
-            if (timelist == ['ELAPSED']) : 
+            if (timelist == ['ELAPSED']) :
                 sql = "select  now(),today(),timezone(), "
-                sql += "%s, " % time_fun_1 
+                sql += "%s, " % time_fun_1
                 sql += "%s  " % time_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             else:
                 sql = "select  ts ,now(),today(),timezone(), "
-                sql += "%s as asct11, " % time_fun_1 
+                sql += "%s as asct11, " % time_fun_1
                 sql += "%s as asct12, " % random.choice(self.q_select)
-                sql += "%s as asct13, " % random.choice(self.q_select) 
+                sql += "%s as asct13, " % random.choice(self.q_select)
                 sql += "%s as asct14  " % time_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(100)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-6 as time_nest from stable_1 limit 1;")
-        for i in range(self.fornum):            
+        for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
-                sql += "%s as asct13, " % time_fun_join_1              
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % time_fun_join_1
                 sql += "t2.ts   from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), (asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
-                sql += "%s as asct13, " % time_fun_join_1              
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % time_fun_join_1
                 sql += "t2.ts  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select   (asct1)*111 from  ( select  "
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2                
-                sql += "%s as asct122 " % time_fun_join_1              
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct122 " % time_fun_join_1
                 sql += " from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdLog.info(len(sql))
+                tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
 
@@ -3195,15 +3195,15 @@ class TDTestCase:
                 sql = "select  ts1,m1 , timediff(asct1,now) from  ( select  "
                 sql += "%s as asct1, ts as m1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as ts1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
-                tdSql.query(sql) 
+                tdSql.query(sql)
                 tdSql.checkRows(300)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3211,15 +3211,15 @@ class TDTestCase:
                 sql = "select  tm1,tm2 , (asct1),now(),today(),timezone()  from  ( select  "
                 sql += "%s as asct1, ts as tm1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as tm2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
-                tdSql.query(sql) 
+                tdSql.query(sql)
                 tdSql.checkRows(300)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3230,12 +3230,12 @@ class TDTestCase:
                 sql += "from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-8 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
@@ -3245,15 +3245,15 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as tm1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as tm2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
-                tdSql.query(sql) 
+                tdSql.query(sql)
                 tdSql.checkRows(300)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3263,18 +3263,18 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as ts1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as ts2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
-                tdSql.query(sql) 
+                tdSql.query(sql)
                 tdSql.checkRows(300)
-                self.cur1.execute(sql)   
-                self.explain_sql(sql)         
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  floor(abs(asct1)),now(),today(),timezone()  "
                 sql += "from  ( select  "
@@ -3283,10 +3283,10 @@ class TDTestCase:
                 sql += "from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdLog.info(len(sql))
-                tdSql.query(sql) 
-                self.cur1.execute(sql)  
+                tdSql.query(sql)
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-9 as time_nest from stable_1 limit 1;")
@@ -3294,12 +3294,12 @@ class TDTestCase:
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select) 
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -3307,19 +3307,19 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1 from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select) 
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -3327,27 +3327,27 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
-                self.explain_sql(sql)                 
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  min(asct1*110) from  ( select  "
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1 " % time_fun_join_2 
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1 " % time_fun_join_2
                 sql += "from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))    
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
-                self.explain_sql(sql)  
-    
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
+
         self.restartDnodes()
         tdSql.query("select 1-10 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -3372,8 +3372,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3397,11 +3397,11 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
-                self.explain_sql(sql)                         
+                self.cur1.execute(sql)
+                self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  abs(asct1),now(),today(),timezone()   from  ( select  "
                 sql += "%s as asct1 ," % time_fun_1
@@ -3416,12 +3416,12 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -3445,8 +3445,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3469,8 +3469,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3486,11 +3486,11 @@ class TDTestCase:
                 sql += "%s as asct2 " % time_fun_2
                 sql += " from stable_2 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "order by asct1 " 
+                sql += "order by asct1 "
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
@@ -3500,114 +3500,114 @@ class TDTestCase:
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)            
+                sql += "%s, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1,now() from  ( select  t1.ts as ts1,"
-                sql += "%s, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)            
+                sql += "%s, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select min(floor(asct1)),now() from  ( select "
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1 " % time_fun_join_2          
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1 " % time_fun_join_2
                 sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))  
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-13 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts , timediff(%s,now)," % time_fun_2
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct11, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % time_fun_2
-                sql += "%s as asct122  " % random.choice(self.t_select) 
+                sql += "%s as asct122  " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts ,now(),today(),timezone(), "
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct11, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % time_fun_2
-                sql += "%s as asct122  " % random.choice(self.t_select) 
+                sql += "%s as asct122  " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
                 tdSql.checkRows(300)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  now(),today(),timezone(), "
-                sql += "%s as asct1, " % time_fun_1  
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct12  " % time_fun_2
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql) 
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-14 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts , timediff(asct1,now),timediff(now,asct2) from ( select ts ts ,"
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct2" % time_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -3615,14 +3615,14 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts , (asct1),now(),(now()),asct2 from ( select ts ts ,"
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct2" % time_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -3630,88 +3630,88 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  (asct1)*asct2,now(),(now()) from ( select "
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct2" % time_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.partiton_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)  
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-                  
+
         tdSql.query("select 1-15 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), timediff(asct1,now),timediff(now,asct2) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)    
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), asct1,(now()),(now()),asct2 ,now(),today(),timezone() from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)   
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select   asct1,(now()),(now()),asct2 ,now(),today(),timezone() from  ( select "
-                sql += "%s as asct2, " % time_fun_join_1   
-                sql += "%s as asct1 " % time_fun_join_2 
+                sql += "%s as asct2, " % time_fun_join_1
+                sql += "%s as asct1 " % time_fun_join_2
                 sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "          
+                sql += ") "
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql) 
-                tdLog.info(len(sql))      
+                tdLog.info(sql)
+                tdLog.info(len(sql))
                 tdSql.query(sql)
-                self.cur1.execute(sql)   
+                self.cur1.execute(sql)
                 self.explain_sql(sql)
-        
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f %s sql start!" %timelist)
@@ -3720,149 +3720,149 @@ class TDTestCase:
         _ = subprocess.check_output(taos_cmd1, shell=True)
         print("taos -f %s sql over!" %timelist)
         endTime_taos_f = time.time()
-        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))       
-                                        
-        print("=========%s====over=============" %timelist) 
+        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
+
+        print("=========%s====over=============" %timelist)
 
     def base_nest(self,baselist):
-                
-        print("==========%s===start=============" %baselist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %baselist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (baselist == ['A']) or (baselist == ['S']) or (baselist == ['F']) \
             or (baselist == ['C']):
-            base_functions = baselist          
-            fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)']        
+            base_functions = baselist
+            fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)']
             fun_column_1 = random.sample(base_functions,1)+random.sample(fun_fix_column,1)
             base_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(base_functions,1)+random.sample(fun_fix_column,1)
             base_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_bigint)','(t1.q_smallint)','(t1.q_tinyint)','(t1.q_int)','(t1.q_float)','(t1.q_double)','(t1.q_bigint_null)','(t1.q_smallint_null)','(t1.q_tinyint_null)','(t1.q_int_null)','(t1.q_float_null)','(t1.q_double_null)',
-                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)']        
+                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)']
             fun_column_join_1 = random.sample(base_functions,1)+random.sample(fun_fix_column_j,1)
             base_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(base_functions,1)+random.sample(fun_fix_column_j,1)
             base_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (baselist == ['P']) or (baselist == ['M']) or (baselist == ['S'])or (baselist == ['T']):
-            base_functions = baselist       
-            num = random.randint(0, 1000)  
+            base_functions = baselist
+            num = random.randint(0, 1000)
             fun_fix_column = ['(q_bigint,num)','(q_smallint,num)','(q_tinyint,num)','(q_int,num)','(q_float,num)','(q_double,num)',
-                              '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)']        
+                              '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)']
             fun_column_1 = random.sample(base_functions,1)+random.sample(fun_fix_column,1)
             base_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",base(num))
             fun_column_2 = random.sample(base_functions,1)+random.sample(fun_fix_column,1)
             base_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",base(num))
-            
+
             fun_fix_column_j = ['(t1.q_bigint,num)','(t1.q_smallint,num)','(t1.q_tinyint,num)','(t1.q_int,num)','(t1.q_float,num)','(t1.q_double,num)',
                     '(t1.q_bigint_null,num)','(t1.q_smallint_null,num)','(t1.q_tinyint_null,num)','(t1.q_int_null,num)','(t1.q_float_null,num)','(t1.q_double_null,num)',
                     '(t2.q_bigint,num)','(t2.q_smallint,num)','(t2.q_tinyint,num)','(t2.q_int,num)','(t2.q_float,num)','(t2.q_double,num)',
-                    '(t2.q_bigint_null,num)','(t2.q_smallint_null,num)','(t2.q_tinyint_null,num)','(t2.q_int_null,num)','(t2.q_float_null,num)','(t2.q_double_null,num)']        
+                    '(t2.q_bigint_null,num)','(t2.q_smallint_null,num)','(t2.q_tinyint_null,num)','(t2.q_int_null,num)','(t2.q_float_null,num)','(t2.q_double_null,num)']
             fun_column_join_1 = random.sample(base_functions,1)+random.sample(fun_fix_column_j,1)
             base_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",base(num))
             fun_column_join_2 = random.sample(base_functions,1)+random.sample(fun_fix_column_j,1)
             base_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",base(num))
-         
+
         tdSql.query("select 1-1 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
-            sql = "select  ts , floor(asct1)  from  ( select  " 
-            sql += "%s as asct1, " % base_fun_1 
-            sql += "%s as asct2, " % base_fun_2 
+            sql = "select  ts , floor(asct1)  from  ( select  "
+            sql += "%s as asct1, " % base_fun_1
+            sql += "%s as asct2, " % base_fun_2
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
-            
+
         tdSql.query("select 1-2 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts , abs(asct1) from  ( select  "
-            sql += "%s as asct1,  " % base_fun_1 
+            sql += "%s as asct1,  " % base_fun_1
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts ts from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s )" % random.choice(self.order_where)
-            sql += "%s " % random.choice(self.unionall_or_union) 
+            sql += "%s " % random.choice(self.unionall_or_union)
             sql += "select  ts , asct2 from  ( select  "
-            sql += "%s as asct2,  " % base_fun_2 
+            sql += "%s as asct2,  " % base_fun_2
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts ts from regular_table_1 where "
-            sql += "%s " % random.choice(self.q_where)           
+            sql += "%s " % random.choice(self.q_where)
             #sql += "%s " % random.choice(having_support)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #tdSql.query(sql)
-            #self.cur1.execute(sql)            
-            
+            #self.cur1.execute(sql)
+
         tdSql.query("select 1-3 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts , min(asct1) from  ( select  "
             sql += "%s as asct1, ts ," % base_fun_1
             sql += "%s as asct2, " % base_fun_2
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
-            sql += "%s select " % random.choice(self.unionall_or_union) 
+            sql += "%s select " % random.choice(self.unionall_or_union)
             sql += "%s as asct2, ts ," % base_fun_2
             sql += "%s as asct1, " % base_fun_1
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts from regular_table_2 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #tdSql.query(sql)
             #self.cur1.execute(sql)
-            
+
         tdSql.query("select 1-4 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1 from  ( select  t1.ts as ts1,"
-            sql += "%s, " % base_fun_join_1   
-            sql += "%s as asct1, " % base_fun_join_2           
-            sql += "%s, " % base_fun_join_1             
-            sql += "t1.%s, " % random.choice(self.q_select) 
-            sql += "t2.%s, " % random.choice(self.q_select)         
+            sql += "%s, " % base_fun_join_1
+            sql += "%s as asct1, " % base_fun_join_2
+            sql += "%s, " % base_fun_join_1
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
             sql += "t2.ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "and %s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
-            
+
         tdSql.query("select 1-5 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts ,"
-            sql += "%s, " % base_fun_1 
+            sql += "%s, " % base_fun_1
+            sql += "%s, " % random.choice(self.q_select)
             sql += "%s, " % random.choice(self.q_select)
-            sql += "%s, " % random.choice(self.q_select) 
             sql += "%s  " % base_fun_2
             sql += " from  ( select  * from regular_table_1 ) where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += " ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
@@ -3870,19 +3870,19 @@ class TDTestCase:
         tdSql.query("select 1-6 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts , max(asct1) from  ( select  t1.ts as ts1,"
-            sql += "%s, " % base_fun_join_1   
-            sql += "%s as asct1, " % base_fun_join_2           
-            sql += "t1.%s, " % random.choice(self.q_select) 
-            sql += "t2.%s, " % random.choice(self.q_select)         
-            sql += "%s, " % base_fun_join_1              
+            sql += "%s, " % base_fun_join_1
+            sql += "%s as asct1, " % base_fun_join_2
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
+            sql += "%s, " % base_fun_join_1
             sql += "t2.ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "and %s  )" % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
 
         tdSql.query("select 1-7 as base_nest from stable_1 limit 1;")
@@ -3890,18 +3890,18 @@ class TDTestCase:
             sql = "select  ts , abs(asct1) from  ( select  "
             sql += "%s as asct1, ts ," % base_fun_1
             sql += "%s as asct2, " % base_fun_2
-            sql += "%s, " % random.choice(self.q_select) 
-            sql += "%s, " % random.choice(self.t_select) 
+            sql += "%s, " % random.choice(self.q_select)
+            sql += "%s, " % random.choice(self.t_select)
             sql += "ts from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
+            tdLog.info(sql)
             tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(300)
             self.cur1.execute(sql)
-            
+
         tdSql.query("select 1-8 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts,floor(asct1) "
@@ -3909,13 +3909,13 @@ class TDTestCase:
             sql += "%s, " % random.choice(self.s_s_select)
             sql += "%s as asct1, ts ," % base_fun_1
             sql += "%s as asct2, " % base_fun_2
-            sql += "%s, " % random.choice(self.q_select) 
-            sql += "%s, " % random.choice(self.t_select) 
+            sql += "%s, " % random.choice(self.q_select)
+            sql += "%s, " % random.choice(self.t_select)
             sql += "ts from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
+            tdLog.info(sql)
             tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(300)
@@ -3924,12 +3924,12 @@ class TDTestCase:
         tdSql.query("select 1-9 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts , max(asct1) from  ( select  t1.ts as ts1,"
-            sql += "%s, " % base_fun_join_1   
-            sql += "%s as asct1, " % base_fun_join_2 
-            sql += "t1.%s, " % random.choice(self.q_select)            
-            sql += "t1.%s, " % random.choice(self.q_select) 
-            sql += "t2.%s, " % random.choice(self.q_select)            
-            sql += "t2.%s, " % random.choice(self.q_select) 
+            sql += "%s, " % base_fun_join_1
+            sql += "%s as asct1, " % base_fun_join_2
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
             sql += "t2.ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "and %s " % random.choice(self.t_u_where)
@@ -3937,11 +3937,11 @@ class TDTestCase:
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))    
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
-    
+
         self.restartDnodes()
         tdSql.query("select 1-10 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -3964,11 +3964,11 @@ class TDTestCase:
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #tdSql.query(sql)
             #self.cur1.execute(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -3992,53 +3992,53 @@ class TDTestCase:
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #TD-15837 tdSql.query(sql)
             # self.cur1.execute(sql)
 
         tdSql.query("select 1-12 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts , max(asct1) from  ( select  t1.ts as ts1,"
-            sql += "%s, " % base_fun_join_1   
-            sql += "%s as asct1, " % base_fun_join_2 
-            sql += "t1.%s, " % random.choice(self.q_select)            
-            sql += "t1.%s, " % random.choice(self.q_select) 
-            sql += "t2.%s, " % random.choice(self.q_select)            
-            sql += "t2.%s, " % random.choice(self.q_select)            
+            sql += "%s, " % base_fun_join_1
+            sql += "%s as asct1, " % base_fun_join_2
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
             sql += "t2.ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_u_where)
             sql += "and %s " % random.choice(self.t_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
-            
+
         tdSql.query("select 1-13 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts ,"
-            sql += "%s, " % base_fun_1 
+            sql += "%s, " % base_fun_1
+            sql += "%s, " % random.choice(self.q_select)
             sql += "%s, " % random.choice(self.q_select)
-            sql += "%s, " % random.choice(self.q_select) 
             sql += "%s  " % base_fun_2
-            sql += "%s  " % random.choice(self.t_select) 
+            sql += "%s  " % random.choice(self.t_select)
             sql += " from  ( select  * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(300)
             self.cur1.execute(sql)
-            
+
         tdSql.query("select 1-14 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  avg(asct1),count(asct2) from ( select "
-            sql += "%s as asct1, " % base_fun_1 
+            sql += "%s as asct1, " % base_fun_1
             sql += "%s as asct2" % base_fun_2
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
@@ -4046,33 +4046,33 @@ class TDTestCase:
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ) ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
-            self.cur1.execute(sql)  
-                  
+            self.cur1.execute(sql)
+
         tdSql.query("select 1-15 as base_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             sql = "select  ts , max(asct1) from  ( select  t1.ts as ts1,"
-            sql += "%s, " % base_fun_join_1   
-            sql += "%s as asct1, " % base_fun_join_2 
-            sql += "t1.%s, " % random.choice(self.q_select)            
-            sql += "t1.%s, " % random.choice(self.q_select) 
-            sql += "t2.%s, " % random.choice(self.q_select)            
-            sql += "t2.%s " % random.choice(self.q_select)  
+            sql += "%s, " % base_fun_join_1
+            sql += "%s as asct1, " % base_fun_join_2
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
+            sql += "t2.%s " % random.choice(self.q_select)
             sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += " and %s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += "%s " % random.choice(self.slimit1_where)
-            sql += ") "            
+            sql += ") "
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
-            self.cur1.execute(sql)    
-        
+            self.cur1.execute(sql)
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f %s sql start!" %baselist)
@@ -4080,35 +4080,35 @@ class TDTestCase:
         _ = subprocess.check_output(taos_cmd1, shell=True).decode("utf-8")
         print("taos -f %s sql over!" %baselist)
         endTime_taos_f = time.time()
-        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))       
-                                        
-        print("=========%s====over=============" %baselist) 
-                                                                    
+        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
+
+        print("=========%s====over=============" %baselist)
+
     def function_before_26(self):
-        
+
         print('=====================2.6 old function start ===========')
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-                    
+
         #1 select * from (select column form regular_table where <\>\in\and\or order by)
         tdSql.query("select 1-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  tas  from  ( select  "
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts as tas from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
-            sql += ");"            
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            sql += ");"
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql,queryTimes=1)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
-        #1 outer union not support        
+
+        #1 outer union not support
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 1-2 from stable_1;")
         for i in range(self.fornum):
@@ -4127,13 +4127,13 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-                   
+
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 1-2 from stable_1;")
         for i in range(self.fornum):
@@ -4151,13 +4151,13 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(200)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         #1 inter union not support
         tdSql.query("select 1-3 from stable_1;")
         for i in range(self.fornum):
@@ -4167,7 +4167,7 @@ class TDTestCase:
             sql += "%s, " % random.choice(self.q_select)
             sql += "ts from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
-            sql += ""  
+            sql += ""
             sql += " union all select  "
             sql += "%s, " % random.choice(self.s_r_select)
             sql += "%s, " % random.choice(self.q_select)
@@ -4175,13 +4175,13 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(300)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         tdSql.query("select 1-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts  from  ( select  "
@@ -4196,48 +4196,48 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             tdSql.checkRows(300)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
-        #join:select * from (select column form regular_table1，regular_table2 where  t1.ts=t2.ts and <\>\in\and\or order by)       
+
+        #join:select * from (select column form regular_table1，regular_table2 where  t1.ts=t2.ts and <\>\in\and\or order by)
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 1-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  t1.ts as t1ts,"
-            sql += "t1.%s as t11, " % random.choice(self.q_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t21, " % random.choice(self.q_select)            
-            sql += "t2.%s as t22, " % random.choice(self.q_select)            
+            sql += "t1.%s as t11, " % random.choice(self.q_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t21, " % random.choice(self.q_select)
+            sql += "t2.%s as t22, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
-            sql += "and %s " % random.choice(self.q_u_or_where)           
+            sql += "and %s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
 
-        #2 select column from (select * form regular_table ) where <\>\in\and\or order by        
+        #2 select column from (select * form regular_table ) where <\>\in\and\or order by
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 2-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts ,"
             sql += "%s, " % random.choice(self.s_r_select)
-            sql += "%s  " % random.choice(self.q_select) 
+            sql += "%s  " % random.choice(self.q_select)
             sql += " from  ( select  * from regular_table_1 ) where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += " ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(100)
             self.cur1.execute(sql)
@@ -4248,31 +4248,31 @@ class TDTestCase:
         tdSql.query("select 2-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts , * from  ( select  t1.ts ,"
-            sql += "t1.%s, " % random.choice(self.q_select)            
-            sql += "t1.%s, " % random.choice(self.q_select) 
-            sql += "t2.%s, " % random.choice(self.q_select)            
-            sql += "t2.%s, " % random.choice(self.q_select)            
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t1.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
+            sql += "t2.%s, " % random.choice(self.q_select)
             sql += "t2.ts from regular_table_1 t1 , regular_table_2 t2 ) where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.order_u_where)
             #sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.error(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.error(sql)
 
-        #3 select * from (select column\tag form stable  where <\>\in\and\or order by )        
+        #3 select * from (select column\tag form stable  where <\>\in\and\or order by )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 3-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   *  from  ( select  "
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
-            sql += "%s, " % random.choice(self.t_select) 
+            sql += "%s, " % random.choice(self.q_select)
+            sql += "%s, " % random.choice(self.t_select)
             sql += "ts from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
+            tdLog.info(sql)
             tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(300)
@@ -4284,39 +4284,39 @@ class TDTestCase:
             sql += "%s  " % random.choice(self.s_r_select)
             sql += "from  ( select  "
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
-            sql += "%s, " % random.choice(self.t_select) 
+            sql += "%s, " % random.choice(self.q_select)
+            sql += "%s, " % random.choice(self.t_select)
             sql += "ts from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
+            tdLog.info(sql)
             tdLog.info(len(sql))
-            tdSql.query(sql) 
+            tdSql.query(sql)
             tdSql.checkRows(300)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        # select ts,* from (select column\tag form stable1,stable2  where t1.ts = t2.ts and <\>\in\and\or order by )        
+        # select ts,* from (select column\tag form stable1,stable2  where t1.ts = t2.ts and <\>\in\and\or order by )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 3-2 from stable_1;")
         for i in range(self.fornum):
             #sql = "select  ts , *  from  ( select  t1.ts as t1ts , "
             sql = "select  t1ts , t2ts  from  ( select  t1.ts as t1ts , "
-            sql += "t1.%s as t11, " % random.choice(self.t_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t13, " % random.choice(self.t_select)            
-            sql += "t2.%s as t14, " % random.choice(self.q_select) 
+            sql += "t1.%s as t11, " % random.choice(self.t_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t13, " % random.choice(self.t_select)
+            sql += "t2.%s as t14, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-    
+
         #3 outer union not support
         self.restartDnodes()
         tdSql.query("select 3-3 from stable_1;")
@@ -4336,10 +4336,10 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
-            tdSql.checkRows(300)
+            tdSql.checkRows(500)
             self.cur1.execute(sql)
             self.explain_sql(sql)
         for i in range(self.fornum):
@@ -4357,13 +4357,13 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(600)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 3-4 from stable_1;")
         for i in range(self.fornum):
@@ -4380,9 +4380,9 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -4390,53 +4390,53 @@ class TDTestCase:
         tdSql.query("select 3-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  t1.ts as t1ts,"
-            sql += "t1.%s as t11, " % random.choice(self.q_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t21, " % random.choice(self.q_select)            
-            sql += "t2.%s as t22, " % random.choice(self.q_select)            
+            sql += "t1.%s as t11, " % random.choice(self.q_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t21, " % random.choice(self.q_select)
+            sql += "t2.%s as t22, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_u_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
-            tdSql.checkRows(300)
+            tdSql.checkRows(100)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 3-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select  * from  ( select  t1.ts as t1ts ,"
-            sql += "t1.%s as t11, " % random.choice(self.q_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t21, " % random.choice(self.q_select)            
-            sql += "t2.%s as t22, " % random.choice(self.q_select)            
+            sql += "t1.%s as t11, " % random.choice(self.q_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t21, " % random.choice(self.q_select)
+            sql += "t2.%s as t22, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ");"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
-            tdSql.checkRows(300)
+            tdSql.checkRows(100)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        #4 select column from (select * form stable  where <\>\in\and\or order by )        
+        #4 select column from (select * form stable  where <\>\in\and\or order by )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 4-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts , "
             sql += "%s as t11, " % random.choice(self.q_select)
-            sql += "%s as t12, " % random.choice(self.q_select) 
-            sql += "%s " % random.choice(self.t_select) 
+            sql += "%s as t12, " % random.choice(self.q_select)
+            sql += "%s " % random.choice(self.t_select)
             sql += " from  ( select  * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(300)
             self.cur1.execute(sql)
@@ -4451,8 +4451,8 @@ class TDTestCase:
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4462,12 +4462,12 @@ class TDTestCase:
         for i in range(self.fornum):
             sql = "select  distinct  c5_1 "
             sql += " from  ( select   "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += " as c5_1 from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4481,8 +4481,8 @@ class TDTestCase:
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.error(sql)
         tdSql.query("select 6-1 from stable_1;")
         for i in range(self.fornum):
@@ -4490,8 +4490,8 @@ class TDTestCase:
             sql += "%s " % random.choice(self.dt_select)
             sql += "  from stable_1 where "
             sql += "%s ) ;" % random.choice(self.qt_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4506,9 +4506,9 @@ class TDTestCase:
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice([self.limit_where[0] , self.limit_where[1]] )
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.error(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.error(sql)
         tdSql.query("select 7-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  * from  ( select  "
@@ -4517,8 +4517,8 @@ class TDTestCase:
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice([self.limit_where[0] , self.limit_where[1]] )
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             tdSql.checkRows(1)
             self.cur1.execute(sql)
@@ -4526,45 +4526,45 @@ class TDTestCase:
 
         #calc_select,TWA/Diff/Derivative/Irate are not allowed to apply to super table directly
         #8 select * from (select ts,calc form ragular_table  where <\>\in\and\or order by   )
-        
+
         # dcDB = self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 8-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  ts ,"
-            sql += "%s " % random.choice(self.calc_select_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_support_ts)
             sql += "from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
         tdSql.query("select 8-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_not_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_not_support_ts)
             sql += "from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4572,130 +4572,130 @@ class TDTestCase:
         tdSql.query("select 8-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select t1.ts, "
-            sql += "%s " % random.choice(self.calc_select_in_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_support_ts_j)
             sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j)
             sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
-            self.cur1.execute(sql)  
-            self.explain_sql(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
+            self.cur1.execute(sql)
+            self.explain_sql(sql)
 
-        #9 select * from (select ts,calc form stable  where <\>\in\and\or order by   )      
+        #9 select * from (select ts,calc form stable  where <\>\in\and\or order by   )
         # self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 9-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_not_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_not_support_ts)
             sql += "from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
         tdSql.query("select 9-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  ts ,"
-            sql += "%s " % random.choice(self.calc_select_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_support_ts)
             sql += "from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         tdSql.query("select 9-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j)
             sql += "from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += " and %s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
         tdSql.query("select 9-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  t1.ts,"
-            sql += "%s " % random.choice(self.calc_select_in_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_support_ts_j)
             sql += "from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += " and %s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
-        #10 select calc from (select * form regualr_table  where <\>\in\and\or order by   )       
+
+        #10 select calc from (select * form regualr_table  where <\>\in\and\or order by   )
         tdSql.query("select 10-1 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql = "select  "
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "as calc10_1 from ( select * from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         #10-1 select calc from (select * form regualr_table  where <\>\in\and\or order by   )
-        # rsDn = self.restartDnodes()        
+        # rsDn = self.restartDnodes()
         # self.dropandcreateDB_random("%s" %db, 1)
         # rsDn = self.restartDnodes()
         tdSql.query("select 10-2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "%s " % random.choice(self.calc_select_all) 
+            sql = "select  "
+            sql += "%s " % random.choice(self.calc_select_all)
             sql += "as calc10_2 from ( select * from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        #10-2 select calc from (select * form regualr_tables  where <\>\in\and\or order by   )        
+        #10-2 select calc from (select * form regualr_tables  where <\>\in\and\or order by   )
         tdSql.query("select 10-3 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "count(*) as calc10_3 " 
+            sql = "select  "
+            sql += "count(*) as calc10_3 "
             sql += " from ( select t1.ts as t11, t2.ts as t22 from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += " and %s " % random.choice(self.q_u_or_where)
@@ -4703,16 +4703,16 @@ class TDTestCase:
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 10-4 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "%s as calc10_4 " % random.choice(self.calc_select_all) 
+            sql = "select  "
+            sql += "%s as calc10_4 " % random.choice(self.calc_select_all)
             sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += " and %s " % random.choice(self.q_u_or_where)
@@ -4720,84 +4720,84 @@ class TDTestCase:
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.error(sql)
 
-        #11 select calc from (select * form stable  where <\>\in\and\or order by limit  )        
+        #11 select calc from (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 11-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "as calc11_1 from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        #11-1 select calc from (select * form stable  where <\>\in\and\or order by limit  )        
+        #11-1 select calc from (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 11-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_select_all) 
+            sql += "%s " % random.choice(self.calc_select_all)
             sql += "as calc11_1 from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
- 
+
         #11-2 select calc from (select * form stables  where <\>\in\and\or order by limit  )
         tdSql.query("select 11-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_select_all) 
+            sql += "%s " % random.choice(self.calc_select_all)
             sql += "as calc11_1 from ( select * from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.error(sql)
 
         tdSql.query("select 11-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_select_all) 
+            sql += "%s " % random.choice(self.calc_select_all)
             sql += "as calc11_1 from ( select * from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))       
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.error(sql)
 
-        #12 select calc-diff from (select * form regualr_table  where <\>\in\and\or order by limit  )        
+        #12 select calc-diff from (select * form regualr_table  where <\>\in\and\or order by limit  )
         ##self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 12-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " from ( select * from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4805,27 +4805,27 @@ class TDTestCase:
         tdSql.query("select 12-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))        
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.error(sql)
 
         tdSql.query("select 12-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " from ( select * from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))          
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.error(sql)
 
         #12-1 select calc-diff from (select * form stable  where <\>\in\and\or order by limit  )
@@ -4833,15 +4833,15 @@ class TDTestCase:
         self.restartDnodes()
         for i in range(self.fornum):
             sql = "select  * from ( select "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += ") "
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4850,15 +4850,15 @@ class TDTestCase:
         #join query does not support group by
         for i in range(self.fornum):
             sql = "select  * from ( select "
-            sql += "%s " % random.choice(self.calc_calculate_regular_j) 
+            sql += "%s " % random.choice(self.calc_calculate_regular_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += ") "
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))     
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4867,31 +4867,31 @@ class TDTestCase:
         #join query does not support group by
         for i in range(self.fornum):
             sql = "select  * from ( select "
-            sql += "%s " % random.choice(self.calc_calculate_regular_j) 
+            sql += "%s " % random.choice(self.calc_calculate_regular_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += ") "
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
 
         #13 select calc-diff as diffns from (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 13-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " as calc13_1 from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.orders_desc_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4900,15 +4900,15 @@ class TDTestCase:
         tdSql.query("select 14-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all)
+            sql += "%s " % random.choice(self.calc_aggregate_all)
             sql += " as calc14_3 from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4917,16 +4917,16 @@ class TDTestCase:
         tdSql.query("select 14-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all)
+            sql += "%s " % random.choice(self.calc_aggregate_all)
             sql += " as calc14_3 from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.partiton_where_regular)
             sql += "%s " % random.choice(self.slimit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4935,17 +4935,17 @@ class TDTestCase:
         tdSql.query("select 14-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s " % random.choice(self.calc_aggregate_all_j)
             sql += " as calc14_3 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += "%s " % random.choice(self.slimit1_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4953,17 +4953,17 @@ class TDTestCase:
         tdSql.query("select 14-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s " % random.choice(self.calc_aggregate_all_j)
             sql += " as calc14_3 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += "%s " % random.choice(self.slimit1_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -4972,48 +4972,48 @@ class TDTestCase:
         tdSql.query("select 15-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular) 
-            sql += "%s " % random.choice(self.calc_aggregate_regular) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular)
+            sql += "%s " % random.choice(self.calc_aggregate_regular)
             sql += " as calc15_3 from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
-            sql += "%s " % random.choice(self.group_where_regular)     
+            sql += "%s " % random.choice(self.group_where_regular)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            self.data_check(sql,mark='15-1') 
-                
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            self.data_check(sql,mark='15-1')
+
         tdSql.query("select 15-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_2 " % random.choice(self.calc_aggregate_regular_j) 
+            sql += "%s as calc15_2 " % random.choice(self.calc_aggregate_regular_j)
             sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
-            sql += "%s " % random.choice(self.group_where_regular_j)            
+            sql += "%s " % random.choice(self.group_where_regular_j)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))   
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 15-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular_j) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_regular_j) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular_j)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular_j)
+            sql += "%s " % random.choice(self.calc_aggregate_regular_j)
             sql += " as calc15_3 from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
-            sql += "%s " % random.choice(self.group_where_regular_j)            
+            sql += "%s " % random.choice(self.group_where_regular_j)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql)) 
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5021,226 +5021,226 @@ class TDTestCase:
         tdSql.query("select 15-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname)
             sql += " as calc15_3 from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_only_where)
             sql += "%s " % random.choice(self.having_support)
             sql += ") "
-            sql += "order by  calc15_1  " 
+            sql += "order by  calc15_1  "
             sql += "%s " % random.choice(self.limit_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 15-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname_j) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname_j) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname_j)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname_j)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname_j)
             sql += " as calc15_3 from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.group_only_where_j)
             sql += "%s " % random.choice(self.having_support_j)
             sql += ") "
-            sql += "order by  calc15_1  " 
+            sql += "order by  calc15_1  "
             sql += "%s " % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 15-4.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname_j) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname_j) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname_j)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname_j)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname_j)
             sql += " as calc15_3 from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.group_where_j)
             sql += ") "
-            sql += "order by  calc15_1  " 
+            sql += "order by  calc15_1  "
             sql += "%s " % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))     
-            self.data_check(sql,mark='15-4.2') 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            self.data_check(sql,mark='15-4.2')
 
         tdSql.query("select 15-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname)
             sql += " as calc15_3 from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") "
-            sql += "order by calc15_1  " 
+            sql += "order by calc15_1  "
             sql += "%s " % random.choice(self.limit_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        #16 select * from (select calc_aggregate_regulars as agg from regular_table  where <\>\in\and\or  order by limit offset )       
+        #16 select * from (select calc_aggregate_regulars as agg from regular_table  where <\>\in\and\or  order by limit offset )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 16-1 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_0 , " % random.choice(self.calc_calculate_all)
-            sql += "%s as calc16_1 , " % random.choice(self.calc_aggregate_all)  
-            sql += "%s as calc16_2 " % random.choice(self.calc_select_in) 
+            sql += "%s as calc16_1 , " % random.choice(self.calc_aggregate_all)
+            sql += "%s as calc16_2 " % random.choice(self.calc_select_in)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") "
-            sql += "order by calc16_0  " 
+            sql += "order by calc16_0  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_0  " % random.choice(self.calc_calculate_all_j)
-            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j)  
+            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += ") "
-            sql += "order by calc16_0  " 
+            sql += "order by calc16_0  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-2.2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_0  " % random.choice(self.calc_calculate_all_j)
-            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j) 
+            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += ") "
-            sql += "order by calc16_0  " 
+            sql += "order by calc16_0  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 16-3 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular)
             sql += "  from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-4 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j)
             sql += "  from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-4.2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j)
             sql += "  from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 16-5 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_1 , " % random.choice(self.calc_calculate_all)
-            sql += "%s as calc16_2 , " % random.choice(self.calc_calculate_all) 
-            sql += "%s as calc16_3 " % random.choice(self.calc_calculate_all) 
+            sql += "%s as calc16_2 , " % random.choice(self.calc_calculate_all)
+            sql += "%s as calc16_3 " % random.choice(self.calc_calculate_all)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") "
-            sql += "order by calc16_1  " 
+            sql += "order by calc16_1  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 16-6 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-7 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j)
             sql += "  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-8 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j)
             sql += "  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
@@ -5249,56 +5249,56 @@ class TDTestCase:
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 17-1 from stable_1;")
         for i in range(self.fornum):
-            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            #this is having_support , but tag-select cannot mix with last_row,other select can
             sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
             sql += "%s as cal17_0 , " % random.choice(self.calc_calculate_all)
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 17-2 from stable_1;")
         for i in range(self.fornum):
-            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            #this is having_support , but tag-select cannot mix with last_row,other select can
             sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
             sql += "%s as cal17_0 , " % random.choice(self.calc_calculate_all_j)
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-2.2 from stable_1;")
         for i in range(self.fornum):
-            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            #this is having_support , but tag-select cannot mix with last_row,other select can
             sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
             sql += "%s as cal17_0 , " % random.choice(self.calc_calculate_all_j)
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5307,17 +5307,17 @@ class TDTestCase:
         for i in range(self.fornum):
             #this is having_tagnot_support , because tag-select cannot mix with last_row...
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5325,16 +5325,16 @@ class TDTestCase:
         for i in range(self.fornum):
             #this is having_tagnot_support , because tag-select cannot mix with last_row...
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5342,82 +5342,82 @@ class TDTestCase:
         for i in range(self.fornum):
             #this is having_tagnot_support , because tag-select cannot mix with last_row...
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-5 from stable_1;")
         for i in range(self.fornum):
-            #having_not_support  
+            #having_not_support
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-       
+
         tdSql.query("select 17-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-7 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, stable_1_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-7.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, stable_1_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5425,48 +5425,48 @@ class TDTestCase:
         tdSql.query("select 17-8 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-       
+
         tdSql.query("select 17-9 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-10 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5474,48 +5474,48 @@ class TDTestCase:
         tdSql.query("select 18-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all)
             sql += " from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.session_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-               
+
         tdSql.query("select 18-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
@@ -5523,258 +5523,258 @@ class TDTestCase:
         tdSql.query("select 18-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.session_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-4.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.session_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 18-7 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        #19 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or session order by  limit )interval_sliding       
+        #19 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or session order by  limit )interval_sliding
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 19-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all)
             sql += " from regular_table_1 where "
-            sql += "%s " % random.choice(self.q_where)        
+            sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.state_window)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
-            sql += "%s " % random.choice(self.q_u_where)        
+            sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.state_u_window)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
-            sql += "%s " % random.choice(self.q_u_or_where)        
+            sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.state_u_window)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 19-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1_1 where "
-            sql += "%s " % random.choice(self.q_where)        
+            sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.state_window)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1  t1, stable_1_2 t2 where t1.ts = t2.ts and  "
-            sql += "%s " % random.choice(self.q_u_where)       
+            sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-4.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1  t1, stable_1_2 t2 where t1.ts = t2.ts and  "
-            sql += "%s " % random.choice(self.q_u_or_where)  
+            sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
-            sql += "%s " % random.choice(self.q_where)        
+            sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.state_window)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
             sql += "%s " % random.choice(self.interval_sliding)
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.error(sql)  
-       
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.error(sql)
+
         tdSql.query("select 19-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
-            sql += "%s " % random.choice(self.q_u_where)        
+            sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-7 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
-            sql += "%s " % random.choice(self.qt_u_or_where)   
+            sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
 
-        #20 select * from (select calc_select_fills form regualr_table or stable  where <\>\in\and\or fill_where group by  order by limit offset  )        
+        #20 select * from (select calc_select_fills form regualr_table or stable  where <\>\in\and\or fill_where group by  order by limit offset  )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 20-1 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill)
-            sql += "%s ," % random.choice(self.calc_select_fill) 
-            sql += "%s  " % random.choice(self.calc_select_fill) 
+            sql += "%s ," % random.choice(self.calc_select_fill)
+            sql += "%s  " % random.choice(self.calc_select_fill)
             sql += " from stable_1 where  "
-            sql += "%s " % random.choice(self.interp_where)  
+            sql += "%s " % random.choice(self.interp_where)
             sql += "%s " % random.choice(self.fill_where)
             sql += "%s " % random.choice(self.group_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
@@ -5782,303 +5782,303 @@ class TDTestCase:
         rsDn = self.restartDnodes()
         tdSql.query("select 20-2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill_j)
-            sql += "%s ," % random.choice(self.calc_select_fill_j) 
-            sql += "%s  " % random.choice(self.calc_select_fill_j) 
+            sql += "%s ," % random.choice(self.calc_select_fill_j)
+            sql += "%s  " % random.choice(self.calc_select_fill_j)
             sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s and " % random.choice(self.t_join_where)
-            sql += "%s " % random.choice(self.interp_where_j)  
+            sql += "%s " % random.choice(self.interp_where_j)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
 
         tdSql.query("select 20-2.2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill_j)
-            sql += "%s ," % random.choice(self.calc_select_fill_j) 
-            sql += "%s  " % random.choice(self.calc_select_fill_j) 
+            sql += "%s ," % random.choice(self.calc_select_fill_j)
+            sql += "%s  " % random.choice(self.calc_select_fill_j)
             sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s and " % random.choice(self.qt_u_or_where)
-            sql += "%s " % random.choice(self.interp_where_j)  
+            sql += "%s " % random.choice(self.interp_where_j)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
 
         tdSql.query("select 20-3 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill)
-            sql += "%s ," % random.choice(self.calc_select_fill) 
-            sql += "%s  " % random.choice(self.calc_select_fill) 
+            sql += "%s ," % random.choice(self.calc_select_fill)
+            sql += "%s  " % random.choice(self.calc_select_fill)
             sql += " from stable_1 where  "
-            sql += "%s " % self.interp_where[2]  
+            sql += "%s " % self.interp_where[2]
             sql += "%s " % random.choice(self.fill_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
-        
+
         tdSql.query("select 20-4 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill_j)
-            sql += "%s ," % random.choice(self.calc_select_fill_j) 
-            sql += "%s  " % random.choice(self.calc_select_fill_j) 
-            sql += " from stable_1 t1, table_1 t2 where t1.ts = t2.ts and    "             
+            sql += "%s ," % random.choice(self.calc_select_fill_j)
+            sql += "%s  " % random.choice(self.calc_select_fill_j)
+            sql += " from stable_1 t1, table_1 t2 where t1.ts = t2.ts and    "
             #sql += "%s and " % random.choice(self.t_join_where)
             sql += "%s " % self.interp_where_j[random.randint(0,5)]
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             #interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
 
         tdSql.query("select 20-4.2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill_j)
-            sql += "%s ," % random.choice(self.calc_select_fill_j) 
-            sql += "%s  " % random.choice(self.calc_select_fill_j) 
-            sql += " from stable_1 t1, stable_1_1 t2 where t1.ts = t2.ts and    "             
+            sql += "%s ," % random.choice(self.calc_select_fill_j)
+            sql += "%s  " % random.choice(self.calc_select_fill_j)
+            sql += " from stable_1 t1, stable_1_1 t2 where t1.ts = t2.ts and    "
             sql += "%s and " % random.choice(self.qt_u_or_where)
             sql += "%s " % self.interp_where_j[random.randint(0,5)]
             sql += "%s " % random.choice(self.fill_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
          ##interp不支持    tdSql.error(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
-               
+
         tdSql.query("select 20-5 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill)
-            sql += "%s ," % random.choice(self.calc_select_fill) 
-            sql += "%s  " % random.choice(self.calc_select_fill) 
+            sql += "%s ," % random.choice(self.calc_select_fill)
+            sql += "%s  " % random.choice(self.calc_select_fill)
             sql += " from regular_table_1 where  "
-            sql += "%s " % self.interp_where[1]  
+            sql += "%s " % self.interp_where[1]
             sql += "%s " % random.choice(self.fill_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             ##interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
 
         tdSql.query("select 20-6 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s , " % random.choice(self.calc_select_fill_j)
-            sql += "%s ," % random.choice(self.calc_select_fill_j) 
-            sql += "%s  " % random.choice(self.calc_select_fill_j) 
+            sql += "%s ," % random.choice(self.calc_select_fill_j)
+            sql += "%s  " % random.choice(self.calc_select_fill_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
-            #sql += "%s " % random.choice(self.interp_where_j) 
-            sql += "%s " % self.interp_where_j[random.randint(0,5)] 
+            #sql += "%s " % random.choice(self.interp_where_j)
+            sql += "%s " % self.interp_where_j[random.randint(0,5)]
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             ##interp不支持 tdSql.query(sql)
             #self.cur1.execute(sql)
             #self.explain_sql(sql)
 
         #1 select * from (select * from (select * form regular_table  where <\>\in\and\or order by limit  ))
         tdSql.query("select 1-1 from stable_1;")
-        for i in range(self.fornum):            
+        for i in range(self.fornum):
             # sql_start = "select  *  from ( "
             # sql_end = ")"
             for_num = random.randint(1, 15);
-            sql = "select  *  from ("  * for_num  
+            sql = "select  *  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_r_select) 
-            sql += "%s, " % random.choice(self.q_select)  
+            sql += "%s, " % random.choice(self.s_r_select)
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts as ttt from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num     
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
             sql2 =  "select  *  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_r_select) 
-            sql2 += "%s, " % random.choice(self.q_select)  
+            sql2 += "%s, " % random.choice(self.s_r_select)
+            sql2 += "%s, " % random.choice(self.q_select)
             sql2 += "ts as tin from regular_table_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) "  
-            tdLog.info(sql2) 
-            tdLog.info(len(sql2))     
-            tdSql.query(sql2)             
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdLog.info(len(sql2))
+            tdSql.query(sql2)
             self.cur1.execute(sql2)
             self.explain_sql(sql2)
-            
+
             self.data_matrix_equal('%s' %sql ,1,10,1,1,'%s' %sql2 ,1,10,1,1)
             self.data_matrix_equal('%s' %sql ,1,10,1,1,'%s' %sql ,1,10,3,3)
             self.data_matrix_equal('%s' %sql ,1,10,3,3,'%s' %sql2 ,1,10,3,3)
-            
-            tdLog.info("=====1-1==over=========") 
-            
+
+            tdLog.info("=====1-1==over=========")
+
         for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  ts2  from ("  * for_num  
+            sql = "select  ts2  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_r_select) 
-            sql += "%s, " % random.choice(self.q_select)  
+            sql += "%s, " % random.choice(self.s_r_select)
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts as ts2 from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num     
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
             sql2 =  "select  *  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_r_select) 
-            sql2 += "%s, " % random.choice(self.q_select)  
+            sql2 += "%s, " % random.choice(self.s_r_select)
+            sql2 += "%s, " % random.choice(self.q_select)
             sql2 += "ts as tt from regular_table_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) "   
-            tdLog.info(sql2) 
-            tdLog.info(len(sql2))      
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdLog.info(len(sql2))
             tdSql.query(sql2)
             self.cur1.execute(sql2)
-            self.explain_sql(sql2) 
-            
+            self.explain_sql(sql2)
+
             self.data_matrix_equal('%s' %sql ,1,10,1,1,'%s' %sql2 ,1,10,1,1)
-            tdLog.info("=====1-2==over=========") 
-            
+            tdLog.info("=====1-2==over=========")
+
         #2 select * from (select * from (select * form stable  where <\>\in\and\or order by limit  ))
         tdSql.query("select 2-1 from stable_1;")
         for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  *  from ("  * for_num  
+            sql = "select  *  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_s_select) 
-            sql += "%s, " % random.choice(self.qt_select) 
+            sql += "%s, " % random.choice(self.s_s_select)
+            sql += "%s, " % random.choice(self.qt_select)
             sql += "ts as tss from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num  
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
             sql2 = "select  *  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_s_select) 
-            sql2 += "%s, " % random.choice(self.qt_select) 
+            sql2 += "%s, " % random.choice(self.s_s_select)
+            sql2 += "%s, " % random.choice(self.qt_select)
             sql2 += "ts as tst from stable_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) " 
-            tdLog.info(sql2) 
-            tdLog.info(len(sql2))      
-            tdSql.query(sql2) 
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdLog.info(len(sql2))
+            tdSql.query(sql2)
             self.cur1.execute(sql2)
             self.explain_sql(sql2)
-            
+
             self.data_matrix_equal('%s' %sql ,1,10,3,3,'%s' %sql2 ,1,10,3,3)
-            
-            tdLog.info("=====2-1==over=========") 
-            
+
+            tdLog.info("=====2-1==over=========")
+
         for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  tsn  from ("  * for_num  
+            sql = "select  tsn  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_s_select) 
-            sql += "%s, " % random.choice(self.qt_select) 
+            sql += "%s, " % random.choice(self.s_s_select)
+            sql += "%s, " % random.choice(self.qt_select)
             sql += "ts as tsn from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num  
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql) 
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
             sql2 = "select  ts1  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_s_select) 
-            sql2 += "%s, " % random.choice(self.qt_select) 
+            sql2 += "%s, " % random.choice(self.s_s_select)
+            sql2 += "%s, " % random.choice(self.qt_select)
             sql2 += "ts as ts1 from stable_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) " 
-            tdLog.info(sql2) 
-            tdLog.info(len(sql2))      
-            tdSql.query(sql2) 
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdLog.info(len(sql2))
+            tdSql.query(sql2)
             self.cur1.execute(sql2)
             self.explain_sql(sql2)
-            
+
             self.data_matrix_equal('%s' %sql ,1,10,1,1,'%s' %sql2 ,1,10,1,1)
-            tdLog.info("=====2-2==over=========") 
-                         
-        #3 select ts ,calc from  (select * form stable  where <\>\in\and\or order by limit  )       
+            tdLog.info("=====2-2==over=========")
+
+        #3 select ts ,calc from  (select * form stable  where <\>\in\and\or order by limit  )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 3-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.orders_desc_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.query(sql)  
-            self.cur1.execute(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.query(sql)
+            self.cur1.execute(sql)
             self.explain_sql(sql)
 
         #4 select * from  (select calc form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 4-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             #sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
+            tdLog.info(sql)
+            tdLog.info(len(sql))
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         #5 select ts ,tbname from  (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 5-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   ts , tbname , "
-            sql += "%s ," % random.choice(self.calc_calculate_regular) 
+            sql += "%s ," % random.choice(self.calc_calculate_regular)
             sql += "%s ," % random.choice(self.dqt_select)
             sql += "%s " % random.choice(self.qt_select)
             sql += " from ( select * from stable_1 where "
@@ -6086,9 +6086,9 @@ class TDTestCase:
             sql += "%s " % random.choice(self.orders_desc_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") ;"
-            tdLog.info(sql) 
-            tdLog.info(len(sql))      
-            tdSql.error(sql) 
+            tdLog.info(sql)
+            tdLog.info(len(sql))
+            tdSql.error(sql)
 
         #special sql
         tdSql.query("select 6-1 from stable_1;")
@@ -6098,41 +6098,41 @@ class TDTestCase:
             sql = "select _block_dist() from (select * from stable_1);"
             tdSql.error(sql)
             sql = "select * from (select database());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
             sql = "select * from (select client_version());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
             sql = "select * from (select client_version() as version);"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_version());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_version() as version);"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_status());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_status() as status);"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.cur1.execute(sql)
             self.explain_sql(sql)
-            
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f sql start!")
@@ -6145,57 +6145,57 @@ class TDTestCase:
 
         print('=====================2.6 old function end ===========')
 
-    
-                        
+
+
     def run(self):
         tdSql.prepare()
-        
-        startTime = time.time() 
 
-        self.function_before_26()       
-               
+        startTime = time.time()
+
+        self.function_before_26()
+
         self.math_nest(['UNIQUE'])
-        self.math_nest(['MODE']) 
+        self.math_nest(['MODE'])
         self.math_nest(['SAMPLE'])
-                
-        # self.math_nest(['ABS','SQRT'])     
-        # self.math_nest(['SIN','COS','TAN','ASIN','ACOS','ATAN'])        
-        # self.math_nest(['POW','LOG']) 
-        # self.math_nest(['FLOOR','CEIL','ROUND']) 
-        # self.math_nest(['MAVG'])  
-        # self.math_nest(['HYPERLOGLOG']) 
-        # self.math_nest(['TAIL']) 
+
+        # self.math_nest(['ABS','SQRT'])
+        # self.math_nest(['SIN','COS','TAN','ASIN','ACOS','ATAN'])
+        # self.math_nest(['POW','LOG'])
+        # self.math_nest(['FLOOR','CEIL','ROUND'])
+        # self.math_nest(['MAVG'])
+        # self.math_nest(['HYPERLOGLOG'])
+        # self.math_nest(['TAIL'])
         # self.math_nest(['CSUM'])
         # self.math_nest(['statecount','stateduration'])
-        # self.math_nest(['HISTOGRAM']) 
-        
-        # self.str_nest(['LTRIM','RTRIM','LOWER','UPPER']) 
-        # self.str_nest(['LENGTH','CHAR_LENGTH']) 
-        # self.str_nest(['SUBSTR'])   
-        # self.str_nest(['CONCAT']) 
-        # self.str_nest(['CONCAT_WS']) 
+        # self.math_nest(['HISTOGRAM'])
+
+        # self.str_nest(['LTRIM','RTRIM','LOWER','UPPER'])
+        # self.str_nest(['LENGTH','CHAR_LENGTH'])
+        # self.str_nest(['SUBSTR'])
+        # self.str_nest(['CONCAT'])
+        # self.str_nest(['CONCAT_WS'])
         # self.time_nest(['CAST']) #放到time里起来弄
         # self.time_nest(['CAST_1'])
         # self.time_nest(['CAST_2'])
         # self.time_nest(['CAST_3'])
         # self.time_nest(['CAST_4'])
-        
-        
-        
-        # self.time_nest(['NOW','TODAY']) 
-        # self.time_nest(['TIMEZONE']) 
-        # self.time_nest(['TIMETRUNCATE']) 
+
+
+
+        # self.time_nest(['NOW','TODAY'])
+        # self.time_nest(['TIMEZONE'])
+        # self.time_nest(['TIMETRUNCATE'])
         # self.time_nest(['TO_ISO8601'])
         # self.time_nest(['TO_UNIXTIMESTAMP'])
         # self.time_nest(['ELAPSED'])
         self.time_nest(['TIMEDIFF_1'])
         self.time_nest(['TIMEDIFF_2'])
-        
+
 
         endTime = time.time()
         print("total time %ds" % (endTime - startTime))
 
-        
+
 
 
     def stop(self):
diff --git a/tests/system-test/2-query/stablity.py b/tests/system-test/2-query/stablity.py
index 569bee62ec..ff026bf120 100755
--- a/tests/system-test/2-query/stablity.py
+++ b/tests/system-test/2-query/stablity.py
@@ -24,10 +24,10 @@ from util.dnodes import tdDnodes
 from util.dnodes import *
 
 class TDTestCase:
-    updatecfgDict = {'maxSQLLength':1048576,'debugFlag': 143 ,"cDebugFlag":143,"uDebugFlag":143 ,"rpcDebugFlag":143 , "tmrDebugFlag":143 , 
+    updatecfgDict = {'maxSQLLength':1048576,'debugFlag': 143 ,"cDebugFlag":143,"uDebugFlag":143 ,"rpcDebugFlag":143 , "tmrDebugFlag":143 ,
     "jniDebugFlag":143 ,"simDebugFlag":143,"dDebugFlag":143, "dDebugFlag":143,"vDebugFlag":143,"mDebugFlag":143,"qDebugFlag":143,
     "wDebugFlag":143,"sDebugFlag":143,"tsdbDebugFlag":143,"tqDebugFlag":143 ,"fsDebugFlag":143 ,"fnDebugFlag":143}
-    
+
     def init(self, conn, logSql, replicaVar=1):
         self.replicaVar = int(replicaVar)
         tdLog.debug("start to execute %s" % __file__)
@@ -36,13 +36,13 @@ class TDTestCase:
         self.testcasePath = os.path.split(__file__)[0]
         self.testcaseFilename = os.path.split(__file__)[-1]
         os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
-        
+
         self.num = 10
         self.fornum = 5
-        
+
         self.db_nest = "stab"
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         # regular column select
         self.q_select= ['q_int', 'q_bigint' , 'q_bigint' , 'q_smallint' , 'q_tinyint' , 'q_bool' , 'q_binary' , 'q_nchar' ,'q_float' , 'q_double' ,'q_ts ', 'q_int_null ', 'q_bigint_null ' , 'q_bigint_null ' , 'q_smallint_null ' , 'q_tinyint_null ' , 'q_bool_null ' , 'q_binary_null ' , 'q_nchar_null ' ,'q_float_null ' , 'q_double_null ' ,'q_ts_null ']
 
@@ -53,11 +53,11 @@ class TDTestCase:
         self.qt_select=  self.q_select + self.t_select
 
         # distinct regular column select
-        self.dq_select= ['distinct q_int', 'distinct q_bigint' , 'distinct q_smallint' , 'distinct q_tinyint' , 
+        self.dq_select= ['distinct q_int', 'distinct q_bigint' , 'distinct q_smallint' , 'distinct q_tinyint' ,
                 'distinct q_bool' , 'distinct q_binary' , 'distinct q_nchar' ,'distinct q_float' , 'distinct q_double' ,'distinct q_ts ']
 
         # distinct tag column select
-        self.dt_select= ['distinct loc', 'distinct t_int', 'distinct t_bigint'  , 'distinct t_smallint' , 'distinct t_tinyint' , 
+        self.dt_select= ['distinct loc', 'distinct t_int', 'distinct t_bigint'  , 'distinct t_smallint' , 'distinct t_tinyint' ,
                 'distinct t_bool' , 'distinct t_binary' , 'distinct t_nchar' ,'distinct t_float' , 'distinct t_double' ,'distinct t_ts ']
 
         # distinct regular and tag column select
@@ -68,13 +68,13 @@ class TDTestCase:
         self.s_s_select= ['tbname' , '_rowts' , '_c0', '_C0' ]
         self.unionall_or_union= [ ' union ' , ' union all ' ]
 
-        # regular column where 
+        # regular column where
         self.q_where = ['ts < now +1s','q_bigint >= -9223372036854775807 and q_bigint <= 9223372036854775807', 'q_int <= 2147483647 and q_int >= -2147483647',
-        'q_smallint >= -32767 and q_smallint <= 32767','q_tinyint >= -127 and q_tinyint <= 127','q_float >= -1.7E308 and q_float <= 1.7E308', 
-        'q_double >= -1.7E308 and q_double <= 1.7E308', 'q_binary like \'binary%\'  or q_binary = \'0\' ' , 'q_nchar like \'nchar%\' or q_nchar = \'0\' ' , 
+        'q_smallint >= -32767 and q_smallint <= 32767','q_tinyint >= -127 and q_tinyint <= 127','q_float >= -1.7E308 and q_float <= 1.7E308',
+        'q_double >= -1.7E308 and q_double <= 1.7E308', 'q_binary like \'binary%\'  or q_binary = \'0\' ' , 'q_nchar like \'nchar%\' or q_nchar = \'0\' ' ,
         'q_bool = true or  q_bool = false' , 'q_bool in (0 , 1)' , 'q_bool in ( true , false)' , 'q_bool = 0 or q_bool = 1',
-        'q_bigint between  -9223372036854775807 and 9223372036854775807',' q_int between -2147483647 and 2147483647','q_smallint between -32767 and 32767', 
-        'q_bigint not between  9223372036854775807 and -9223372036854775807','q_int not between 2147483647 and -2147483647','q_smallint not between 32767 and -32767', 
+        'q_bigint between  -9223372036854775807 and 9223372036854775807',' q_int between -2147483647 and 2147483647','q_smallint between -32767 and 32767',
+        'q_bigint not between  9223372036854775807 and -9223372036854775807','q_int not between 2147483647 and -2147483647','q_smallint not between 32767 and -32767',
         'q_tinyint between -127 and 127 ','q_float >= -3.4E38  ','q_float <= 3.4E38  ','q_double >= -1.7E308  ',
         'q_double <= 1.7E308  ','q_float between -3.4E38 and 3.4E38  ','q_double between -1.7E308 and 1.7E308  ' ,'q_float not between 3.4E38 and -3.4E38  ','q_double not between 1.7E308 and -1.7E308  ',
         'q_float is not null  ' ,'q_double is not null  ' ,'q_binary match \'binary\' ','q_binary nmatch \'binarynchar\' ','q_nchar match \'nchar\' ','q_nchar nmatch \'binarynchar\' ',
@@ -88,38 +88,38 @@ class TDTestCase:
         't1.q_smallint >= -32767 and t1.q_smallint <= 32767 and t2.q_smallint >= -32767 and t2.q_smallint <= 32767',
         't1.q_tinyint >= -127 and t1.q_tinyint <= 127 and t2.q_tinyint >= -127 and t2.q_tinyint <= 127',
         't1.q_float >= - 1.7E308 and t1.q_float <=  1.7E308 and t2.q_float >= - 1.7E308 and t2.q_float <=  1.7E308',
-        't1.q_double >= - 1.7E308 and t1.q_double <=  1.7E308 and t2.q_double >= - 1.7E308 and t2.q_double <=  1.7E308', 
-        't1.q_binary like \'binary%\'  and t2.q_binary like \'binary%\'  ' , 
-        't1.q_nchar like \'nchar%\' and t2.q_nchar like \'nchar%\' ' , 
-        't1.q_bool in (0 , 1) and t2.q_bool in (0 , 1)' , 't1.q_bool in ( true , false) and t2.q_bool in ( true , false)' , 
+        't1.q_double >= - 1.7E308 and t1.q_double <=  1.7E308 and t2.q_double >= - 1.7E308 and t2.q_double <=  1.7E308',
+        't1.q_binary like \'binary%\'  and t2.q_binary like \'binary%\'  ' ,
+        't1.q_nchar like \'nchar%\' and t2.q_nchar like \'nchar%\' ' ,
+        't1.q_bool in (0 , 1) and t2.q_bool in (0 , 1)' , 't1.q_bool in ( true , false) and t2.q_bool in ( true , false)' ,
         't1.q_bigint between  -9223372036854775807 and 9223372036854775807 and t2.q_bigint between  -9223372036854775807 and 9223372036854775807',
         't1.q_int between -2147483647 and 2147483647 and t2.q_int between -2147483647 and 2147483647',
-        't1.q_smallint between -32767 and 32767 and t2.q_smallint between -32767 and 32767', 
+        't1.q_smallint between -32767 and 32767 and t2.q_smallint between -32767 and 32767',
         't1.q_tinyint between -127 and 127 and t2.q_tinyint between -127 and 127 ','t1.q_float between -1.7E308 and  1.7E308 and t2.q_float between -1.7E308 and  1.7E308',
         't1.q_double between -1.7E308 and  1.7E308 and t2.q_double between -1.7E308 and  1.7E308',
         't1.q_bigint not between  9223372036854775807 and -9223372036854775807 and t2.q_bigint not between  9223372036854775807 and -9223372036854775807',
         't1.q_int not between 2147483647 and -2147483647 and t2.q_int not between 2147483647 and -2147483647',
-        't1.q_smallint not between 32767 and -32767 and t2.q_smallint not between 32767 and -32767', 
+        't1.q_smallint not between 32767 and -32767 and t2.q_smallint not between 32767 and -32767',
         't1.q_tinyint not between 127 and -127 and t2.q_tinyint not between 127 and -127 ','t1.q_float not between -1.7E308 and  -1.7E308 and t2.q_float not between 1.7E308 and  -1.7E308',
         't1.q_double not between 1.7E308 and  -1.7E308 and t2.q_double not between 1.7E308 and  -1.7E308']
         #TD-6201 ,'t1.q_bool between 0 and 1 or t2.q_bool between 0 and 1']
         #'t1.q_bool = true and  t1.q_bool = false and t2.q_bool = true and  t2.q_bool = false' , 't1.q_bool = 0 and t1.q_bool = 1 and t2.q_bool = 0 and t2.q_bool = 1' ,
 
-        self.q_u_or_where = ['(t1.q_binary like \'binary%\'  or t1.q_binary = \'0\'  or t2.q_binary like \'binary%\'  or t2.q_binary = \'0\' )' , 
-        '(t1.q_nchar like \'nchar%\' or t1.q_nchar = \'0\' or t2.q_nchar like \'nchar%\' or t2.q_nchar = \'0\' )' , '(t1.q_bool = true or  t1.q_bool = false or t2.q_bool = true or  t2.q_bool = false)' , 
+        self.q_u_or_where = ['(t1.q_binary like \'binary%\'  or t1.q_binary = \'0\'  or t2.q_binary like \'binary%\'  or t2.q_binary = \'0\' )' ,
+        '(t1.q_nchar like \'nchar%\' or t1.q_nchar = \'0\' or t2.q_nchar like \'nchar%\' or t2.q_nchar = \'0\' )' , '(t1.q_bool = true or  t1.q_bool = false or t2.q_bool = true or  t2.q_bool = false)' ,
         '(t1.q_bool in (0 , 1) or t2.q_bool in (0 , 1))' , '(t1.q_bool in ( true , false) or t2.q_bool in ( true , false))' , '(t1.q_bool = 0 or t1.q_bool = 1 or t2.q_bool = 0 or t2.q_bool = 1)' ,
         '(t1.q_bigint between  -9223372036854775807 and 9223372036854775807 or t2.q_bigint between  -9223372036854775807 and 9223372036854775807)',
         '(t1.q_int between -2147483647 and 2147483647 or t2.q_int between -2147483647 and 2147483647)',
-        '(t1.q_smallint between -32767 and 32767 or t2.q_smallint between -32767 and 32767)', 
+        '(t1.q_smallint between -32767 and 32767 or t2.q_smallint between -32767 and 32767)',
         '(t1.q_tinyint between -127 and 127 or t2.q_tinyint between -127 and 127 )','(t1.q_float between -1.7E308 and 1.7E308 or t2.q_float between -1.7E308 and 1.7E308)',
         '(t1.q_double between -1.7E308 and 1.7E308 or t2.q_double between -1.7E308 and 1.7E308)']
 
         # tag column where
         self.t_where = ['ts < now +1s','t_bigint >= -9223372036854775807 and t_bigint <= 9223372036854775807','t_int <= 2147483647 and t_int >= -2147483647',
         't_smallint >= -32767 and t_smallint <= 32767','q_tinyint >= -127 and t_tinyint <= 127','t_float >= -1.7E308 and t_float <= 1.7E308',
-        't_double >= -1.7E308 and t_double <= 1.7E308', 't_binary like \'binary%\'   or t_binary = \'0\' ' , 't_nchar like \'nchar%\' or t_nchar = \'0\'' , 
+        't_double >= -1.7E308 and t_double <= 1.7E308', 't_binary like \'binary%\'   or t_binary = \'0\' ' , 't_nchar like \'nchar%\' or t_nchar = \'0\'' ,
         't_bool = true or  t_bool = false' , 't_bool in (0 , 1)' , 't_bool in ( true , false)' , 't_bool = 0 or t_bool = 1',
-        't_bigint between  -9223372036854775807 and 9223372036854775807',' t_int between -2147483647 and 2147483647','t_smallint between -32767 and 32767', 
+        't_bigint between  -9223372036854775807 and 9223372036854775807',' t_int between -2147483647 and 2147483647','t_smallint between -32767 and 32767',
         't_tinyint between -127 and 127 ','t_float between -1.7E308 and 1.7E308','t_double between -1.7E308 and 1.7E308',
         't_binary match \'binary\' ','t_binary nmatch \'binarynchar\' ','t_nchar match \'nchar\' ','t_nchar nmatch \'binarynchar\' ',
         't_binary like \'binary%\' ','t_nchar like \'nchar%\' ','(t_binary like \'binary%\'  or t_nchar = \'0\' ) ','(t_nchar like \'nchar%\' or t_binary = \'0\' ) ',
@@ -132,38 +132,38 @@ class TDTestCase:
         't1.t_smallint >= -32767 and t1.t_smallint <= 32767 and t2.t_smallint >= -32767 and t2.t_smallint <= 32767',
         't1.t_tinyint >= -127 and t1.t_tinyint <= 127 and t2.t_tinyint >= -127 and t2.t_tinyint <= 127',
         't1.t_float >= -1.7E308 and t1.t_float <= 1.7E308 and t2.t_float >= -1.7E308 and t2.t_float <= 1.7E308',
-        't1.t_double >= -1.7E308 and t1.t_double <= 1.7E308 and t2.t_double >= -1.7E308 and t2.t_double <= 1.7E308', 
-        '(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\') ' , 
-        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' , 
+        't1.t_double >= -1.7E308 and t1.t_double <= 1.7E308 and t2.t_double >= -1.7E308 and t2.t_double <= 1.7E308',
+        '(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\') ' ,
+        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' ,
         't1.t_bool in (0 , 1) and t2.t_bool in (0 , 1)' , 't1.t_bool in ( true , false) and t2.t_bool in ( true , false)' , '(t1.t_bool = 0 or t1.t_bool = 1 or t2.t_bool = 0 or t2.t_bool = 1)',
         't1.t_bigint between  -9223372036854775807 and 9223372036854775807 and t2.t_bigint between  -9223372036854775807 and 9223372036854775807',
         't1.t_int between -2147483647 and 2147483647 and t2.t_int between -2147483647 and 2147483647',
-        't1.t_smallint between -32767 and 32767 and t2.t_smallint between -32767 and 32767', 
+        't1.t_smallint between -32767 and 32767 and t2.t_smallint between -32767 and 32767',
         '(t1.t_tinyint between -127 and 127 and t2.t_tinyint between -127 and 127) ','t1.t_float between -1.7E308 and 1.7E308 and t2.t_float between -1.7E308 and 1.7E308',
         '(t1.t_double between -1.7E308 and 1.7E308 and t2.t_double between -1.7E308 and 1.7E308)',
         '(t1.loc match \'[stable]\'  and t2.loc match \'[stable]\')','(t1.loc nmatch \'[qqeqweq]\'  and t2.loc nmatch \'[eqeqweq]\')',
-        '(t1.loc match \'[^stable]\'  and t2.loc match \'[^stable]\')','(t1.loc nmatch \'[^qqeqweq]\'  and t2.loc nmatch \'[^eqeqweq]\')',        
+        '(t1.loc match \'[^stable]\'  and t2.loc match \'[^stable]\')','(t1.loc nmatch \'[^qqeqweq]\'  and t2.loc nmatch \'[^eqeqweq]\')',
         '(t1.t_binary match \'[stable]\'  and t2.t_binary match \'[stable]\')','(t1.t_binary nmatch \'[qqeqweq]\'  and t2.t_binary nmatch \'[eqeqweq]\')',
-        '(t1.t_binary match \'[^stable]\'  and t2.t_binary match \'[^stable]\')','(t1.t_binary nmatch \'[^qqeqweq]\'  and t2.t_binary nmatch \'[^eqeqweq]\')', 
+        '(t1.t_binary match \'[^stable]\'  and t2.t_binary match \'[^stable]\')','(t1.t_binary nmatch \'[^qqeqweq]\'  and t2.t_binary nmatch \'[^eqeqweq]\')',
         '(t1.t_nchar match \'[stable]\'  and t2.t_nchar match \'[stable]\')','(t1.t_nchar nmatch \'[qqeqweq]\'  and t2.t_nchar nmatch \'[eqeqweq]\')',
         '(t1.t_nchar match \'[^stable]\'  and t2.t_nchar match \'[^stable]\')','(t1.t_nchar nmatch \'[^qqeqweq]\'  and t2.t_nchar nmatch \'[^eqeqweq]\')']
 
-        self.t_u_or_where = ['(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\' )' , 
-        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' , 
+        self.t_u_or_where = ['(t1.t_binary like \'binary%\'  or t1.t_binary = \'0\'  or t2.t_binary like \'binary%\'  or t2.t_binary = \'0\' )' ,
+        '(t1.t_nchar like \'nchar%\' or t1.t_nchar = \'0\' or t2.t_nchar like \'nchar%\' or t2.t_nchar = \'0\' )' , '(t1.t_bool = true or  t1.t_bool = false or t2.t_bool = true or  t2.t_bool = false)' ,
         '(t1.t_bool in (0 , 1) or t2.t_bool in (0 , 1))' , '(t1.t_bool in ( true , false) or t2.t_bool in ( true , false))' , '(t1.t_bool = 0 or t1.t_bool = 1 or t2.t_bool = 0 or t2.t_bool = 1)',
         '(t1.t_bigint between  -9223372036854775807 and 9223372036854775807 or t2.t_bigint between  -9223372036854775807 and 9223372036854775807)',
         '(t1.t_int between -2147483647 and 2147483647 or t2.t_int between -2147483647 and 2147483647)',
-        '(t1.t_smallint between -32767 and 32767 or t2.t_smallint between -32767 and 32767)', 
+        '(t1.t_smallint between -32767 and 32767 or t2.t_smallint between -32767 and 32767)',
         '(t1.t_tinyint between -127 and 127 or t2.t_tinyint between -127 and 127 )','(t1.t_float between -1.7E308 and 1.7E308 or t2.t_float between -1.7E308 and 1.7E308)',
         '(t1.t_double between -1.7E308 and 1.7E308 or t2.t_double between -1.7E308 and 1.7E308)',
         '(t1.loc match \'[stable]\'  or t2.loc match \'[stable]\')','(t1.loc nmatch \'[qqeqweq]\'  or t2.loc nmatch \'[eqeqweq]\')',
-        '(t1.loc match \'[^stable]\'  or t2.loc match \'[^stable]\')','(t1.loc nmatch \'[^qqeqweq]\'  or t2.loc nmatch \'[^eqeqweq]\')' ,   
+        '(t1.loc match \'[^stable]\'  or t2.loc match \'[^stable]\')','(t1.loc nmatch \'[^qqeqweq]\'  or t2.loc nmatch \'[^eqeqweq]\')' ,
         '(t1.t_binary match \'[stable]\'  or t2.t_binary match \'[stable]\')','(t1.t_binary nmatch \'[qqeqweq]\'  or t2.t_binary nmatch \'[eqeqweq]\')',
-        '(t1.t_binary match \'[^stable]\'  or t2.t_binary match \'[^stable]\')','(t1.t_binary nmatch \'[^qqeqweq]\'  or t2.t_binary nmatch \'[^eqeqweq]\')', 
+        '(t1.t_binary match \'[^stable]\'  or t2.t_binary match \'[^stable]\')','(t1.t_binary nmatch \'[^qqeqweq]\'  or t2.t_binary nmatch \'[^eqeqweq]\')',
         '(t1.t_nchar match \'[stable]\'  or t2.t_nchar match \'[stable]\')','(t1.t_nchar nmatch \'[qqeqweq]\'  or t2.t_nchar nmatch \'[eqeqweq]\')',
         '(t1.t_nchar match \'[^stable]\'  or t2.t_nchar match \'[^stable]\')','(t1.t_nchar nmatch \'[^qqeqweq]\'  or t2.t_nchar nmatch \'[^eqeqweq]\')']
 
-        # regular and tag column where 
+        # regular and tag column where
         self.qt_where = self.q_where + self.t_where
         self.qt_u_where = self.q_u_where + self.t_u_where
         self.qt_u_or_where = self.q_u_or_where + self.t_u_or_where
@@ -176,87 +176,87 @@ class TDTestCase:
         self.session_where = ['session(ts,10a)' , 'session(ts,10s)', 'session(ts,10m)' , 'session(ts,10h)','session(ts,10d)' , 'session(ts,10w)']
         self.session_u_where = ['session(t1.ts,10a)' , 'session(t1.ts,10s)', 'session(t1.ts,10m)' , 'session(t1.ts,10h)','session(t1.ts,10d)' , 'session(t1.ts,10w)',
                     'session(t2.ts,10a)' , 'session(t2.ts,10s)', 'session(t2.ts,10m)' , 'session(t2.ts,10h)','session(t2.ts,10d)' , 'session(t2.ts,10w)']
-        
+
         self.fill_where = ['FILL(NONE)','FILL(PREV)','FILL(NULL)','FILL(LINEAR)','FILL(NEXT)','FILL(VALUE, 1.23)']
-        
+
         self.state_window = ['STATE_WINDOW(q_tinyint)','STATE_WINDOW(q_bigint)','STATE_WINDOW(q_int)','STATE_WINDOW(q_bool)','STATE_WINDOW(q_smallint)']
         self.state_u_window = ['STATE_WINDOW(t1.q_tinyint)','STATE_WINDOW(t1.q_bigint)','STATE_WINDOW(t1.q_int)','STATE_WINDOW(t1.q_bool)','STATE_WINDOW(t1.q_smallint)',
                     'STATE_WINDOW(t2.q_tinyint)','STATE_WINDOW(t2.q_bigint)','STATE_WINDOW(t2.q_int)','STATE_WINDOW(t2.q_bool)','STATE_WINDOW(t2.q_smallint)']
 
-        # order by where 
+        # order by where
         self.order_where = ['order by ts' , 'order by ts asc']
         self.order_u_where = ['order by t1.ts' , 'order by t1.ts asc' , 'order by t2.ts' , 'order by t2.ts asc']
         self.order_desc_where = ['order by ts' , 'order by ts asc' , 'order by ts desc' ]
         self.orders_desc_where = ['order by ts' , 'order by ts asc' , 'order by ts desc' , 'order by ts,loc' , 'order by ts,loc asc' , 'order by ts,loc desc']
- 
-        self.group_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint', 
+
+        self.group_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint',
                     'group by tbname,t_float', 'group by tbname,t_double' , 'group by tbname,t_binary', 'group by tbname,t_nchar', 'group by tbname,t_bool' ,'group by tbname ,loc ,t_bigint',
                     'group by tbname,t_binary ,t_nchar ,t_bool' , 'group by tbname,t_int ,t_smallint ,t_tinyint' , 'group by tbname,t_float ,t_double ' ,
-                    'PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint', 
+                    'PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint',
                     'PARTITION BY tbname,t_float', 'PARTITION BY tbname,t_double' , 'PARTITION BY tbname,t_binary', 'PARTITION BY tbname,t_nchar', 'PARTITION BY tbname,t_bool' ,'PARTITION BY tbname ,loc ,t_bigint',
                     'PARTITION BY tbname,t_binary ,t_nchar ,t_bool' , 'PARTITION BY tbname,t_int ,t_smallint ,t_tinyint' , 'PARTITION BY tbname,t_float ,t_double ']
-        self.group_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint', 
+        self.group_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint',
                     'group by t1.t_float', 'group by t1.t_double' , 'group by t1.t_binary', 'group by t1.t_nchar', 'group by t1.t_bool' ,'group by t1.loc ,t1.t_bigint',
                     'group by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'group by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'group by t1.t_float ,t1.t_double ' ,
-                    'PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint', 
+                    'PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint',
                     'PARTITION by t1.t_float', 'PARTITION by t1.t_double' , 'PARTITION by t1.t_binary', 'PARTITION by t1.t_nchar', 'PARTITION by t1.t_bool' ,'PARTITION BY t1.loc ,t1.t_bigint',
                     'PARTITION by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'PARTITION by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'PARTITION by t1.t_float ,t1.t_double ',
-                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint', 
+                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint',
                     'group by t2.t_float', 'group by t2.t_double' , 'group by t2.t_binary', 'group by t2.t_nchar', 'group by t2.t_bool' ,'group by t2.loc ,t2.t_bigint',
                     'group by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'group by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'group by t2.t_float ,t2.t_double ' ,
-                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint', 
+                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint',
                     'PARTITION by t2.t_float', 'PARTITION by t2.t_double' , 'PARTITION by t2.t_binary', 'PARTITION by t2.t_nchar', 'PARTITION by t2.t_bool' ,'PARTITION BY t2.loc ,t2.t_bigint',
-                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double ']  
-              
-        self.group_only_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint', 
+                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double ']
+
+        self.group_only_where = ['group by tbname , loc' , 'group by tbname', 'group by tbname, t_bigint', 'group by tbname,t_int', 'group by tbname, t_smallint', 'group by tbname,t_tinyint',
                     'group by tbname,t_float', 'group by tbname,t_double' , 'group by tbname,t_binary', 'group by tbname,t_nchar', 'group by tbname,t_bool' ,'group by tbname ,loc ,t_bigint',
                     'group by tbname,t_binary ,t_nchar ,t_bool' , 'group by tbname,t_int ,t_smallint ,t_tinyint' , 'group by tbname,t_float ,t_double ' ]
-        self.group_only_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint', 
+        self.group_only_where_j = ['group by  t1.loc' , 'group by t1.t_bigint', 'group by t1.t_int', 'group by t1.t_smallint', 'group by t1.t_tinyint',
                     'group by t1.t_float', 'group by t1.t_double' , 'group by t1.t_binary', 'group by t1.t_nchar', 'group by t1.t_bool' ,'group by t1.loc ,t1.t_bigint',
                     'group by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'group by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'group by t1.t_float ,t1.t_double ' ,
-                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint', 
+                    'group by  t2.loc' , 'group by t2.t_bigint', 'group by t2.t_int', 'group by t2.t_smallint', 'group by t2.t_tinyint',
                     'group by t2.t_float', 'group by t2.t_double' , 'group by t2.t_binary', 'group by t2.t_nchar', 'group by t2.t_bool' ,'group by t2.loc ,t2.t_bigint',
-                    'group by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'group by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'group by t2.t_float ,t2.t_double ' ]  
-        
-        self.partiton_where = ['PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint', 
+                    'group by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'group by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'group by t2.t_float ,t2.t_double ' ]
+
+        self.partiton_where = ['PARTITION BY tbname , loc' , 'PARTITION BY tbname', 'PARTITION BY tbname, t_bigint', 'PARTITION BY tbname,t_int', 'PARTITION BY tbname, t_smallint', 'PARTITION BY tbname,t_tinyint',
                     'PARTITION BY tbname,t_float', 'PARTITION BY tbname,t_double' , 'PARTITION BY tbname,t_binary', 'PARTITION BY tbname,t_nchar', 'PARTITION BY tbname,t_bool' ,'PARTITION BY tbname ,loc ,t_bigint',
                     'PARTITION BY tbname,t_binary ,t_nchar ,t_bool' , 'PARTITION BY tbname,t_int ,t_smallint ,t_tinyint' , 'PARTITION BY tbname,t_float ,t_double ']
-        self.partiton_where_j = ['PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint', 
+        self.partiton_where_j = ['PARTITION BY t1.loc' , 'PARTITION by t1.t_bigint', 'PARTITION by t1.t_int', 'PARTITION by t1.t_smallint', 'PARTITION by t1.t_tinyint',
                     'PARTITION by t1.t_float', 'PARTITION by t1.t_double' , 'PARTITION by t1.t_binary', 'PARTITION by t1.t_nchar', 'PARTITION by t1.t_bool' ,'PARTITION BY t1.loc ,t1.t_bigint',
                     'PARTITION by t1.t_binary ,t1.t_nchar ,t1.t_bool' , 'PARTITION by t1.t_int ,t1.t_smallint ,t1.t_tinyint' , 'PARTITION by t1.t_float ,t1.t_double ',
-                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint', 
+                    'PARTITION BY t2.loc' , 'PARTITION by t2.t_bigint', 'PARTITION by t2.t_int', 'PARTITION by t2.t_smallint', 'PARTITION by t2.t_tinyint',
                     'PARTITION by t2.t_float', 'PARTITION by t2.t_double' , 'PARTITION by t2.t_binary', 'PARTITION by t2.t_nchar', 'PARTITION by t2.t_bool' ,'PARTITION BY t2.loc ,t2.t_bigint',
-                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double '] 
- 
-        self.group_where_regular = ['group by tbname ' , 'group by tbname', 'group by tbname, q_bigint', 'group by tbname,q_int', 'group by tbname, q_smallint', 'group by tbname,q_tinyint', 
+                    'PARTITION by t2.t_binary ,t2.t_nchar ,t2.t_bool' , 'PARTITION by t2.t_int ,t2.t_smallint ,t2.t_tinyint' , 'PARTITION by t2.t_float ,t2.t_double ']
+
+        self.group_where_regular = ['group by tbname ' , 'group by tbname', 'group by tbname, q_bigint', 'group by tbname,q_int', 'group by tbname, q_smallint', 'group by tbname,q_tinyint',
                     'group by tbname,q_float', 'group by tbname,q_double' , 'group by tbname,q_binary', 'group by tbname,q_nchar', 'group by tbname,q_bool' ,'group by tbname ,q_bigint',
                     'group by tbname,q_binary ,q_nchar ,q_bool' , 'group by tbname,q_int ,q_smallint ,q_tinyint' , 'group by tbname,q_float ,q_double ' ,
-                    'PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint', 
+                    'PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint',
                     'PARTITION BY tbname,q_float', 'PARTITION BY tbname,q_double' , 'PARTITION BY tbname,q_binary', 'PARTITION BY tbname,q_nchar', 'PARTITION BY tbname,q_bool' ,'PARTITION BY tbname ,q_bigint',
                     'PARTITION BY tbname,q_binary ,q_nchar ,q_bool' , 'PARTITION BY tbname,q_int ,q_smallint ,q_tinyint' , 'PARTITION BY tbname,q_float ,q_double ']
-        self.group_where_regular_j = ['group by t1.q_bigint', 'group by t1.q_int', 'group by t1.q_smallint', 'group by t1.q_tinyint', 
+        self.group_where_regular_j = ['group by t1.q_bigint', 'group by t1.q_int', 'group by t1.q_smallint', 'group by t1.q_tinyint',
                     'group by t1.q_float', 'group by t1.q_double' , 'group by t1.q_binary', 'group by t1.q_nchar', 'group by t1.q_bool' ,'group by t1.q_bigint',
                     'group by t1.q_binary ,t1.q_nchar ,t1.q_bool' , 'group by t1.q_int ,t1.q_smallint ,t1.q_tinyint' , 'group by t1.q_float ,t1.q_double ' ,
-                    'PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint', 
+                    'PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint',
                     'PARTITION by t1.q_float', 'PARTITION by t1.q_double' , 'PARTITION by t1.q_binary', 'PARTITION by t1.q_nchar', 'PARTITION by t1.q_bool' ,'PARTITION BY t1.q_bigint',
                     'PARTITION by t1.q_binary ,t1.q_nchar ,t1.q_bool' , 'PARTITION by t1.q_int ,t1.q_smallint ,t1.q_tinyint' , 'PARTITION by t1.q_float ,t1.q_double ',
-                    'group by t2.q_bigint', 'group by t2.q_int', 'group by t2.q_smallint', 'group by t2.q_tinyint', 
+                    'group by t2.q_bigint', 'group by t2.q_int', 'group by t2.q_smallint', 'group by t2.q_tinyint',
                     'group by t2.q_float', 'group by t2.q_double' , 'group by t2.q_binary', 'group by t2.q_nchar', 'group by t2.q_bool' ,'group by t2.q_bigint',
                     'group by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'group by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'group by t2.q_float ,t2.q_double ' ,
-                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint', 
+                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint',
                     'PARTITION by t2.q_float', 'PARTITION by t2.q_double' , 'PARTITION by t2.q_binary', 'PARTITION by t2.q_nchar', 'PARTITION by t2.q_bool' ,'PARTITION BY t2.q_bigint',
-                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']   
- 
-        self.partiton_where_regular = ['PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint', 
+                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']
+
+        self.partiton_where_regular = ['PARTITION BY tbname ' , 'PARTITION BY tbname', 'PARTITION BY tbname, q_bigint', 'PARTITION BY tbname,q_int', 'PARTITION BY tbname, q_smallint', 'PARTITION BY tbname,q_tinyint',
                     'PARTITION BY tbname,q_float', 'PARTITION BY tbname,q_double' , 'PARTITION BY tbname,q_binary', 'PARTITION BY tbname,q_nchar', 'PARTITION BY tbname,q_bool' ,'PARTITION BY tbname ,q_bigint',
                     'PARTITION BY tbname,q_binary ,q_nchar ,q_bool' , 'PARTITION BY tbname,q_int ,q_smallint ,q_tinyint' , 'PARTITION BY tbname,q_float ,q_double ']
-        self.partiton_where_regular_j = ['PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint', 
+        self.partiton_where_regular_j = ['PARTITION by t1.q_bigint', 'PARTITION by t1.q_int', 'PARTITION by t1.q_smallint', 'PARTITION by t1.q_tinyint',
                     'PARTITION by t1.q_float', 'PARTITION by t1.q_double' , 'PARTITION by t1.q_binary', 'PARTITION by t1.q_nchar', 'PARTITION by t1.q_bool' ,'PARTITION BY t1.q_bigint',
                     'PARTITION by t1.q_binary ,t1.q_nchar ,t1.q_bool' , 'PARTITION by t1.q_int ,t1.q_smallint ,t1.q_tinyint' , 'PARTITION by t1.q_float ,t1.q_double ',
-                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint', 
+                    'PARTITION by t2.q_bigint', 'PARTITION by t2.q_int', 'PARTITION by t2.q_smallint', 'PARTITION by t2.q_tinyint',
                     'PARTITION by t2.q_float', 'PARTITION by t2.q_double' , 'PARTITION by t2.q_binary', 'PARTITION by t2.q_nchar', 'PARTITION by t2.q_bool' ,'PARTITION BY t2.q_bigint',
-                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']           
-                
+                    'PARTITION by t2.q_binary ,t2.q_nchar ,t2.q_bool' , 'PARTITION by t2.q_int ,t2.q_smallint ,t2.q_tinyint' , 'PARTITION by t2.q_float ,t2.q_double ']
+
         self.having_support = ['having count(q_int) > 0','having count(q_bigint) > 0','having count(q_smallint) > 0','having count(q_tinyint) > 0','having count(q_float) > 0','having count(q_double) > 0','having count(q_bool) > 0',
                     'having avg(q_int) > 0','having avg(q_bigint) > 0','having avg(q_smallint) > 0','having avg(q_tinyint) > 0','having avg(q_float) > 0','having avg(q_double) > 0',
                     'having sum(q_int) > 0','having sum(q_bigint) > 0','having sum(q_smallint) > 0','having sum(q_tinyint) > 0','having sum(q_float) > 0','having sum(q_double) > 0',
@@ -282,15 +282,15 @@ class TDTestCase:
         self.having_not_support = ['having TOP(q_int,10) > 0','having TOP(q_bigint,10) > 0','having TOP(q_smallint,10) > 0','having TOP(q_tinyint,10) > 0','having TOP(q_float,10) > 0','having TOP(q_double,10) > 0','having TOP(q_bool,10) > 0',
                     'having BOTTOM(q_int,10) > 0','having BOTTOM(q_bigint,10) > 0','having BOTTOM(q_smallint,10) > 0','having BOTTOM(q_tinyint,10) > 0','having BOTTOM(q_float,10) > 0','having BOTTOM(q_double,10) > 0','having BOTTOM(q_bool,10) > 0',
                     'having LEASTSQUARES(q_int) > 0','having  LEASTSQUARES(q_bigint) > 0','having  LEASTSQUARES(q_smallint) > 0','having  LEASTSQUARES(q_tinyint) > 0','having  LEASTSQUARES(q_float) > 0','having  LEASTSQUARES(q_double) > 0','having  LEASTSQUARES(q_bool) > 0',
-                    'having FIRST(q_bool) > 0','having IRATE(q_bool) > 0','having PERCENTILE(q_bool,10) > 0','having avg(q_bool) > 0','having LAST_ROW(q_bool) > 0','having sum(q_bool) > 0','having STDDEV(q_bool) > 0','having APERCENTILE(q_bool,10) > 0','having  TWA(q_bool) > 0','having LAST(q_bool) > 0',                    
+                    'having FIRST(q_bool) > 0','having IRATE(q_bool) > 0','having PERCENTILE(q_bool,10) > 0','having avg(q_bool) > 0','having LAST_ROW(q_bool) > 0','having sum(q_bool) > 0','having STDDEV(q_bool) > 0','having APERCENTILE(q_bool,10) > 0','having  TWA(q_bool) > 0','having LAST(q_bool) > 0',
                     'having PERCENTILE(q_int,10) > 0','having PERCENTILE(q_bigint,10) > 0','having PERCENTILE(q_smallint,10) > 0','having PERCENTILE(q_tinyint,10) > 0','having PERCENTILE(q_float,10) > 0','having PERCENTILE(q_double,10) > 0',
                     'having TOP(q_int_null,10) > 0','having TOP(q_bigint_null,10) > 0','having TOP(q_smallint_null,10) > 0','having TOP(q_tinyint_null,10) > 0','having TOP(q_float_null,10) > 0','having TOP(q_double_null,10) > 0','having TOP(q_bool_null,10) > 0',
                     'having BOTTOM(q_int_null,10) > 0','having BOTTOM(q_bigint_null,10) > 0','having BOTTOM(q_smallint_null,10) > 0','having BOTTOM(q_tinyint_null,10) > 0','having BOTTOM(q_float_null,10) > 0','having BOTTOM(q_double_null,10) > 0','having BOTTOM(q_bool_null,10) > 0',
                     'having LEASTSQUARES(q_int_null) > 0','having  LEASTSQUARES(q_bigint_null) > 0','having  LEASTSQUARES(q_smallint_null) > 0','having  LEASTSQUARES(q_tinyint_null) > 0','having  LEASTSQUARES(q_float_null) > 0','having  LEASTSQUARES(q_double_null) > 0','having  LEASTSQUARES(q_bool_null) > 0',
-                    'having FIRST(q_bool_null) > 0','having IRATE(q_bool_null) > 0','having PERCENTILE(q_bool_null,10) > 0','having avg(q_bool_null) > 0','having LAST_ROW(q_bool_null) > 0','having sum(q_bool_null) > 0','having STDDEV(q_bool_null) > 0','having APERCENTILE(q_bool_null,10) > 0','having  TWA(q_bool_null) > 0','having LAST(q_bool_null) > 0',                    
+                    'having FIRST(q_bool_null) > 0','having IRATE(q_bool_null) > 0','having PERCENTILE(q_bool_null,10) > 0','having avg(q_bool_null) > 0','having LAST_ROW(q_bool_null) > 0','having sum(q_bool_null) > 0','having STDDEV(q_bool_null) > 0','having APERCENTILE(q_bool_null,10) > 0','having  TWA(q_bool_null) > 0','having LAST(q_bool_null) > 0',
                     'having PERCENTILE(q_int_null,10) > 0','having PERCENTILE(q_bigint_null,10) > 0','having PERCENTILE(q_smallint_null,10) > 0','having PERCENTILE(q_tinyint_null,10) > 0','having PERCENTILE(q_float_null,10) > 0','having PERCENTILE(q_double_null,10) > 0']
         self.having_tagnot_support = ['having LAST_ROW(q_int) > 0','having LAST_ROW(q_bigint) > 0','having LAST_ROW(q_smallint) > 0','having LAST_ROW(q_tinyint) > 0','having LAST_ROW(q_float) > 0','having LAST_ROW(q_double) > 0',
-                                      'having LAST_ROW(q_int_null) > 0','having LAST_ROW(q_bigint_null) > 0','having LAST_ROW(q_smallint_null) > 0','having LAST_ROW(q_tinyint_null) > 0','having LAST_ROW(q_float_null) > 0','having LAST_ROW(q_double_null) > 0']    
+                                      'having LAST_ROW(q_int_null) > 0','having LAST_ROW(q_bigint_null) > 0','having LAST_ROW(q_smallint_null) > 0','having LAST_ROW(q_tinyint_null) > 0','having LAST_ROW(q_float_null) > 0','having LAST_ROW(q_double_null) > 0']
 
         self.having_support_j = ['having count(t1.q_int) > 0','having count(t1.q_bigint) > 0','having count(t1.q_smallint) > 0','having count(t1.q_tinyint) > 0','having count(t1.q_float) > 0','having count(t1.q_double) > 0','having count(t1.q_bool) > 0',
                     'having avg(t1.q_int) > 0','having avg(t1.q_bigint) > 0','having avg(t1.q_smallint) > 0','having avg(t1.q_tinyint) > 0','having avg(t1.q_float) > 0','having avg(t1.q_double) > 0',
@@ -303,7 +303,7 @@ class TDTestCase:
                     'having FIRST(t1.q_int) > 0','having FIRST(t1.q_bigint) > 0','having FIRST(t1.q_smallint) > 0','having FIRST(t1.q_tinyint) > 0','having FIRST(t1.q_float) > 0','having FIRST(t1.q_double) > 0',
                     'having LAST(t1.q_int) > 0','having LAST(t1.q_bigint) > 0','having LAST(t1.q_smallint) > 0','having LAST(t1.q_tinyint) > 0','having LAST(t1.q_float) > 0','having LAST(t1.q_double) > 0',
                     'having APERCENTILE(t1.q_int,10) > 0','having APERCENTILE(t1.q_bigint,10) > 0','having APERCENTILE(t1.q_smallint,10) > 0','having APERCENTILE(t1.q_tinyint,10) > 0','having APERCENTILE(t1.q_float,10) > 0','having APERCENTILE(t1.q_double,10) > 0']
-        
+
         # limit offset where
         self.limit_where = ['limit 1 offset 1' , 'limit 1' , 'limit 2 offset 1' , 'limit 2', 'limit 12 offset 1' , 'limit 20', 'limit 20 offset 10' , 'limit 200']
         self.limit1_where = ['limit 1 offset 1' , 'limit 1' ]
@@ -312,7 +312,7 @@ class TDTestCase:
         # slimit soffset where
         self.slimit_where = ['slimit 1 soffset 1' , 'slimit 1' , 'slimit 2 soffset 1' , 'slimit 2']
         self.slimit1_where = ['slimit 2 soffset 1' , 'slimit 1' ]
-        
+
         self.calc_select_all = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
                     'top(q_int,20)' , 'top(q_bigint,20)' , 'top(q_smallint,20)' ,'top(q_tinyint,20)' ,'top(q_float,20)' ,'top(q_double,20)' ,
                     'first(q_int)' , 'first(q_bigint)' , 'first(q_smallint)' , 'first(q_tinyint)' , 'first(q_float)' ,'first(q_double)' ,'first(q_binary)' ,'first(q_nchar)' ,'first(q_bool)' ,'first(q_ts)' ,
@@ -320,7 +320,7 @@ class TDTestCase:
                     'min(q_int)' , 'min(q_bigint)' , 'min(q_smallint)' , 'min(q_tinyint)' , 'min(q_float)' ,'min(q_double)' ,
                     'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)' ,
                     'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)' ,
-                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' ,
                     'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)',
                     'bottom(q_int_null,20)' , 'bottom(q_bigint_null,20)' , 'bottom(q_smallint_null,20)' , 'bottom(q_tinyint_null,20)' ,'bottom(q_float_null,20)' , 'bottom(q_double_null,20)' ,
                     'top(q_int_null,20)' , 'top(q_bigint_null,20)' , 'top(q_smallint_null,20)' ,'top(q_tinyint_null,20)' ,'top(q_float_null,20)' ,'top(q_double_null,20)' ,
@@ -328,8 +328,8 @@ class TDTestCase:
                     'last(q_int_null)' ,  'last(q_bigint_null)' , 'last(q_smallint_null)'  , 'last(q_tinyint_null)' , 'last(q_float_null)'  ,'last(q_double_null)' , 'last(q_binary_null)' ,'last(q_nchar_null)' ,'last(q_bool_null)' ,'last(q_ts_null)' ,
                     'min(q_int_null)' , 'min(q_bigint_null)' , 'min(q_smallint_null)' , 'min(q_tinyint_null)' , 'min(q_float_null)' ,'min(q_double_null)' ,
                     'max(q_int_null)' ,  'max(q_bigint_null)' , 'max(q_smallint_null)' , 'max(q_tinyint_null)' ,'max(q_float_null)' ,'max(q_double_null)' ,
-                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' , 
-                    'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)',                    
+                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' ,
+                    'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)',
                     'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)' ,]
 
         self.calc_select_in_ts = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
@@ -344,25 +344,25 @@ class TDTestCase:
         self.calc_select_in = ['min(q_int)' , 'min(q_bigint)' , 'min(q_smallint)' , 'min(q_tinyint)' , 'min(q_float)' ,'min(q_double)' ,
                     'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)' ,
                     'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)' ,
-                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' ,
                     'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)',
                     'min(q_int_null)' , 'min(q_bigint_null)' , 'min(q_smallint_null)' , 'min(q_tinyint_null)' , 'min(q_float_null)' ,'min(q_double_null)' ,
                     'max(q_int_null)' ,  'max(q_bigint_null)' , 'max(q_smallint_null)' , 'max(q_tinyint_null)' ,'max(q_float_null)' ,'max(q_double_null)' ,
                     'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)' ,
-                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' , 
+                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' ,
                     'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)']
-        
+
         self.calc_select_not_support_ts = ['first(q_int)' , 'first(q_bigint)' , 'first(q_smallint)' , 'first(q_tinyint)' , 'first(q_float)' ,'first(q_double)' ,'first(q_binary)' ,'first(q_nchar)' ,'first(q_bool)' ,'first(q_ts)' ,
                     'last(q_int)' ,  'last(q_bigint)' , 'last(q_smallint)'  , 'last(q_tinyint)' , 'last(q_float)'  ,'last(q_double)' , 'last(q_binary)' ,'last(q_nchar)' ,'last(q_bool)' ,'last(q_ts)' ,
-                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' , 
+                    'last_row(q_int)' ,  'last_row(q_bigint)' , 'last_row(q_smallint)' , 'last_row(q_tinyint)' , 'last_row(q_float)' ,
                     'last_row(q_double)' , 'last_row(q_bool)' ,'last_row(q_binary)' ,'last_row(q_nchar)' ,'last_row(q_ts)',
                     'apercentile(q_int,20)' ,  'apercentile(q_bigint,20)'  ,'apercentile(q_smallint,20)'  ,'apercentile(q_tinyint,20)' ,'apercentile(q_float,20)'  ,'apercentile(q_double,20)',
                     'first(q_int_null)' , 'first(q_bigint_null)' , 'first(q_smallint_null)' , 'first(q_tinyint_null)' , 'first(q_float_null)' ,'first(q_double_null)' ,'first(q_binary_null)' ,'first(q_nchar_null)' ,'first(q_bool_null)' ,'first(q_ts_null)' ,
                     'last(q_int_null)' ,  'last(q_bigint_null)' , 'last(q_smallint_null)'  , 'last(q_tinyint_null)' , 'last(q_float_null)'  ,'last(q_double_null)' , 'last(q_binary_null)' ,'last(q_nchar_null)' ,'last(q_bool_null)' ,'last(q_ts_null)' ,
-                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' , 
+                    'last_row(q_int_null)' ,  'last_row(q_bigint_null)' , 'last_row(q_smallint_null)' , 'last_row(q_tinyint_null)' , 'last_row(q_float_null)' ,
                     'last_row(q_double_null)' , 'last_row(q_bool_null)' ,'last_row(q_binary_null)' ,'last_row(q_nchar_null)' ,'last_row(q_ts_null)',
-                    'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)']  
-              
+                    'apercentile(q_int_null,20)' ,  'apercentile(q_bigint_null,20)'  ,'apercentile(q_smallint_null,20)'  ,'apercentile(q_tinyint_null,20)' ,'apercentile(q_float_null,20)'  ,'apercentile(q_double_null,20)']
+
         self.calc_select_support_ts = ['bottom(q_int,20)' , 'bottom(q_bigint,20)' , 'bottom(q_smallint,20)' , 'bottom(q_tinyint,20)' ,'bottom(q_float,20)' , 'bottom(q_double,20)' ,
                     'top(q_int,20)' , 'top(q_bigint,20)' , 'top(q_smallint,20)' ,'top(q_tinyint,20)' ,'top(q_float,20)' ,'top(q_double,20)' ,
                     'bottom(q_int_null,20)' , 'bottom(q_bigint_null,20)' , 'bottom(q_smallint_null,20)' , 'bottom(q_tinyint_null,20)' ,'bottom(q_float_null,20)' , 'bottom(q_double_null,20)' ,
@@ -371,11 +371,11 @@ class TDTestCase:
                     'max(q_int)' ,  'max(q_bigint)' , 'max(q_smallint)' , 'max(q_tinyint)' ,'max(q_float)' ,'max(q_double)'  ,
                     'min(q_int_null)' , 'min(q_bigint_null)' , 'min(q_smallint_null)' , 'min(q_tinyint_null)' , 'min(q_float_null)' ,'min(q_double_null)' ,
                     'max(q_int_null)' ,  'max(q_bigint_null)' , 'max(q_smallint_null)' , 'max(q_tinyint_null)' ,'max(q_float_null)' ,'max(q_double_null)']
-        
+
         self.calc_select_regular = [ 'PERCENTILE(q_int,10)' ,'PERCENTILE(q_bigint,20)' , 'PERCENTILE(q_smallint,30)' ,'PERCENTILE(q_tinyint,40)' ,'PERCENTILE(q_float,50)' ,'PERCENTILE(q_double,60)',
                                     'PERCENTILE(q_int_null,10)' ,'PERCENTILE(q_bigint_null,20)' , 'PERCENTILE(q_smallint_null,30)' ,'PERCENTILE(q_tinyint_null,40)' ,'PERCENTILE(q_float_null,50)' ,'PERCENTILE(q_double_null,60)']
 
-                    
+
         self.calc_select_fill = ['INTERP(q_int)' ,'INTERP(q_bigint)' ,'INTERP(q_smallint)' ,'INTERP(q_tinyint)', 'INTERP(q_float)' ,'INTERP(q_double)']
         self.interp_where = ['ts = now' , 'ts = \'2020-09-13 20:26:40.000\'' , 'ts = \'2020-09-13 20:26:40.009\'' ,'tbname in (\'table_1\') and ts = now' ,'tbname in (\'table_0\' ,\'table_1\',\'table_2\',\'table_3\',\'table_4\',\'table_5\') and ts =  \'2020-09-13 20:26:40.000\'','tbname like \'table%\'  and ts =  \'2020-09-13 20:26:40.002\'']
 
@@ -410,21 +410,21 @@ class TDTestCase:
                     'bottom(t2.q_int_null,20)' , 'bottom(t2.q_bigint_null,20)' , 'bottom(t2.q_smallint_null,20)' , 'bottom(t2.q_tinyint_null,20)' ,'bottom(t2.q_float_null,20)' , 'bottom(t2.q_double_null,20)' ,
                     'top(t2.q_int_null,20)' , 'top(t2.q_bigint_null,20)' , 'top(t2.q_smallint_null,20)' ,'top(t2.q_tinyint_null,20)' ,'top(t2.q_float_null,20)' ,'top(t2.q_double_null,20)' ,
                     'min(t1.q_int_null)' , 'min(t1.q_bigint_null)' , 'min(t1.q_smallint_null)' , 'min(t1.q_tinyint_null)' , 'min(t1.q_float_null)' ,'min(t1.q_double_null)' ,
-                    'max(t1.q_int_null)' ,  'max(t1.q_bigint_null)' , 'max(t1.q_smallint_null)' , 'max(t1.q_tinyint_null)' ,'max(t1.q_float_null)' ,'max(t1.q_double_null)' ,        
+                    'max(t1.q_int_null)' ,  'max(t1.q_bigint_null)' , 'max(t1.q_smallint_null)' , 'max(t1.q_tinyint_null)' ,'max(t1.q_float_null)' ,'max(t1.q_double_null)' ,
                     'min(t2.q_int_null)' , 'min(t2.q_bigint_null)' , 'min(t2.q_smallint_null)' , 'min(t2.q_tinyint_null)' , 'min(t2.q_float_null)' ,'min(t2.q_double_null)' ,
                     'max(t2.q_int_null)' ,  'max(t2.q_bigint_null)' , 'max(t2.q_smallint_null)' , 'max(t2.q_tinyint_null)' ,'max(t2.q_float_null)' ,'max(t2.q_double_null)' ]
 
         self.calc_select_in_not_support_ts_j = ['apercentile(t1.q_int,20)' ,  'apercentile(t1.q_bigint,20)'  ,'apercentile(t1.q_smallint,20)'  ,'apercentile(t1.q_tinyint,20)' ,'apercentile(t1.q_float,20)'  ,'apercentile(t1.q_double,20)' ,
                     'apercentile(t1.q_int_null,20)' ,  'apercentile(t1.q_bigint_null,20)'  ,'apercentile(t1.q_smallint_null,20)'  ,'apercentile(t1.q_tinyint_null,20)' ,'apercentile(t1.q_float_null,20)'  ,'apercentile(t1.q_double_null,20)' ,
-                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' , 
+                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' ,
                     'last_row(t1.q_double)' , 'last_row(t1.q_bool)' ,'last_row(t1.q_binary)' ,'last_row(t1.q_nchar)' ,'last_row(t1.q_ts)' ,
-                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' , 
+                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' ,
                     'last_row(t1.q_double_null)' , 'last_row(t1.q_bool_null)' ,'last_row(t1.q_binary_null)' ,'last_row(t1.q_nchar_null)' ,'last_row(t1.q_ts_null)' ,
                     'apercentile(t2.q_int,20)' ,  'apercentile(t2.q_bigint,20)'  ,'apercentile(t2.q_smallint,20)'  ,'apercentile(t2.q_tinyint,20)' ,'apercentile(t2.q_float,20)'  ,'apercentile(t2.q_double,20)' ,
                     'apercentile(t2.q_int_null,20)' ,  'apercentile(t2.q_bigint_null,20)'  ,'apercentile(t2.q_smallint_null,20)'  ,'apercentile(t2.q_tinyint_null,20)' ,'apercentile(t2.q_float_null,20)'  ,'apercentile(t2.q_double_null,20)' ,
-                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' , 
+                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' ,
                     'last_row(t2.q_double)' , 'last_row(t2.q_bool)' ,'last_row(t2.q_binary)' ,'last_row(t2.q_nchar)' ,'last_row(t2.q_ts)',
-                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' , 
+                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' ,
                     'last_row(t2.q_double_null)' , 'last_row(t2.q_bool_null)' ,'last_row(t2.q_binary_null)' ,'last_row(t2.q_nchar_null)' ,'last_row(t2.q_ts_null)']
 
         self.calc_select_in_j = ['min(t1.q_int)' , 'min(t1.q_bigint)' , 'min(t1.q_smallint)' , 'min(t1.q_tinyint)' , 'min(t1.q_float)' ,'min(t1.q_double)' ,
@@ -433,20 +433,20 @@ class TDTestCase:
                     'min(t1.q_int_null)' , 'min(t1.q_bigint_null)' , 'min(t1.q_smallint_null)' , 'min(t1.q_tinyint_null)' , 'min(t1.q_float_null)' ,'min(t1.q_double_null)' ,
                     'max(t1.q_int_null)' ,  'max(t1.q_bigint_null)' , 'max(t1.q_smallint_null)' , 'max(t1.q_tinyint_null)' ,'max(t1.q_float_null)' ,'max(t1.q_double_null)' ,
                     'apercentile(t1.q_int_null,20)' ,  'apercentile(t1.q_bigint_null,20)'  ,'apercentile(t1.q_smallint_null,20)'  ,'apercentile(t1.q_tinyint_null,20)' ,'apercentile(t1.q_float_null,20)'  ,'apercentile(t1.q_double_null,20)' ,
-                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' , 
+                    'last_row(t1.q_int)' ,  'last_row(t1.q_bigint)' , 'last_row(t1.q_smallint)' , 'last_row(t1.q_tinyint)' , 'last_row(t1.q_float)' ,
                     'last_row(t1.q_double)' , 'last_row(t1.q_bool)' ,'last_row(t1.q_binary)' ,'last_row(t1.q_nchar)' ,'last_row(t1.q_ts)' ,
                     'min(t2.q_int)' , 'min(t2.q_bigint)' , 'min(t2.q_smallint)' , 'min(t2.q_tinyint)' , 'min(t2.q_float)' ,'min(t2.q_double)' ,
                     'max(t2.q_int)' ,  'max(t2.q_bigint)' , 'max(t2.q_smallint)' , 'max(t2.q_tinyint)' ,'max(t2.q_float)' ,'max(t2.q_double)' ,
-                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' , 
+                    'last_row(t1.q_int_null)' ,  'last_row(t1.q_bigint_null)' , 'last_row(t1.q_smallint_null)' , 'last_row(t1.q_tinyint_null)' , 'last_row(t1.q_float_null)' ,
                     'last_row(t1.q_double_null)' , 'last_row(t1.q_bool_null)' ,'last_row(t1.q_binary_null)' ,'last_row(t1.q_nchar_null)' ,'last_row(t1.q_ts_null)' ,
                     'min(t2.q_int_null)' , 'min(t2.q_bigint_null)' , 'min(t2.q_smallint_null)' , 'min(t2.q_tinyint_null)' , 'min(t2.q_float_null)' ,'min(t2.q_double_null)' ,
                     'max(t2.q_int_null)' ,  'max(t2.q_bigint_null)' , 'max(t2.q_smallint_null)' , 'max(t2.q_tinyint_null)' ,'max(t2.q_float_null)' ,'max(t2.q_double_null)' ,
                     'apercentile(t2.q_int,20)' ,  'apercentile(t2.q_bigint,20)'  ,'apercentile(t2.q_smallint,20)'  ,'apercentile(t2.q_tinyint,20)' ,'apercentile(t2.q_float,20)'  ,'apercentile(t2.q_double,20)' ,
                     'apercentile(t2.q_int_null,20)' ,  'apercentile(t2.q_bigint_null,20)'  ,'apercentile(t2.q_smallint_null,20)'  ,'apercentile(t2.q_tinyint_null,20)' ,'apercentile(t2.q_float_null,20)'  ,'apercentile(t2.q_double_null,20)' ,
-                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' , 
+                    'last_row(t2.q_int)' ,  'last_row(t2.q_bigint)' , 'last_row(t2.q_smallint)' , 'last_row(t2.q_tinyint)' , 'last_row(t2.q_float)' ,
                     'last_row(t2.q_double)' , 'last_row(t2.q_bool)' ,'last_row(t2.q_binary)' ,'last_row(t2.q_nchar)' ,'last_row(t2.q_ts)',
-                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' , 
-                    'last_row(t2.q_double_null)' , 'last_row(t2.q_bool_null)' ,'last_row(t2.q_binary_null)' ,'last_row(t2.q_nchar_null)' ,'last_row(t2.q_ts_null)']        
+                    'last_row(t2.q_int_null)' ,  'last_row(t2.q_bigint_null)' , 'last_row(t2.q_smallint_null)' , 'last_row(t2.q_tinyint_null)' , 'last_row(t2.q_float_null)' ,
+                    'last_row(t2.q_double_null)' , 'last_row(t2.q_bool_null)' ,'last_row(t2.q_binary_null)' ,'last_row(t2.q_nchar_null)' ,'last_row(t2.q_ts_null)']
         self.calc_select_all_j = self.calc_select_in_ts_j + self.calc_select_in_j
 
         self.calc_select_regular_j = [ 'PERCENTILE(t1.q_int,10)' ,'PERCENTILE(t1.q_bigint,20)' , 'PERCENTILE(t1.q_smallint,30)' ,'PERCENTILE(t1.q_tinyint,40)' ,'PERCENTILE(t1.q_float,50)' ,'PERCENTILE(t1.q_double,60)' ,
@@ -454,7 +454,7 @@ class TDTestCase:
                     'PERCENTILE(t1.q_int_null,10)' ,'PERCENTILE(t1.q_bigint_null,20)' , 'PERCENTILE(t1.q_smallint_null,30)' ,'PERCENTILE(t1.q_tinyint_null,40)' ,'PERCENTILE(t1.q_float_null,50)' ,'PERCENTILE(t1.q_double_null,60)' ,
                     'PERCENTILE(t2.q_int_null,10)' ,'PERCENTILE(t2.q_bigint_null,20)' , 'PERCENTILE(t2.q_smallint_null,30)' ,'PERCENTILE(t2.q_tinyint_null,40)' ,'PERCENTILE(t2.q_float_null,50)' ,'PERCENTILE(t2.q_double_null,60)']
 
-                    
+
         self.calc_select_fill_j = ['INTERP(t1.q_int)' ,'INTERP(t1.q_bigint)' ,'INTERP(t1.q_smallint)' ,'INTERP(t1.q_tinyint)', 'INTERP(t1.q_float)' ,'INTERP(t1.q_double)' ,
                     'INTERP(t2.q_int)' ,'INTERP(t2.q_bigint)' ,'INTERP(t2.q_smallint)' ,'INTERP(t2.q_tinyint)', 'INTERP(t2.q_float)' ,'INTERP(t2.q_double)']
         self.interp_where_j = ['t1.ts = now' , 't1.ts = \'2020-09-13 20:26:40.000\'' , 't1.ts = \'2020-09-13 20:26:40.009\'' ,'t2.ts = now' , 't2.ts = \'2020-09-13 20:26:40.000\'' , 't2.ts = \'2020-09-13 20:26:40.009\'' ,
@@ -486,7 +486,7 @@ class TDTestCase:
         self.calc_aggregate_groupbytbname = ['twa(q_int)' ,'twa(q_bigint)' , 'twa(q_smallint)' ,'twa(q_tinyint)' ,'twa (q_float)' ,'twa(q_double)' ,
                     'IRATE(q_int)' ,'IRATE(q_bigint)' , 'IRATE(q_smallint)' ,'IRATE(q_tinyint)' ,'IRATE (q_float)' ,'IRATE(q_double)',
                     'twa(q_int_null)' ,'twa(q_bigint_null)' , 'twa(q_smallint_null)' ,'twa(q_tinyint_null)' ,'twa (q_float_null)' ,'twa(q_double_null)' ,
-                    'IRATE(q_int_null)' ,'IRATE(q_bigint_null)' , 'IRATE(q_smallint_null)' ,'IRATE(q_tinyint_null)' ,'IRATE (q_float_null)' ,'IRATE(q_double_null)'] 
+                    'IRATE(q_int_null)' ,'IRATE(q_bigint_null)' , 'IRATE(q_smallint_null)' ,'IRATE(q_tinyint_null)' ,'IRATE (q_float_null)' ,'IRATE(q_double_null)']
 
         #two table join
         self.calc_aggregate_all_j = ['count(t1.*)' , 'count(t1.q_int)' ,'count(t1.q_bigint)' , 'count(t1.q_smallint)' ,'count(t1.q_tinyint)' ,'count(t1.q_float)' ,
@@ -534,11 +534,11 @@ class TDTestCase:
                     'twa(t1.q_int_null)' ,'twa(t1.q_bigint_null)' , 'twa(t1.q_smallint_null)' ,'twa(t1.q_tinyint_null)' ,'twa (t1.q_float_null)' ,'twa(t1.q_double_null)' ,
                     'IRATE(t1.q_int_null)' ,'IRATE(t1.q_bigint_null)' , 'IRATE(t1.q_smallint_null)' ,'IRATE(t1.q_tinyint_null)' ,'IRATE (t1.q_float_null)' ,'IRATE(t1.q_double_null)' ,
                     'twa(t2.q_int_null)' ,'twa(t2.q_bigint_null)' , 'twa(t2.q_smallint_null)' ,'twa(t2.q_tinyint_null)' ,'twa (t2.q_float_null)' ,'twa(t2.q_double_null)' ,
-                    'IRATE(t2.q_int_null)' ,'IRATE(t2.q_bigint_null)' , 'IRATE(t2.q_smallint_null)' ,'IRATE(t2.q_tinyint_null)' ,'IRATE (t2.q_float_null)' ,'IRATE(t2.q_double_null)'  ] 
-  
-        self.calc_calculate_all = ['SPREAD(ts)'  , 'SPREAD(q_ts)'  , 'SPREAD(q_int)' ,'SPREAD(q_bigint)' , 'SPREAD(q_smallint)' ,'SPREAD(q_tinyint)' ,'SPREAD(q_float)' ,'SPREAD(q_double)' , 
+                    'IRATE(t2.q_int_null)' ,'IRATE(t2.q_bigint_null)' , 'IRATE(t2.q_smallint_null)' ,'IRATE(t2.q_tinyint_null)' ,'IRATE (t2.q_float_null)' ,'IRATE(t2.q_double_null)'  ]
+
+        self.calc_calculate_all = ['SPREAD(ts)'  , 'SPREAD(q_ts)'  , 'SPREAD(q_int)' ,'SPREAD(q_bigint)' , 'SPREAD(q_smallint)' ,'SPREAD(q_tinyint)' ,'SPREAD(q_float)' ,'SPREAD(q_double)' ,
                      '(SPREAD(q_int) + SPREAD(q_bigint))' , '(SPREAD(q_smallint) - SPREAD(q_float))', '(SPREAD(q_double) * SPREAD(q_tinyint))' , '(SPREAD(q_double) / SPREAD(q_float))',
-                     'SPREAD(q_ts_null)'  , 'SPREAD(q_int_null)' ,'SPREAD(q_bigint_null)' , 'SPREAD(q_smallint_null)' ,'SPREAD(q_tinyint_null)' ,'SPREAD(q_float_null)' ,'SPREAD(q_double_null)' , 
+                     'SPREAD(q_ts_null)'  , 'SPREAD(q_int_null)' ,'SPREAD(q_bigint_null)' , 'SPREAD(q_smallint_null)' ,'SPREAD(q_tinyint_null)' ,'SPREAD(q_float_null)' ,'SPREAD(q_double_null)' ,
                      '(SPREAD(q_int_null) + SPREAD(q_bigint_null))' , '(SPREAD(q_smallint_null) - SPREAD(q_float_null))', '(SPREAD(q_double_null) * SPREAD(q_tinyint_null))' , '(SPREAD(q_double_null) / SPREAD(q_float_null))']
         self.calc_calculate_regular = ['DIFF(q_int)' ,'DIFF(q_bigint)' , 'DIFF(q_smallint)' ,'DIFF(q_tinyint)' ,'DIFF(q_float)' ,'DIFF(q_double)' ,
                                 'DIFF(q_int,0)' ,'DIFF(q_bigint,0)' , 'DIFF(q_smallint,0)' ,'DIFF(q_tinyint,0)' ,'DIFF(q_float,0)' ,'DIFF(q_double,0)' ,
@@ -549,7 +549,7 @@ class TDTestCase:
                                 'DIFF(q_int_null,1)' ,'DIFF(q_bigint_null,1)' , 'DIFF(q_smallint_null,1)' ,'DIFF(q_tinyint_null,1)' ,'DIFF(q_float_null,1)' ,'DIFF(q_double_null,1)' ,
                                 'DERIVATIVE(q_int_null,15s,0)' , 'DERIVATIVE(q_bigint_null,10s,1)' , 'DERIVATIVE(q_smallint_null,20s,0)' ,'DERIVATIVE(q_tinyint_null,10s,1)' ,'DERIVATIVE(q_float_null,6s,0)' ,'DERIVATIVE(q_double_null,3s,1)']
         self.calc_calculate_groupbytbname = self.calc_calculate_regular
-        
+
         #two table join
         self.calc_calculate_all_j = ['SPREAD(t1.ts)'  , 'SPREAD(t1.q_ts)'  , 'SPREAD(t1.q_int)' ,'SPREAD(t1.q_bigint)' , 'SPREAD(t1.q_smallint)' ,'SPREAD(t1.q_tinyint)' ,'SPREAD(t1.q_float)' ,'SPREAD(t1.q_double)' ,
                     'SPREAD(t2.ts)'  , 'SPREAD(t2.q_ts)'  , 'SPREAD(t2.q_int)' ,'SPREAD(t2.q_bigint)' , 'SPREAD(t2.q_smallint)' ,'SPREAD(t2.q_tinyint)' ,'SPREAD(t2.q_float)' ,'SPREAD(t2.q_double)' ,
@@ -585,11 +585,11 @@ class TDTestCase:
                     'interval(1y,1n) ','interval(1n,1w) ','interval(1w,1d) ','interval(1d,1h) ','interval(1h,1m) ','interval(1m,1s) ','interval(1s,10a) ' ,'interval(100a,30a)']
 
         self.conn1 = taos.connect(host="127.0.0.1", user="root", password="taosdata", config="/etc/taos/")
-        self.cur1 = self.conn1.cursor()       
+        self.cur1 = self.conn1.cursor()
         self.cur1.execute("use %s ;" %self.db_nest)
         sql = 'select * from stable_1 limit 5;'
         self.cur1.execute(sql)
-   
+
 
     def dropandcreateDB_random(self,database,n):
         ts = 1630000000000
@@ -609,7 +609,7 @@ class TDTestCase:
                 q_binary5 binary(100) , q_nchar5 nchar(100) ,q_binary6 binary(100) , q_nchar6 nchar(100) ,q_binary7 binary(100) , q_nchar7 nchar(100) ,q_binary8 binary(100) , q_nchar8 nchar(100) ,\
                 q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
                 tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
-        
+
         tdSql.execute('''create stable stable_null_data (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint , q_float float , q_double double , q_bool bool , q_binary binary(100) , q_nchar nchar(100) , q_ts timestamp , \
                 q_binary1 binary(100) , q_nchar1 nchar(100) ,q_binary2 binary(100) , q_nchar2 nchar(100) ,q_binary3 binary(100) , q_nchar3 nchar(100) ,q_binary4 binary(100) , q_nchar4 nchar(100) ,\
                 q_binary5 binary(100) , q_nchar5 nchar(100) ,q_binary6 binary(100) , q_nchar6 nchar(100) ,q_binary7 binary(100) , q_nchar7 nchar(100) ,q_binary8 binary(100) , q_nchar8 nchar(100) ,\
@@ -621,28 +621,28 @@ class TDTestCase:
                 q_binary5 binary(100) , q_nchar5 nchar(100) ,q_binary6 binary(100) , q_nchar6 nchar(100) ,q_binary7 binary(100) , q_nchar7 nchar(100) ,q_binary8 binary(100) , q_nchar8 nchar(100) ,\
                 q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) \
                 tags(loc nchar(100) , t_int int , t_bigint bigint , t_smallint smallint , t_tinyint tinyint, t_bool bool , t_binary binary(100) , t_nchar nchar(100) ,t_float float , t_double double , t_ts timestamp);''')
-        
-        tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '%d' , '%d', '%d' , '%d' , 0 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))  
+
+        tdSql.execute('''create table stable_1_1 using stable_1 tags('stable_1_1', '%d' , '%d', '%d' , '%d' , 0 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
         tdSql.execute('''create table stable_1_2 using stable_1 tags('stable_1_2', '2147483647' , '9223372036854775807' , '32767' , '127' , 1 , 'binary2' , 'nchar2' , '2' , '22' , \'1999-09-09 09:09:09.090\') ;''')
         tdSql.execute('''create table stable_1_3 using stable_1 tags('stable_1_3', '-2147483647' , '-9223372036854775807' , '-32767' , '-127' , false , 'binary3' , 'nchar3nchar3' , '-3.3' , '-33.33' , \'2099-09-09 09:09:09.090\') ;''')
-        tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+        tdSql.execute('''create table stable_1_4 using stable_1 tags('stable_1_4', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
 
         tdSql.execute('''create table stable_2_1 using stable_2 tags('stable_2_1' , '0' , '0' , '0' , '0' , 0 , 'binary21' , 'nchar21' , '0' , '0' ,\'2099-09-09 09:09:09.090\') ;''')
-        tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '%d' , '%d', '%d' , '%d' , 0 , 'binary2.%s' , 'nchar2.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+        tdSql.execute('''create table stable_2_2 using stable_2 tags('stable_2_2' , '%d' , '%d', '%d' , '%d' , 0 , 'binary2.%s' , 'nchar2.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
 
-        tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;''' 
-                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1))) 
+        tdSql.execute('''create table stable_null_data_1 using stable_null_data tags('stable_null_data_1', '%d' , '%d', '%d' , '%d' , 1 , 'binary1.%s' , 'nchar1.%s' , '%f', '%f' ,'%d') ;'''
+                      %(fake.random_int(min=-2147483647, max=2147483647, step=1), fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pystr() ,fake.pystr() ,fake.pyfloat(),fake.pyfloat(),fake.random_int(min=-2147483647, max=2147483647, step=1)))
 
         #regular table
         tdSql.execute('''create table regular_table_1 \
@@ -668,105 +668,105 @@ class TDTestCase:
                     q_int_null int , q_bigint_null bigint , q_smallint_null smallint , q_tinyint_null tinyint, q_float_null float , q_double_null double , q_bool_null bool , q_binary_null binary(20) , q_nchar_null nchar(20) , q_ts_null timestamp) ;''')
 
 
-        for i in range(num_random*n):        
+        for i in range(1, num_random*n + 1):
             tdSql.execute('''insert into stable_1_1  (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double , q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1), 
-                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1),
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1),
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
             tdSql.execute('''insert into  regular_table_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1) , 
-                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1) , 
-                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000, fake.random_int(min=-2147483647, max=2147483647, step=1) ,
+                        fake.random_int(min=-9223372036854775807, max=9223372036854775807, step=1) ,
+                        fake.random_int(min=-32767, max=32767, step=1) , fake.random_int(min=-127, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_1_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8)\
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1), 
-                        fake.random_int(min=0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*2, fake.random_int(min=0, max=2147483647, step=1),
+                        fake.random_int(min=0, max=9223372036854775807, step=1),
+                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
             tdSql.execute('''insert into regular_table_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1), 
-                        fake.random_int(min=0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000, fake.random_int(min=0, max=2147483647, step=1),
+                        fake.random_int(min=0, max=9223372036854775807, step=1),
+                        fake.random_int(min=0, max=32767, step=1) , fake.random_int(min=0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
-            
+
             tdSql.execute('''insert into stable_1_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1), 
-                        fake.random_int(min=-9223372036854775807, max=0, step=1), 
-                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*2 +1, fake.random_int(min=-2147483647, max=0, step=1),
+                        fake.random_int(min=-9223372036854775807, max=0, step=1),
+                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
             tdSql.execute('''insert into regular_table_2 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 1, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1), 
-                        fake.random_int(min=-9223372036854775807, max=0, step=1), 
-                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000 +1, fake.random_int(min=-2147483647, max=0, step=1),
+                        fake.random_int(min=-9223372036854775807, max=0, step=1),
+                        fake.random_int(min=-32767, max=0, step=1) , fake.random_int(min=-127, max=0, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i +1, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000, fake.random_int(min=-0, max=2147483647, step=1), 
-                        fake.random_int(min=-0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*4, fake.random_int(min=-0, max=2147483647, step=1),
+                        fake.random_int(min=-0, max=9223372036854775807, step=1),
+                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +1, fake.random_int(min=-0, max=2147483647, step=1), 
-                        fake.random_int(min=-0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*4 +1, fake.random_int(min=-0, max=2147483647, step=1),
+                        fake.random_int(min=-0, max=9223372036854775807, step=1),
+                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
             tdSql.execute('''insert into stable_2_1 (ts , q_int , q_bigint , q_smallint , q_tinyint , q_float , q_double, q_bool , q_binary , q_nchar, q_ts,\
                         q_binary1 , q_nchar1 , q_binary2 , q_nchar2 , q_binary3 , q_nchar3 , q_binary4 , q_nchar4 , q_binary5 , q_nchar5 , q_binary6 , q_nchar6 , q_binary7 , q_nchar7, q_binary8 , q_nchar8) \
                         values(%d, %d, %d, %d, %d, %f, %f, 0, 'binary.%s', 'nchar.%s', %d, 'binary1.%s', 'nchar1.%s', 'binary2.%s', 'nchar2.%s', 'binary3.%s', 'nchar3.%s', \
-                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;''' 
-                        % (ts + i*1000 +10, fake.random_int(min=-0, max=2147483647, step=1), 
-                        fake.random_int(min=-0, max=9223372036854775807, step=1), 
-                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) , 
-                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , 
+                        'binary4.%s', 'nchar4.%s', 'binary5.%s', 'nchar5.%s', 'binary6.%s', 'nchar6.%s', 'binary7.%s', 'nchar7.%s', 'binary8.%s', 'nchar8.%s') ;'''
+                        % (ts + i*1000*60*60*4 +10, fake.random_int(min=-0, max=2147483647, step=1),
+                        fake.random_int(min=-0, max=9223372036854775807, step=1),
+                        fake.random_int(min=-0, max=32767, step=1) , fake.random_int(min=-0, max=127, step=1) ,
+                        fake.pyfloat() , fake.pyfloat() , fake.pystr() , fake.pystr() , ts + i, fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() ,
                         fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr() , fake.pystr()))
 
         tdSql.query("select count(*) from stable_1;")
         tdSql.checkData(0,0,3*num_random*n)
         tdSql.query("select count(*) from regular_table_1;")
         tdSql.checkData(0,0,num_random*n)
-        
-    def explain_sql(self,sql):   
-        # #执行sql解析     
-        sql = "explain " + sql 
-        tdLog.info(sql) 
+
+    def explain_sql(self,sql):
+        # #执行sql解析
+        sql = "explain " + sql
+        tdLog.info(sql)
         tdSql.query(sql)
-        
+
     def data_check(self,sql,mark='mark') :
         tdLog.info("========mark==%s==="% mark);
         try:
@@ -774,60 +774,60 @@ class TDTestCase:
         except:
             tdLog.info("sql is not support :=====%s; " %sql)
             tdSql.error(sql)
-        
-             
+
+
     def math_nest(self,mathlist):
-                
-        print("==========%s===start=============" %mathlist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %mathlist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         #self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (mathlist == ['ABS','SQRT']) or (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['FLOOR','CEIL','ROUND']) \
             or (mathlist == ['CSUM']) :
-            math_functions = mathlist          
-            fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)']        
+            math_functions = mathlist
+            fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_bigint)','(t1.q_smallint)','(t1.q_tinyint)','(t1.q_int)','(t1.q_float)','(t1.q_double)','(t1.q_bigint_null)','(t1.q_smallint_null)','(t1.q_tinyint_null)','(t1.q_int_null)','(t1.q_float_null)','(t1.q_double_null)',
-                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)']        
+                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
         elif (mathlist == ['UNIQUE']) or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['MODE'])  :
-            math_functions = mathlist          
+            math_functions = mathlist
             fun_fix_column = ['(q_bigint)','(q_smallint)','(q_tinyint)','(q_int)','(q_float)','(q_double)','(q_binary)','(q_nchar)','(q_bool)','(q_ts)',
-                '(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)','(q_binary_null)','(q_nchar_null)','(q_bool_null)','(q_ts_null)']        
+                '(q_bigint_null)','(q_smallint_null)','(q_tinyint_null)','(q_int_null)','(q_float_null)','(q_double_null)','(q_binary_null)','(q_nchar_null)','(q_bool_null)','(q_ts_null)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_bigint)','(t1.q_smallint)','(t1.q_tinyint)','(t1.q_int)','(t1.q_float)','(t1.q_double)','(t1.q_bigint_null)','(t1.q_smallint_null)','(t1.q_tinyint_null)','(t1.q_int_null)','(t1.q_float_null)','(t1.q_double_null)','(t1.q_ts)','(t1.q_ts_null)',
-                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)','(t2.q_ts)','(t2.q_ts_null)']        
+                            '(t2.q_bigint)','(t2.q_smallint)','(t2.q_tinyint)','(t2.q_int)','(t2.q_float)','(t2.q_double)','(t2.q_bigint_null)','(t2.q_smallint_null)','(t2.q_tinyint_null)','(t2.q_int_null)','(t2.q_float_null)','(t2.q_double_null)','(t2.q_ts)','(t2.q_ts_null)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (mathlist == ['TAIL']):
-            math_functions = mathlist  
-            num = random.randint(1, 100)  
-            offset_rows = random.randint(0, 100)           
+            math_functions = mathlist
+            num = random.randint(1, 100)
+            offset_rows = random.randint(0, 100)
             fun_fix_column = ['(q_bigint,num)','(q_smallint,num)','(q_tinyint,num)','(q_int,num)','(q_float,num)','(q_double,num)','(q_binary,num)','(q_nchar,num)','(q_bool,num)','(q_ts,num)',
                 '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)','(q_binary_null,num)','(q_nchar_null,num)','(q_bool_null,num)','(q_ts_null,num)',
                 '(q_bigint,num,offset_rows)','(q_smallint,num,offset_rows)','(q_tinyint,num,offset_rows)','(q_int,num,offset_rows)','(q_float,num,offset_rows)','(q_double,num,offset_rows)','(q_binary,num,offset_rows)','(q_nchar,num,offset_rows)','(q_bool,num,offset_rows)','(q_ts,num,offset_rows)',
-                '(q_bigint_null,num,offset_rows)','(q_smallint_null,num,offset_rows)','(q_tinyint_null,num,offset_rows)','(q_int_null,num,offset_rows)','(q_float_null,num,offset_rows)','(q_double_null,num,offset_rows)','(q_binary_null,num,offset_rows)','(q_nchar_null,num,offset_rows)','(q_bool_null,num,offset_rows)','(q_ts_null,num,offset_rows)']        
+                '(q_bigint_null,num,offset_rows)','(q_smallint_null,num,offset_rows)','(q_tinyint_null,num,offset_rows)','(q_int_null,num,offset_rows)','(q_float_null,num,offset_rows)','(q_double_null,num,offset_rows)','(q_binary_null,num,offset_rows)','(q_nchar_null,num,offset_rows)','(q_bool_null,num,offset_rows)','(q_ts_null,num,offset_rows)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
-            
+
             fun_fix_column_j = ['(t1.q_bigint,num)','(t1.q_smallint,num)','(t1.q_tinyint,num)','(t1.q_int,num)','(t1.q_float,num)','(t1.q_double,num)','(t1.q_binary,num)','(t1.q_nchar,num)','(t1.q_bool,num)','(t1.q_ts,num)',
                     '(t1.q_bigint_null,num)','(t1.q_smallint_null,num)','(t1.q_tinyint_null,num)','(t1.q_int_null,num)','(t1.q_float_null,num)','(t1.q_double_null,num)','(t1.q_binary_null,num)','(t1.q_nchar_null,num)','(t1.q_bool_null,num)','(t1.q_ts_null,num)',
                     '(t2.q_bigint,num)','(t2.q_smallint,num)','(t2.q_tinyint,num)','(t2.q_int,num)','(t2.q_float,num)','(t2.q_double,num)','(t2.q_binary,num)','(t2.q_nchar,num)','(t2.q_bool,num)','(t2.q_ts,num)',
@@ -835,207 +835,207 @@ class TDTestCase:
                     '(t1.q_bigint,num,offset_rows)','(t1.q_smallint,num,offset_rows)','(t1.q_tinyint,num,offset_rows)','(t1.q_int,num,offset_rows)','(t1.q_float,num,offset_rows)','(t1.q_double,num,offset_rows)','(t1.q_binary,num,offset_rows)','(t1.q_nchar,num,offset_rows)','(t1.q_bool,num,offset_rows)','(t1.q_ts,num,offset_rows)',
                     '(t1.q_bigint_null,num,offset_rows)','(t1.q_smallint_null,num,offset_rows)','(t1.q_tinyint_null,num,offset_rows)','(t1.q_int_null,num,offset_rows)','(t1.q_float_null,num,offset_rows)','(t1.q_double_null,num,offset_rows)','(t1.q_binary_null,num,offset_rows)','(t1.q_nchar_null,num,offset_rows)','(t1.q_bool_null,num,offset_rows)','(t1.q_ts_null,num,offset_rows)',
                     '(t2.q_bigint,num,offset_rows)','(t2.q_smallint,num,offset_rows)','(t2.q_tinyint,num,offset_rows)','(t2.q_int,num,offset_rows)','(t2.q_float,num,offset_rows)','(t2.q_double,num,offset_rows)','(t2.q_binary,num,offset_rows)','(t2.q_nchar,num,offset_rows)','(t2.q_bool,num,offset_rows)','(t2.q_ts,num,offset_rows)',
-                    '(t2.q_bigint_null,num,offset_rows)','(t2.q_smallint_null,num,offset_rows)','(t2.q_tinyint_null,num,offset_rows)','(t2.q_int_null,num,offset_rows)','(t2.q_float_null,num,offset_rows)','(t2.q_double_null,num,offset_rows)','(t2.q_binary_null,num,offset_rows)','(t2.q_nchar_null,num,offset_rows)','(t2.q_bool_null,num,offset_rows)','(t2.q_ts_null,num,offset_rows)']        
+                    '(t2.q_bigint_null,num,offset_rows)','(t2.q_smallint_null,num,offset_rows)','(t2.q_tinyint_null,num,offset_rows)','(t2.q_int_null,num,offset_rows)','(t2.q_float_null,num,offset_rows)','(t2.q_double_null,num,offset_rows)','(t2.q_binary_null,num,offset_rows)','(t2.q_nchar_null,num,offset_rows)','(t2.q_bool_null,num,offset_rows)','(t2.q_ts_null,num,offset_rows)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num)).replace("offset_rows",str(offset_rows))
-            
+
         elif (mathlist == ['POW','LOG']) or (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) :
-            math_functions = mathlist       
-            num = random.randint(1, 1000)  
+            math_functions = mathlist
+            num = random.randint(1, 1000)
             fun_fix_column = ['(q_bigint,num)','(q_smallint,num)','(q_tinyint,num)','(q_int,num)','(q_float,num)','(q_double,num)',
-                              '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)']        
+                              '(q_bigint_null,num)','(q_smallint_null,num)','(q_tinyint_null,num)','(q_int_null,num)','(q_float_null,num)','(q_double_null,num)']
             fun_column_1 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
             fun_column_2 = random.sample(math_functions,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
-            
+
             fun_fix_column_j = ['(t1.q_bigint,num)','(t1.q_smallint,num)','(t1.q_tinyint,num)','(t1.q_int,num)','(t1.q_float,num)','(t1.q_double,num)',
                     '(t1.q_bigint_null,num)','(t1.q_smallint_null,num)','(t1.q_tinyint_null,num)','(t1.q_int_null,num)','(t1.q_float_null,num)','(t1.q_double_null,num)',
                     '(t2.q_bigint,num)','(t2.q_smallint,num)','(t2.q_tinyint,num)','(t2.q_int,num)','(t2.q_float,num)','(t2.q_double,num)',
-                    '(t2.q_bigint_null,num)','(t2.q_smallint_null,num)','(t2.q_tinyint_null,num)','(t2.q_int_null,num)','(t2.q_float_null,num)','(t2.q_double_null,num)']        
+                    '(t2.q_bigint_null,num)','(t2.q_smallint_null,num)','(t2.q_tinyint_null,num)','(t2.q_int_null,num)','(t2.q_float_null,num)','(t2.q_double_null,num)']
             fun_column_join_1 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
             fun_column_join_2 = random.sample(math_functions,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("num",str(num))
 
         elif (mathlist == ['statecount','stateduration']):
-            math_functions = mathlist  
-            num = random.randint(-1000, 1000) 
-            
-            operator = ['LT' , 'GT' ,'GE','NE','EQ']  
-            oper = str(random.sample(operator,1)).replace("[","").replace("]","")#.replace("'","")  
-             
+            math_functions = mathlist
+            num = random.randint(-1000, 1000)
+
+            operator = ['LT' , 'GT' ,'GE','NE','EQ']
+            oper = str(random.sample(operator,1)).replace("[","").replace("]","")#.replace("'","")
+
             fun_fix_column = ['(q_bigint,oper,num,time)','(q_smallint,oper,num,time)','(q_tinyint,oper,num,time)','(q_int,oper,num,time)','(q_float,oper,num,time)','(q_double,oper,num,time)',
-                              '(q_bigint_null,oper,num,time)','(q_smallint_null,oper,num,time)','(q_tinyint_null,oper,num,time)','(q_int_null,oper,num,time)','(q_float_null,oper,num,time)','(q_double_null,oper,num,time)']        
-            
+                              '(q_bigint_null,oper,num,time)','(q_smallint_null,oper,num,time)','(q_tinyint_null,oper,num,time)','(q_int_null,oper,num,time)','(q_float_null,oper,num,time)','(q_double_null,oper,num,time)']
+
             hanshu_select1 = random.sample(math_functions,1)
             fun_column_1 = random.sample(hanshu_select1,1)+random.sample(fun_fix_column,1)
             math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-                       
+
             if str(hanshu_select1).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_1 = math_fun_1.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select1).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
                 math_fun_1 = math_fun_1.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
-                
-            hanshu_select2 = random.sample(math_functions,1)            
+
+            hanshu_select2 = random.sample(math_functions,1)
             fun_column_2 = random.sample(hanshu_select2,1)+random.sample(fun_fix_column,1)
             math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             if str(hanshu_select2).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_2 = math_fun_2.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select2).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
-                math_fun_2 = math_fun_2.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))           
-            
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
+                math_fun_2 = math_fun_2.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
+
             fun_fix_column_j = ['(t1.q_bigint,oper,num,time)','(t1.q_smallint,oper,num,time)','(t1.q_tinyint,oper,num,time)','(t1.q_int,oper,num,time)','(t1.q_float,oper,num,time)','(t1.q_double,oper,num,time)',
                               '(t1.q_bigint_null,oper,num,time)','(t1.q_smallint_null,oper,num,time)','(t1.q_tinyint_null,oper,num,time)','(t1.q_int_null,oper,num,time)','(t1.q_float_null,oper,num,time)','(t1.q_double_null,oper,num,time)',
                               '(t2.q_bigint,oper,num,time)','(t2.q_smallint,oper,num,time)','(t2.q_tinyint,oper,num,time)','(t2.q_int,oper,num,time)','(t2.q_float,oper,num,time)','(t2.q_double,oper,num,time)',
-                              '(t2.q_bigint_null,oper,num,time)','(t2.q_smallint_null,oper,num,time)','(t2.q_tinyint_null,oper,num,time)','(t2.q_int_null,oper,num,time)','(t2.q_float_null,oper,num,time)','(t2.q_double_null,oper,num,time)']        
-            
+                              '(t2.q_bigint_null,oper,num,time)','(t2.q_smallint_null,oper,num,time)','(t2.q_tinyint_null,oper,num,time)','(t2.q_int_null,oper,num,time)','(t2.q_float_null,oper,num,time)','(t2.q_double_null,oper,num,time)']
+
             hanshu_select_join_1 = random.sample(math_functions,1)
             fun_column_join_1 = random.sample(hanshu_select_join_1,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             if str(hanshu_select_join_1).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_join_1 = math_fun_join_1.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select_join_1).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
                 math_fun_join_1 = math_fun_join_1.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
-            
+
             hanshu_select_join_2 = random.sample(math_functions,1)
             fun_column_join_2 = random.sample(hanshu_select_join_2,1)+random.sample(fun_fix_column_j,1)
             math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             if str(hanshu_select_join_2).replace("[","").replace("]","").replace("'","") == 'statecount':
                 math_fun_join_2 = math_fun_join_2.replace("oper","%s" %oper).replace(",time","").replace("num",str(num))
             elif str(hanshu_select_join_2).replace("[","").replace("]","").replace("'","") == 'stateduration':
-                timeunit = ['1s' , '1m' ,'1h']  
-                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","") 
+                timeunit = ['1s' , '1m' ,'1h']
+                time = str(random.sample(timeunit,1)).replace("[","").replace("]","").replace("'","")
                 math_fun_join_2 = math_fun_join_2.replace("oper","%s" %oper).replace("time","%s" %time).replace("num",str(num))
 
         elif(mathlist == ['HISTOGRAM']) :
-            math_functions = mathlist          
-            fun_fix_column = ['(q_bigint','(q_smallint','(q_tinyint','(q_int','(q_float','(q_double','(q_bigint_null','(q_smallint_null','(q_tinyint_null','(q_int_null','(q_float_null','(q_double_null'] 
-            
+            math_functions = mathlist
+            fun_fix_column = ['(q_bigint','(q_smallint','(q_tinyint','(q_int','(q_float','(q_double','(q_bigint_null','(q_smallint_null','(q_tinyint_null','(q_int_null','(q_float_null','(q_double_null']
+
             fun_fix_column_j = ['(t1.q_bigint','(t1.q_smallint','(t1.q_tinyint','(t1.q_int','(t1.q_float','(t1.q_double','(t1.q_bigint_null','(t1.q_smallint_null','(t1.q_tinyint_null','(t1.q_int_null','(t1.q_float_null','(t1.q_double_null',
                              '(t2.q_bigint','(t2.q_smallint','(t2.q_tinyint','(t2.q_int','(t2.q_float','(t2.q_double','(t2.q_bigint_null','(t2.q_smallint_null','(t2.q_tinyint_null','(t2.q_int_null','(t2.q_float_null','(t2.q_double_null']
-            
-            normalized = random.randint(0, 1)        
-            
+
+            normalized = random.randint(0, 1)
+
             i = random.randint(1,3)
             if i == 1:
-                bin_type = 'user_input'                
+                bin_type = 'user_input'
                 bin_description = {-11111119395555977777}  #9一会转译成，
                 fun_column_1 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                
+
                 fun_column_2 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                
+
                 fun_column_join_1 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                
+
                 fun_column_join_2 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',',"'%s'" % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("{","[").replace("}","]").replace("9",",")
-                            
+
             elif i == 2:
-                bin_type = 'linear_bin'   
-                true_false = random.randint(10, 11)             
+                bin_type = 'linear_bin'
+                true_false = random.randint(10, 11)
                 bin_description = {"ZstartZ": -333339, "ZwidthZ":559, "ZcountZ":59, "ZinfinityZ":'%d' %true_false}  #Z一会转译成" ，9一会转译成 ，
                 fun_column_1 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
-                
+
                 fun_column_2 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
 
                 fun_column_join_1 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
-                
+
                 fun_column_join_2 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
                 math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
-                                    
+
             elif i == 3:
-                bin_type = 'log_bin'   
-                true_false = random.randint(10, 11)             
+                bin_type = 'log_bin'
+                true_false = random.randint(10, 11)
                 bin_description = {"ZstartZ": -333339, "ZfactorZ":559, "ZcountZ":59, "ZinfinityZ":'%d' %true_false}  #Z一会转译成" ，9一会转译成 ，
                 fun_column_1 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")  
-                
+                math_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
                 fun_column_2 = [math_functions , random.sample(fun_fix_column,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")           
-                
+                math_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
                 fun_column_join_1 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")  
-                
+                math_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
                 fun_column_join_2 = [math_functions , random.sample(fun_fix_column_j,1), ',',"'%s'" %bin_type, ',','%s' % bin_description, ',', "%d" %normalized,')']
-                math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")         
-                                 
+                math_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("9",",").replace("Z","\"").replace("10","false").replace("11","true").replace("\"{","'{").replace("}\"","}'")
+
         tdSql.query("select 1-1 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']):
-                sql = "select  %s as asct1, " % math_fun_1 
-                sql += "%s as asct2, " % math_fun_2 
+                sql = "select  %s as asct1, " % math_fun_1
+                sql += "%s as asct2, " % math_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as ts1 from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
-                tdLog.info(sql)      
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or  (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
-                sql = "select  %s as asct1 " % math_fun_1 
+                sql = "select  %s as asct1 " % math_fun_1
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-2 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
-                sql = "(select  %s as asct1,  " % math_fun_1 
+                sql = "(select  %s as asct1,  " % math_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
-                sql += "(select  %s as asct2,  " % math_fun_2 
+                sql += "%s " % random.choice(self.unionall_or_union)
+                sql += "(select  %s as asct2,  " % math_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
-                self.explain_sql(sql) 
+                self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
-                or (mathlist == ['HYPERLOGLOG'])  or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']):  
-                sql = "(select  %s as asct1  " % math_fun_1 
+                or (mathlist == ['HYPERLOGLOG'])  or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']):
+                sql = "(select  %s as asct1  " % math_fun_1
                 sql += "from regular_table_1 where "
                 sql += "%s )" % random.choice(self.q_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
-                sql += "(select  %s as asct2  " % math_fun_2 
+                sql += "%s " % random.choice(self.unionall_or_union)
+                sql += "(select  %s as asct2  " % math_fun_2
                 sql += " from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)      
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql)     
-                self.explain_sql(sql)       
-            
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-3 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
@@ -1043,19 +1043,19 @@ class TDTestCase:
                 sql = "(select  %s as asct1, ts ," % math_fun_1
                 sql += "%s as asct2, " % math_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += ") %s (select " % random.choice(self.unionall_or_union) 
+                sql += ") %s (select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2, ts ," % math_fun_2
                 sql += "%s as asct1, " % math_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += " from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MODE']) :
@@ -1063,13 +1063,13 @@ class TDTestCase:
                 sql += "%s as asct2 " % math_fun_2
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += ") %s (select " % random.choice(self.unionall_or_union) 
+                sql += ") %s (select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 ," % math_fun_2
-                sql += "%s as asct1 " % math_fun_1 
+                sql += "%s as asct1 " % math_fun_1
                 sql += " from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['statecount','stateduration']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
@@ -1077,66 +1077,66 @@ class TDTestCase:
                 sql = "(select %s as asct1 " % math_fun_1
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += ") %s (select " % random.choice(self.unionall_or_union) 
+                sql += ") %s (select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct1 " % math_fun_2
                 sql += " from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += " order by asct1 asc " 
+                sql += " order by asct1 asc "
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-4 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1 from  ( select  t1.ts as ts1,"
-                sql += "%s as asct0, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2           
-                sql += "%s as asct2, " % math_fun_join_1             
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct22, " % random.choice(self.q_select)         
+                sql += "%s as asct0, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "%s as asct2, " % math_fun_join_1
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct22, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2 from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  count(asct1) from  ( select  "
-                sql += "%s as asct1 " % math_fun_join_2                
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-5 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts ,"
-                sql += "%s, " % math_fun_1 
+                sql += "%s, " % math_fun_1
                 sql += "%s as asct1, " % random.choice(self.q_select)
-                sql += "%s as asct2, " % random.choice(self.q_select) 
+                sql += "%s as asct2, " % random.choice(self.q_select)
                 sql += "%s  " % math_fun_2
-                sql += " from  regular_table_1" 
-                tdLog.info(sql)       
+                sql += " from  regular_table_1"
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select "
                 sql += "%s  " % math_fun_2
-                sql += " from  regular_table_1" 
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                sql += " from  regular_table_1"
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-6 as math_nest from stable_1 limit 1;")
@@ -1144,29 +1144,29 @@ class TDTestCase:
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1 ,timediff(ts1,ts2), max(asct1) from  ( select  t1.ts,t1.ts as ts1,"
-                sql += "%s as asct0, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2           
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
-                sql += "%s as asct13, " % math_fun_join_1              
+                sql += "%s as asct0, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % math_fun_join_1
                 sql += "t2.ts as ts2 from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  count(asct1) from  ( select "
-                sql += "%s as asct1 " % math_fun_join_2           
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-7 as math_nest from stable_1 limit 1;")
@@ -1176,13 +1176,13 @@ class TDTestCase:
                 sql = "select  ts1,ts2 , abs(asct1) from  ( select  "
                 sql += "%s as asct1, ts as ts1," % math_fun_1
                 sql += "%s as asct2, " % math_fun_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
@@ -1192,10 +1192,10 @@ class TDTestCase:
                 sql += "from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-8 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
@@ -1203,12 +1203,12 @@ class TDTestCase:
                 sql = "select  %s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as ts1," % math_fun_1
                 sql += "%s as asct2, " % math_fun_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
@@ -1216,7 +1216,7 @@ class TDTestCase:
                 sql = "select  %s as asct1 " % math_fun_1
                 sql += " from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
@@ -1224,33 +1224,33 @@ class TDTestCase:
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
-                sql = "select  %s, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct22, " % random.choice(self.q_select) 
+                sql = "select  %s, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "t2.%s as asct22, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)     
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
-                sql = "select  %s as asct1 " % math_fun_join_2 
+                sql = "select  %s as asct1 " % math_fun_join_2
                 sql += "from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)     
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-    
+
         tdSql.query("select 1-10 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
@@ -1273,7 +1273,7 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])   \
@@ -1288,10 +1288,10 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql)               
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -1314,8 +1314,8 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql)               
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
@@ -1328,7 +1328,7 @@ class TDTestCase:
                 sql += " from stable_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
@@ -1337,65 +1337,65 @@ class TDTestCase:
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), max(asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct111, " % random.choice(self.q_select)            
+                sql += "%s, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "t2.%s as asct111, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
-                sql = "select count(asct1) from  ( select  " 
-                sql += "%s as asct1 " % math_fun_join_2            
+                sql = "select count(asct1) from  ( select  "
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-13 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts ,"
-                sql += "%s as asct11, " % math_fun_1 
+                sql += "%s as asct11, " % math_fun_1
                 sql += "%s as asct12, " % random.choice(self.q_select)
-                sql += "%s as asct13, " % random.choice(self.q_select) 
+                sql += "%s as asct13, " % random.choice(self.q_select)
                 sql += "%s  as asct14, " % math_fun_2
-                sql += "%s  as asct15 " % random.choice(self.t_select) 
+                sql += "%s  as asct15 " % random.choice(self.t_select)
                 sql += " from  stable_1  "
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM'])  \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  "
                 sql += "%s  " % math_fun_2
-                sql += "%s  " % random.choice(self.t_select) 
+                sql += "%s  " % random.choice(self.t_select)
                 sql += " from  stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-14 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  avg(asct1),count(asct2) from ( select "
-                sql += "%s as asct1, " % math_fun_1 
+                sql += "%s as asct1, " % math_fun_1
                 sql += "%s as asct2" % math_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -1403,322 +1403,322 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE'])or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
                 or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
                 sql = "select  count(asct1) from ( select "
-                sql += "%s as asct1 " % math_fun_1 
+                sql += "%s as asct1 " % math_fun_1
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.partiton_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-                  
+
         tdSql.query("select 1-15 as math_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (mathlist == ['SIN','COS','TAN','ASIN','ACOS','ATAN']) or (mathlist == ['ABS','SQRT'])  \
                 or (mathlist == ['POW','LOG']) or (mathlist == ['FLOOR','CEIL','ROUND']) :
                 sql = "select  ts1,ts ,timediff(ts1,ts), max(asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % math_fun_join_1   
-                sql += "%s as asct1, " % math_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s, " % math_fun_join_1
+                sql += "%s as asct1, " % math_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts   from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (mathlist == ['MAVG']) or (mathlist == ['SAMPLE']) or (mathlist == ['TAIL']) or (mathlist == ['CSUM']) or (mathlist == ['HISTOGRAM']) \
-                or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :   
-                sql = "select  count(asct1) from  ( select  " 
-                sql += "%s as asct1 " % math_fun_join_2 
+                or (mathlist == ['HYPERLOGLOG']) or (mathlist == ['UNIQUE']) or (mathlist == ['MODE']) or (mathlist == ['statecount','stateduration']) :
+                sql = "select  count(asct1) from  ( select  "
+                sql += "%s as asct1 " % math_fun_join_2
                 sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-        
+
         #taos -f sql
         # startTime_taosf = time.time()
         print("taos -f %s sql start!" %mathlist)
         # taos_cmd1 = "taos -f %s/%s.sql" % (self.testcasePath,self.testcaseFilename)
         # _ = subprocess.check_output(taos_cmd1, shell=True)
-        print("taos -f %s sql over!" %mathlist)   
-                                        
-        print("=========%s====over=============" %mathlist) 
+        print("taos -f %s sql over!" %mathlist)
+
+        print("=========%s====over=============" %mathlist)
 
 
     def str_nest(self,strlist):
-                
-        print("==========%s===start=============" %strlist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %strlist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         #self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['LENGTH','CHAR_LENGTH'])  \
             or (strlist == ['']):
-            str_functions = strlist          
-            fun_fix_column = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)']        
+            str_functions = strlist
+            fun_fix_column = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)']
             fun_column_1 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_j = ['(t1.q_nchar)','(t1.q_binary)','(t1.q_nchar_null)','(t1.q_binary_null)',
-                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)']        
+                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)']
             fun_column_join_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
-            fun_fix_column_s = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)','(loc)','(tbname)']        
+
+            fun_fix_column_s = ['(q_nchar)','(q_binary)','(q_nchar_null)','(q_binary_null)','(loc)','(tbname)']
             fun_column_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_1 = str(fun_column_s_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_2 = str(fun_column_s_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar)','(t1.q_binary)','(t1.q_nchar_null)','(t1.q_binary_null)','(t1.loc)','(t1.tbname)',
-                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)','(t2.loc)','(t2.tbname)']        
+                            '(t2.q_nchar)','(t2.q_binary)','(t2.q_nchar_null)','(t2.q_binary_null)','(t2.loc)','(t2.tbname)']
             fun_column_join_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_s_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_s_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
         elif (strlist == ['SUBSTR']) :
-            str_functions = strlist       
-            pos = random.randint(1, 20)  
-            sub_len = random.randint(1, 10)  
+            str_functions = strlist
+            pos = random.randint(1, 20)
+            sub_len = random.randint(1, 10)
             fun_fix_column = ['(q_nchar,pos)','(q_binary,pos)','(q_nchar_null,pos)','(q_binary_null,pos)',
-                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)',]        
+                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)',]
             fun_column_1 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_2 = random.sample(str_functions,1)+random.sample(fun_fix_column,1)
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
             fun_fix_column_j = ['(t1.q_nchar,pos)','(t1.q_binary,pos)','(t1.q_nchar_null,pos)','(t1.q_binary_null,pos)',
                     '(t1.q_nchar,pos,sub_len)','(t1.q_binary,pos,sub_len)','(t1.q_nchar_null,pos,sub_len)','(t1.q_binary_null,pos,sub_len)',
                     '(t2.q_nchar,pos)','(t2.q_binary,pos)','(t2.q_nchar_null,pos)','(t2.q_binary_null,pos)',
-                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)']        
+                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)']
             fun_column_join_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_join_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_j,1)
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
             fun_fix_column_s = ['(q_nchar,pos)','(q_binary,pos)','(q_nchar_null,pos)','(q_binary_null,pos)','(loc,pos)',
-                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)','(loc,pos,sub_len)',]        
+                '(q_nchar,pos,sub_len)','(q_binary,pos,sub_len)','(q_nchar_null,pos,sub_len)','(q_binary_null,pos,sub_len)','(loc,pos,sub_len)',]
             fun_column_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_s,1)
             str_fun_s_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar,pos)','(t1.q_binary,pos)','(t1.q_nchar_null,pos)','(t1.q_binary_null,pos)','(t1.loc,pos)',
                     '(t1.q_nchar,pos,sub_len)','(t1.q_binary,pos,sub_len)','(t1.q_nchar_null,pos,sub_len)','(t1.q_binary_null,pos,sub_len)','(t1.loc,pos,sub_len)',
                     '(t2.q_nchar,pos)','(t2.q_binary,pos)','(t2.q_nchar_null,pos)','(t2.q_binary_null,pos)','(t2.loc,pos)',
-                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)','(t2.loc,pos,sub_len)']        
+                    '(t2.q_nchar,pos,sub_len)','(t2.q_binary,pos,sub_len)','(t2.q_nchar_null,pos,sub_len)','(t2.q_binary_null,pos,sub_len)','(t2.loc,pos,sub_len)']
             fun_column_join_s_1 = random.sample(str_functions,1)+random.sample(fun_fix_column_s_j,1)
             str_fun_join_s_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
             fun_column_join_s_2 = random.sample(str_functions,1)+random.sample(fun_fix_column_s_j,1)
             str_fun_join_s_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("pos",str(pos)).replace("sub_len",str(sub_len))
-            
+
         elif (strlist == ['CONCAT']) :
-            str_functions = strlist       
-            i = random.randint(2,4) 
+            str_functions = strlist
+            i = random.randint(2,4)
             fun_fix_column = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']     
-            
-            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
+            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+column1+')'
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
-            
+
             column2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+column2+')'
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
-                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)'] 
-            
-            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
+
+            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+column_j1+')'
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-            
-            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+column_j2+')'
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','loc','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']    
-            
-            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
+            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_1 = str(random.sample(str_functions,1))+'('+column_s1+')'
             str_fun_s_1 = str(fun_column_s_1).replace("[","").replace("]","").replace("'","")
-                
-            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+
+            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_2 = str(random.sample(str_functions,1))+'('+column_s2+')'
             str_fun_s_2 = str(fun_column_s_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)','(t1.loc)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)','(t2.loc)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
                     '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
-            
-            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_1 = str(random.sample(str_functions,1))+'('+column_j_s1+')'
             str_fun_join_s_1 = str(fun_column_join_s_1).replace("[","").replace("]","").replace("'","")
-                    
-            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_2 = str(random.sample(str_functions,1))+'('+column_j_s2+')'
             str_fun_join_s_2 = str(fun_column_join_s_2).replace("[","").replace("]","").replace("'","")
- 
+
         elif (strlist == ['CONCAT_WS']):
-            str_functions = strlist       
-            i = random.randint(2,4) 
+            str_functions = strlist
+            i = random.randint(2,4)
             fun_fix_column = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']     
-            
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
             separators = ['',' ','abc','123','!','@','#','$','%','^','&','*','(',')','-','_','+','=','{',
                         '[','}',']','|',';',':',',','.','<','>','?','/','~','`','taos','涛思']
-            separator = str(random.sample(separators,i)).replace("[","").replace("]","") 
-        
-            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+            separator = str(random.sample(separators,i)).replace("[","").replace("]","")
+
+            column1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column1+')'
             str_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
-            
+
             column2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column2+')'
             str_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
-                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)'] 
-            
-            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+                    '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
+
+            column_j1 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j1+')'
             str_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-            
-            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j2 = str(random.sample(fun_fix_column_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j2+')'
             str_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s = ['q_nchar','q_nchar1','q_nchar2','q_nchar3','q_nchar4','q_nchar5','q_nchar6','q_nchar7','q_nchar8','loc','q_nchar_null',
-                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']    
-            
-            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+                              'q_binary','q_binary1','q_binary2','q_binary3','q_binary4','q_binary5','q_binary6','q_binary7','q_binary8','q_binary_null']
+
+            column_s1 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_s1+')'
             str_fun_s_1 = str(fun_column_s_1).replace("[","").replace("]","").replace("'","")
-                
-            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")              
+
+            column_s2 = str(random.sample(fun_fix_column,i)).replace("[","").replace("]","").replace("'","")
             fun_column_s_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_s2+')'
             str_fun_s_2 = str(fun_column_s_2).replace("[","").replace("]","").replace("'","")
-            
+
             fun_fix_column_s_j = ['(t1.q_nchar)','(t1.q_nchar1)','(t1.q_nchar2)','(t1.q_nchar3)','(t1.q_nchar4)','(t1.q_nchar5)','(t1.q_nchar6)','(t1.q_nchar7)','(t1.q_nchar8)','(t1.q_nchar_null)','(t1.loc)',
                     '(t2.q_nchar)','(t2.q_nchar1)','(t2.q_nchar2)','(t2.q_nchar3)','(t2.q_nchar4)','(t2.q_nchar5)','(t2.q_nchar6)','(t2.q_nchar7)','(t2.q_nchar8)','(t2.q_nchar_null)','(t2.loc)',
                     '(t1.q_binary)','(t1.q_binary1)','(t1.q_binary2)','(t1.q_binary3)','(t1.q_binary4)','(t1.q_binary5)','(t1.q_binary6)','(t1.q_binary7)','(t1.q_binary8)','(t1.q_binary_null)',
                     '(t2.q_binary)','(t2.q_binary1)','(t2.q_binary2)','(t2.q_binary3)','(t2.q_binary4)','(t2.q_binary5)','(t2.q_binary6)','(t2.q_binary7)','(t2.q_binary8)','(t2.q_binary_null)']
-            
-            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s1 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_1 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j_s1+')'
             str_fun_join_s_1 = str(fun_column_join_s_1).replace("[","").replace("]","").replace("'","")
-                    
-            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")       
+
+            column_j_s2 = str(random.sample(fun_fix_column_s_j,i)).replace("[","").replace("]","").replace("'","")
             fun_column_join_s_2 = str(random.sample(str_functions,1))+'('+'\"'+separator+'\",'+column_j_s2+')'
             str_fun_join_s_2 = str(fun_column_join_s_2).replace("[","").replace("]","").replace("'","")
-            
-            
+
+
         tdSql.query("select 1-1 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']) :
-                sql = "select  t1s , LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  " 
-                sql += "%s as asct1, " % str_fun_1 
-                sql += "%s as asct2, " % str_fun_2 
+                sql = "select  t1s , LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  "
+                sql += "%s as asct1, " % str_fun_1
+                sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as t1s from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql)       
-                tdSql.query(sql)               
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
-                sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  " 
-                sql += "%s as asct1, " % str_fun_1 
-                sql += "%s as asct2, " % str_fun_2 
+                sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
+                sql += "%s as asct1, " % str_fun_1
+                sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-2 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']) :
                 sql = "select  ts ,  asct1  from  ( select  "
-                sql += "%s as asct1,  " % str_fun_1 
+                sql += "%s as asct1,  " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts , asct2 from  ( select  "
-                sql += "%s as asct2,  " % str_fun_2 
+                sql += "%s as asct2,  " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)  
-            elif (strlist == ['LENGTH','CHAR_LENGTH']): 
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
+            elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1)  from  ( select  "
-                sql += "%s as asct1,  " % str_fun_1 
+                sql += "%s as asct1,  " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  sum(asct2), min(asct2) from  ( select  "
-                sql += "%s as asct2,  " % str_fun_2 
+                sql += "%s as asct2,  " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)        
-            
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-3 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
@@ -1726,100 +1726,100 @@ class TDTestCase:
                 sql += "%s as asct1 ," % str_fun_1
                 sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 ," % str_fun_2
                 sql += "%s as asct1, " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1 ," % str_fun_1
                 sql += "%s as asct2, " % str_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2 ," % str_fun_2
                 sql += "%s as asct1, " % str_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-4 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "%s, " % str_fun_join_1             
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "%s, " % str_fun_join_1
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "%s, " % str_fun_join_1             
-                sql += "t1.%s as asct21, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct22, " % random.choice(self.q_select)         
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "%s, " % str_fun_join_1
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t2.%s as asct22, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-5 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts ,"
-                sql += "%s, " % str_fun_1 
+                sql += "%s, " % str_fun_1
                 sql += "%s as asct21, " % random.choice(self.q_select)
-                sql += "%s as asct22, " % random.choice(self.q_select) 
+                sql += "%s as asct22, " % random.choice(self.q_select)
                 sql += "%s  " % str_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  ts ,"
-                sql += "%s, " % str_fun_1 
+                sql += "%s, " % str_fun_1
                 sql += "%s as asct22, " % random.choice(self.q_select)
-                sql += "%s as asct21, " % random.choice(self.q_select) 
+                sql += "%s as asct21, " % random.choice(self.q_select)
                 sql += "%s  " % str_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
@@ -1827,32 +1827,32 @@ class TDTestCase:
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts ,timediff(ts1,ts),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)         
-                sql += "%s, " % str_fun_join_1              
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "%s, " % str_fun_join_1
                 sql += "t2.ts  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_1   
-                sql += "%s as asct1, " % str_fun_join_2           
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct21, " % random.choice(self.q_select)         
-                sql += "%s, " % str_fun_join_1              
+                sql += "%s as asct2, " % str_fun_join_1
+                sql += "%s as asct1, " % str_fun_join_2
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct21, " % random.choice(self.q_select)
+                sql += "%s, " % str_fun_join_1
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-7 as str_nest from stable_1 limit 1;")
@@ -1861,29 +1861,29 @@ class TDTestCase:
                 sql = "select  t1s ,ts1,  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  "
                 sql += "%s as asct1, ts as t1s," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1, ts as ts1," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as t1s from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-8 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
@@ -1892,13 +1892,13 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as st1," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as ts1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
@@ -1907,13 +1907,13 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as ts1," % str_fun_s_1
                 sql += "%s as asct2, " % str_fun_s_2
-                sql += "%s, " % random.choice(self.q_select) 
-                sql += "%s, " % random.choice(self.t_select) 
+                sql += "%s, " % random.choice(self.q_select)
+                sql += "%s, " % random.choice(self.t_select)
                 sql += "ts as st1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
@@ -1921,12 +1921,12 @@ class TDTestCase:
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select) 
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -1934,17 +1934,17 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql)     
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select) 
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -1952,11 +1952,11 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql)     
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-    
-        
+
+
         tdSql.query("select 1-10 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
@@ -1979,9 +1979,9 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1 ," % str_fun_s_1
@@ -2002,10 +2002,10 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -2028,9 +2028,9 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  "
                 sql += "%s as asct1 ," % str_fun_s_1
@@ -2050,7 +2050,7 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
@@ -2058,75 +2058,75 @@ class TDTestCase:
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2),  LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select)            
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct21, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct22, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct23, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct24, " % random.choice(self.q_select)            
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct21, " % random.choice(self.q_select)
+                sql += "t1.%s as asct22, " % random.choice(self.q_select)
+                sql += "t2.%s as asct23, " % random.choice(self.q_select)
+                sql += "t2.%s as asct24, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-13 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts ,"
-                sql += "%s as asct10, " % str_fun_1 
+                sql += "%s as asct10, " % str_fun_1
                 sql += "%s as asct1, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % str_fun_2
-                sql += "%s  as asct14 " % random.choice(self.t_select) 
+                sql += "%s  as asct14 " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  ts ,"
-                sql += "%s as asct1, " % str_fun_1 
+                sql += "%s as asct1, " % str_fun_1
                 sql += "%s as asct11, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % str_fun_2
-                sql += "%s as asct14  " % random.choice(self.t_select) 
+                sql += "%s as asct14  " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-14 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select   LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from ( select "
-                sql += "%s as asct1, " % str_fun_s_1 
+                sql += "%s as asct1, " % str_fun_s_1
                 sql += "%s as asct2" % str_fun_s_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -2134,12 +2134,12 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select   sum(asct1), min(asct1), max(asct2), avg(asct2)  from ( select "
-                sql += "%s as asct1, " % str_fun_s_1 
+                sql += "%s as asct1, " % str_fun_s_1
                 sql += "%s as asct2" % str_fun_s_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -2147,50 +2147,50 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-                  
+
         tdSql.query("select 1-15 as str_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (strlist == ['LTRIM','RTRIM','LOWER','UPPER']) or (strlist == ['SUBSTR']) or (strlist == ['CONCAT']) or (strlist == ['CONCAT_WS']):
                 sql = "select  ts,ts2 ,timediff(ts,ts2), LTRIM(asct1), LOWER(asct1), RTRIM(asct2), UPPER(asct2)  from  ( select  t1.ts ,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql)    
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (strlist == ['LENGTH','CHAR_LENGTH']):
                 sql = "select  sum(asct1), min(asct1), max(asct2), avg(asct2)  from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % str_fun_join_s_1   
-                sql += "%s as asct1, " % str_fun_join_s_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14 " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % str_fun_join_s_1
+                sql += "%s as asct1, " % str_fun_join_s_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14 " % random.choice(self.q_select)
                 sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-        
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f %s sql start!" %strlist)
@@ -2198,215 +2198,215 @@ class TDTestCase:
         # _ = subprocess.check_output(taos_cmd1, shell=True)
         print("taos -f %s sql over!" %strlist)
         endTime_taos_f = time.time()
-        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))       
-                                        
-        print("=========%s====over=============" %strlist) 
-                
+        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
+
+        print("=========%s====over=============" %strlist)
+
     def time_nest(self,timelist):
-                
-        print("==========%s===start=============" %timelist)       
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+
+        print("==========%s===start=============" %timelist)
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         #self.dropandcreateDB_random("%s" %self.db_nest, 1)
-        
+
         if (timelist == ['NOW','TODAY']) or (timelist == ['TIMEZONE']):
-            time_functions = timelist          
-            fun_fix_column = ['()']        
+            time_functions = timelist
+            fun_fix_column = ['()']
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
-            fun_fix_column_j = ['()']        
+
+            fun_fix_column_j = ['()']
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (timelist == ['TIMETRUNCATE']):
-            time_functions = timelist     
-            
-            t = time.time()  
-            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t)) 
+            time_functions = timelist
+
+            t = time.time()
+            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
             fun_fix_column = ['q_ts','ts','_c0','_C0','_rowts','1600000000000','1600000000000000','1600000000000000000',
-                        '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            timeunits = ['1a' ,'1s', '1m' ,'1h', '1d']  
-            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","") 
-            
-            column_1 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))]             
+                        '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            timeunits = ['1a' ,'1s', '1m' ,'1h', '1d']
+            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","")
+
+            column_1 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))]
             fun_column_1 = random.sample(time_functions,1)+random.sample(column_1,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
-            
-            column_2 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))] 
+
+            column_2 = ['(%s,timeutil)'%(random.sample(fun_fix_column,1))]
             fun_column_2 = random.sample(time_functions,1)+random.sample(column_2,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
-            
-            
+
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','(1600000000000)','(1600000000000000)','(1600000000000000000)',
-                        '(%d)' %t, '(%d000)' %t, '(%d000000)' %t,'t_to_s'] 
-            
-            column_j1 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]             
+                        '(%d)' %t, '(%d000)' %t, '(%d000000)' %t,'t_to_s']
+
+            column_j1 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(column_j1,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
-                   
-            column_j2 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]             
+
+            column_j2 = ['(%s,timeutil)'%(random.sample(fun_fix_column_j,1))]
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(column_j2,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s)
 
         elif (timelist == ['TO_ISO8601']):
-            time_functions = timelist   
-            
-            t = time.time()             
+            time_functions = timelist
+
+            t = time.time()
             fun_fix_column = ['(now())','(ts)','(q_ts)','(_rowts)','(_c0)','(_C0)',
                               '(1600000000000)','(1600000000000000)','(1600000000000000000)',
-                              '(%d)' %t, '(%d000)' %t, '(%d000000)' %t]  
-                      
+                              '(%d)' %t, '(%d000)' %t, '(%d000000)' %t]
+
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-            
+
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","")
-                       
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','(1600000000000)','(1600000000000000)','(1600000000000000000)','(now())',
-                                '(%d)' %t, '(%d000)' %t, '(%d000000)' %t] 
-                     
+                                '(%d)' %t, '(%d000)' %t, '(%d000000)' %t]
+
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","")
-                       
+
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","")
 
         elif (timelist == ['TO_UNIXTIMESTAMP']):
-            time_functions = timelist   
-            
-            t = time.time()     
-            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))       
-            fun_fix_column = ['(q_nchar)','(q_nchar1)','(q_nchar2)','(q_nchar3)','(q_nchar4)','(q_nchar_null)','(q_binary)','(q_binary5)','(q_binary6)','(q_binary7)','(q_binary8)','(q_binary_null)','(t_to_s)']  
-                      
+            time_functions = timelist
+
+            t = time.time()
+            t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
+            fun_fix_column = ['(q_nchar)','(q_nchar1)','(q_nchar2)','(q_nchar3)','(q_nchar4)','(q_nchar_null)','(q_binary)','(q_binary5)','(q_binary6)','(q_binary7)','(q_binary8)','(q_binary_null)','(t_to_s)']
+
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("t_to_s","%s" %t_to_s)
-            
+
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("t_to_s","%s" %t_to_s)
-                       
-            fun_fix_column_j = ['(t1.q_nchar)','(t1.q_binary)', '(t2.q_nchar)','(t2.q_binary)','(t_to_s)'] 
-                     
+
+            fun_fix_column_j = ['(t1.q_nchar)','(t1.q_binary)', '(t2.q_nchar)','(t2.q_binary)','(t_to_s)']
+
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("t_to_s","%s" %t_to_s)
-                       
+
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("t_to_s","%s" %t_to_s)
 
         elif (timelist == ['TIMEDIFF_1']):
-            time_functions = timelist    
-            
-            t = time.time()     
+            time_functions = timelist
+
+            t = time.time()
             t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
             timeunits = [ '1a' ,'1s', '1m' ,'1h', '1d']
-            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","") 
-                   
+            timeunit = str(random.sample(timeunits,1)).replace("[","").replace("]","").replace("'","")
+
             fun_fix_column = ['q_ts','ts','_c0','_C0','_rowts','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_12 = ['(%s,%s,timeutil)'%(column_1,column_2)]
             fun_column_1 = random.sample(time_functions,1)+random.sample(column_12,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
-            
-            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+
+            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_34 = ['(%s,%s,timeutil)'%(column_3,column_4)]
             fun_column_2 = random.sample(time_functions,1)+random.sample(column_34,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
-                       
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
             column_j12 = ['(%s,%s,timeutil)'%(column_j1,column_j2)]
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(column_j12,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
-                
-            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
-            column_j34 = ['(%s,%s,timeutil)'%(column_j3,column_j4)]           
+
+            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
+            column_j34 = ['(%s,%s,timeutil)'%(column_j3,column_j4)]
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(column_j34,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("timeutil","%s" %timeunit).replace("t_to_s","%s" %t_to_s).replace("_1","")
 
         elif (timelist == ['TIMEDIFF_2']):
-            time_functions = timelist    
-            
-            t = time.time()     
+            time_functions = timelist
+
+            t = time.time()
             t_to_s =  time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(t))
-                   
+
             fun_fix_column = ['q_ts','ts','_c0','_C0','_rowts','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_1,column_2 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_12 = ['(%s,%s)'%(column_1,column_2)]
             fun_column_1 = random.sample(time_functions,1)+random.sample(column_12,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_1 = str(time_fun_1).replace("t_to_s","%s" %t_to_s).replace("_2","")
-            
-            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)            
+
+            column_3,column_4 = random.sample(fun_fix_column,1),random.sample(fun_fix_column,1)
             column_34 = ['(%s,%s)'%(column_3,column_4)]
             fun_column_2 = random.sample(time_functions,1)+random.sample(column_34,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_2 = str(time_fun_2).replace("t_to_s","%s" %t_to_s).replace("_2","")
-                       
+
             fun_fix_column_j = ['(t1.q_ts)','(t1.ts)', '(t2.q_ts)','(t2.ts)','1600000000000','1600000000000000','1600000000000000000',
-                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']  
-            
-            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
+                              '%d' %t, '%d000' %t, '%d000000' %t,'t_to_s']
+
+            column_j1,column_j2 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
             column_j12 = ['(%s,%s)'%(column_j1,column_j2)]
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(column_j12,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_1 = str(time_fun_join_1).replace("t_to_s","%s" %t_to_s).replace("_2","")
-                
-            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)            
-            column_j34 = ['(%s,%s)'%(column_j3,column_j4)]           
+
+            column_j3,column_j4 = random.sample(fun_fix_column_j,1),random.sample(fun_fix_column_j,1)
+            column_j34 = ['(%s,%s)'%(column_j3,column_j4)]
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(column_j34,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("\"","").replace("t_to_s","'t_to_s'")
             time_fun_join_2 = str(time_fun_join_2).replace("t_to_s","%s" %t_to_s).replace("_2","")
-            
+
         elif (timelist == ['ELAPSED']):
-            time_functions = timelist   
-                  
-            fun_fix_column = ['(ts)','(_c0)','(_C0)','(_rowts)','(ts,time_unit)','(_c0,time_unit)','(_C0,time_unit)','(_rowts,time_unit)']  
-            
-            time_units = ['1s','1m','1h','1d','1a']      
-            time_unit1 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","")   
-            time_unit2 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","") 
-                      
+            time_functions = timelist
+
+            fun_fix_column = ['(ts)','(_c0)','(_C0)','(_rowts)','(ts,time_unit)','(_c0,time_unit)','(_C0,time_unit)','(_rowts,time_unit)']
+
+            time_units = ['1s','1m','1h','1d','1a']
+            time_unit1 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","")
+            time_unit2 = str(random.sample(time_units,1)).replace("[","").replace("]","").replace("'","")
+
             fun_column_1 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit1)
-            
+
             fun_column_2 = random.sample(time_functions,1)+random.sample(fun_fix_column,1)
             time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit2)
-           
-                       
-            fun_fix_column_j = ['(t1.ts)', '(t2.ts)','(t1.ts,time_unit)','(t1.ts,time_unit)','(t2.ts,time_unit)','(t2.ts,time_unit)'] 
-                     
+
+
+            fun_fix_column_j = ['(t1.ts)', '(t2.ts)','(t1.ts,time_unit)','(t1.ts,time_unit)','(t2.ts,time_unit)','(t2.ts,time_unit)']
+
             fun_column_join_1 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit1)
-                       
+
             fun_column_join_2 = random.sample(time_functions,1)+random.sample(fun_fix_column_j,1)
             time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace(", ","").replace("time_unit","%s" %time_unit2)
-            
-                                                            
+
+
         elif (timelist == ['CAST']) :
-            str_functions = timelist                                
+            str_functions = timelist
             #下面的4个是全的，这个只是1个
             i = random.randint(1,4)
             if i ==1:
@@ -2414,33 +2414,33 @@ class TDTestCase:
                 fun_fix_column = ['q_bool','q_bool_null','q_bigint','q_bigint_null','q_smallint','q_smallint_null',
                 'q_tinyint','q_tinyint_null','q_int','q_int_null','q_float','q_float_null','q_double','q_double_null']
                 type_names = ['BIGINT','BINARY(100)','TIMESTAMP','NCHAR(100)','BIGINT UNSIGNED']
-                
-                type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
                 time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","") 
+
+                type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
                 time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-                
+
                 fun_fix_column_j = ['t1.q_bool','t1.q_bool_null','t1.q_bigint','t1.q_bigint_null','t1.q_smallint','t1.q_smallint_null',
                 't1.q_tinyint','t1.q_tinyint_null','t1.q_int','t1.q_int_null','t1.q_float','t1.q_float_null','t1.q_double','t1.q_double_null',
                 't2.q_bool','t2.q_bool_null','t2.q_bigint','t2.q_bigint_null','t2.q_smallint','t2.q_smallint_null',
-                't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")              
-                            
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
             elif i==2:
                 print('===========cast_2===========')
                 fun_fix_column = ['q_binary','q_binary_null','q_binary1','q_binary2','q_binary3','q_binary4']
                 type_names = ['BIGINT','BINARY(100)','NCHAR(100)','BIGINT UNSIGNED']
-                
+
                 type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
                 time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
@@ -2448,270 +2448,270 @@ class TDTestCase:
                 type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
                 time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
-                
+
                 fun_fix_column_j = ['t1.q_binary','t1.q_binary_null','t1.q_binary1','t1.q_binary2','t1.q_binary3','t1.q_binary4',
-                        't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                        't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")  
-                                
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
             elif i==3:
                 print('===========cast_3===========')
                 fun_fix_column = ['q_nchar','q_nchar_null','q_nchar5','q_nchar6','q_nchar7','q_nchar8']
                 type_names = ['BIGINT','NCHAR(100)','BIGINT UNSIGNED']
-                
+
                 type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")                
+                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
 
                 type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")  
-                
+                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
+
                 fun_fix_column_j = ['t1.q_nchar','t1.q_nchar_null','t1.q_nchar5','t1.q_nchar6','t1.q_nchar7','t1.q_nchar8',
-                        't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                        't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")  
-                            
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
             elif i==4:
                 print('===========cast_4===========')
                 fun_fix_column = ['q_ts','q_ts_null','_C0','_c0','ts','_rowts']
                 type_names = ['BIGINT','TIMESTAMP','BIGINT UNSIGNED']
-                
+
                 type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")  
-                
+                time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","")
+
                 type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")  
-                
-                fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts'] 
-                
-                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","")
+
+                fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts']
+
+                type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
                 time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","")
-                
-                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+
+                type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
                 fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")  
-                            
+                time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","")
+
         elif (timelist == ['CAST_1']) :
-            str_functions = timelist                               
-            
+            str_functions = timelist
+
             print('===========cast_1===========')
             fun_fix_column = ['q_bool','q_bool_null','q_bigint','q_bigint_null','q_smallint','q_smallint_null',
             'q_tinyint','q_tinyint_null','q_int','q_int_null','q_float','q_float_null','q_double','q_double_null']
             type_names = ['BIGINT','BINARY(100)','TIMESTAMP','NCHAR(100)','BIGINT UNSIGNED']
-            
-            type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")               
+
+            type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_1","")  
-            
-            type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")  
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_1","")
+
+            type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_1","")  
-            
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_1","")
+
             fun_fix_column_j = ['t1.q_bool','t1.q_bool_null','t1.q_bigint','t1.q_bigint_null','t1.q_smallint','t1.q_smallint_null',
             't1.q_tinyint','t1.q_tinyint_null','t1.q_int','t1.q_int_null','t1.q_float','t1.q_float_null','t1.q_double','t1.q_double_null',
             't2.q_bool','t2.q_bool_null','t2.q_bigint','t2.q_bigint_null','t2.q_smallint','t2.q_smallint_null',
-            't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                  
+            't2.q_tinyint','t2.q_tinyint_null','t2.q_int','t2.q_int_null','t2.q_float','t2.q_float_null','t2.q_double','t2.q_double_null']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_1","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                 
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_1","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_1","")               
-                                
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_1","")
+
         elif (timelist == ['CAST_2']) :
-            str_functions = timelist  
+            str_functions = timelist
             print('===========cast_2===========')
             fun_fix_column = ['q_binary','q_binary_null','q_binary1','q_binary2','q_binary3','q_binary4']
             type_names = ['BIGINT','BINARY(100)','NCHAR(100)','BIGINT UNSIGNED']
-            
+
             type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_2","")  
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_2","")
 
             type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_2","")  
-            
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_2","")
+
             fun_fix_column_j = ['t1.q_binary','t1.q_binary_null','t1.q_binary1','t1.q_binary2','t1.q_binary3','t1.q_binary4',
-                    't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                    't2.q_binary','t2.q_binary_null','t2.q_binary1','t2.q_binary2','t2.q_binary3','t2.q_binary4']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_2","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_2","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_2","")   
-                                
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_2","")
+
         elif (timelist == ['CAST_3']) :
-            str_functions = timelist  
+            str_functions = timelist
             print('===========cast_3===========')
             fun_fix_column = ['q_nchar','q_nchar_null','q_nchar5','q_nchar6','q_nchar7','q_nchar8']
             type_names = ['BIGINT','NCHAR(100)','BIGINT UNSIGNED']
-            
+
             type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_3","")                  
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_3","")
 
             type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_3","")    
-            
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_3","")
+
             fun_fix_column_j = ['t1.q_nchar','t1.q_nchar_null','t1.q_nchar5','t1.q_nchar6','t1.q_nchar7','t1.q_nchar8',
-                    't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+                    't2.q_nchar','t2.q_nchar_null','t2.q_nchar5','t2.q_nchar6','t2.q_nchar7','t2.q_nchar8']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_3","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_3","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_3","")    
-                            
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_3","")
+
         elif (timelist == ['CAST_4']) :
-            str_functions = timelist  
+            str_functions = timelist
             print('===========cast_4===========')
             fun_fix_column = ['q_ts','q_ts_null','_C0','_c0','ts','_rowts']
             type_names = ['BIGINT','TIMESTAMP','BIGINT UNSIGNED']
-            
+
             type_name1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name1+')'
-            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_4","")    
-            
+            time_fun_1 = str(fun_column_1).replace("[","").replace("]","").replace("'","").replace("_4","")
+
             type_name2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column,1))+' AS '+type_name2+')'
-            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_4","")    
-            
-            fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts'] 
-            
-            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_2 = str(fun_column_2).replace("[","").replace("]","").replace("'","").replace("_4","")
+
+            fun_fix_column_j = ['t1.q_ts','t1.q_ts_null','t1.ts','t2.q_ts','t2.q_ts_null','t2.ts']
+
+            type_name_j1 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_1 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j1+')'
-            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_4","")  
-            
-            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")                
+            time_fun_join_1 = str(fun_column_join_1).replace("[","").replace("]","").replace("'","").replace("_4","")
+
+            type_name_j2 = str(random.sample(type_names,1)).replace("[","").replace("]","").replace("'","")
             fun_column_join_2 = str(random.sample(str_functions,1))+'('+str(random.sample(fun_fix_column_j,1))+' AS '+type_name_j2+')'
-            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_4","")    
-                                          
+            time_fun_join_2 = str(fun_column_join_2).replace("[","").replace("]","").replace("'","").replace("_4","")
+
         tdSql.query("select 1-1 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
-                sql = "select  ts1 , timediff(asct1,now)  from  ( select  " 
-                sql += "%s as asct1, " % time_fun_1 
-                sql += "%s as asct2, " % time_fun_2 
+                sql = "select  ts1 , timediff(asct1,now)  from  ( select  "
+                sql += "%s as asct1, " % time_fun_1
+                sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as ts1 from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) \
                 or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
-                sql = "select  ts2 , asct1,now(),today(),timezone()  from  ( select  " 
-                sql += "%s as asct1, " % time_fun_1 
-                sql += "%s as asct2, " % time_fun_2 
+                sql = "select  ts2 , asct1,now(),today(),timezone()  from  ( select  "
+                sql += "%s as asct1, " % time_fun_1
+                sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts as ts2 from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
-                sql = "select  max(asct1),now(),today(),timezone()  from  ( select  " 
-                sql += "%s as asct1, " % time_fun_1 
-                sql += "%s as asct2 " % time_fun_2 
+                sql = "select  max(asct1),now(),today(),timezone()  from  ( select  "
+                sql += "%s as asct1, " % time_fun_1
+                sql += "%s as asct2 " % time_fun_2
                 sql += "from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-2 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts , timediff(asct1,now),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct1,  " % time_fun_1 
+                sql += "%s as asct1,  " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts ,  timediff(asct2,now),now(),today(),timezone() from  ( select  "
-                sql += "%s as asct2,  " % time_fun_2 
+                sql += "%s as asct2,  " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)       
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts , (asct1),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct1,  " % time_fun_1 
+                sql += "%s as asct1,  " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s )" % random.choice(self.order_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select  ts , asct2,now(),today(),timezone() from  ( select  "
-                sql += "%s as asct2,  " % time_fun_2 
+                sql += "%s as asct2,  " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s, " % random.choice(self.q_select) 
+                sql += "%s, " % random.choice(self.q_select)
                 sql += "ts ts from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)           
-            elif (timelist == ['ELAPSED']) :  
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
+            elif (timelist == ['ELAPSED']) :
                 sql = "select  min(asct1),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct1  " % time_fun_1 
+                sql += "%s as asct1  " % time_fun_1
                 sql += " from regular_table_1 where "
                 sql += "%s )" % random.choice(self.q_where)
-                sql += "%s " % random.choice(self.unionall_or_union) 
+                sql += "%s " % random.choice(self.unionall_or_union)
                 sql += "select   avg(asct2),now(),today(),timezone()  from  ( select  "
-                sql += "%s as asct2  " % time_fun_2 
+                sql += "%s as asct2  " % time_fun_2
                 sql += " from regular_table_1 where "
-                sql += "%s " % random.choice(self.q_where)    
+                sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)        
-            
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
+
         tdSql.query("select 1-3 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
@@ -2720,19 +2720,19 @@ class TDTestCase:
                 sql += "%s as asct1, ts ," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += "from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2, ts ," % time_fun_2
                 sql += "%s as asct1, " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += "from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " order by asct1 desc  "
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
@@ -2740,154 +2740,154 @@ class TDTestCase:
                 sql += "%s as asct1, ts ," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += " from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2, ts ," % time_fun_2
                 sql += "%s as asct1, " % time_fun_1
                 sql += "%s, " % random.choice(self.s_s_select)
-                sql += "%s " % random.choice(self.q_select) 
+                sql += "%s " % random.choice(self.q_select)
                 sql += "from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " order by asct1 desc  "
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            elif (timelist == ['ELAPSED']) :  
+            elif (timelist == ['ELAPSED']) :
                 sql = "select  abs(asct1),now(),today(),timezone()  from  ( select  "
                 sql += "%s as asct1," % time_fun_1
                 sql += "%s as asct2 " % time_fun_2
                 sql += "from regular_table_1 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "%s select " % random.choice(self.unionall_or_union) 
+                sql += "%s select " % random.choice(self.unionall_or_union)
                 sql += "%s as asct2," % time_fun_2
                 sql += "%s as asct1  " % time_fun_1
                 sql += "from regular_table_2 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += " order by asct1 asc " 
+                sql += " order by asct1 asc "
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-4 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct11, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "%s as asct12, " % time_fun_join_1             
-                sql += "t1.%s as asct111, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct121, " % random.choice(self.q_select)         
+                sql += "%s as asct11, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct12, " % time_fun_join_1
+                sql += "t1.%s as asct111, " % random.choice(self.q_select)
+                sql += "t2.%s as asct121, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), (asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct10, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "%s as asct11, " % time_fun_join_1             
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)         
+                sql += "%s as asct10, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct11, " % time_fun_join_1
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            elif (timelist == ['ELAPSED']) :  
+            elif (timelist == ['ELAPSED']) :
                 sql = "select  floor(asct1) from  ( select "
-                sql += "%s as asct10, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "%s as asct11" % time_fun_join_1                  
+                sql += "%s as asct10, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct11" % time_fun_join_1
                 sql += " from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s " % random.choice(self.q_u_or_where)
                 sql += ");"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-5 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
-            if (timelist == ['ELAPSED']) : 
+            if (timelist == ['ELAPSED']) :
                 sql = "select  now(),today(),timezone(), "
-                sql += "%s, " % time_fun_1 
+                sql += "%s, " % time_fun_1
                 sql += "%s  " % time_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += " ;"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             else:
                 sql = "select  ts ,now(),today(),timezone(), "
-                sql += "%s as asct11, " % time_fun_1 
+                sql += "%s as asct11, " % time_fun_1
                 sql += "%s as asct12, " % random.choice(self.q_select)
-                sql += "%s as asct13, " % random.choice(self.q_select) 
+                sql += "%s as asct13, " % random.choice(self.q_select)
                 sql += "%s as asct14  " % time_fun_2
                 sql += " from  ( select  * from regular_table_1 ) where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += " ;"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-6 as time_nest from stable_1 limit 1;")
-        for i in range(self.fornum):            
+        for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
-                sql += "%s as asct13, " % time_fun_join_1              
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % time_fun_join_1
                 sql += "t2.ts   from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), (asct1) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2           
-                sql += "t1.%s as asct11, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct12, " % random.choice(self.q_select)         
-                sql += "%s as asct13, " % time_fun_join_1              
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t2.%s as asct12, " % random.choice(self.q_select)
+                sql += "%s as asct13, " % time_fun_join_1
                 sql += "t2.ts  from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select   (asct1)*111 from  ( select  "
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2                
-                sql += "%s as asct122 " % time_fun_join_1              
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "%s as asct122 " % time_fun_join_1
                 sql += " from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.q_u_where)
                 sql += "and %s  )" % random.choice(self.q_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-7 as time_nest from stable_1 limit 1;")
@@ -2897,27 +2897,27 @@ class TDTestCase:
                 sql = "select  ts1,m1 , timediff(asct1,now) from  ( select  "
                 sql += "%s as asct1, ts as m1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as ts1 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  tm1,tm2 , (asct1),now(),today(),timezone()  from  ( select  "
                 sql += "%s as asct1, ts as tm1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as tm2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  (asct1)/asct2 ,now(),today(),timezone()  from  ( select  "
@@ -2926,10 +2926,10 @@ class TDTestCase:
                 sql += "from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-8 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
@@ -2939,14 +2939,14 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as tm1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as tm2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 , (asct1),now(),today(),timezone()  "
@@ -2954,15 +2954,15 @@ class TDTestCase:
                 sql += "%s, " % random.choice(self.s_s_select)
                 sql += "%s as asct1, ts as ts1," % time_fun_1
                 sql += "%s as asct2, " % time_fun_2
-                sql += "%s as asct11, " % random.choice(self.q_select) 
-                sql += "%s as asct12, " % random.choice(self.t_select) 
+                sql += "%s as asct11, " % random.choice(self.q_select)
+                sql += "%s as asct12, " % random.choice(self.t_select)
                 sql += "ts as ts2 from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdSql.query(sql)    
-                self.explain_sql(sql)         
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  floor(abs(asct1)),now(),today(),timezone()  "
                 sql += "from  ( select  "
@@ -2971,8 +2971,8 @@ class TDTestCase:
                 sql += "from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += ") ;"
-                tdLog.info(sql) 
-                tdSql.query(sql)   
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
 
         tdSql.query("select 1-9 as time_nest from stable_1 limit 1;")
@@ -2980,12 +2980,12 @@ class TDTestCase:
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select) 
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -2993,17 +2993,17 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql)     
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1 from  ( select  t1.ts as ts1,"
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select) 
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
@@ -3011,24 +3011,24 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql)     
-                tdSql.query(sql)  
-                self.explain_sql(sql)                 
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  min(asct1*110) from  ( select  "
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1 " % time_fun_join_2 
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1 " % time_fun_join_2
                 sql += "from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += "and %s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ") ;"
-                tdLog.info(sql)     
-                tdSql.query(sql)  
-                self.explain_sql(sql)  
-    
-        
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
+
+
         tdSql.query("select 1-10 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
@@ -3052,7 +3052,7 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
@@ -3075,9 +3075,9 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
-                self.explain_sql(sql)                         
+                tdLog.info(sql)
+                tdSql.query(sql)
+                self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  abs(asct1),now(),today(),timezone()   from  ( select  "
                 sql += "%s as asct1 ," % time_fun_1
@@ -3092,10 +3092,10 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 1-11 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
@@ -3119,7 +3119,7 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
@@ -3141,7 +3141,7 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
@@ -3156,10 +3156,10 @@ class TDTestCase:
                 sql += "%s as asct2 " % time_fun_2
                 sql += " from stable_2 where "
                 sql += "%s " % random.choice(self.q_where)
-                sql += "order by asct1 " 
+                sql += "order by asct1 "
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ")"
-                tdLog.info(sql)       
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
 
@@ -3168,100 +3168,100 @@ class TDTestCase:
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), timediff(asct1,now) from  ( select  t1.ts as ts1,"
-                sql += "%s, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)            
+                sql += "%s, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts2 ,timediff(ts1,ts2), asct1,now() from  ( select  t1.ts as ts1,"
-                sql += "%s, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)            
+                sql += "%s, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts as ts2  from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.order_u_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select min(floor(asct1)),now() from  ( select "
-                sql += "%s as asct121, " % time_fun_join_1   
-                sql += "%s as asct1 " % time_fun_join_2          
+                sql += "%s as asct121, " % time_fun_join_1
+                sql += "%s as asct1 " % time_fun_join_2
                 sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
                 sql += "%s " % random.choice(self.t_u_where)
                 sql += "and %s " % random.choice(self.t_u_or_where)
                 sql += "%s " % random.choice(self.limit1_where)
                 sql += ");"
-                tdLog.info(sql)   
+                tdLog.info(sql)
                 tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-13 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts , timediff(%s,now)," % time_fun_2
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct11, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % time_fun_2
-                sql += "%s as asct122  " % random.choice(self.t_select) 
+                sql += "%s as asct122  " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts ,now(),today(),timezone(), "
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct11, " % random.choice(self.q_select)
-                sql += "%s as asct12, " % random.choice(self.q_select) 
+                sql += "%s as asct12, " % random.choice(self.q_select)
                 sql += "%s as asct13, " % time_fun_2
-                sql += "%s as asct122  " % random.choice(self.t_select) 
+                sql += "%s as asct122  " % random.choice(self.t_select)
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  now(),today(),timezone(), "
-                sql += "%s as asct1, " % time_fun_1  
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct12  " % time_fun_2
                 sql += " from  ( select  * from stable_1 where "
                 sql += "%s " % random.choice(self.qt_where)
                 sql += "%s " % random.choice(self.order_where)
                 sql += ") ;"
-                tdLog.info(sql)       
-                tdSql.query(sql) 
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-            
+
         tdSql.query("select 1-14 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts , timediff(asct1,now),timediff(now,asct2) from ( select ts ts ,"
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct2" % time_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -3269,12 +3269,12 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts , (asct1),now(),(now()),asct2 from ( select ts ts ,"
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct2" % time_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
@@ -3282,78 +3282,78 @@ class TDTestCase:
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select  (asct1)*asct2,now(),(now()) from ( select "
-                sql += "%s as asct1, " % time_fun_1 
+                sql += "%s as asct1, " % time_fun_1
                 sql += "%s as asct2" % time_fun_2
                 sql += "  from stable_1 where "
                 sql += "%s " % random.choice(self.q_where)
                 sql += "%s " % random.choice(self.partiton_where)
                 sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
                 sql += " ) ;"
-                tdLog.info(sql)       
-                tdSql.query(sql)  
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-                  
+
         tdSql.query("select 1-15 as time_nest from stable_1 limit 1;")
         for i in range(self.fornum):
             if (timelist == ['NOW','TODAY']) or (timelist == ['TIMETRUNCATE']) or (timelist == ['TO_ISO8601'])\
                 or (timelist == ['TO_UNIXTIMESTAMP']) or (timelist == ['TIMEDIFF_1']) or (timelist == ['TIMEDIFF_2']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), timediff(asct1,now),timediff(now,asct2) from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql)    
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['TIMEZONE']) or (timelist == ['CAST']) or (timelist == ['CAST_1']) or (timelist == ['CAST_2']) or (timelist == ['CAST_3']) or (timelist == ['CAST_4']):
                 sql = "select  ts1,ts ,timediff(ts1,ts), asct1,(now()),(now()),asct2 ,now(),today(),timezone() from  ( select  t1.ts as ts1,"
-                sql += "%s as asct2, " % time_fun_join_1   
-                sql += "%s as asct1, " % time_fun_join_2 
-                sql += "t1.%s as asct11, " % random.choice(self.q_select)            
-                sql += "t1.%s as asct12, " % random.choice(self.q_select) 
-                sql += "t2.%s as asct13, " % random.choice(self.q_select)            
-                sql += "t2.%s as asct14, " % random.choice(self.q_select)  
+                sql += "%s as asct2, " % time_fun_join_1
+                sql += "%s as asct1, " % time_fun_join_2
+                sql += "t1.%s as asct11, " % random.choice(self.q_select)
+                sql += "t1.%s as asct12, " % random.choice(self.q_select)
+                sql += "t2.%s as asct13, " % random.choice(self.q_select)
+                sql += "t2.%s as asct14, " % random.choice(self.q_select)
                 sql += "t2.ts  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "            
+                sql += ") "
                 sql += "%s " % random.choice(self.order_desc_where)
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql)   
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
             elif (timelist == ['ELAPSED']) :
                 sql = "select   asct1,(now()),(now()),asct2 ,now(),today(),timezone() from  ( select "
-                sql += "%s as asct2, " % time_fun_join_1   
-                sql += "%s as asct1 " % time_fun_join_2 
+                sql += "%s as asct2, " % time_fun_join_1
+                sql += "%s as asct1 " % time_fun_join_2
                 sql += "from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
                 sql += "%s " % random.choice(self.t_join_where)
                 sql += " and %s " % random.choice(self.qt_u_or_where)
                 sql += "%s " % random.choice(self.partiton_where_j)
                 sql += "%s " % random.choice(self.slimit1_where)
-                sql += ") "          
+                sql += ") "
                 sql += "%s ;" % random.choice(self.limit_u_where)
-                tdLog.info(sql)       
-                tdSql.query(sql)   
+                tdLog.info(sql)
+                tdSql.query(sql)
                 self.explain_sql(sql)
-        
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f %s sql start!" %timelist)
@@ -3361,32 +3361,32 @@ class TDTestCase:
         # _ = subprocess.check_output(taos_cmd1, shell=True)
         print("taos -f %s sql over!" %timelist)
         endTime_taos_f = time.time()
-        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))       
-                                        
-        print("=========%s====over=============" %timelist) 
-                                                                    
+        print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
+
+        print("=========%s====over=============" %timelist)
+
     def function_before_26(self):
-        
+
         print('=====================2.6 old function start ===========')
-        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename)) 
-        
+        os.system("rm -rf %s/%s.sql" % (self.testcasePath,self.testcaseFilename))
+
         self.dropandcreateDB_random("%s" %self.db_nest, 1)
-                    
+
         #1 select * from (select column form regular_table where <\>\in\and\or order by)
         tdSql.query("select 1-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  tas  from  ( select  "
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts as tas from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
-            sql += ");"            
-            tdLog.info(sql)      
+            sql += ");"
+            tdLog.info(sql)
             tdSql.query(sql,queryTimes=1)
             self.explain_sql(sql)
-            
-        #1 outer union not support        
+
+        #1 outer union not support
         tdSql.query("select 1-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  t1s  from  ( select  "
@@ -3403,10 +3403,10 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-                   
+
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 1-2 from stable_1;")
         for i in range(self.fornum):
@@ -3424,10 +3424,10 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         #1 inter union not support
         tdSql.query("select 1-3 from stable_1;")
         for i in range(self.fornum):
@@ -3437,7 +3437,7 @@ class TDTestCase:
             sql += "%s, " % random.choice(self.q_select)
             sql += "ts from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
-            sql += ""  
+            sql += ""
             sql += " union all select  "
             sql += "%s, " % random.choice(self.s_r_select)
             sql += "%s, " % random.choice(self.q_select)
@@ -3445,10 +3445,10 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         tdSql.query("select 1-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts  from  ( select  "
@@ -3463,54 +3463,54 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
-            tdSql.query(sql) 
-            self.explain_sql(sql)
-            
-        #join:select * from (select column form regular_table1，regular_table2 where  t1.ts=t2.ts and <\>\in\and\or order by)       
-        tdSql.query("select 1-4 from stable_1;")
-        for i in range(self.fornum):
-            sql = "select  *  from  ( select  t1.ts as t1ts,"
-            sql += "t1.%s as t11, " % random.choice(self.q_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t21, " % random.choice(self.q_select)            
-            sql += "t2.%s as t22, " % random.choice(self.q_select)            
-            sql += "t2.ts as t2ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
-            sql += "%s " % random.choice(self.q_u_where)
-            sql += "and %s " % random.choice(self.q_u_or_where)           
-            sql += "%s " % random.choice(self.order_u_where)
-            sql += ");"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #2 select column from (select * form regular_table ) where <\>\in\and\or order by        
+        #join:select * from (select column form regular_table1，regular_table2 where  t1.ts=t2.ts and <\>\in\and\or order by)
+        tdSql.query("select 1-4 from stable_1;")
+        for i in range(self.fornum):
+            sql = "select  *  from  ( select  t1.ts as t1ts,"
+            sql += "t1.%s as t11, " % random.choice(self.q_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t21, " % random.choice(self.q_select)
+            sql += "t2.%s as t22, " % random.choice(self.q_select)
+            sql += "t2.ts as t2ts from regular_table_1 t1 , regular_table_2 t2 where t1.ts = t2.ts and "
+            sql += "%s " % random.choice(self.q_u_where)
+            sql += "and %s " % random.choice(self.q_u_or_where)
+            sql += "%s " % random.choice(self.order_u_where)
+            sql += ");"
+            tdLog.info(sql)
+            tdSql.query(sql)
+            self.explain_sql(sql)
+
+        #2 select column from (select * form regular_table ) where <\>\in\and\or order by
         tdSql.query("select 2-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts ,"
             sql += "%s, " % random.choice(self.s_r_select)
-            sql += "%s  " % random.choice(self.q_select) 
+            sql += "%s  " % random.choice(self.q_select)
             sql += " from  ( select  * from regular_table_1 ) where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += " ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #3 select * from (select column\tag form stable  where <\>\in\and\or order by )        
+        #3 select * from (select column\tag form stable  where <\>\in\and\or order by )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 3-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   *  from  ( select  "
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
-            sql += "%s, " % random.choice(self.t_select) 
+            sql += "%s, " % random.choice(self.q_select)
+            sql += "%s, " % random.choice(self.t_select)
             sql += "ts from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
+            tdLog.info(sql)
             tdLog.info(len(sql))
             tdSql.query(sql)
             self.explain_sql(sql)
@@ -3520,37 +3520,37 @@ class TDTestCase:
             sql += "%s  " % random.choice(self.s_r_select)
             sql += "from  ( select  "
             sql += "%s, " % random.choice(self.s_s_select)
-            sql += "%s, " % random.choice(self.q_select) 
-            sql += "%s, " % random.choice(self.t_select) 
+            sql += "%s, " % random.choice(self.q_select)
+            sql += "%s, " % random.choice(self.t_select)
             sql += "ts from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql) 
+            tdLog.info(sql)
             tdLog.info(len(sql))
-            tdSql.query(sql) 
+            tdSql.query(sql)
             self.explain_sql(sql)
 
-        # select ts,* from (select column\tag form stable1,stable2  where t1.ts = t2.ts and <\>\in\and\or order by )        
+        # select ts,* from (select column\tag form stable1,stable2  where t1.ts = t2.ts and <\>\in\and\or order by )
         #self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 3-2 from stable_1;")
         for i in range(self.fornum):
             #sql = "select  ts , *  from  ( select  t1.ts as t1ts , "
             sql = "select  t1ts , t2ts  from  ( select  t1.ts as t1ts , "
-            sql += "t1.%s as t11, " % random.choice(self.t_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t13, " % random.choice(self.t_select)            
-            sql += "t2.%s as t14, " % random.choice(self.q_select) 
+            sql += "t1.%s as t11, " % random.choice(self.t_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t13, " % random.choice(self.t_select)
+            sql += "t2.%s as t14, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ") ;"
-            tdLog.info(sql)      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-    
+
         #3 outer union not support
-        
+
         tdSql.query("select 3-3 from stable_1;")
         for i in range(self.fornum):
             #sql = "select  ts , * from  ( select  "
@@ -3568,7 +3568,7 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
         for i in range(self.fornum):
@@ -3586,10 +3586,10 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         #3 inter union not support
         tdSql.query("select 3-4 from stable_1;")
         for i in range(self.fornum):
@@ -3606,53 +3606,53 @@ class TDTestCase:
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ")"
-            tdLog.info(sql)      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         #join:select * from (select column form stable1，stable2 where  t1.ts=t2.ts and <\>\in\and\or order by)
         tdSql.query("select 3-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  t1.ts as t1ts,"
-            sql += "t1.%s as t11, " % random.choice(self.q_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t21, " % random.choice(self.q_select)            
-            sql += "t2.%s as t22, " % random.choice(self.q_select)            
+            sql += "t1.%s as t11, " % random.choice(self.q_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t21, " % random.choice(self.q_select)
+            sql += "t2.%s as t22, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_u_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ");"
-            tdLog.info(sql)  
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 3-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select  * from  ( select  t1.ts as t1ts ,"
-            sql += "t1.%s as t11, " % random.choice(self.q_select)            
-            sql += "t1.%s as t12, " % random.choice(self.q_select) 
-            sql += "t2.%s as t21, " % random.choice(self.q_select)            
-            sql += "t2.%s as t22, " % random.choice(self.q_select)            
+            sql += "t1.%s as t11, " % random.choice(self.q_select)
+            sql += "t1.%s as t12, " % random.choice(self.q_select)
+            sql += "t2.%s as t21, " % random.choice(self.q_select)
+            sql += "t2.%s as t22, " % random.choice(self.q_select)
             sql += "t2.ts as t2ts from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += ");"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #4 select column from (select * form stable  where <\>\in\and\or order by )   
+        #4 select column from (select * form stable  where <\>\in\and\or order by )
         tdSql.query("select 4-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  ts , "
             sql += "%s as t11, " % random.choice(self.q_select)
-            sql += "%s as t12, " % random.choice(self.q_select) 
-            sql += "%s " % random.choice(self.t_select) 
+            sql += "%s as t12, " % random.choice(self.q_select)
+            sql += "%s " % random.choice(self.t_select)
             sql += " from  ( select  * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3665,7 +3665,7 @@ class TDTestCase:
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3674,11 +3674,11 @@ class TDTestCase:
         for i in range(self.fornum):
             sql = "select  distinct  c5_1 "
             sql += " from  ( select   "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += " as c5_1 from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3689,11 +3689,11 @@ class TDTestCase:
             sql += "%s " % random.choice(self.dt_select)
             sql += "  from stable_1 where "
             sql += "%s ) ;" % random.choice(self.qt_where)
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #7 select * from (select distinct(tag) form stable  where <\>\in\and\or order by limit  ) 
+        #7 select * from (select distinct(tag) form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 7-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  * from  ( select  "
@@ -3702,7 +3702,7 @@ class TDTestCase:
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice([self.limit_where[0] , self.limit_where[1]] )
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3711,146 +3711,146 @@ class TDTestCase:
         tdSql.query("select 8-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  ts ,"
-            sql += "%s " % random.choice(self.calc_select_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_support_ts)
             sql += "from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
         tdSql.query("select 8-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_not_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_not_support_ts)
             sql += "from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 8-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select t1.ts, "
-            sql += "%s " % random.choice(self.calc_select_in_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_support_ts_j)
             sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j)
             sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
-            tdSql.query(sql)   
-            self.explain_sql(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
+            self.explain_sql(sql)
 
-        #9 select * from (select ts,calc form stable  where <\>\in\and\or order by   )      
+        #9 select * from (select ts,calc form stable  where <\>\in\and\or order by   )
         # self.dropandcreateDB_random("%s" %db, 1)
         tdSql.query("select 9-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_not_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_not_support_ts)
             sql += "from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
         tdSql.query("select 9-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  ts ,"
-            sql += "%s " % random.choice(self.calc_select_support_ts) 
+            sql += "%s " % random.choice(self.calc_select_support_ts)
             sql += "from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         tdSql.query("select 9-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_not_support_ts_j)
             sql += "from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += " and %s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
         tdSql.query("select 9-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  t1.ts,"
-            sql += "%s " % random.choice(self.calc_select_in_support_ts_j) 
+            sql += "%s " % random.choice(self.calc_select_in_support_ts_j)
             sql += "from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += " and %s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.order_u_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-        
-        #10 select calc from (select * form regualr_table  where <\>\in\and\or order by   )       
+
+        #10 select calc from (select * form regualr_table  where <\>\in\and\or order by   )
         tdSql.query("select 10-1 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql = "select  "
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "as calc10_1 from ( select * from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         #10-1 select calc from (select * form regualr_table  where <\>\in\and\or order by   )
         tdSql.query("select 10-2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "%s " % random.choice(self.calc_select_all) 
+            sql = "select  "
+            sql += "%s " % random.choice(self.calc_select_all)
             sql += "as calc10_2 from ( select * from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #10-2 select calc from (select * form regualr_tables  where <\>\in\and\or order by   )        
+        #10-2 select calc from (select * form regualr_tables  where <\>\in\and\or order by   )
         tdSql.query("select 10-3 from stable_1;")
         for i in range(self.fornum):
-            sql = "select  " 
-            sql += "count(*) as calc10_3 " 
+            sql = "select  "
+            sql += "count(*) as calc10_3 "
             sql += " from ( select t1.ts as t11, t2.ts as t22 from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += " and %s " % random.choice(self.q_u_or_where)
@@ -3858,64 +3858,64 @@ class TDTestCase:
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #11 select calc from (select * form stable  where <\>\in\and\or order by limit  )        
+        #11 select calc from (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 11-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "as calc11_1 from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #11-1 select calc from (select * form stable  where <\>\in\and\or order by limit  )        
+        #11-1 select calc from (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 11-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_select_all) 
+            sql += "%s " % random.choice(self.calc_select_all)
             sql += "as calc11_1 from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
-        #12 select calc-diff from (select * form regualr_table  where <\>\in\and\or order by limit  )        
+        #12 select calc-diff from (select * form regualr_table  where <\>\in\and\or order by limit  )
         tdSql.query("select 12-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " from ( select * from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.order_desc_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += ") ;"
-            tdLog.info(sql)  
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         #12-1 select calc-diff from (select * form stable  where <\>\in\and\or order by limit  )
-        tdSql.query("select 12-3 from stable_1;")        
+        tdSql.query("select 12-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select  * from ( select "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += ") "
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ;"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3923,14 +3923,14 @@ class TDTestCase:
         #join query does not support group by
         for i in range(self.fornum):
             sql = "select  * from ( select "
-            sql += "%s " % random.choice(self.calc_calculate_regular_j) 
+            sql += "%s " % random.choice(self.calc_calculate_regular_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += ") "
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ;"
-            tdLog.info(sql)     
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3938,27 +3938,27 @@ class TDTestCase:
         #join query does not support group by
         for i in range(self.fornum):
             sql = "select  * from ( select "
-            sql += "%s " % random.choice(self.calc_calculate_regular_j) 
+            sql += "%s " % random.choice(self.calc_calculate_regular_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += ") "
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += " ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
-            self.explain_sql(sql)        
+            self.explain_sql(sql)
 
         #13 select calc-diff as diffns from (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 13-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " as calc13_1 from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.orders_desc_where)
             sql += "%s " % random.choice([self.limit_where[2] , self.limit_where[3]] )
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3966,14 +3966,14 @@ class TDTestCase:
         tdSql.query("select 14-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all)
+            sql += "%s " % random.choice(self.calc_aggregate_all)
             sql += " as calc14_3 from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3981,15 +3981,15 @@ class TDTestCase:
         tdSql.query("select 14-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all) 
-            sql += "%s " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all)
+            sql += "%s " % random.choice(self.calc_aggregate_all)
             sql += " as calc14_3 from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.partiton_where_regular)
             sql += "%s " % random.choice(self.slimit1_where)
             sql += ") "
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -3997,32 +3997,32 @@ class TDTestCase:
         tdSql.query("select 14-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s " % random.choice(self.calc_aggregate_all_j)
             sql += " as calc14_3 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += "%s " % random.choice(self.slimit1_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 14-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as calc14_1, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as calc14_2, " % random.choice(self.calc_aggregate_all_j)
+            sql += "%s " % random.choice(self.calc_aggregate_all_j)
             sql += " as calc14_3 from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.partiton_where_j)
             sql += "%s " % random.choice(self.slimit1_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -4030,227 +4030,227 @@ class TDTestCase:
         tdSql.query("select 15-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular) 
-            sql += "%s " % random.choice(self.calc_aggregate_regular) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular)
+            sql += "%s " % random.choice(self.calc_aggregate_regular)
             sql += " as calc15_3 from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
-            sql += "%s " % random.choice(self.group_where_regular)     
+            sql += "%s " % random.choice(self.group_where_regular)
             sql += ") ;"
-            tdLog.info(sql)      
-            self.data_check(sql,mark='15-1') 
-                
+            tdLog.info(sql)
+            self.data_check(sql,mark='15-1')
+
         tdSql.query("select 15-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_2 " % random.choice(self.calc_aggregate_regular_j) 
+            sql += "%s as calc15_2 " % random.choice(self.calc_aggregate_regular_j)
             sql += "from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
-            sql += "%s " % random.choice(self.group_where_regular_j)            
+            sql += "%s " % random.choice(self.group_where_regular_j)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql)   
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 15-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular_j) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_regular_j) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_regular_j)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_regular_j)
+            sql += "%s " % random.choice(self.calc_aggregate_regular_j)
             sql += " as calc15_3 from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
-            sql += "%s " % random.choice(self.group_where_regular_j)            
+            sql += "%s " % random.choice(self.group_where_regular_j)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
             sql += "%s ;" % random.choice(self.limit_u_where)
-            tdLog.info(sql) 
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 15-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname)
             sql += " as calc15_3 from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_only_where)
             sql += "%s " % random.choice(self.having_support)
             sql += ") "
-            sql += "order by  calc15_1  " 
+            sql += "order by  calc15_1  "
             sql += "%s " % random.choice(self.limit_where)
-            tdLog.info(sql)      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 15-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname_j) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname_j) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname_j) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname_j)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname_j)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname_j)
             sql += " as calc15_3 from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.group_only_where_j)
             sql += "%s " % random.choice(self.having_support_j)
             sql += ") "
-            sql += "order by  calc15_1  " 
+            sql += "order by  calc15_1  "
             sql += "%s " % random.choice(self.limit_u_where)
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 15-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select   * from  ( select "
-            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname) 
-            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname) 
+            sql += "%s as calc15_1, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s as calc15_2, " % random.choice(self.calc_aggregate_groupbytbname)
+            sql += "%s " % random.choice(self.calc_aggregate_groupbytbname)
             sql += " as calc15_3 from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") "
-            sql += "order by calc15_1  " 
+            sql += "order by calc15_1  "
             sql += "%s " % random.choice(self.limit_where)
-            tdLog.info(sql)      
-            tdSql.query(sql) 
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
-        #16 select * from (select calc_aggregate_regulars as agg from regular_table  where <\>\in\and\or  order by limit offset )       
+        #16 select * from (select calc_aggregate_regulars as agg from regular_table  where <\>\in\and\or  order by limit offset )
         tdSql.query("select 16-1 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_0 , " % random.choice(self.calc_calculate_all)
-            sql += "%s as calc16_1 , " % random.choice(self.calc_aggregate_all)  
-            sql += "%s as calc16_2 " % random.choice(self.calc_select_in) 
+            sql += "%s as calc16_1 , " % random.choice(self.calc_aggregate_all)
+            sql += "%s as calc16_2 " % random.choice(self.calc_select_in)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") "
-            sql += "order by calc16_0  " 
+            sql += "order by calc16_0  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_0  " % random.choice(self.calc_calculate_all_j)
-            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j)  
+            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += ") "
-            sql += "order by calc16_0  " 
+            sql += "order by calc16_0  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-2.2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_0  " % random.choice(self.calc_calculate_all_j)
-            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j) 
+            sql += ", %s as calc16_1  " % random.choice(self.calc_aggregate_all_j)
             sql += "  from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += ") "
-            sql += "order by calc16_0  " 
+            sql += "order by calc16_0  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 16-3 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular)
             sql += "  from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-4 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j)
             sql += "  from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-4.2 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_regular_j)
             sql += "  from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 16-5 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
+            sql = "select   * from  ( select  "
             sql += "%s as calc16_1 , " % random.choice(self.calc_calculate_all)
-            sql += "%s as calc16_2 , " % random.choice(self.calc_calculate_all) 
-            sql += "%s as calc16_3 " % random.choice(self.calc_calculate_all) 
+            sql += "%s as calc16_2 , " % random.choice(self.calc_calculate_all)
+            sql += "%s as calc16_3 " % random.choice(self.calc_calculate_all)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.group_where)
             sql += ") "
-            sql += "order by calc16_1  " 
+            sql += "order by calc16_1  "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 16-6 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname)
             sql += "  from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-7 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j)
             sql += "  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 16-8 from stable_1;")
         for i in range(self.fornum):
-            sql = "select   * from  ( select  " 
-            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j) 
+            sql = "select   * from  ( select  "
+            sql += "%s as calc16_1  " % random.choice(self.calc_calculate_groupbytbname_j)
             sql += "  from stable_1  t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "limit 2 ) "
             sql += "%s " % random.choice(self.limit1_where)
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
@@ -4259,566 +4259,566 @@ class TDTestCase:
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
             sql += "%s as cal17_0 , " % random.choice(self.calc_calculate_all)
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 17-2 from stable_1;")
         for i in range(self.fornum):
-            #this is having_support , but tag-select cannot mix with last_row,other select can 
+            #this is having_support , but tag-select cannot mix with last_row,other select can
             sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
             sql += "%s as cal17_0 , " % random.choice(self.calc_calculate_all_j)
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_0, %d)/10 ,apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
             sql += "%s as cal17_0 , " % random.choice(self.calc_calculate_all_j)
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 17-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-4.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.partiton_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-       
+
         tdSql.query("select 17-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-7 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, stable_1_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-7.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, stable_1_2 t2 where t1.ts = t2.ts and "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 17-8 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all)
             sql += " from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-       
+
         tdSql.query("select 17-9 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 17-10 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal17_1, %d)/1000 ,apercentile(cal17_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal17_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal17_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.interval_sliding)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all)
             sql += " from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.session_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-               
+
         tdSql.query("select 18-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-       
+
         tdSql.query("select 18-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.session_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-4.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1 t1, regular_table_2 t2 where t1.ts = t2.ts and  "
             sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-5 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.session_where)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 18-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.t_join_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 18-7 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal18_1, %d)/1000 ,apercentile(cal18_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal18_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal18_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1, stable_2 t2 where t1.ts = t2.ts and   "
             sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.session_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
-        #19 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or session order by  limit )interval_sliding       
+        #19 select apercentile from (select calc_aggregate_alls form regualr_table or stable  where <\>\in\and\or session order by  limit )interval_sliding
         tdSql.query("select 19-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all)
             sql += " from regular_table_1 where "
-            sql += "%s " % random.choice(self.q_where)        
+            sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.state_window)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
-            sql += "%s " % random.choice(self.q_u_where)        
+            sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.state_u_window)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-2.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from regular_table_1 t1, regular_table_2 t2 where t1.ts = t2.ts and   "
-            sql += "%s " % random.choice(self.q_u_or_where)        
+            sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.state_u_window)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-        
+
         tdSql.query("select 19-3 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all)
             sql += " from stable_1_1 where "
-            sql += "%s " % random.choice(self.q_where)        
+            sql += "%s " % random.choice(self.q_where)
             sql += "%s " % random.choice(self.state_window)
             sql += "%s " % random.choice(self.limit1_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-4 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1  t1, stable_1_2 t2 where t1.ts = t2.ts and  "
-            sql += "%s " % random.choice(self.q_u_where)       
+            sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-4.2 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1_1  t1, stable_1_2 t2 where t1.ts = t2.ts and  "
-            sql += "%s " % random.choice(self.q_u_or_where)  
+            sql += "%s " % random.choice(self.q_u_or_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
-            self.explain_sql(sql) 
-       
+            tdLog.info(sql)
+            tdSql.query(sql)
+            self.explain_sql(sql)
+
         tdSql.query("select 19-6 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
-            sql += "%s " % random.choice(self.q_u_where)        
+            sql += "%s " % random.choice(self.q_u_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         tdSql.query("select 19-7 from stable_1;")
         for i in range(self.fornum):
             sql = "select   apercentile(cal19_1, %d)/1000 ,apercentile(cal19_2, %d)*10+%d  from  ( select  " %(random.randint(0,100) , random.randint(0,100) ,random.randint(-1000,1000))
-            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j) 
-            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j) 
+            sql += "%s as cal19_1 ," % random.choice(self.calc_aggregate_all_j)
+            sql += "%s as cal19_2 " % random.choice(self.calc_aggregate_all_j)
             sql += " from stable_1 t1 , stable_2 t2 where t1.ts = t2.ts and "
-            sql += "%s " % random.choice(self.qt_u_or_where)   
+            sql += "%s " % random.choice(self.qt_u_or_where)
             sql += "%s " % random.choice(self.limit_u_where)
             sql += ") "
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         #1 select * from (select * from (select * form regular_table  where <\>\in\and\or order by limit  ))
         tdSql.query("select 1-1 from stable_1;")
-        for i in range(self.fornum):       
+        for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  *  from ("  * for_num  
+            sql = "select  *  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_r_select) 
-            sql += "%s, " % random.choice(self.q_select)  
+            sql += "%s, " % random.choice(self.s_r_select)
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts as ttt from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num     
-            tdLog.info(sql)      
-            tdSql.query(sql)  
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-            
+
             sql2 =  "select  *  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_r_select) 
-            sql2 += "%s, " % random.choice(self.q_select)  
+            sql2 += "%s, " % random.choice(self.s_r_select)
+            sql2 += "%s, " % random.choice(self.q_select)
             sql2 += "ts as tin from regular_table_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) "  
-            tdLog.info(sql2)     
-            tdSql.query(sql2)             
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdSql.query(sql2)
             self.cur1.execute(sql2)
-            self.explain_sql(sql2)           
-            
-            tdLog.info("=====1-1==over=========") 
-            
+            self.explain_sql(sql2)
+
+            tdLog.info("=====1-1==over=========")
+
         for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  ts2  from ("  * for_num  
+            sql = "select  ts2  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_r_select) 
-            sql += "%s, " % random.choice(self.q_select)  
+            sql += "%s, " % random.choice(self.s_r_select)
+            sql += "%s, " % random.choice(self.q_select)
             sql += "ts as ts2 from regular_table_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num     
-            tdLog.info(sql)     
-            tdSql.query(sql)  
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-            
+
             sql2 =  "select  *  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_r_select) 
-            sql2 += "%s, " % random.choice(self.q_select)  
+            sql2 += "%s, " % random.choice(self.s_r_select)
+            sql2 += "%s, " % random.choice(self.q_select)
             sql2 += "ts as tt from regular_table_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) "   
-            tdLog.info(sql2)      
+            sql2 += ")) "
+            tdLog.info(sql2)
             tdSql.query(sql2)
-            self.explain_sql(sql2) 
-            tdLog.info("=====1-2==over=========") 
-            
+            self.explain_sql(sql2)
+            tdLog.info("=====1-2==over=========")
+
         #2 select * from (select * from (select * form stable  where <\>\in\and\or order by limit  ))
         tdSql.query("select 2-1 from stable_1;")
         for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  *  from ("  * for_num  
+            sql = "select  *  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_s_select) 
-            sql += "%s, " % random.choice(self.qt_select) 
+            sql += "%s, " % random.choice(self.s_s_select)
+            sql += "%s, " % random.choice(self.qt_select)
             sql += "ts as tss from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num  
-            tdLog.info(sql)    
-            tdSql.query(sql) 
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-            
+
             sql2 = "select  *  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_s_select) 
-            sql2 += "%s, " % random.choice(self.qt_select) 
+            sql2 += "%s, " % random.choice(self.s_s_select)
+            sql2 += "%s, " % random.choice(self.qt_select)
             sql2 += "ts as tst from stable_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) " 
-            tdLog.info(sql2)      
-            tdSql.query(sql2) 
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdSql.query(sql2)
             self.explain_sql(sql2)
-            
-            tdLog.info("=====2-1==over=========") 
-            
+
+            tdLog.info("=====2-1==over=========")
+
         for i in range(self.fornum):
             for_num = random.randint(1, 15);
-            sql = "select  tsn  from ("  * for_num  
+            sql = "select  tsn  from ("  * for_num
             sql += "select  *  from  ( select * from ( select  "
-            sql += "%s, " % random.choice(self.s_s_select) 
-            sql += "%s, " % random.choice(self.qt_select) 
+            sql += "%s, " % random.choice(self.s_s_select)
+            sql += "%s, " % random.choice(self.qt_select)
             sql += "ts as tsn from stable_1 where "
             sql += "%s " % random.choice(self.q_where)
             sql += ")) "
-            sql += ")"  * for_num  
-            tdLog.info(sql)      
-            tdSql.query(sql) 
+            sql += ")"  * for_num
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
-            
+
             sql2 = "select  ts1  from  ( select * from ( select  "
-            sql2 += "%s, " % random.choice(self.s_s_select) 
-            sql2 += "%s, " % random.choice(self.qt_select) 
+            sql2 += "%s, " % random.choice(self.s_s_select)
+            sql2 += "%s, " % random.choice(self.qt_select)
             sql2 += "ts as ts1 from stable_1 where "
             sql2 += "%s " % random.choice(self.q_where)
-            sql2 += ")) " 
-            tdLog.info(sql2)      
-            tdSql.query(sql2) 
+            sql2 += ")) "
+            tdLog.info(sql2)
+            tdSql.query(sql2)
             self.cur1.execute(sql2)
             self.explain_sql(sql2)
-            tdLog.info("=====2-2==over=========") 
-                         
-        #3 select ts ,calc from  (select * form stable  where <\>\in\and\or order by limit  )  
+            tdLog.info("=====2-2==over=========")
+
+        #3 select ts ,calc from  (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 3-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   "
-            sql += "%s " % random.choice(self.calc_calculate_regular) 
+            sql += "%s " % random.choice(self.calc_calculate_regular)
             sql += " from ( select * from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.orders_desc_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") ;"
-            tdLog.info(sql)      
-            tdSql.query(sql)   
+            tdLog.info(sql)
+            tdSql.query(sql)
             self.explain_sql(sql)
 
         #4 select * from  (select calc form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 4-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select  *  from  ( select  "
-            sql += "%s " % random.choice(self.calc_select_in_ts) 
+            sql += "%s " % random.choice(self.calc_select_in_ts)
             sql += "from stable_1 where "
             sql += "%s " % random.choice(self.qt_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") ;"
-            tdLog.info(sql)      
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         #5 select ts ,tbname from  (select * form stable  where <\>\in\and\or order by limit  )
         tdSql.query("select 5-1 from stable_1;")
         for i in range(self.fornum):
             sql = "select   ts , tbname , "
-            sql += "%s ," % random.choice(self.calc_calculate_regular) 
+            sql += "%s ," % random.choice(self.calc_calculate_regular)
             sql += "%s ," % random.choice(self.dqt_select)
             sql += "%s " % random.choice(self.qt_select)
             sql += " from ( select * from stable_1 where "
@@ -4826,8 +4826,8 @@ class TDTestCase:
             sql += "%s " % random.choice(self.orders_desc_where)
             sql += "%s " % random.choice(self.limit_where)
             sql += ") ;"
-            tdLog.info(sql)      
-            tdSql.error(sql) 
+            tdLog.info(sql)
+            tdSql.error(sql)
 
         #special sql
         tdSql.query("select 6-1 from stable_1;")
@@ -4837,34 +4837,34 @@ class TDTestCase:
             sql = "select _block_dist() from (select * from stable_1);"
             tdSql.error(sql)
             sql = "select * from (select database());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
             sql = "select * from (select client_version());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
             sql = "select * from (select client_version() as version);"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_version());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_version() as version);"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_status());"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
             sql = "select * from (select server_status() as status);"
-            tdLog.info(sql)   
+            tdLog.info(sql)
             tdSql.query(sql)
             self.explain_sql(sql)
-            
+
         #taos -f sql
         startTime_taos_f = time.time()
         print("taos -f sql start!")
@@ -4875,56 +4875,56 @@ class TDTestCase:
         print("taos_f total time %ds" % (endTime_taos_f - startTime_taos_f))
 
         print('=====================2.6 old function end ===========')
-    
-                        
+
+
     def run(self):
         tdSql.prepare()
-        
-        startTime = time.time() 
 
-        #self.function_before_26()  
-        
-        self.dropandcreateDB_random("%s" %self.db_nest, 1)     
-               
+        startTime = time.time()
+
+        #self.function_before_26()
+
+        self.dropandcreateDB_random("%s" %self.db_nest, 1)
+
         self.math_nest(['UNIQUE'])
-        self.math_nest(['MODE']) 
+        self.math_nest(['MODE'])
         self.math_nest(['SAMPLE'])
-                
-        self.math_nest(['ABS','SQRT'])     
-        self.math_nest(['SIN','COS','TAN','ASIN','ACOS','ATAN'])        
-        self.math_nest(['POW','LOG']) 
-        self.math_nest(['FLOOR','CEIL','ROUND']) 
-        self.math_nest(['MAVG'])  
-        self.math_nest(['HYPERLOGLOG']) 
-        self.math_nest(['TAIL']) 
+
+        self.math_nest(['ABS','SQRT'])
+        self.math_nest(['SIN','COS','TAN','ASIN','ACOS','ATAN'])
+        self.math_nest(['POW','LOG'])
+        self.math_nest(['FLOOR','CEIL','ROUND'])
+        self.math_nest(['MAVG'])
+        self.math_nest(['HYPERLOGLOG'])
+        self.math_nest(['TAIL'])
         self.math_nest(['CSUM'])
         self.math_nest(['statecount','stateduration'])
-        self.math_nest(['HISTOGRAM']) 
-        
-        self.str_nest(['LTRIM','RTRIM','LOWER','UPPER']) 
-        self.str_nest(['LENGTH','CHAR_LENGTH']) 
-        self.str_nest(['SUBSTR'])   
-        self.str_nest(['CONCAT']) 
-        self.str_nest(['CONCAT_WS']) 
-        self.time_nest(['CAST']) 
+        self.math_nest(['HISTOGRAM'])
+
+        self.str_nest(['LTRIM','RTRIM','LOWER','UPPER'])
+        self.str_nest(['LENGTH','CHAR_LENGTH'])
+        self.str_nest(['SUBSTR'])
+        self.str_nest(['CONCAT'])
+        self.str_nest(['CONCAT_WS'])
+        self.time_nest(['CAST'])
         self.time_nest(['CAST_1'])
         self.time_nest(['CAST_2'])
         self.time_nest(['CAST_3'])
         self.time_nest(['CAST_4'])
-        
-        self.time_nest(['NOW','TODAY']) 
-        self.time_nest(['TIMEZONE']) 
-        self.time_nest(['TIMETRUNCATE']) 
+
+        self.time_nest(['NOW','TODAY'])
+        self.time_nest(['TIMEZONE'])
+        self.time_nest(['TIMETRUNCATE'])
         self.time_nest(['TO_ISO8601'])
         self.time_nest(['TO_UNIXTIMESTAMP'])
         self.time_nest(['ELAPSED'])
         self.time_nest(['TIMEDIFF_1'])
-        self.time_nest(['TIMEDIFF_2'])       
+        self.time_nest(['TIMEDIFF_2'])
 
         endTime = time.time()
         print("total time %ds" % (endTime - startTime))
 
-        
+
 
 
     def stop(self):
diff --git a/tests/system-test/2-query/stablity_1.py b/tests/system-test/2-query/stablity_1.py
index c1a5eea350..bde92fc9bd 100755
--- a/tests/system-test/2-query/stablity_1.py
+++ b/tests/system-test/2-query/stablity_1.py
@@ -17,52 +17,52 @@ class TDTestCase(TDTestCase):
 
     def run(self):
         tdSql.prepare()
-        
-        startTime = time.time() 
 
-        self.function_before_26()    
-        
-        self.dropandcreateDB_random("%s" %self.db_nest, 1)   
-               
+        startTime = time.time()
+
+        self.function_before_26()
+
+        self.dropandcreateDB_random("%s" %self.db_nest, 1)
+
         # self.math_nest(['UNIQUE'])
-        # self.math_nest(['MODE']) 
+        # self.math_nest(['MODE'])
         # self.math_nest(['SAMPLE'])
-                
-        # self.math_nest(['ABS','SQRT'])     
-        # self.math_nest(['SIN','COS','TAN','ASIN','ACOS','ATAN'])        
-        # self.math_nest(['POW','LOG']) 
-        # self.math_nest(['FLOOR','CEIL','ROUND']) 
-        # self.math_nest(['MAVG'])  
-        # self.math_nest(['HYPERLOGLOG']) 
-        # self.math_nest(['TAIL']) 
+
+        # self.math_nest(['ABS','SQRT'])
+        # self.math_nest(['SIN','COS','TAN','ASIN','ACOS','ATAN'])
+        # self.math_nest(['POW','LOG'])
+        # self.math_nest(['FLOOR','CEIL','ROUND'])
+        # self.math_nest(['MAVG'])
+        # self.math_nest(['HYPERLOGLOG'])
+        # self.math_nest(['TAIL'])
         # self.math_nest(['CSUM'])
         # self.math_nest(['statecount','stateduration'])
-        # self.math_nest(['HISTOGRAM']) 
-        
-        self.str_nest(['LTRIM','RTRIM','LOWER','UPPER']) 
-        self.str_nest(['LENGTH','CHAR_LENGTH']) 
-        self.str_nest(['SUBSTR'])   
-        self.str_nest(['CONCAT']) 
-        self.str_nest(['CONCAT_WS']) 
-        self.time_nest(['CAST']) 
+        # self.math_nest(['HISTOGRAM'])
+
+        self.str_nest(['LTRIM','RTRIM','LOWER','UPPER'])
+        self.str_nest(['LENGTH','CHAR_LENGTH'])
+        self.str_nest(['SUBSTR'])
+        self.str_nest(['CONCAT'])
+        self.str_nest(['CONCAT_WS'])
+        self.time_nest(['CAST'])
         self.time_nest(['CAST_1'])
         self.time_nest(['CAST_2'])
         self.time_nest(['CAST_3'])
         self.time_nest(['CAST_4'])
-        
-        self.time_nest(['NOW','TODAY']) 
-        self.time_nest(['TIMEZONE']) 
-        self.time_nest(['TIMETRUNCATE']) 
+
+        self.time_nest(['NOW','TODAY'])
+        self.time_nest(['TIMEZONE'])
+        self.time_nest(['TIMETRUNCATE'])
         self.time_nest(['TO_ISO8601'])
         self.time_nest(['TO_UNIXTIMESTAMP'])
         self.time_nest(['ELAPSED'])
         self.time_nest(['TIMEDIFF_1'])
-        self.time_nest(['TIMEDIFF_2'])       
+        self.time_nest(['TIMEDIFF_2'])
 
         endTime = time.time()
         print("total time %ds" % (endTime - startTime))
 
-        
+
 
     def stop(self):
         tdSql.close()

From a90ce0008c35e22e52e2d94e2c01c5355ea935c6 Mon Sep 17 00:00:00 2001
From: "wenzhouwww@live.cn" <wenzhouwww@live.cn>
Date: Tue, 15 Nov 2022 14:55:37 +0800
Subject: [PATCH 27/85] fix/release of CentOS about rpm packing can find 
 python3

---
 packaging/rpm/tdengine.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/rpm/tdengine.spec b/packaging/rpm/tdengine.spec
index 637d2d425a..e9d86219cb 100644
--- a/packaging/rpm/tdengine.spec
+++ b/packaging/rpm/tdengine.spec
@@ -2,6 +2,7 @@
 %define userlocalpath    /usr/local
 %define cfg_install_dir  /etc/taos
 %define __strip /bin/true
+%global __python /usr/bin/python3
 
 Name:		tdengine
 Version:	%{_version}

From 9d1cdb0b055e0ec3ee6c257719e158e58673c8e1 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 15:13:59 +0800
Subject: [PATCH 28/85] test: add asan case

---
 tests/parallel_test/cases.task | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 2369b238ea..cf2e95e590 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -10,9 +10,9 @@
 ,,y,script,./test.sh -f tsim/user/password.sim
 ,,y,script,./test.sh -f tsim/user/privilege_db.sim
 ,,y,script,./test.sh -f tsim/user/privilege_sysinfo.sim
-,,,script,./test.sh -f tsim/db/alter_option.sim
-,,,script,./test.sh -f tsim/db/alter_replica_13.sim
-,,,script,./test.sh -f tsim/db/alter_replica_31.sim
+,,y,script,./test.sh -f tsim/db/alter_option.sim
+,,y,script,./test.sh -f tsim/db/alter_replica_13.sim
+,,y,script,./test.sh -f tsim/db/alter_replica_31.sim
 ,,y,script,./test.sh -f tsim/db/basic1.sim
 ,,y,script,./test.sh -f tsim/db/basic2.sim
 ,,y,script,./test.sh -f tsim/db/basic3.sim
@@ -20,7 +20,7 @@
 ,,y,script,./test.sh -f tsim/db/basic5.sim
 ,,y,script,./test.sh -f tsim/db/basic6.sim
 ,,y,script,./test.sh -f tsim/db/commit.sim
-,,,script,./test.sh -f tsim/db/create_all_options.sim
+,,y,script,./test.sh -f tsim/db/create_all_options.sim
 ,,y,script,./test.sh -f tsim/db/delete_reuse1.sim
 ,,y,script,./test.sh -f tsim/db/delete_reuse2.sim
 ,,y,script,./test.sh -f tsim/db/delete_reusevnode.sim
@@ -90,7 +90,7 @@
 ,,y,script,./test.sh -f tsim/parser/auto_create_tb.sim
 ,,y,script,./test.sh -f tsim/parser/between_and.sim
 ,,y,script,./test.sh -f tsim/parser/binary_escapeCharacter.sim
-,,,script,./test.sh -f tsim/parser/col_arithmetic_operation.sim     
+,,y,script,./test.sh -f tsim/parser/col_arithmetic_operation.sim     
 ,,y,script,./test.sh -f tsim/parser/columnValue_bigint.sim
 ,,y,script,./test.sh -f tsim/parser/columnValue_bool.sim
 ,,y,script,./test.sh -f tsim/parser/columnValue_double.sim
@@ -124,7 +124,7 @@
 ,,y,script,./test.sh -f tsim/parser/import.sim
 ,,y,script,./test.sh -f tsim/parser/insert_multiTbl.sim
 ,,y,script,./test.sh -f tsim/parser/insert_tb.sim
-,,,script,./test.sh -f tsim/parser/join_manyblocks.sim
+,,y,script,./test.sh -f tsim/parser/join_manyblocks.sim
 ,,y,script,./test.sh -f tsim/parser/join_multitables.sim
 ,,y,script,./test.sh -f tsim/parser/join_multivnode.sim
 ,,y,script,./test.sh -f tsim/parser/join.sim
@@ -173,9 +173,9 @@
 ,,,script,./test.sh -f tsim/query/udf.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
 ,,y,script,./test.sh -f tsim/snode/basic1.sim
-,,,script,./test.sh -f tsim/mnode/basic1.sim
-,,,script,./test.sh -f tsim/mnode/basic2.sim
-,,,script,./test.sh -f tsim/mnode/basic3.sim
+,,y,script,./test.sh -f tsim/mnode/basic1.sim
+,,y,script,./test.sh -f tsim/mnode/basic2.sim
+,,y,script,./test.sh -f tsim/mnode/basic3.sim
 ,,,script,./test.sh -f tsim/mnode/basic4.sim
 ,,,script,./test.sh -f tsim/mnode/basic5.sim
 ,,y,script,./test.sh -f tsim/show/basic.sim
@@ -219,8 +219,8 @@
 ,,,script,./test.sh -f tsim/stream/distributeSession0.sim
 ,,,script,./test.sh -f tsim/stream/session0.sim
 ,,,script,./test.sh -f tsim/stream/session1.sim
-,,,script,./test.sh -f tsim/stream/state0.sim
-,,,script,./test.sh -f tsim/stream/triggerInterval0.sim
+,,y,script,./test.sh -f tsim/stream/state0.sim
+,,y,script,./test.sh -f tsim/stream/triggerInterval0.sim
 ,,,script,./test.sh -f tsim/stream/triggerSession0.sim
 ,,y,script,./test.sh -f tsim/stream/partitionby.sim
 ,,y,script,./test.sh -f tsim/stream/partitionby1.sim
@@ -288,11 +288,11 @@
 ,,,script,./test.sh -f tsim/valgrind/checkError7.sim
 ,,,script,./test.sh -f tsim/valgrind/checkError8.sim
 ,,,script,./test.sh -f tsim/valgrind/checkUdf.sim
-,,,script,./test.sh -f tsim/vnode/replica3_basic.sim
-,,,script,./test.sh -f tsim/vnode/replica3_repeat.sim
-,,,script,./test.sh -f tsim/vnode/replica3_vgroup.sim
-,,,script,./test.sh -f tsim/vnode/replica3_many.sim
-,,,script,./test.sh -f tsim/vnode/replica3_import.sim
+,,y,script,./test.sh -f tsim/vnode/replica3_basic.sim
+,,y,script,./test.sh -f tsim/vnode/replica3_repeat.sim
+,,y,script,./test.sh -f tsim/vnode/replica3_vgroup.sim
+,,y,script,./test.sh -f tsim/vnode/replica3_many.sim
+,,y,script,./test.sh -f tsim/vnode/replica3_import.sim
 ,,,script,./test.sh -f tsim/vnode/stable_balance_replica1.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2_stop.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2.sim
@@ -307,7 +307,7 @@
 ,,y,script,./test.sh -f tsim/scalar/in.sim
 ,,y,script,./test.sh -f tsim/scalar/scalar.sim
 ,,y,script,./test.sh -f tsim/scalar/filter.sim 
-,,,script,./test.sh -f tsim/scalar/caseWhen.sim 
+,,y,script,./test.sh -f tsim/scalar/caseWhen.sim 
 ,,y,script,./test.sh -f tsim/alter/cached_schema_after_alter.sim
 ,,y,script,./test.sh -f tsim/alter/dnode.sim
 ,,y,script,./test.sh -f tsim/alter/table.sim

From 5f824801d1c3aa67a5b930214c7f5793c49f3cae Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 15:28:08 +0800
Subject: [PATCH 29/85] test: add asan case

---
 tests/parallel_test/cases.task | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index cf2e95e590..e15260a284 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -42,8 +42,8 @@
 ,,,script,./test.sh -f tsim/dnode/balance3.sim
 ,,,script,./test.sh -f tsim/dnode/balancex.sim
 ,,y,script,./test.sh -f tsim/dnode/create_dnode.sim
-,,,script,./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim
-,,,script,./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim
+,,y,script,./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim
+,,y,script,./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim
 ,,,script,./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica1.sim
 ,,,script,./test.sh -f tsim/dnode/drop_dnode_has_vnode_replica3.sim
 ,,,script,./test.sh -f tsim/dnode/drop_dnode_has_multi_vnode_replica1.sim

From 276fc51969dd57752a684832c50615d163ae3471 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 15 Nov 2022 15:28:51 +0800
Subject: [PATCH 30/85] fix: clear meta reader's decoder to free leaked memory

---
 source/dnode/vnode/src/vnd/vnodeSvr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index 6883354547..5c8c166833 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -1189,6 +1189,8 @@ static int32_t vnodeProcessBatchDeleteReq(SVnode *pVnode, int64_t version, void
       vError("vgId:%d, delete error since %s, suid:%" PRId64 ", uid:%" PRId64 ", start ts:%" PRId64 ", end ts:%" PRId64,
              TD_VID(pVnode), terrstr(), deleteReq.suid, uid, pOneReq->ts, pOneReq->ts);
     }
+
+    tDecoderClear(&mr.coder);
   }
   metaReaderClear(&mr);
   taosArrayDestroy(deleteReq.deleteReqs);

From 5ad1bca624057d439bd97f9fec5e96f02cbe8dd5 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 15 Nov 2022 15:57:50 +0800
Subject: [PATCH 31/85] fix: free value return by tdb

---
 source/dnode/vnode/src/tq/tqMeta.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/dnode/vnode/src/tq/tqMeta.c b/source/dnode/vnode/src/tq/tqMeta.c
index b021c5ee7f..a15d19fbe1 100644
--- a/source/dnode/vnode/src/tq/tqMeta.c
+++ b/source/dnode/vnode/src/tq/tqMeta.c
@@ -179,6 +179,7 @@ int32_t tqMetaRestoreCheckInfo(STQ* pTq) {
     if (tDecodeSTqCheckInfo(&decoder, &info) < 0) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
       tdbFree(pKey);
+      tdbFree(pVal);
       tdbTbcClose(pCur);
       return -1;
     }
@@ -186,11 +187,13 @@ int32_t tqMetaRestoreCheckInfo(STQ* pTq) {
     if (taosHashPut(pTq->pCheckInfo, info.topic, strlen(info.topic), &info, sizeof(STqCheckInfo)) < 0) {
       terrno = TSDB_CODE_OUT_OF_MEMORY;
       tdbFree(pKey);
+      tdbFree(pVal);
       tdbTbcClose(pCur);
       return -1;
     }
   }
   tdbFree(pKey);
+  tdbFree(pVal);
   tdbTbcClose(pCur);
   return 0;
 }

From cfc00310809f3e40884df8eb98f2c001f3604fb6 Mon Sep 17 00:00:00 2001
From: Huo Linhe <linhehuo@gmail.com>
Date: Tue, 15 Nov 2022 15:58:47 +0800
Subject: [PATCH 32/85] chore: update taosws to fix some unhandled error

---
 cmake/taosws_CMakeLists.txt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/taosws_CMakeLists.txt.in b/cmake/taosws_CMakeLists.txt.in
index 33ca6c659c..5c448e2c1d 100644
--- a/cmake/taosws_CMakeLists.txt.in
+++ b/cmake/taosws_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosws-rs
 ExternalProject_Add(taosws-rs
         GIT_REPOSITORY https://github.com/taosdata/taos-connector-rust.git
-        GIT_TAG 38c4599
+        GIT_TAG 7664c41
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosws-rs"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

From 094ada1566b0f5d800a1da194c8c11b72769999a Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 16:13:22 +0800
Subject: [PATCH 33/85] test: add tsan case

---
 tests/parallel_test/cases.task | 58 +++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index e15260a284..2e964c3f42 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -12,7 +12,7 @@
 ,,y,script,./test.sh -f tsim/user/privilege_sysinfo.sim
 ,,y,script,./test.sh -f tsim/db/alter_option.sim
 ,,y,script,./test.sh -f tsim/db/alter_replica_13.sim
-,,y,script,./test.sh -f tsim/db/alter_replica_31.sim
+,,,script,./test.sh -f tsim/db/alter_replica_31.sim
 ,,y,script,./test.sh -f tsim/db/basic1.sim
 ,,y,script,./test.sh -f tsim/db/basic2.sim
 ,,y,script,./test.sh -f tsim/db/basic3.sim
@@ -207,7 +207,7 @@
 ,,y,script,./test.sh -f tsim/table/table.sim
 ,,y,script,./test.sh -f tsim/table/tinyint.sim
 ,,y,script,./test.sh -f tsim/table/vgroup.sim
-,,,script,./test.sh -f tsim/stream/basic0.sim -g
+,,n,script,./test.sh -f tsim/stream/basic0.sim -g
 ,,y,script,./test.sh -f tsim/stream/basic1.sim
 ,,y,script,./test.sh -f tsim/stream/basic2.sim
 ,,,script,./test.sh -f tsim/stream/drop_stream.sim
@@ -228,14 +228,14 @@
 ,,,script,./test.sh -f tsim/stream/windowClose.sim
 ,,y,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
 ,,y,script,./test.sh -f tsim/stream/sliding.sim
-,,,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim
+,,y,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim
 ,,,script,./test.sh -f tsim/stream/partitionbyColumnSession.sim
-,,,script,./test.sh -f tsim/stream/partitionbyColumnState.sim
-,,,script,./test.sh -f tsim/stream/deleteInterval.sim
+,,y,script,./test.sh -f tsim/stream/partitionbyColumnState.sim
+,,y,script,./test.sh -f tsim/stream/deleteInterval.sim
 ,,,script,./test.sh -f tsim/stream/deleteSession.sim
-,,,script,./test.sh -f tsim/stream/deleteState.sim
+,,y,script,./test.sh -f tsim/stream/deleteState.sim
 ,,y,script,./test.sh -f tsim/stream/fillIntervalDelete0.sim
-,,,script,./test.sh -f tsim/stream/fillIntervalDelete1.sim
+,,y,script,./test.sh -f tsim/stream/fillIntervalDelete1.sim
 ,,y,script,./test.sh -f tsim/stream/fillIntervalLinear.sim
 ,,y,script,./test.sh -f tsim/stream/fillIntervalPartitionBy.sim
 ,,y,script,./test.sh -f tsim/stream/fillIntervalPrevNext.sim
@@ -244,16 +244,16 @@
 ,,y,script,./test.sh -f tsim/trans/create_db.sim
 ,,y,script,./test.sh -f tsim/tmq/basic1.sim
 ,,y,script,./test.sh -f tsim/tmq/basic2.sim
-,,,script,./test.sh -f tsim/tmq/basic3.sim
-,,,script,./test.sh -f tsim/tmq/basic4.sim
-,,,script,./test.sh -f tsim/tmq/basic1Of2Cons.sim
-,,,script,./test.sh -f tsim/tmq/basic2Of2Cons.sim
-,,,script,./test.sh -f tsim/tmq/basic3Of2Cons.sim
-,,,script,./test.sh -f tsim/tmq/basic4Of2Cons.sim
-,,,script,./test.sh -f tsim/tmq/basic2Of2ConsOverlap.sim
+,,y,script,./test.sh -f tsim/tmq/basic3.sim
+,,y,script,./test.sh -f tsim/tmq/basic4.sim
+,,y,script,./test.sh -f tsim/tmq/basic1Of2Cons.sim
+,,y,script,./test.sh -f tsim/tmq/basic2Of2Cons.sim
+,,y,script,./test.sh -f tsim/tmq/basic3Of2Cons.sim
+,,y,script,./test.sh -f tsim/tmq/basic4Of2Cons.sim
+,,y,script,./test.sh -f tsim/tmq/basic2Of2ConsOverlap.sim
 ,,,script,./test.sh -f tsim/tmq/topic.sim
-,,,script,./test.sh -f tsim/tmq/snapshot.sim
-,,,script,./test.sh -f tsim/tmq/snapshot1.sim
+,,y,script,./test.sh -f tsim/tmq/snapshot.sim
+,,y,script,./test.sh -f tsim/tmq/snapshot1.sim
 ,,y,script,./test.sh -f tsim/stable/alter_comment.sim
 ,,y,script,./test.sh -f tsim/stable/alter_count.sim
 ,,y,script,./test.sh -f tsim/stable/alter_import.sim
@@ -279,15 +279,15 @@
 ,,,script,./test.sh -f tsim/sma/tsmaCreateInsertQuery.sim
 ,,y,script,./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim
 ,,,script,./test.sh -f tsim/sma/rsmaPersistenceRecovery.sim
-,,,script,./test.sh -f tsim/valgrind/checkError1.sim
-,,,script,./test.sh -f tsim/valgrind/checkError2.sim
-,,,script,./test.sh -f tsim/valgrind/checkError3.sim
-,,,script,./test.sh -f tsim/valgrind/checkError4.sim
-,,,script,./test.sh -f tsim/valgrind/checkError5.sim
-,,,script,./test.sh -f tsim/valgrind/checkError6.sim
-,,,script,./test.sh -f tsim/valgrind/checkError7.sim
-,,,script,./test.sh -f tsim/valgrind/checkError8.sim
-,,,script,./test.sh -f tsim/valgrind/checkUdf.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError1.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError2.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError3.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError4.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError5.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError6.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError7.sim
+,,n,script,./test.sh -f tsim/valgrind/checkError8.sim
+,,n,script,./test.sh -f tsim/valgrind/checkUdf.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_basic.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_repeat.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_vgroup.sim
@@ -299,10 +299,10 @@
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode3.sim
 ,,,script,./test.sh -f tsim/vnode/stable_replica3_dnode6.sim
 ,,,script,./test.sh -f tsim/vnode/stable_replica3_vnode3.sim
-,,,script,./test.sh -f tsim/sync/3Replica1VgElect.sim
-,,,script,./test.sh -f tsim/sync/3Replica5VgElect.sim
-,,,script,./test.sh -f tsim/sync/oneReplica1VgElect.sim
-,,,script,./test.sh -f tsim/sync/oneReplica5VgElect.sim
+,,y,script,./test.sh -f tsim/sync/3Replica1VgElect.sim
+,,y,script,./test.sh -f tsim/sync/3Replica5VgElect.sim
+,,y,script,./test.sh -f tsim/sync/oneReplica1VgElect.sim
+,,y,script,./test.sh -f tsim/sync/oneReplica5VgElect.sim
 ,,y,script,./test.sh -f tsim/catalog/alterInCurrent.sim
 ,,y,script,./test.sh -f tsim/scalar/in.sim
 ,,y,script,./test.sh -f tsim/scalar/scalar.sim

From 91b098735cbea200df978a8bc9133fb8bc7c62fe Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 16:16:43 +0800
Subject: [PATCH 34/85] test: remove asan case

---
 tests/parallel_test/cases.task | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 2e964c3f42..67753d7f46 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -173,9 +173,9 @@
 ,,,script,./test.sh -f tsim/query/udf.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
 ,,y,script,./test.sh -f tsim/snode/basic1.sim
-,,y,script,./test.sh -f tsim/mnode/basic1.sim
-,,y,script,./test.sh -f tsim/mnode/basic2.sim
-,,y,script,./test.sh -f tsim/mnode/basic3.sim
+,,,script,./test.sh -f tsim/mnode/basic1.sim
+,,,script,./test.sh -f tsim/mnode/basic2.sim
+,,,script,./test.sh -f tsim/mnode/basic3.sim
 ,,,script,./test.sh -f tsim/mnode/basic4.sim
 ,,,script,./test.sh -f tsim/mnode/basic5.sim
 ,,y,script,./test.sh -f tsim/show/basic.sim
@@ -288,7 +288,7 @@
 ,,n,script,./test.sh -f tsim/valgrind/checkError7.sim
 ,,n,script,./test.sh -f tsim/valgrind/checkError8.sim
 ,,n,script,./test.sh -f tsim/valgrind/checkUdf.sim
-,,y,script,./test.sh -f tsim/vnode/replica3_basic.sim
+,,,script,./test.sh -f tsim/vnode/replica3_basic.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_repeat.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_vgroup.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_many.sim

From 9687d352e5981ffe68979382c84ce6ae79993c5e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 16:23:54 +0800
Subject: [PATCH 35/85] test: remove asan case

---
 tests/parallel_test/cases.task | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 67753d7f46..9b1d829c9a 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -11,7 +11,7 @@
 ,,y,script,./test.sh -f tsim/user/privilege_db.sim
 ,,y,script,./test.sh -f tsim/user/privilege_sysinfo.sim
 ,,y,script,./test.sh -f tsim/db/alter_option.sim
-,,y,script,./test.sh -f tsim/db/alter_replica_13.sim
+,,,script,./test.sh -f tsim/db/alter_replica_13.sim
 ,,,script,./test.sh -f tsim/db/alter_replica_31.sim
 ,,y,script,./test.sh -f tsim/db/basic1.sim
 ,,y,script,./test.sh -f tsim/db/basic2.sim

From 885c49b2ebedcb7fd0e1b4325300881f28aabc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Tue, 15 Nov 2022 16:54:55 +0800
Subject: [PATCH 36/85] test: refine query cases

---
 tests/parallel_test/cases.task | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 9b1d829c9a..e58ad6b892 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -111,6 +111,9 @@
 ,,y,script,./test.sh -f tsim/parser/fill_us.sim
 ,,y,script,./test.sh -f tsim/parser/fill.sim
 ,,y,script,./test.sh -f tsim/parser/first_last.sim
+,,y,script,./test.sh -f tsim/parser/fill_stb.sim
+,,y,script,./test.sh -f tsim/parser/interp.sim
+#,,y,script,./test.sh -f tsim/parser/limit2.sim
 ,,y,script,./test.sh -f tsim/parser/fourArithmetic-basic.sim
 ,,,script,./test.sh -f tsim/parser/function.sim
 ,,y,script,./test.sh -f tsim/parser/groupby-basic.sim

From 92e4ad1bdd2c04fc401ad3c6e4709e97a7696c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Tue, 15 Nov 2022 16:55:12 +0800
Subject: [PATCH 37/85] test: refine query cases

---
 tests/script/tsim/parser/interp.sim | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/script/tsim/parser/interp.sim b/tests/script/tsim/parser/interp.sim
index f6cfc86098..1b7878178c 100644
--- a/tests/script/tsim/parser/interp.sim
+++ b/tests/script/tsim/parser/interp.sim
@@ -68,12 +68,8 @@ print ================= TD-5931
 sql create stable st5931(ts timestamp, f int) tags(t int)
 sql create table ct5931 using st5931 tags(1)
 sql create table nt5931(ts timestamp, f int)
-sql select interp(*) from nt5931 where ts=now
-sql select interp(*) from st5931 where ts=now
-sql select interp(*) from ct5931 where ts=now
-
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(*) from nt5931 where ts=now
+sql_error select interp(*) from st5931 where ts=now
+sql_error select interp(*) from ct5931 where ts=now
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

From b64de325708f6c3641bb984e72d05c3089816741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Tue, 15 Nov 2022 16:55:34 +0800
Subject: [PATCH 38/85] test: refine query cases

---
 tests/script/tsim/parser/interp_test.sim | 2421 +---------------------
 1 file changed, 75 insertions(+), 2346 deletions(-)

diff --git a/tests/script/tsim/parser/interp_test.sim b/tests/script/tsim/parser/interp_test.sim
index 5c94b72b43..ae80cb09fd 100644
--- a/tests/script/tsim/parser/interp_test.sim
+++ b/tests/script/tsim/parser/interp_test.sim
@@ -23,60 +23,12 @@ sql use $db
 print ====== select interp from table
 $tb = $tbPrefix . 0
 ## interp(*) from tb
-sql select interp(*) from $tb where ts = $ts0
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
+sql_error select interp(*) from $tb where ts = $ts0
 
 ## interp + limit offset
-sql select interp(*) from $tb where ts = $ts0 limit 5 offset 1
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(*) from $tb where ts = $ts0 limit 5 offset 1
 
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != 0.000000000 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != binary0 then
-  return -1
-endi
-if $data09 != nchar0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0
 
 ## intp + aggregation functions
 $t = $ts0 + $delta
@@ -91,2405 +43,182 @@ sql_error select interp(ts), max(c1), min(c2), count(c3), interp(c4), interp(c5)
 
 ### interp from tb + fill
 $t = $ts0 + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t
 
 ## fill(none)
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
-if $rows != 0 then
-  return -1
-endi
-$t = $tsu + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
+
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
 
 ## fill(NULL)
 $t = $tsu - 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, NULL) order by ts asc
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-11-25 19:29:59.000@ then
-  return -1
-endi
-if $data01 != NULL then
-  print expect NULL, actual $data01
-  return -1
-endi
-if $data02 != NULL then
-  return -1
-endi
-if $data03 != NULL then
-  return -1
-endi
-if $data04 != NULL then
-  return -1
-endi
-if $data05 != NULL then
-  return -1
-endi
-if $data06 != NULL then
-  return -1
-endi
-if $data07 != NULL then
-  return -1
-endi
-if $data08 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, NULL) order by ts asc
 
 $t = $tsu + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(none)
 
 ## fill(prev)
 $t = $ts0 + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
-if $rows != 1 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
 
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(prev)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != 0.000000000 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != binary0 then
-  return -1
-endi
-if $data09 != nchar0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(prev)
 
 $t = $ts0 - 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
 
 $t = $ts0 + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $t fill(prev)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != NULL then
-  return -1
-endi
-if $data03 != 0.00000 then
-  print expect 0.00000, actual:$data03
-  return -1
-endi
-#  if $data04 != NULL then
-#    return -1
-#  endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $t fill(prev)
 
 $t = $tsu + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(prev)
 
 ## fill(linear)
 $t = $ts0 + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
-print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-print $data03
-if $data03 != 0.00167 then
-  return -1
-endi
-if $data04 != 0.001666667 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != NULL then
-  return -1
-endi
-if $data08 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
+
 # columns contain NULL values
 $t = $ts0 + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $t fill(linear)
-print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != NULL then
-  return -1
-endi
-if $data03 != 0.00167 then
-  return -1
-endi
-if $data04 != NULL then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != NULL then
-  return -1
-endi
-if $data08 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $t fill(linear)
 
 print select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(linear)
 
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(linear)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != 0.000000000 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != binary0 then
-  return -1
-endi
-if $data09 != nchar0 then
-  return -1
-endi
-# columns contain NULL values
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(linear)
 
 print select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(linear)
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(linear)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != NULL then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != NULL then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != binary0 then
-  return -1
-endi
-if $data09 != nchar0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(linear)
 
 $t = $ts0 - 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
 
 $t = $tsu + 1000
 print select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
 
 ## fill(value)
 $t = $ts0 + 1000
 print 91
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != -2 then
-  return -1
-endi
-if $data02 != -2 then
-  return -1
-endi
-if $data03 != -2.00000 then
-  return -1
-endi
-if $data04 != -2.000000000 then
-  return -1
-endi
-if $data05 != -2 then
-  return -1
-endi
-if $data06 != -2 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
 
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(value, -1, -2, -3)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != 0.000000000 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != binary0 then
-  return -1
-endi
-if $data09 != nchar0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(value, -1, -2, -3)
 
 # table has NULL columns
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(value, -1, -2, -3)
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != NULL then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != NULL then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(value, -1, -2, -3)
 
 $t = $ts0 - 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
 
 $t = $tsu + 1000
-sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
 
 ### select interp from stable
 ## interp(*) from stb
 print select interp(*) from $stb where ts = $ts0
-sql select interp(*) from $stb where ts = $ts0
-if $rows != 1 then
-  return -1
-endi
-$t = $ts0 + 1000
-print 92
+sql_error select interp(*) from $stb where ts = $ts0
+
+sql_error select interp(*) from $stb where ts = $t
 
-sql select interp(*) from $stb where ts = $t
-if $rows != 0 then
-  return -1
-endi
 ## interp(*) from stb + group by
-sql select interp(ts, c1, c2, c3, c4, c5, c7, c9) from $stb where ts = $ts0 group by tbname order by tbname asc
+sql_error select interp(ts, c1, c2, c3, c4, c5, c7, c9) from $stb where ts = $ts0 group by tbname order by tbname asc
 print ====== select interp(ts, c1, c2, c3, c4, c5, c7, c9) from $stb where ts = $ts0 group by tbname order by tbname asc
-print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
-print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
-if $rows != $tbNum then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:00.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data04 != 0.000000000 then
-  return -1
-endi
-if $data08 != intp_tb0 then
-  return -1
-endi
-if $data22 != NULL then
-  return -1
-endi
-if $data24 != NULL then
-  return -1
-endi
-if $data28 != intp_tb2 then
-  return -1
-endi
 
 ## interp(*) from stb + group by + limit offset
-sql select interp(*) from $stb where ts = $ts0 group by tbname limit 0
-if $rows != 0 then
-  return -1
-endi
-sql select interp(*) from $stb where ts = $ts0 group by tbname limit 0 offset 1
+sql_error select interp(*) from $stb where ts = $ts0 group by tbname limit 0
+
+sql_error select interp(*) from $stb where ts = $ts0 group by tbname limit 0 offset 1
 
 ## interp(*) from stb + group by + fill(none)
 $t = $ts0 + 1000
-sql select interp(*) from $stb where ts = $t fill(none) group by tbname
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(*) from $stb where ts = $t fill(none) group by tbname
 
-sql select interp(*) from $stb where ts = $ts0 fill(none) group by tbname
-if $rows != 4 then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data21 != 0 then
-  return -1
-endi
-if $data22 != NULL then
-  return -1
-endi
-if $data24 != NULL then
-  return -1
-endi
+sql_error select interp(*) from $stb where ts = $ts0 fill(none) group by tbname
 
 ## interp(*) from stb + group by + fill(none)
 $t = $ts0 + 1000
-sql select interp(*) from $stb where ts = $t fill(NULL) group by tbname
-if $rows != $tbNum then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != NULL then
-  return -1
-endi
-if $data12 != NULL then
-  return -1
-endi
-if $data23 != NULL then
-  return -1
-endi
-if $data34 != NULL then
-  return -1
-endi
-if $data05 != NULL then
-  return -1
-endi
-if $data16 != NULL then
-  return -1
-endi
-if $data27 != NULL then
-  return -1
-endi
-if $data38 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
+sql_error select interp(*) from $stb where ts = $t fill(NULL) group by tbname
 
-sql select interp(*) from $stb where ts = $ts0 fill(NULL) group by tbname
+sql_error select interp(*) from $stb where ts = $ts0 fill(NULL) group by tbname
 print $rows
 
-if $rows != 4 then
-  return -1
-endi
-
-if $data01 != 0 then
-  return -1
-endi
-
-if $data02 != 0 then
-  return -1
-endi
-if $data21 != 0 then
-  return -1
-endi
-if $data22 != NULL then
-  return -1
-endi
-if $data24 != NULL then
-  return -1
-endi
-
 ## interp(*) from stb + group by + fill(prev)
 $t = $ts0 + 1000
-sql select interp(*) from $stb where ts = $t fill(prev) group by tbname
-print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
-print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
-if $rows != $tbNum then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data03 != 0.00000 then
-  return -1
-endi
-if $data04 != 0.000000000 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != binary0 then
-  return -1
-endi
-if $data09 != nchar0 then
-  return -1
-endi
-if $data20 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data21 != 0 then
-  return -1
-endi
-if $data22 != NULL then
-  return -1
-endi
-if $data23 != 0.00000 then
-  return -1
-endi
-if $data24 != NULL then
-  return -1
-endi
-if $data25 != 0 then
-  return -1
-endi
-if $data26 != 0 then
-   return -1
-endi
-if $data27 != 1 then
-  return -1
-endi
-if $data28 != binary0 then
-  return -1
-endi
-if $data29 != nchar0 then
-  return -1
-endi
+sql_error select interp(*) from $stb where ts = $t fill(prev) group by tbname
 
 ## interp(*) from stb + group by + fill(linear)
 $t = $ts0 + 1000
-sql select interp(*) from $stb where ts = $t fill(linear) group by tbname
-print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
-print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
-if $rows != $tbNum then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != 0 then
-  return -1
-endi
-if $data02 != 0 then
-  return -1
-endi
-if $data03 != 0.00167 then
-  return -1
-endi
-if $data04 != 0.001666667 then
-  return -1
-endi
-if $data05 != 0 then
-  return -1
-endi
-if $data06 != 0 then
-   return -1
-endi
-if $data07 != NULL then
-  return -1
-endi
-if $data08 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
-if $data20 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data21 != 0 then
-  return -1
-endi
-if $data22 != NULL then
-  return -1
-endi
-if $data23 != 0.00167 then
-  return -1
-endi
-if $data24 != NULL then
-  return -1
-endi
-if $data25 != 0 then
-  return -1
-endi
-if $data26 != 0 then
-   return -1
-endi
-if $data27 != NULL then
-  return -1
-endi
-if $data28 != NULL then
-  return -1
-endi
-if $data29 != NULL then
-  return -1
-endi
+sql_error select interp(*) from $stb where ts = $t fill(linear) group by tbname
 
   ## interp(*) from stb + group by + fill(value)
 $t = $ts0 + 1000
-sql select interp(*) from $stb where ts = $t fill(value, -1, -2) group by tbname
-print ====== 0:$data00, 1:$data01, 2:$data02, 3:$data03, 4:$data04, 5:$data05, 6:$data06, 7:$data07, 8:$data08, 9:$data09
-print ====== 0:$data20, 1:$data21, 2:$data22, 3:$data23, 4:$data24, 5:$data25, 6:$data26, 7:$data27, 8:$data28, 9:$data29
-if $rows != $tbNum then
-  return -1
-endi
-if $data00 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data01 != -2 then
-  return -1
-endi
-if $data02 != -2 then
-  return -1
-endi
-if $data03 != -2.00000 then
-  return -1
-endi
-if $data04 != -2.000000000 then
-  return -1
-endi
-if $data05 != -2 then
-  return -1
-endi
-if $data06 != -2 then
-   return -1
-endi
-if $data07 != 1 then
-  return -1
-endi
-if $data08 != NULL then
-  return -1
-endi
-if $data09 != NULL then
-  return -1
-endi
-if $data20 != @18-09-17 09:00:01.000@ then
-  return -1
-endi
-if $data21 != -2 then
-  return -1
-endi
-if $data22 != -2 then
-  return -1
-endi
-if $data23 != -2.00000 then
-  return -1
-endi
-if $data24 != -2.000000000 then
-  return -1
-endi
-if $data25 != -2 then
-  return -1
-endi
-if $data26 != -2 then
-   return -1
-endi
-if $data27 != 1 then
-  return -1
-endi
-if $data28 != NULL then
-  return -1
-endi
-if $data29 != NULL then
-  return -1
-endi
+sql_error select interp(*) from $stb where ts = $t fill(value, -1, -2) group by tbname
 
 sql_error select interp(ts,c1) from intp_tb0 where ts>'2018-11-25 19:19:00' and ts<'2018-11-25 19:19:12';
-sql select interp(ts,c1) from intp_tb0 where ts>'2018-11-25 19:19:00' and ts<'2018-11-25 19:19:12' every(1s) fill(linear);
-if $rows != 0 then
-  return -1
-endi
+sql_error select interp(ts,c1) from intp_tb0 where ts>'2018-11-25 19:19:00' and ts<'2018-11-25 19:19:12' every(1s) fill(linear);
 
-sql select interp(c1) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' every(18m);
-if $rows != 1 then
-  return -1
-endi
+sql_error select interp(c1) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' every(18m);
 
-if $data00 != @18-11-25 18:30:00.000@ then
-  return -1
-endi
+sql_error select interp(c1,c3,c4,ts) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' every(18m) fill(linear)
 
-if $data01 != 3 then
-  return -1
-endi
+sql_error select interp(c1) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:42:00.000' every(1m) fill(linear);
 
-sql select interp(c1,c3,c4,ts) from intp_tb0 where ts>'2018-11-25 18:09:00' and ts<'2018-11-25 19:20:12' every(18m) fill(linear)
-if $rows != 5 then
-  return -1
-endi
+sql_error select interp(c1) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:42:00.000' every(1m) fill(linear) order by ts desc;
 
-if $data00 != @18-11-25 17:54:00.000@  then
-  return -1
-endi
+sql_error  select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' every(2m) fill(linear) order by ts;
 
-if $data01 != 0 then
-  return -1
-endi
+sql_error select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' every(3m) fill(linear) order by ts;
 
-if $data02 != 0.00000 then
-  return -1
-endi
+sql_error select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' every(3m) fill(linear) order by ts desc;
 
-if $data03 != 0.000000000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(linear);
 
-if $data04 != @18-11-25 17:54:00.000@ then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(value, 1);
 
-if $data10 != @18-11-25 18:12:00.000@ then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(NULL);
 
-if $data11 != 1 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(prev);
 
-if $data12 != 1.20000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(next);
 
-if $data13 != 1.200000000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:56' every(1s) fill(linear);
 
-if $data14 != @18-11-25 18:12:00.000@ then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:56' every(1s) fill(next);
 
-if $data40 != @18-11-25 19:06:00.000@ then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:57' every(1s) fill(linear);
 
-if $data41 != 6 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:57' every(1s) fill(prev);
 
-if $data42 != 6.60000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:57' every(1s) fill(next);
 
-if $data43 != 6.600000000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:03' every(1s) fill(linear);
 
-if $data44 != @18-11-25 19:06:00.000@ then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:03' every(1s) fill(prev);
 
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:03' every(1s) fill(next);
 
-sql select interp(c1) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:42:00.000' every(1m) fill(linear);
-if $rows != 8 then
-  return -1
-endi
-if $data00 != @18-09-17 20:35:00.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @18-09-17 20:36:00.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-if $data20 != @18-09-17 20:37:00.000@  then
-  return -1
-endi
-if $data21 != NULL then
-  return -1
-endi
-if $data30 != @18-09-17 20:38:00.000@  then
-  return -1
-endi
-if $data31 != NULL then
-  return -1
-endi
-if $data40 != @18-09-17 20:39:00.000@  then
-  return -1
-endi
-if $data41 != NULL then
-  return -1
-endi
-if $data50 != @18-09-17 20:40:00.000@  then
-  return -1
-endi
-if $data51 != 0 then
-  return -1
-endi
-if $data60 != @18-09-17 20:41:00.000@  then
-  return -1
-endi
-if $data61 != NULL then
-  return -1
-endi
-if $data70 != @18-09-17 20:42:00.000@  then
-  return -1
-endi
-if $data71 != NULL then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:05' every(1s) fill(linear);
 
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:05' every(1s) fill(prev);
 
-sql select interp(c1) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:42:00.000' every(1m) fill(linear) order by ts desc;
-if $rows != 8 then
-  return -1
-endi
-if $data00 != @18-09-17 20:42:00.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @18-09-17 20:41:00.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-if $data20 != @18-09-17 20:40:00.000@  then
-  return -1
-endi
-if $data21 != 0 then
-  return -1
-endi
-if $data30 != @18-09-17 20:39:00.000@  then
-  return -1
-endi
-if $data31 != NULL then
-  return -1
-endi
-if $data40 != @18-09-17 20:38:00.000@  then
-  return -1
-endi
-if $data41 != NULL then
-  return -1
-endi
-if $data50 != @18-09-17 20:37:00.000@  then
-  return -1
-endi
-if $data51 != NULL then
-  return -1
-endi
-if $data60 != @18-09-17 20:36:00.000@  then
-  return -1
-endi
-if $data61 != NULL then
-  return -1
-endi
-if $data70 != @18-09-17 20:35:00.000@  then
-  return -1
-endi
-if $data71 != NULL then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:05' every(1s) fill(next);
 
-sql  select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' every(2m) fill(linear) order by ts;
-if $rows != 9 then
-  return -1
-endi
-if $data00 != @18-09-17 20:34:00.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @18-09-17 20:36:00.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-if $data20 != @18-09-17 20:38:00.000@  then
-  return -1
-endi
-if $data21 != NULL then
-  return -1
-endi
-if $data30 != @18-09-17 20:40:00.000@  then
-  return -1
-endi
-if $data31 != 0.00000 then
-  return -1
-endi
-if $data40 != @18-09-17 20:42:00.000@  then
-  return -1
-endi
-if $data41 != 0.20000 then
-  return -1
-endi
-if $data50 != @18-09-17 20:44:00.000@  then
-  return -1
-endi
-if $data51 != 0.40000 then
-  return -1
-endi
-if $data60 != @18-09-17 20:46:00.000@  then
-  return -1
-endi
-if $data61 != 0.60000 then
-  return -1
-endi
-if $data70 != @18-09-17 20:48:00.000@  then
-  return -1
-endi
-if $data71 != 0.80000 then
-  return -1
-endi
-if $data80 != @18-09-17 20:50:00.000@  then
-  return -1
-endi
-if $data81 != 1.00000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:20:02' and ts<='2021-07-25 02:20:05' every(1s) fill(value, 1);
 
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:20:02' and ts<='2021-07-25 02:20:05' every(1s) fill(null);
 
-sql select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' every(3m) fill(linear) order by ts;
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @18-09-17 20:33:00.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @18-09-17 20:36:00.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-if $data20 != @18-09-17 20:39:00.000@  then
-  return -1
-endi
-if $data21 != NULL then
-  return -1
-endi
-if $data30 != @18-09-17 20:42:00.000@  then
-  return -1
-endi
-if $data31 != 0.20000 then
-  return -1
-endi
-if $data40 != @18-09-17 20:45:00.000@  then
-  return -1
-endi
-if $data41 != 0.50000 then
-  return -1
-endi
-if $data50 != @18-09-17 20:48:00.000@  then
-  return -1
-endi
-if $data51 != 0.80000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:25' every(1s) fill(linear);
 
-sql select interp(c3) from intp_stb0 where ts >= '2018-09-17 20:35:00.000' and ts <= '2018-09-17 20:50:00.000' every(3m) fill(linear) order by ts desc;
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @18-09-17 20:48:00.000@  then
-  return -1
-endi
-if $data01 != 0.80000 then
-  return -1
-endi
-if $data10 != @18-09-17 20:45:00.000@  then
-  return -1
-endi
-if $data11 != 0.50000 then
-  return -1
-endi
-if $data20 != @18-09-17 20:42:00.000@  then
-  return -1
-endi
-if $data21 != 0.20000 then
-  return -1
-endi
-if $data30 != @18-09-17 20:39:00.000@  then
-  return -1
-endi
-if $data31 != NULL then
-  return -1
-endi
-if $data40 != @18-09-17 20:36:00.000@  then
-  return -1
-endi
-if $data41 != NULL then
-  return -1
-endi
-if $data50 != @18-09-17 20:33:00.000@  then
-  return -1
-endi
-if $data51 != NULL  then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:25' every(1s) fill(prev);
 
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:25' every(1s) fill(next);
 
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:25:00' every(1s) fill(linear);
 
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(linear);
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.50000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.50000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.87500 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:25:00' every(1s) fill(prev);
 
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(value, 1);
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 1.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 1.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 1.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 1.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 1.00000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:25:00' every(1s) fill(next);
 
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(NULL);
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != NULL then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != NULL then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != NULL then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != NULL then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 03:25:00' every(1s) fill(prev);
 
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(prev);
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.00000 then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 03:25:00' every(1s) fill(next);
 
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:00' every(1s) fill(next);
-if $rows != 6 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 5.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 8.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 10.00000 then
-  return -1
-endi
-
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:56' every(1s) fill(linear);
-if $rows != 0 then
-  return -1
-endi
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:56' every(1s) fill(prev);
-if $rows != 2 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:56' every(1s) fill(next);
-if $rows != 2 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:57' every(1s) fill(linear);
-if $rows != 3 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:57' every(1s) fill(prev);
-if $rows != 3 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:19:57' every(1s) fill(next);
-if $rows != 3 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:03' every(1s) fill(linear);
-if $rows != 10 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.50000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.50000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.87500 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != NULL then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != NULL then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != NULL then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != NULL then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:03' every(1s) fill(prev);
-if $rows != 10 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 14.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 14.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 14.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:03' every(1s) fill(next);
-if $rows != 10 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 5.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 8.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 10.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != NULL then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != NULL then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != NULL then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != NULL then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:05' every(1s) fill(linear);
-if $rows != 12 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.50000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.50000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.87500 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.11765 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 15.29412 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:05' every(1s) fill(prev);
-if $rows != 12 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 14.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 14.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 14.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:05' every(1s) fill(next);
-if $rows != 12 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 5.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 8.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 10.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 20.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 20.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 20.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 20.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:20:02' and ts<='2021-07-25 02:20:05' every(1s) fill(value, 1);
-if $rows != 4 then
-  return -1
-endi
-if $data00 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data11 != 1.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:20:04.000@  then
-  return -1
-endi
-if $data21 != 1.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:20:05.000@  then
-  return -1
-endi
-if $data31 != 20.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:20:02' and ts<='2021-07-25 02:20:05' every(1s) fill(null);
-if $rows != 4 then
-  return -1
-endi
-if $data00 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data11 != NULL then
-  return -1
-endi
-if $data20 != @21-07-25 02:20:04.000@  then
-  return -1
-endi
-if $data21 != NULL then
-  return -1
-endi
-if $data30 != @21-07-25 02:20:05.000@  then
-  return -1
-endi
-if $data31 != 20.00000 then
-  return -1
-endi
-
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:25' every(1s) fill(linear);
-if $rows != 32 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.50000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.50000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.87500 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.11765 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 15.29412 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:25' every(1s) fill(prev);
-if $rows != 32 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 14.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 14.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 14.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:20:25' every(1s) fill(next);
-if $rows != 32 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 5.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 8.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 10.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 20.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 20.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 20.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 20.00000 then
-  return -1
-endi
-
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:25:00' every(1s) fill(linear);
-if $rows != 307 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.50000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.50000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.87500 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.11765 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 15.29412 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:25:00' every(1s) fill(prev);
-if $rows != 307 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 14.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 14.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 14.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 02:25:00' every(1s) fill(next);
-if $rows != 307 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 5.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 8.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 10.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 20.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 20.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 20.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 20.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 03:25:00' every(1s) fill(linear);
-if $rows != 3907 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.31818 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.77273 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.50000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.50000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.87500 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.11765 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 15.29412 then
-  return -1
-endi
-
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 03:25:00' every(1s) fill(prev);
-if $rows != 3907 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != NULL  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 3.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 3.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 4.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 7.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 9.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 14.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 14.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 14.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 14.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<='2021-07-25 03:25:00' every(1s) fill(next);
-if $rows != 3907 then
-  return -1
-endi
-if $data00 != @21-07-25 02:19:54.000@  then
-  return -1
-endi
-if $data01 != 1.00000  then
-  return -1
-endi
-if $data10 != @21-07-25 02:19:55.000@  then
-  return -1
-endi
-if $data11 != 4.00000 then
-  return -1
-endi
-if $data20 != @21-07-25 02:19:56.000@  then
-  return -1
-endi
-if $data21 != 4.00000 then
-  return -1
-endi
-if $data30 != @21-07-25 02:19:57.000@  then
-  return -1
-endi
-if $data31 != 5.00000 then
-  return -1
-endi
-if $data40 != @21-07-25 02:19:58.000@  then
-  return -1
-endi
-if $data41 != 8.00000 then
-  return -1
-endi
-if $data50 != @21-07-25 02:19:59.000@  then
-  return -1
-endi
-if $data51 != 10.00000 then
-  return -1
-endi
-if $data60 != @21-07-25 02:20:00.000@  then
-  return -1
-endi
-if $data61 != 20.00000 then
-  return -1
-endi
-if $data70 != @21-07-25 02:20:01.000@  then
-  return -1
-endi
-if $data71 != 20.00000 then
-  return -1
-endi
-if $data80 != @21-07-25 02:20:02.000@  then
-  return -1
-endi
-if $data81 != 20.00000 then
-  return -1
-endi
-if $data90 != @21-07-25 02:20:03.000@  then
-  return -1
-endi
-if $data91 != 20.00000 then
-  return -1
-endi
-
-sql select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:07' every(1s);
-if $rows != 1 then
-  return -1
-endi
-if $data00 != @21-07-25 02:20:05.000@  then
-  return -1
-endi
-if $data01 != 20.00000  then
-  return -1
-endi
+sql_error select interp(pav) from ap1 where ts> '2021-07-25 02:19:54' and ts<'2021-07-25 02:20:07' every(1s);
 

From bd9f5338db1fb4abc64d09c489ed149e713adedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Tue, 15 Nov 2022 16:55:54 +0800
Subject: [PATCH 39/85] test: refine query cases

---
 tests/script/tsim/parser/limit2_query.sim | 118 ++++++----------------
 1 file changed, 31 insertions(+), 87 deletions(-)

diff --git a/tests/script/tsim/parser/limit2_query.sim b/tests/script/tsim/parser/limit2_query.sim
index fc69035935..3c5002d591 100644
--- a/tests/script/tsim/parser/limit2_query.sim
+++ b/tests/script/tsim/parser/limit2_query.sim
@@ -80,7 +80,7 @@ endi
 sql_error select count(*) from $stb where t1 like 1
 
 ##### aggregation on tb + where + fill + limit offset
-sql select _wstart, max(c1) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit 10 offset 1
+sql select _wstart, max(c1) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1) limit 10 offset 1
 if $rows != 10 then
   return -1
 endi
@@ -101,32 +101,26 @@ if $data91 != 5 then
 endi
 
 $tb5 = $tbPrefix . 5
-sql select max(c1), min(c2) from $tb5 where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4) limit 10 offset 1
+sql select max(c1), min(c2) from $tb5 where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit 10 offset 1
 if $rows != 10 then
   return -1
 endi
-if $data00 != @18-09-17 09:05:00.000@ then
+if $data00 != -1 then
   return -1
 endi
-if $data01 != -1 then
+if $data01 != -2 then
   return -1
 endi
-if $data02 != -2 then
+if $data10 != 1 then
   return -1
 endi
-if $data11 != 1 then
+if $data11 != -2 then
   return -1
 endi
-if $data12 != -2 then
+if $data90 != 5 then
   return -1
 endi
-if $data90 != @18-09-17 09:50:00.000@ then
-  return -1
-endi
-if $data91 != 5 then
-  return -1
-endi
-if $data92 != -2 then
+if $data91 != -2 then
   return -1
 endi
 
@@ -135,7 +129,7 @@ endi
 $tb = $tbPrefix . 0
 $limit = $rowNum
 $offset = $limit / 2
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit $limit offset $offset
+sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2 ,-3, -4 , -5, -6 ,-7 ,'-8', '-9') limit $limit offset $offset
 if $rows != $limit then
   print expect $limit, actual $rows
   return -1
@@ -143,11 +137,8 @@ endi
 if $data01 != 0 then
   return -1
 endi
-if $data11 != -1 then
-  return -1
-endi
 
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 8200
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 8200
 if $rows != 8200 then
   return -1
 endi
@@ -155,88 +146,56 @@ endi
 sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 100000;
 
 
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 10 offset 8190;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 10 offset 8190;
 if $rows != 10 then
   return -1
 endi
 
-if $data00 != @18-10-15 19:30:00.000@ then
+if $data00 != 5 then
   return -1
 endi
 
-if $data01 != 5 then
+if $data10 != -1000 then
   return -1
 endi
 
-if $data10 != @18-10-15 19:35:00.000@ then
+if $data20 != 6 then
   return -1
 endi
 
-if $data11 != -1000 then
+if $data30 != -1000 then
   return -1
 endi
 
-if $data20 != @18-10-15 19:40:00.000@ then
-  return -1
-endi
-
-if $data21 != 6 then
-  return -1
-endi
-
-if $data30 != @18-10-15 19:45:00.000@ then
-  return -1
-endi
-
-if $data31 != -1000 then
-  return -1
-endi
-
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 10 offset 10001;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 10 offset 10001;
 if $rows != 10 then
   return -1
 endi
 
-if $data00 != @18-10-22 02:25:00.000@ then
+if $data00 != -1000 then
   return -1
 endi
 
-if $data01 != -1000 then
+if $data10 != 1 then
   return -1
 endi
 
-if $data10 != @18-10-22 02:30:00.000@ then
+if $data20 != -1000 then
   return -1
 endi
 
-if $data11 != 1 then
+if $data30 != 2 then
   return -1
 endi
 
-if $data20 != @18-10-22 02:35:00.000@ then
-  return -1
-endi
-
-if $data21 != -1000 then
-  return -1
-endi
-
-if $data30 != @18-10-22 02:40:00.000@ then
-  return -1
-endi
-
-if $data31 != 2 then
-  return -1
-endi
-
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 10000 offset 10001;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 10000 offset 10001;
 print ====> needs to validate the last row result
 if $rows != 9998 then
   return -1
 endi
 
 
-sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000, -2) limit 100 offset 20001;
+sql select max(c1) from lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1000) limit 100 offset 20001;
 if $rows != 0 then
   return -1
 endi
@@ -244,7 +203,7 @@ endi
 # tb + interval + fill(linear) + limit offset
 $limit = $rowNum
 $offset = $limit / 2
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
+sql select _wstart,max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
 if $rows != $limit then
   print expect $limit, actual $rows
   return -1
@@ -290,7 +249,7 @@ endi
 $limit = $rowNum
 $offset = $limit / 2
 $offset = $offset + 10
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+sql select _wstart,max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2 ,-3, -4 , -5, -6 ,-7 ,'-8', '-9') limit $limit offset $offset
 if $rows != $limit then
   return -1
 endi
@@ -324,20 +283,11 @@ endi
 if $data19 != NULL then
   return -1
 endi
-if $data16 != -2.000000000 then
-  return -1
-endi
-if $data17 != 1 then
-  return -1
-endi
-if $data11 != -1 then
-  return -1
-endi
 
 $limit = $rowNum
 $offset = $limit * 2
 $offset = $offset - 11
-sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2) limit $limit offset $offset
+sql select _wstart,max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu and c1 = 5 interval(5m) fill(value, -1, -2 ,-3, -4 , -5, -6 ,-7 ,'-8', '-9') limit $limit offset $offset
 if $rows != 10 then
   return -1
 endi
@@ -368,27 +318,21 @@ endi
 if $data19 != nchar5 then
   return -1
 endi
-if $data27 != 1 then
-  return -1
-endi
-if $data38 != NULL then
-  return -1
-endi
-if $data49 != NULL then
-  return -1
-endi
 
 ### [TBASE-350]
 ## stb + interval + fill + group by + limit offset
-sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10
-if $rows != 20 then
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4 ,-7 ,'-8', '-9') limit 2 offset 10
+if $rows != 2 then
   return -1
 endi
+#add one more test case
+sql select max(c1), last(c8) from lm2_db0.lm2_tb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(linear) limit 10 offset 4089;"
+
 
 $limit = 5
 $offset = $rowNum * 2
 $offset = $offset - 2
-sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) group by t1 order by t1 limit $limit offset $offset
+sql select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4 ,-7 ,'-8', '-9') order by t1 limit $limit offset $offset
 if $rows != $tbNum then
   return -1
 endi

From 5434f996e80ad369508482a50408e2e87a97fce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chappyguoxy=E2=80=9D?= <“happy_guoxy@163.com”>
Date: Tue, 15 Nov 2022 16:56:15 +0800
Subject: [PATCH 40/85] test: refine query cases

---
 tests/script/tsim/parser/fill_stb.sim | 66 +++++++++------------------
 1 file changed, 22 insertions(+), 44 deletions(-)

diff --git a/tests/script/tsim/parser/fill_stb.sim b/tests/script/tsim/parser/fill_stb.sim
index 6c61631aa8..66787b3606 100644
--- a/tests/script/tsim/parser/fill_stb.sim
+++ b/tests/script/tsim/parser/fill_stb.sim
@@ -97,8 +97,8 @@ $tsu = $tsu + $ts0
 #endi
 
 # number of fill values exceeds number of selected columns
-print select _wstart, count(ts), max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4, -5, -6, -7, -8)
-sql select _wstart, count(ts), max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4, -5, -6, -7, -8)
+print select _wstart, count(ts), max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4, -5, -6)
+sql select _wstart, count(ts), max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2, -3, -4, -5, -6)
 $val = $rowNum * 2
 $val = $val - 1
 print $rows  $val
@@ -136,8 +136,8 @@ if $data74 != -4.00000 then
 endi
 
 ## fill(value) + group by
-print select _wstart, max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4, -5, -6, -7, -8)
-sql select _wstart, max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4, -5, -6, -7, -8)
+print select _wstart, max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4, -5)
+sql select _wstart, max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu partition by t1 interval(5m) fill(value, -1, -2, -3, -4, -5)
 $val = $rowNum * 2
 print $rowNum, $val
 
@@ -154,8 +154,8 @@ if $data11 != -1 then
 endi
 
 # number of fill values is smaller than number of selected columns
-print select _wstart, max(c1), max(c2), max(c3) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6)
-sql select _wstart, max(c1), max(c2), max(c3) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6)
+print select _wstart, max(c1), max(c2), max(c3) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6)
+sql select _wstart, max(c1), max(c2), max(c3) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 6, 6, 6)
 if $data11 != 6 then
   return -1
 endi
@@ -170,7 +170,7 @@ endi
 sql_error select max(c1), max(c2), max(c3), max(c4), max(c5) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill (6, 6, 6, 6, 6)
 
 # fill_char_values_to_arithmetic_fields
-sql select sum(c1), avg(c2), max(c3), min(c4), avg(c4), count(c6), last(c7), last(c8) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'c', 'c', 'c', 'c', 'c', 'c', 'c', 'c')
+sql_error select sum(c1), avg(c2), max(c3), min(c4), avg(c4), count(c6), last(c7), last(c8) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'c', 'c', 'c', 'c', 'c', 'c', 'c', 'c')
 
 # fill_multiple_columns
 sql_error select sum(c1), avg(c2), min(c3), max(c4), count(c6), first(c7), last(c8) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 99, 99, 99, 99, 99, abc, abc)
@@ -199,7 +199,7 @@ sql select max(c4) from $stb where t1 > 4 and ts >= $ts0 and ts <= $tsu partitio
 #  return -1
 #endi
 
-sql select _wstart, min(c1), max(c4) from $stb where t1 > 4 and ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1)
+sql select _wstart, min(c1), max(c4) from $stb where t1 > 4 and ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -1)
 $val = $rowNum * 2
 $val = $val - 1
 if $rows != $val then
@@ -222,52 +222,30 @@ if $data12 != -1.000000000 then
 endi
 
 # fill_into_nonarithmetic_fieds
-print select _wstart, first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 20000000, 20000000, 20000000)
-sql select _wstart, first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 20000000, 20000000, 20000000)
+print select _wstart, first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '20000000', '20000000', '20000000')
+sql select _wstart, first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '20000000', '20000000', '20000000')
 #if $data11 != 20000000 then
 #if $data11 != 1 then
 #  return -1
 #endi
 
-sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1, 1, 1)
-sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1.1, 1.1, 1.1)
-sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 1e1, 1e1, 1e1)
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1', '1', '1')
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1.1', '1.1', '1.1')
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e1', '1e1', '1e1')
 sql select first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1')
 # fill quoted values into bool column will throw error unless the value is 'true' or 'false' Note:2018-10-24
 # fill values into binary or nchar columns will be set to NULL automatically Note:2018-10-24
 sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '1e', '1e1','1e1')
-sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, true, true, true)
+sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true', 'true')
 sql select first(c7), first(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true', 'true','true')
 
 # fill nonarithmetic values into arithmetic fields
-sql_error select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, abc);
-sql select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true');
+sql_error select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'abc');
+sql_error select count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 'true');
 
-sql select _wstart, count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '2e1');
-$val = $rowNum * 2
-$val = $val - 1
-if $rows != $val then
-  return -1
-endi
-if $data01 != $rowNum then
-  return -1
-endi
-#if $data11 != 20 then
-#  return -1
-#endi
+sql_error select _wstart, count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '2e1');
 
-sql select _wstart, count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 2e1);
-if $rows != $val then
-  return -1
-endi
-if $data01 != $rowNum then
-  return -1
-endi
-if $data11 != 20 then
-  return -1
-endi
-
-sql select _wstart, count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, '20');
+sql select _wstart, count(*) from $stb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, 20);
 if $rows != $val then
   return -1
 endi
@@ -377,23 +355,23 @@ endi
 ## NULL fill
 print fill(NULL)
 print select _wstart, max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 partition by t1 interval(5m) fill(value, NULL) limit 5
-sql select _wstart, max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 partition by t1 interval(5m) fill(value, NULL) limit 5
+sql select _wstart, max(c1), min(c2), avg(c3), sum(c4), count(c5), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and t1 > 4 partition by t1 interval(5m) fill(NULL) limit 5
 if $rows != 25 then
   return -1
 endi
 if $data01 != 0 then
   return -1
 endi
-if $data02 != 0 then
+if $data02 != NULL then
   return -1
 endi
 if $data06 != 1 then
   return -1
 endi
-if $data11 != 0 then
+if $data11 != NULL then
   return -1
 endi
-if $data12 != 0 then
+if $data12 != NULL then
   return -1
 endi
 if $data18 != NULL then

From 1963761cc26fb2a9f024418672d1818612eec373 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Tue, 15 Nov 2022 17:27:22 +0800
Subject: [PATCH 41/85] fix: asan error

---
 source/libs/parser/src/parTranslater.c  | 1 +
 source/libs/planner/src/planOptimizer.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index 8de130bbb5..9883c81819 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -5679,6 +5679,7 @@ static int32_t translateCreateFunction(STranslateContext* pCxt, SCreateFunctionS
   if (TSDB_CODE_SUCCESS == code) {
     code = buildCmdMsg(pCxt, TDMT_MND_CREATE_FUNC, (FSerializeFunc)tSerializeSCreateFuncReq, &req);
   }
+  tFreeSCreateFuncReq(&req);
   return code;
 }
 
diff --git a/source/libs/planner/src/planOptimizer.c b/source/libs/planner/src/planOptimizer.c
index 79f33f3ac3..40b70d7d3e 100644
--- a/source/libs/planner/src/planOptimizer.c
+++ b/source/libs/planner/src/planOptimizer.c
@@ -833,6 +833,7 @@ static int32_t partitionAggCondConj(SAggLogicNode* pAgg, SNode** ppAggFuncCond,
     nodesDestroyNode(pTempAggFuncCond);
     nodesDestroyNode(pTempGroupKeyCond);
   }
+  nodesDestroyNode(pAgg->node.pConditions);
   pAgg->node.pConditions = NULL;
   return code;
 }
@@ -853,8 +854,7 @@ static int32_t partitionAggCond(SAggLogicNode* pAgg, SNode** ppAggFunCond, SNode
 }
 
 static int32_t pushCondToAggCond(SOptimizeContext* pCxt, SAggLogicNode* pAgg, SNode** pAggFuncCond) {
-  pushDownCondOptAppendCond(&pAgg->node.pConditions, pAggFuncCond);
-  return TSDB_CODE_SUCCESS;
+  return pushDownCondOptAppendCond(&pAgg->node.pConditions, pAggFuncCond);
 }
 
 typedef struct SRewriteAggGroupKeyCondContext {

From 55a84dab92f833a7716abba68d3c90a4748f93ab Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 18:15:27 +0800
Subject: [PATCH 42/85] test: add asan case

---
 tests/parallel_test/cases.task | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 9b1d829c9a..abf5d76733 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -12,7 +12,7 @@
 ,,y,script,./test.sh -f tsim/user/privilege_sysinfo.sim
 ,,y,script,./test.sh -f tsim/db/alter_option.sim
 ,,,script,./test.sh -f tsim/db/alter_replica_13.sim
-,,,script,./test.sh -f tsim/db/alter_replica_31.sim
+,,y,script,./test.sh -f tsim/db/alter_replica_31.sim
 ,,y,script,./test.sh -f tsim/db/basic1.sim
 ,,y,script,./test.sh -f tsim/db/basic2.sim
 ,,y,script,./test.sh -f tsim/db/basic3.sim
@@ -149,27 +149,27 @@
 ,,y,script,./test.sh -f tsim/parser/selectResNum.sim
 ,,y,script,./test.sh -f tsim/parser/set_tag_vals.sim
 ,,y,script,./test.sh -f tsim/parser/single_row_in_tb.sim
-,,,script,./test.sh -f tsim/parser/sliding.sim
+,,y,script,./test.sh -f tsim/parser/sliding.sim
 ,,y,script,./test.sh -f tsim/parser/slimit_alter_tags.sim
 ,,y,script,./test.sh -f tsim/parser/slimit.sim
 ,,y,script,./test.sh -f tsim/parser/slimit1.sim
 ,,y,script,./test.sh -f tsim/parser/stableOp.sim
 ,,y,script,./test.sh -f tsim/parser/tags_dynamically_specifiy.sim
-,,,script,./test.sh -f tsim/parser/tags_filter.sim
-,,,script,./test.sh -f tsim/parser/tbnameIn.sim
+,,y,script,./test.sh -f tsim/parser/tags_filter.sim
+,,y,script,./test.sh -f tsim/parser/tbnameIn.sim
 ,,y,script,./test.sh -f tsim/parser/timestamp.sim
 ,,y,script,./test.sh -f tsim/parser/top_groupby.sim
 ,,y,script,./test.sh -f tsim/parser/topbot.sim
 ,,,script,./test.sh -f tsim/parser/union.sim
 ,,y,script,./test.sh -f tsim/parser/union_sysinfo.sim
-,,,script,./test.sh -f tsim/parser/where.sim
+,,y,script,./test.sh -f tsim/parser/where.sim
 ,,y,script,./test.sh -f tsim/query/charScalarFunction.sim
 ,,y,script,./test.sh -f tsim/query/explain.sim
 ,,y,script,./test.sh -f tsim/query/interval-offset.sim
 ,,y,script,./test.sh -f tsim/query/interval.sim
 ,,y,script,./test.sh -f tsim/query/scalarFunction.sim
 ,,y,script,./test.sh -f tsim/query/scalarNull.sim
-,,,script,./test.sh -f tsim/query/session.sim
+,,y,script,./test.sh -f tsim/query/session.sim
 ,,,script,./test.sh -f tsim/query/udf.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
 ,,y,script,./test.sh -f tsim/snode/basic1.sim
@@ -215,17 +215,17 @@
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
 ,,y,script,./test.sh -f tsim/stream/distributeInterval0.sim
-,,,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
+,,y,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
 ,,,script,./test.sh -f tsim/stream/distributeSession0.sim
 ,,,script,./test.sh -f tsim/stream/session0.sim
-,,,script,./test.sh -f tsim/stream/session1.sim
+,,y,script,./test.sh -f tsim/stream/session1.sim
 ,,y,script,./test.sh -f tsim/stream/state0.sim
 ,,y,script,./test.sh -f tsim/stream/triggerInterval0.sim
-,,,script,./test.sh -f tsim/stream/triggerSession0.sim
+,,y,script,./test.sh -f tsim/stream/triggerSession0.sim
 ,,y,script,./test.sh -f tsim/stream/partitionby.sim
 ,,y,script,./test.sh -f tsim/stream/partitionby1.sim
 ,,y,script,./test.sh -f tsim/stream/schedSnode.sim
-,,,script,./test.sh -f tsim/stream/windowClose.sim
+,,y,script,./test.sh -f tsim/stream/windowClose.sim
 ,,y,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
 ,,y,script,./test.sh -f tsim/stream/sliding.sim
 ,,y,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim
@@ -251,7 +251,7 @@
 ,,y,script,./test.sh -f tsim/tmq/basic3Of2Cons.sim
 ,,y,script,./test.sh -f tsim/tmq/basic4Of2Cons.sim
 ,,y,script,./test.sh -f tsim/tmq/basic2Of2ConsOverlap.sim
-,,,script,./test.sh -f tsim/tmq/topic.sim
+,,y,script,./test.sh -f tsim/tmq/topic.sim
 ,,y,script,./test.sh -f tsim/tmq/snapshot.sim
 ,,y,script,./test.sh -f tsim/tmq/snapshot1.sim
 ,,y,script,./test.sh -f tsim/stable/alter_comment.sim
@@ -278,7 +278,7 @@
 ,,,script,./test.sh -f tsim/sma/drop_sma.sim
 ,,,script,./test.sh -f tsim/sma/tsmaCreateInsertQuery.sim
 ,,y,script,./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim
-,,,script,./test.sh -f tsim/sma/rsmaPersistenceRecovery.sim
+,,y,script,./test.sh -f tsim/sma/rsmaPersistenceRecovery.sim
 ,,n,script,./test.sh -f tsim/valgrind/checkError1.sim
 ,,n,script,./test.sh -f tsim/valgrind/checkError2.sim
 ,,n,script,./test.sh -f tsim/valgrind/checkError3.sim
@@ -297,8 +297,8 @@
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2_stop.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode3.sim
-,,,script,./test.sh -f tsim/vnode/stable_replica3_dnode6.sim
-,,,script,./test.sh -f tsim/vnode/stable_replica3_vnode3.sim
+,,y,script,./test.sh -f tsim/vnode/stable_replica3_dnode6.sim
+,,y,script,./test.sh -f tsim/vnode/stable_replica3_vnode3.sim
 ,,y,script,./test.sh -f tsim/sync/3Replica1VgElect.sim
 ,,y,script,./test.sh -f tsim/sync/3Replica5VgElect.sim
 ,,y,script,./test.sh -f tsim/sync/oneReplica1VgElect.sim

From d696745e00495f54d9c647603be1c0bdcecd8467 Mon Sep 17 00:00:00 2001
From: 54liuyao <54liuyao@163.com>
Date: Tue, 15 Nov 2022 18:42:10 +0800
Subject: [PATCH 43/85] fix stack-buffer-overflow in timewindowoperator.c

---
 source/libs/executor/src/timewindowoperator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/executor/src/timewindowoperator.c b/source/libs/executor/src/timewindowoperator.c
index 40742087ea..6357af1d06 100644
--- a/source/libs/executor/src/timewindowoperator.c
+++ b/source/libs/executor/src/timewindowoperator.c
@@ -4290,7 +4290,7 @@ static SSDataBlock* doStreamSessionSemiAgg(SOperatorInfo* pOperator) {
     if (pBlock->info.type == STREAM_DELETE_DATA || pBlock->info.type == STREAM_DELETE_RESULT ||
         pBlock->info.type == STREAM_CLEAR) {
       // gap must be 0
-      SArray* pWins = taosArrayInit(16, sizeof(SResultWindowInfo));
+      SArray* pWins = taosArrayInit(16, sizeof(SSessionKey));
       doDeleteTimeWindows(&pInfo->streamAggSup, pBlock, pWins);
       removeSessionResults(pStUpdated, pWins);
       copyDeleteWindowInfo(pWins, pInfo->pStDeleted);

From bf7ad8e85e04f0283431afcf47c5df287e003166 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Tue, 15 Nov 2022 18:51:55 +0800
Subject: [PATCH 44/85] fix(query): fix signed integer overflow in
 builtinsimpl.c

TD-20403
---
 source/libs/function/src/builtinsimpl.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index d02d30dc60..22c61923eb 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -2132,6 +2132,11 @@ int32_t stddevFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
   int32_t               type = pStddevRes->type;
   double                avg;
 
+  if (pStddevRes->count == 0) {
+    GET_RES_INFO(pCtx)->numOfRes = 0;
+    return functionFinalize(pCtx, pBlock);
+  }
+
   if (IS_SIGNED_NUMERIC_TYPE(type)) {
     avg = pStddevRes->isum / ((double)pStddevRes->count);
     pStddevRes->result = sqrt(fabs(pStddevRes->quadraticISum / ((double)pStddevRes->count) - avg * avg));
@@ -5651,6 +5656,10 @@ bool twaFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultInfo) {
 }
 
 static double twa_get_area(SPoint1 s, SPoint1 e) {
+  if (e.key == INT64_MAX || s.key == INT64_MIN) {
+    return 0;
+  }
+
   if ((s.val >= 0 && e.val >= 0) || (s.val <= 0 && e.val <= 0)) {
     return (s.val + e.val) * (e.key - s.key) / 2;
   }
@@ -5945,6 +5954,8 @@ int32_t twaFinalize(struct SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
   } else {
     if (pInfo->win.ekey == pInfo->win.skey) {
       pInfo->dOutput = pInfo->p.val;
+    } else if (pInfo->win.ekey == INT64_MAX || pInfo->win.skey == INT64_MIN) { //no data in timewindow
+      pInfo->dOutput = 0;
     } else {
       pInfo->dOutput = pInfo->dOutput / (pInfo->win.ekey - pInfo->win.skey);
     }

From a9bf05bc018d338103c01874dc41b64fdd4ac054 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 15 Nov 2022 18:32:08 +0800
Subject: [PATCH 45/85] refactor: stream meta ref count

---
 include/libs/stream/tstream.h           |  7 +++-
 source/dnode/mnode/impl/src/mndStream.c |  1 +
 source/dnode/snode/src/snode.c          | 23 ++++++++----
 source/dnode/vnode/src/tq/tq.c          | 48 ++++++++++++++++++-------
 source/libs/executor/src/scanoperator.c |  2 ++
 source/libs/stream/src/streamMeta.c     | 41 +++++++++++++++++++++
 source/libs/wal/src/walRef.c            |  4 +--
 7 files changed, 103 insertions(+), 23 deletions(-)

diff --git a/include/libs/stream/tstream.h b/include/libs/stream/tstream.h
index 0354078b7b..ecd1b6f916 100644
--- a/include/libs/stream/tstream.h
+++ b/include/libs/stream/tstream.h
@@ -338,7 +338,7 @@ typedef struct SStreamTask {
   int32_t recoverWaitingUpstream;
   int64_t checkReqId;
   SArray* checkReqIds;  // shuffle
-
+  int32_t refCnt;
 } SStreamTask;
 
 int32_t tEncodeStreamEpInfo(SEncoder* pEncoder, const SStreamChildEpInfo* pInfo);
@@ -565,6 +565,7 @@ typedef struct SStreamMeta {
   TXN          txn;
   FTaskExpand* expandFunc;
   int32_t      vgId;
+  SRWLatch     lock;
 } SStreamMeta;
 
 SStreamMeta* streamMetaOpen(const char* path, void* ahandle, FTaskExpand expandFunc, int32_t vgId);
@@ -575,6 +576,10 @@ int32_t      streamMetaAddSerializedTask(SStreamMeta* pMeta, int64_t startVer, c
 int32_t      streamMetaRemoveTask(SStreamMeta* pMeta, int32_t taskId);
 SStreamTask* streamMetaGetTask(SStreamMeta* pMeta, int32_t taskId);
 
+SStreamTask* streamMetaAcquireTask(SStreamMeta* pMeta, int32_t taskId);
+void         streamMetaReleaseTask(SStreamMeta* pMeta, SStreamTask* pTask);
+void         streamMetaRemoveTask1(SStreamMeta* pMeta, int32_t taskId);
+
 int32_t streamMetaBegin(SStreamMeta* pMeta);
 int32_t streamMetaCommit(SStreamMeta* pMeta);
 int32_t streamMetaRollBack(SStreamMeta* pMeta);
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index c649180285..2cfb81a817 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -738,6 +738,7 @@ static int32_t mndProcessDropStreamReq(SRpcMsg *pReq) {
   }
 
   sdbRelease(pMnode->pSdb, pStream);
+  mndTransDrop(pTrans);
 
   return TSDB_CODE_ACTION_IN_PROGRESS;
 }
diff --git a/source/dnode/snode/src/snode.c b/source/dnode/snode/src/snode.c
index f53350c10b..aa55204ae5 100644
--- a/source/dnode/snode/src/snode.c
+++ b/source/dnode/snode/src/snode.c
@@ -36,13 +36,14 @@ void sndEnqueueStreamDispatch(SSnode *pSnode, SRpcMsg *pMsg) {
 
   int32_t taskId = req.taskId;
 
-  SStreamTask *pTask = streamMetaGetTask(pSnode->pMeta, taskId);
+  SStreamTask *pTask = streamMetaAcquireTask(pSnode->pMeta, taskId);
   if (pTask) {
     SRpcMsg rsp = {
         .info = pMsg->info,
         .code = 0,
     };
     streamProcessDispatchReq(pTask, &req, &rsp, false);
+    streamMetaReleaseTask(pSnode->pMeta, pTask);
     rpcFreeCont(pMsg->pCont);
     taosFreeQitem(pMsg);
     return;
@@ -63,6 +64,7 @@ int32_t sndExpandTask(SSnode *pSnode, SStreamTask *pTask, int64_t ver) {
   ASSERT(pTask->taskLevel == TASK_LEVEL__AGG);
   ASSERT(taosArrayGetSize(pTask->childEpInfo) != 0);
 
+  pTask->refCnt = 1;
   pTask->schedStatus = TASK_SCHED_STATUS__INACTIVE;
   pTask->inputQueue = streamQueueOpen();
   pTask->outputQueue = streamQueueOpen();
@@ -166,15 +168,17 @@ int32_t sndProcessTaskDeployReq(SSnode *pSnode, char *msg, int32_t msgLen) {
 
 int32_t sndProcessTaskDropReq(SSnode *pSnode, char *msg, int32_t msgLen) {
   SVDropStreamTaskReq *pReq = (SVDropStreamTaskReq *)msg;
-  return streamMetaRemoveTask(pSnode->pMeta, pReq->taskId);
+  streamMetaRemoveTask1(pSnode->pMeta, pReq->taskId);
+  return 0;
 }
 
 int32_t sndProcessTaskRunReq(SSnode *pSnode, SRpcMsg *pMsg) {
   SStreamTaskRunReq *pReq = pMsg->pCont;
   int32_t            taskId = pReq->taskId;
-  SStreamTask       *pTask = streamMetaGetTask(pSnode->pMeta, taskId);
+  SStreamTask       *pTask = streamMetaAcquireTask(pSnode->pMeta, taskId);
   if (pTask) {
     streamProcessRunReq(pTask);
+    streamMetaReleaseTask(pSnode->pMeta, pTask);
     return 0;
   } else {
     return -1;
@@ -191,13 +195,14 @@ int32_t sndProcessTaskDispatchReq(SSnode *pSnode, SRpcMsg *pMsg, bool exec) {
   tDecodeStreamDispatchReq(&decoder, &req);
   int32_t taskId = req.taskId;
 
-  SStreamTask *pTask = streamMetaGetTask(pSnode->pMeta, taskId);
+  SStreamTask *pTask = streamMetaAcquireTask(pSnode->pMeta, taskId);
   if (pTask) {
     SRpcMsg rsp = {
         .info = pMsg->info,
         .code = 0,
     };
     streamProcessDispatchReq(pTask, &req, &rsp, exec);
+    streamMetaReleaseTask(pSnode->pMeta, pTask);
     return 0;
   } else {
     return -1;
@@ -215,13 +220,14 @@ int32_t sndProcessTaskRetrieveReq(SSnode *pSnode, SRpcMsg *pMsg) {
   tDecodeStreamRetrieveReq(&decoder, &req);
   tDecoderClear(&decoder);
   int32_t      taskId = req.dstTaskId;
-  SStreamTask *pTask = streamMetaGetTask(pSnode->pMeta, taskId);
+  SStreamTask *pTask = streamMetaAcquireTask(pSnode->pMeta, taskId);
   if (pTask) {
     SRpcMsg rsp = {
         .info = pMsg->info,
         .code = 0,
     };
     streamProcessRetrieveReq(pTask, &req, &rsp);
+    streamMetaReleaseTask(pSnode->pMeta, pTask);
     tDeleteStreamRetrieveReq(&req);
     return 0;
   } else {
@@ -232,9 +238,10 @@ int32_t sndProcessTaskRetrieveReq(SSnode *pSnode, SRpcMsg *pMsg) {
 int32_t sndProcessTaskDispatchRsp(SSnode *pSnode, SRpcMsg *pMsg) {
   SStreamDispatchRsp *pRsp = POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead));
   int32_t             taskId = ntohl(pRsp->upstreamTaskId);
-  SStreamTask        *pTask = streamMetaGetTask(pSnode->pMeta, taskId);
+  SStreamTask        *pTask = streamMetaAcquireTask(pSnode->pMeta, taskId);
   if (pTask) {
     streamProcessDispatchRsp(pTask, pRsp, pMsg->code);
+    streamMetaReleaseTask(pSnode->pMeta, pTask);
     return 0;
   } else {
     return -1;
@@ -274,15 +281,17 @@ int32_t sndProcessTaskRecoverFinishReq(SSnode *pSnode, SRpcMsg *pMsg) {
   tDecoderClear(&decoder);
 
   // find task
-  SStreamTask *pTask = streamMetaGetTask(pSnode->pMeta, req.taskId);
+  SStreamTask *pTask = streamMetaAcquireTask(pSnode->pMeta, req.taskId);
   if (pTask == NULL) {
     return -1;
   }
   // do process request
   if (streamProcessRecoverFinishReq(pTask, req.childId) < 0) {
+    streamMetaReleaseTask(pSnode->pMeta, pTask);
     return -1;
   }
 
+  streamMetaReleaseTask(pSnode->pMeta, pTask);
   return 0;
 }
 
diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 1cc771dbb4..419d4c3b9b 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -882,6 +882,7 @@ int32_t tqExpandTask(STQ* pTq, SStreamTask* pTask, int64_t ver) {
     ASSERT(taosArrayGetSize(pTask->childEpInfo) != 0);
   }
 
+  pTask->refCnt = 1;
   pTask->schedStatus = TASK_SCHED_STATUS__INACTIVE;
 
   pTask->inputQueue = streamQueueOpen();
@@ -975,13 +976,15 @@ int32_t tqProcessStreamTaskCheckReq(STQ* pTq, SRpcMsg* pMsg) {
       .upstreamNodeId = req.upstreamNodeId,
       .upstreamTaskId = req.upstreamTaskId,
   };
-  SStreamTask* pTask = streamMetaGetTask(pTq->pStreamMeta, taskId);
+  SStreamTask* pTask = streamMetaAcquireTask(pTq->pStreamMeta, taskId);
   if (pTask && atomic_load_8(&pTask->taskStatus) == TASK_STATUS__NORMAL) {
     rsp.status = 1;
   } else {
     rsp.status = 0;
   }
 
+  streamMetaReleaseTask(pTq->pStreamMeta, pTask);
+
   tqDebug("tq recv task check req(reqId: %" PRId64 ") %d at node %d check req from task %d at node %d, status %d",
           rsp.reqId, rsp.downstreamTaskId, rsp.downstreamNodeId, rsp.upstreamTaskId, rsp.upstreamNodeId, rsp.status);
 
@@ -1027,12 +1030,14 @@ int32_t tqProcessStreamTaskCheckRsp(STQ* pTq, int64_t version, char* msg, int32_
   tqDebug("tq recv task check rsp(reqId: %" PRId64 ") %d at node %d check req from task %d at node %d, status %d",
           rsp.reqId, rsp.downstreamTaskId, rsp.downstreamNodeId, rsp.upstreamTaskId, rsp.upstreamNodeId, rsp.status);
 
-  SStreamTask* pTask = streamMetaGetTask(pTq->pStreamMeta, rsp.upstreamTaskId);
+  SStreamTask* pTask = streamMetaAcquireTask(pTq->pStreamMeta, rsp.upstreamTaskId);
   if (pTask == NULL) {
     return -1;
   }
 
-  return streamProcessTaskCheckRsp(pTask, &rsp, version);
+  code = streamProcessTaskCheckRsp(pTask, &rsp, version);
+  streamMetaReleaseTask(pTq->pStreamMeta, pTask);
+  return code;
 }
 
 int32_t tqProcessTaskDeployReq(STQ* pTq, int64_t version, char* msg, int32_t msgLen) {
@@ -1077,15 +1082,17 @@ int32_t tqProcessTaskRecover1Req(STQ* pTq, SRpcMsg* pMsg) {
   int32_t msgLen = pMsg->contLen;
 
   SStreamRecoverStep1Req* pReq = (SStreamRecoverStep1Req*)msg;
-  SStreamTask*            pTask = streamMetaGetTask(pTq->pStreamMeta, pReq->taskId);
+  SStreamTask*            pTask = streamMetaAcquireTask(pTq->pStreamMeta, pReq->taskId);
   if (pTask == NULL) {
     return -1;
   }
+  ASSERT(pReq->taskId == pTask->taskId);
 
   // check param
   int64_t fillVer1 = pTask->startVer;
   if (fillVer1 <= 0) {
     ASSERT(0);
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
@@ -1096,10 +1103,11 @@ int32_t tqProcessTaskRecover1Req(STQ* pTq, SRpcMsg* pMsg) {
   SStreamRecoverStep2Req req;
   code = streamBuildSourceRecover2Req(pTask, &req);
   if (code < 0) {
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
-  ASSERT(pReq->taskId == pTask->taskId);
+  streamMetaReleaseTask(pTq->pStreamMeta, pTask);
 
   // serialize msg
   int32_t len = sizeof(SStreamRecoverStep1Req);
@@ -1127,7 +1135,7 @@ int32_t tqProcessTaskRecover1Req(STQ* pTq, SRpcMsg* pMsg) {
 int32_t tqProcessTaskRecover2Req(STQ* pTq, int64_t version, char* msg, int32_t msgLen) {
   int32_t                 code;
   SStreamRecoverStep2Req* pReq = (SStreamRecoverStep2Req*)msg;
-  SStreamTask*            pTask = streamMetaGetTask(pTq->pStreamMeta, pReq->taskId);
+  SStreamTask*            pTask = streamMetaAcquireTask(pTq->pStreamMeta, pReq->taskId);
   if (pTask == NULL) {
     return -1;
   }
@@ -1135,27 +1143,33 @@ int32_t tqProcessTaskRecover2Req(STQ* pTq, int64_t version, char* msg, int32_t m
   // do recovery step 2
   code = streamSourceRecoverScanStep2(pTask, version);
   if (code < 0) {
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
   // restore param
   code = streamRestoreParam(pTask);
   if (code < 0) {
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
   // set status normal
   code = streamSetStatusNormal(pTask);
   if (code < 0) {
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
   // dispatch recover finish req to all related downstream task
   code = streamDispatchRecoverFinishReq(pTask);
   if (code < 0) {
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
+  streamMetaReleaseTask(pTq->pStreamMeta, pTask);
+
   return 0;
 }
 
@@ -1172,15 +1186,17 @@ int32_t tqProcessTaskRecoverFinishReq(STQ* pTq, SRpcMsg* pMsg) {
   tDecoderClear(&decoder);
 
   // find task
-  SStreamTask* pTask = streamMetaGetTask(pTq->pStreamMeta, req.taskId);
+  SStreamTask* pTask = streamMetaAcquireTask(pTq->pStreamMeta, req.taskId);
   if (pTask == NULL) {
     return -1;
   }
   // do process request
   if (streamProcessRecoverFinishReq(pTask, req.childId) < 0) {
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return -1;
   }
 
+  streamMetaReleaseTask(pTq->pStreamMeta, pTask);
   return 0;
 }
 
@@ -1354,9 +1370,10 @@ int32_t tqProcessSubmitReq(STQ* pTq, SSubmitReq* pReq, int64_t ver) {
 int32_t tqProcessTaskRunReq(STQ* pTq, SRpcMsg* pMsg) {
   SStreamTaskRunReq* pReq = pMsg->pCont;
   int32_t            taskId = pReq->taskId;
-  SStreamTask*       pTask = streamMetaGetTask(pTq->pStreamMeta, taskId);
+  SStreamTask*       pTask = streamMetaAcquireTask(pTq->pStreamMeta, taskId);
   if (pTask) {
     streamProcessRunReq(pTask);
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return 0;
   } else {
     return -1;
@@ -1373,13 +1390,14 @@ int32_t tqProcessTaskDispatchReq(STQ* pTq, SRpcMsg* pMsg, bool exec) {
   tDecodeStreamDispatchReq(&decoder, &req);
   int32_t taskId = req.taskId;
 
-  SStreamTask* pTask = streamMetaGetTask(pTq->pStreamMeta, taskId);
+  SStreamTask* pTask = streamMetaAcquireTask(pTq->pStreamMeta, taskId);
   if (pTask) {
     SRpcMsg rsp = {
         .info = pMsg->info,
         .code = 0,
     };
     streamProcessDispatchReq(pTask, &req, &rsp, exec);
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return 0;
   } else {
     return -1;
@@ -1389,10 +1407,11 @@ int32_t tqProcessTaskDispatchReq(STQ* pTq, SRpcMsg* pMsg, bool exec) {
 int32_t tqProcessTaskDispatchRsp(STQ* pTq, SRpcMsg* pMsg) {
   SStreamDispatchRsp* pRsp = POINTER_SHIFT(pMsg->pCont, sizeof(SMsgHead));
   int32_t             taskId = ntohl(pRsp->upstreamTaskId);
-  SStreamTask*        pTask = streamMetaGetTask(pTq->pStreamMeta, taskId);
+  SStreamTask*        pTask = streamMetaAcquireTask(pTq->pStreamMeta, taskId);
   tqDebug("recv dispatch rsp, code: %x", pMsg->code);
   if (pTask) {
     streamProcessDispatchRsp(pTask, pRsp, pMsg->code);
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     return 0;
   } else {
     return -1;
@@ -1401,7 +1420,8 @@ int32_t tqProcessTaskDispatchRsp(STQ* pTq, SRpcMsg* pMsg) {
 
 int32_t tqProcessTaskDropReq(STQ* pTq, int64_t version, char* msg, int32_t msgLen) {
   SVDropStreamTaskReq* pReq = (SVDropStreamTaskReq*)msg;
-  return streamMetaRemoveTask(pTq->pStreamMeta, pReq->taskId);
+  streamMetaRemoveTask1(pTq->pStreamMeta, pReq->taskId);
+  return 0;
 }
 
 int32_t tqProcessTaskRetrieveReq(STQ* pTq, SRpcMsg* pMsg) {
@@ -1414,13 +1434,14 @@ int32_t tqProcessTaskRetrieveReq(STQ* pTq, SRpcMsg* pMsg) {
   tDecodeStreamRetrieveReq(&decoder, &req);
   tDecoderClear(&decoder);
   int32_t      taskId = req.dstTaskId;
-  SStreamTask* pTask = streamMetaGetTask(pTq->pStreamMeta, taskId);
+  SStreamTask* pTask = streamMetaAcquireTask(pTq->pStreamMeta, taskId);
   if (pTask) {
     SRpcMsg rsp = {
         .info = pMsg->info,
         .code = 0,
     };
     streamProcessRetrieveReq(pTask, &req, &rsp);
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     tDeleteStreamRetrieveReq(&req);
     return 0;
   } else {
@@ -1452,13 +1473,14 @@ int32_t vnodeEnqueueStreamMsg(SVnode* pVnode, SRpcMsg* pMsg) {
 
   int32_t taskId = req.taskId;
 
-  SStreamTask* pTask = streamMetaGetTask(pTq->pStreamMeta, taskId);
+  SStreamTask* pTask = streamMetaAcquireTask(pTq->pStreamMeta, taskId);
   if (pTask) {
     SRpcMsg rsp = {
         .info = pMsg->info,
         .code = 0,
     };
     streamProcessDispatchReq(pTask, &req, &rsp, false);
+    streamMetaReleaseTask(pTq->pStreamMeta, pTask);
     rpcFreeCont(pMsg->pCont);
     taosFreeQitem(pMsg);
     return 0;
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index d2e59ea8e1..77d2aeba28 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -2385,6 +2385,8 @@ static void destroyStreamScanOperatorInfo(void* param) {
     taosMemoryFree(pStreamScan->pPseudoExpr);
   }
 
+  cleanupExprSupp(&pStreamScan->tbnameCalSup);
+
   updateInfoDestroy(pStreamScan->pUpdateInfo);
   blockDataDestroy(pStreamScan->pRes);
   blockDataDestroy(pStreamScan->pUpdateRes);
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index da082b7f74..5ec8828c05 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -169,6 +169,47 @@ SStreamTask* streamMetaGetTask(SStreamMeta* pMeta, int32_t taskId) {
   }
 }
 
+SStreamTask* streamMetaAcquireTask(SStreamMeta* pMeta, int32_t taskId) {
+  taosRLockLatch(&pMeta->lock);
+
+  SStreamTask** ppTask = (SStreamTask**)taosHashGet(pMeta->pTasks, &taskId, sizeof(int32_t));
+  if (ppTask) {
+    SStreamTask* pTask = *ppTask;
+    if (atomic_load_8(&pTask->taskStatus) != TASK_STATUS__DROPPING) {
+      atomic_add_fetch_32(&pTask->refCnt, 1);
+      taosRUnLockLatch(&pMeta->lock);
+      return pTask;
+    } else {
+      taosRUnLockLatch(&pMeta->lock);
+      return NULL;
+    }
+  }
+  taosRUnLockLatch(&pMeta->lock);
+  return NULL;
+}
+
+void streamMetaReleaseTask(SStreamMeta* pMeta, SStreamTask* pTask) {
+  int32_t left = atomic_sub_fetch_32(&pTask->refCnt, 1);
+  ASSERT(left >= 0);
+  if (left == 0) {
+    ASSERT(atomic_load_8(&pTask->taskStatus) == TASK_STATUS__DROPPING);
+    tFreeSStreamTask(pTask);
+  }
+}
+
+void streamMetaRemoveTask1(SStreamMeta* pMeta, int32_t taskId) {
+  SStreamTask** ppTask = (SStreamTask**)taosHashGet(pMeta->pTasks, &taskId, sizeof(int32_t));
+  if (ppTask) {
+    SStreamTask* pTask = *ppTask;
+    taosHashRemove(pMeta->pTasks, &taskId, sizeof(int32_t));
+    atomic_store_8(&pTask->taskStatus, TASK_STATUS__DROPPING);
+
+    taosWLockLatch(&pMeta->lock);
+    streamMetaReleaseTask(pMeta, pTask);
+    taosWUnLockLatch(&pMeta->lock);
+  }
+}
+
 int32_t streamMetaRemoveTask(SStreamMeta* pMeta, int32_t taskId) {
   SStreamTask** ppTask = (SStreamTask**)taosHashGet(pMeta->pTasks, &taskId, sizeof(int32_t));
   if (ppTask) {
diff --git a/source/libs/wal/src/walRef.c b/source/libs/wal/src/walRef.c
index f9994fd315..eae5d9f1a7 100644
--- a/source/libs/wal/src/walRef.c
+++ b/source/libs/wal/src/walRef.c
@@ -32,7 +32,7 @@ SWalRef *walOpenRef(SWal *pWal) {
   return pRef;
 }
 
-#if 0
+#if 1
 void walCloseRef(SWal *pWal, int64_t refId) {
   SWalRef **ppRef = taosHashGet(pWal->pRefHash, &refId, sizeof(int64_t));
   if (ppRef == NULL) return;
@@ -67,7 +67,7 @@ int32_t walRefVer(SWalRef *pRef, int64_t ver) {
   return 0;
 }
 
-#if 0
+#if 1
 void walUnrefVer(SWalRef *pRef) {
   pRef->refId = -1;
   pRef->refFile = -1;

From c5aa7e072dd8780c9d8d34d08fac44dc1a1944b3 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Tue, 15 Nov 2022 19:17:28 +0800
Subject: [PATCH 46/85] refactor(sync): optimize, make LRU Cache hit more

---
 source/libs/sync/inc/syncInt.h           |   1 +
 source/libs/sync/src/syncAppendEntries.c | 100 ++++++++++++++++++++---
 source/libs/sync/src/syncCommit.c        |   5 ++
 source/libs/sync/src/syncMain.c          |  81 ++++++++++++------
 source/libs/sync/src/syncRaftEntry.c     |   2 +
 source/libs/sync/src/syncRaftLog.c       |  14 +++-
 source/libs/sync/src/syncReplication.c   |  21 ++++-
 source/libs/sync/src/syncUtil.c          |  36 ++++----
 8 files changed, 206 insertions(+), 54 deletions(-)

diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index e81f63d871..0e0042d526 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -225,6 +225,7 @@ int32_t syncNodeRestartHeartbeatTimer(SSyncNode* pSyncNode);
 int32_t   syncNodeSendMsgById(const SRaftId* destRaftId, SSyncNode* pSyncNode, SRpcMsg* pMsg);
 int32_t   syncNodeSendMsgByInfo(const SNodeInfo* nodeInfo, SSyncNode* pSyncNode, SRpcMsg* pMsg);
 SyncIndex syncMinMatchIndex(SSyncNode* pSyncNode);
+int32_t   syncCacheEntry(SSyncLogStore* pLogStore, SSyncRaftEntry* pEntry, LRUHandle** h);
 
 // raft state change --------------
 void syncNodeUpdateTerm(SSyncNode* pSyncNode, SyncTerm term);
diff --git a/source/libs/sync/src/syncAppendEntries.c b/source/libs/sync/src/syncAppendEntries.c
index 4551702b34..df2ccee546 100644
--- a/source/libs/sync/src/syncAppendEntries.c
+++ b/source/libs/sync/src/syncAppendEntries.c
@@ -192,13 +192,34 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
     SSyncRaftEntry* pAppendEntry = syncEntryBuildFromAppendEntries(pMsg);
     ASSERT(pAppendEntry != NULL);
 
-    SyncIndex       appendIndex = pMsg->prevLogIndex + 1;
+    SyncIndex appendIndex = pMsg->prevLogIndex + 1;
+
+    LRUHandle* hLocal = NULL;
+    LRUHandle* hAppend = NULL;
+
+    int32_t         code = 0;
     SSyncRaftEntry* pLocalEntry = NULL;
-    int32_t         code = ths->pLogStore->syncLogGetEntry(ths->pLogStore, appendIndex, &pLocalEntry);
+    SLRUCache*      pCache = ths->pLogStore->pCache;
+    hLocal = taosLRUCacheLookup(pCache, &appendIndex, sizeof(appendIndex));
+    if (hLocal) {
+      pLocalEntry = (SSyncRaftEntry*)taosLRUCacheValue(pCache, hLocal);
+      code = 0;
+
+      sNTrace(ths, "hit cache index:%" PRId64 ", bytes:%u, %p", appendIndex, pLocalEntry->bytes, pLocalEntry);
+
+    } else {
+      sNTrace(ths, "miss cache index:%" PRId64, appendIndex);
+
+      code = ths->pLogStore->syncLogGetEntry(ths->pLogStore, appendIndex, &pLocalEntry);
+    }
+
     if (code == 0) {
+      // get local entry success
+
       if (pLocalEntry->term == pAppendEntry->term) {
         // do nothing
         sNTrace(ths, "log match, do nothing, index:%" PRId64, appendIndex);
+
       } else {
         // truncate
         code = ths->pLogStore->syncLogTruncate(ths->pLogStore, appendIndex);
@@ -207,8 +228,18 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
           snprintf(logBuf, sizeof(logBuf), "ignore, truncate error, append-index:%" PRId64, appendIndex);
           syncLogRecvAppendEntries(ths, pMsg, logBuf);
 
-          syncEntryDestory(pLocalEntry);
-          syncEntryDestory(pAppendEntry);
+          if (hLocal) {
+            taosLRUCacheRelease(ths->pLogStore->pCache, hLocal, false);
+          } else {
+            syncEntryDestory(pLocalEntry);
+          }
+
+          if (hAppend) {
+            taosLRUCacheRelease(ths->pLogStore->pCache, hAppend, false);
+          } else {
+            syncEntryDestory(pAppendEntry);
+          }
+
           goto _IGNORE;
         }
 
@@ -219,10 +250,22 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
           snprintf(logBuf, sizeof(logBuf), "ignore, append error, append-index:%" PRId64, appendIndex);
           syncLogRecvAppendEntries(ths, pMsg, logBuf);
 
-          syncEntryDestory(pLocalEntry);
-          syncEntryDestory(pAppendEntry);
+          if (hLocal) {
+            taosLRUCacheRelease(ths->pLogStore->pCache, hLocal, false);
+          } else {
+            syncEntryDestory(pLocalEntry);
+          }
+
+          if (hAppend) {
+            taosLRUCacheRelease(ths->pLogStore->pCache, hAppend, false);
+          } else {
+            syncEntryDestory(pAppendEntry);
+          }
+
           goto _IGNORE;
         }
+
+        syncCacheEntry(ths->pLogStore, pAppendEntry, &hAppend);
       }
 
     } else {
@@ -248,20 +291,42 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
           snprintf(logBuf, sizeof(logBuf), "ignore, log not exist, append error, append-index:%" PRId64, appendIndex);
           syncLogRecvAppendEntries(ths, pMsg, logBuf);
 
-          syncEntryDestory(pLocalEntry);
-          syncEntryDestory(pAppendEntry);
+          if (hLocal) {
+            taosLRUCacheRelease(ths->pLogStore->pCache, hLocal, false);
+          } else {
+            syncEntryDestory(pLocalEntry);
+          }
+
+          if (hAppend) {
+            taosLRUCacheRelease(ths->pLogStore->pCache, hAppend, false);
+          } else {
+            syncEntryDestory(pAppendEntry);
+          }
+
           goto _IGNORE;
         }
 
+        syncCacheEntry(ths->pLogStore, pAppendEntry, &hAppend);
+
       } else {
-        // error
+        // get local entry success
         char logBuf[128];
         snprintf(logBuf, sizeof(logBuf), "ignore, get local entry error, append-index:%" PRId64 " err:%d", appendIndex,
                  terrno);
         syncLogRecvAppendEntries(ths, pMsg, logBuf);
 
-        syncEntryDestory(pLocalEntry);
-        syncEntryDestory(pAppendEntry);
+        if (hLocal) {
+          taosLRUCacheRelease(ths->pLogStore->pCache, hLocal, false);
+        } else {
+          syncEntryDestory(pLocalEntry);
+        }
+
+        if (hAppend) {
+          taosLRUCacheRelease(ths->pLogStore->pCache, hAppend, false);
+        } else {
+          syncEntryDestory(pAppendEntry);
+        }
+
         goto _IGNORE;
       }
     }
@@ -269,8 +334,17 @@ int32_t syncNodeOnAppendEntries(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
     // update match index
     pReply->matchIndex = pAppendEntry->index;
 
-    syncEntryDestory(pLocalEntry);
-    syncEntryDestory(pAppendEntry);
+    if (hLocal) {
+      taosLRUCacheRelease(ths->pLogStore->pCache, hLocal, false);
+    } else {
+      syncEntryDestory(pLocalEntry);
+    }
+
+    if (hAppend) {
+      taosLRUCacheRelease(ths->pLogStore->pCache, hAppend, false);
+    } else {
+      syncEntryDestory(pAppendEntry);
+    }
 
   } else {
     // no append entries, do nothing
diff --git a/source/libs/sync/src/syncCommit.c b/source/libs/sync/src/syncCommit.c
index d2320fc6be..60bec6ab65 100644
--- a/source/libs/sync/src/syncCommit.c
+++ b/source/libs/sync/src/syncCommit.c
@@ -116,7 +116,12 @@ void syncMaybeAdvanceCommitIndex(SSyncNode* pSyncNode) {
       LRUHandle*      h = taosLRUCacheLookup(pCache, &index, sizeof(index));
       if (h) {
         pEntry = (SSyncRaftEntry*)taosLRUCacheValue(pCache, h);
+
+        sNTrace(pSyncNode, "hit cache index:%" PRId64 ", bytes:%u, %p", index, pEntry->bytes, pEntry);
+
       } else {
+        sNTrace(pSyncNode, "miss cache index:%" PRId64, index);
+
         int32_t code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, index, &pEntry);
         if (code != 0) {
           sNError(pSyncNode, "advance commit index error, read wal index:%" PRId64, index);
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index e802f60f30..a59078fff6 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -383,15 +383,33 @@ bool syncIsReadyForRead(int64_t rid) {
 
     } else {
       if (!pSyncNode->pLogStore->syncLogIsEmpty(pSyncNode->pLogStore)) {
+        SyncIndex       lastIndex = pSyncNode->pLogStore->syncLogLastIndex(pSyncNode->pLogStore);
         SSyncRaftEntry* pEntry = NULL;
-        int32_t         code = pSyncNode->pLogStore->syncLogGetEntry(
-            pSyncNode->pLogStore, pSyncNode->pLogStore->syncLogLastIndex(pSyncNode->pLogStore), &pEntry);
+        SLRUCache*      pCache = pSyncNode->pLogStore->pCache;
+        LRUHandle*      h = taosLRUCacheLookup(pCache, &lastIndex, sizeof(lastIndex));
+        int32_t         code = 0;
+        if (h) {
+          pEntry = (SSyncRaftEntry*)taosLRUCacheValue(pCache, h);
+          code = 0;
+
+          sNTrace(pSyncNode, "hit cache index:%" PRId64 ", bytes:%u, %p", lastIndex, pEntry->bytes, pEntry);
+
+        } else {
+          sNTrace(pSyncNode, "miss cache index:%" PRId64, lastIndex);
+
+          code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, lastIndex, &pEntry);
+        }
+
         if (code == 0 && pEntry != NULL) {
           if (pEntry->originalRpcType == TDMT_SYNC_NOOP && pEntry->term == pSyncNode->pRaftStore->currentTerm) {
             ready = true;
           }
 
-          syncEntryDestory(pEntry);
+          if (h) {
+            taosLRUCacheRelease(pCache, h, false);
+          } else {
+            syncEntryDestory(pEntry);
+          }
         }
       }
     }
@@ -1761,10 +1779,24 @@ SyncTerm syncNodeGetPreTerm(SSyncNode* pSyncNode, SyncIndex index) {
     return 0;
   }
 
-  SyncTerm        preTerm = 0;
-  SyncIndex       preIndex = index - 1;
+  SyncTerm  preTerm = 0;
+  SyncIndex preIndex = index - 1;
+
   SSyncRaftEntry* pPreEntry = NULL;
-  int32_t         code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, preIndex, &pPreEntry);
+  SLRUCache*      pCache = pSyncNode->pLogStore->pCache;
+  LRUHandle*      h = taosLRUCacheLookup(pCache, &preIndex, sizeof(preIndex));
+  int32_t         code = 0;
+  if (h) {
+    pPreEntry = (SSyncRaftEntry*)taosLRUCacheValue(pCache, h);
+    code = 0;
+
+    sNTrace(pSyncNode, "hit cache index:%" PRId64 ", bytes:%u, %p", preIndex, pPreEntry->bytes, pPreEntry);
+
+  } else {
+    sNTrace(pSyncNode, "miss cache index:%" PRId64, preIndex);
+
+    code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, preIndex, &pPreEntry);
+  }
 
   SSnapshot snapshot = {.data = NULL,
                         .lastApplyIndex = SYNC_INDEX_INVALID,
@@ -1774,7 +1806,13 @@ SyncTerm syncNodeGetPreTerm(SSyncNode* pSyncNode, SyncIndex index) {
   if (code == 0) {
     ASSERT(pPreEntry != NULL);
     preTerm = pPreEntry->term;
-    taosMemoryFree(pPreEntry);
+
+    if (h) {
+      taosLRUCacheRelease(pCache, h, false);
+    } else {
+      syncEntryDestory(pPreEntry);
+    }
+
     return preTerm;
   } else {
     if (pSyncNode->pFsm->FpGetSnapshotInfo != NULL) {
@@ -1820,9 +1858,6 @@ static void syncNodeEqPingTimer(void* param, void* tmrId) {
     }
 
     taosTmrReset(syncNodeEqPingTimer, pNode->pingTimerMS, pNode, syncEnv()->pTimerManager, &pNode->pPingTimer);
-  } else {
-    sTrace("==syncNodeEqPingTimer== pingTimerLogicClock:%" PRId64 ", pingTimerLogicClockUser:%" PRId64,
-           pNode->pingTimerLogicClock, pNode->pingTimerLogicClockUser);
   }
 }
 
@@ -1856,16 +1891,6 @@ static void syncNodeEqElectTimer(void* param, void* tmrId) {
   }
 
   taosMemoryFree(pElectTimer);
-
-#if 0
-  // reset timer ms
-  if (syncIsInit() && pNode->electBaseLine > 0) {
-    pNode->electTimerMS = syncUtilElectRandomMS(pNode->electBaseLine, 2 * pNode->electBaseLine);
-    taosTmrReset(syncNodeEqElectTimer, pNode->electTimerMS, pNode, syncEnv()->pTimerManager, &pNode->pElectTimer);
-  } else {
-    sError("sync env is stop, syncNodeEqElectTimer");
-  }
-#endif
 }
 
 static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
@@ -1979,7 +2004,10 @@ static int32_t syncNodeEqNoop(SSyncNode* pNode) {
 
 static void deleteCacheEntry(const void* key, size_t keyLen, void* value) { taosMemoryFree(value); }
 
-static int32_t syncCacheEntry(SSyncLogStore* pLogStore, SSyncRaftEntry* pEntry, LRUHandle** h) {
+int32_t syncCacheEntry(SSyncLogStore* pLogStore, SSyncRaftEntry* pEntry, LRUHandle** h) {
+  SSyncLogStoreData* pData = pLogStore->data;
+  sNTrace(pData->pSyncNode, "in cache index:%" PRId64 ", bytes:%u, %p", pEntry->index, pEntry->bytes, pEntry);
+
   int32_t   code = 0;
   int32_t   entryLen = sizeof(*pEntry) + pEntry->dataLen;
   LRUStatus status = taosLRUCacheInsert(pLogStore->pCache, &pEntry->index, sizeof(pEntry->index), pEntry, entryLen,
@@ -2000,7 +2028,6 @@ static int32_t syncNodeAppendNoop(SSyncNode* ths) {
   ASSERT(pEntry != NULL);
 
   LRUHandle* h = NULL;
-  syncCacheEntry(ths->pLogStore, pEntry, &h);
 
   if (ths->state == TAOS_SYNC_STATE_LEADER) {
     int32_t code = ths->pLogStore->syncLogAppendEntry(ths->pLogStore, pEntry);
@@ -2008,6 +2035,8 @@ static int32_t syncNodeAppendNoop(SSyncNode* ths) {
       sError("append noop error");
       return -1;
     }
+
+    syncCacheEntry(ths->pLogStore, pEntry, &h);
   }
 
   if (h) {
@@ -2143,7 +2172,6 @@ int32_t syncNodeOnClientRequest(SSyncNode* ths, SRpcMsg* pMsg, SyncIndex* pRetIn
   }
 
   LRUHandle* h = NULL;
-  syncCacheEntry(ths->pLogStore, pEntry, &h);
 
   if (ths->state == TAOS_SYNC_STATE_LEADER) {
     // append entry
@@ -2183,6 +2211,8 @@ int32_t syncNodeOnClientRequest(SSyncNode* ths, SRpcMsg* pMsg, SyncIndex* pRetIn
       }
     }
 
+    syncCacheEntry(ths->pLogStore, pEntry, &h);
+
     // if mulit replica, start replicate right now
     if (ths->replicaNum > 1) {
       syncNodeReplicate(ths);
@@ -2349,7 +2379,12 @@ int32_t syncNodeDoCommit(SSyncNode* ths, SyncIndex beginIndex, SyncIndex endInde
         LRUHandle*      h = taosLRUCacheLookup(pCache, &i, sizeof(i));
         if (h) {
           pEntry = (SSyncRaftEntry*)taosLRUCacheValue(pCache, h);
+
+          sNTrace(ths, "hit cache index:%" PRId64 ", bytes:%u, %p", i, pEntry->bytes, pEntry);
+
         } else {
+          sNTrace(ths, "miss cache index:%" PRId64, i);
+
           code = ths->pLogStore->syncLogGetEntry(ths->pLogStore, i, &pEntry);
           // ASSERT(code == 0);
           // ASSERT(pEntry != NULL);
diff --git a/source/libs/sync/src/syncRaftEntry.c b/source/libs/sync/src/syncRaftEntry.c
index 540054e473..a759409163 100644
--- a/source/libs/sync/src/syncRaftEntry.c
+++ b/source/libs/sync/src/syncRaftEntry.c
@@ -92,6 +92,8 @@ SSyncRaftEntry* syncEntryBuildNoop(SyncTerm term, SyncIndex index, int32_t vgId)
 void syncEntryDestory(SSyncRaftEntry* pEntry) {
   if (pEntry != NULL) {
     taosMemoryFree(pEntry);
+
+    sTrace("free entry: %p", pEntry);
   }
 }
 
diff --git a/source/libs/sync/src/syncRaftLog.c b/source/libs/sync/src/syncRaftLog.c
index b00ba3918c..2b1cee51d7 100644
--- a/source/libs/sync/src/syncRaftLog.c
+++ b/source/libs/sync/src/syncRaftLog.c
@@ -37,7 +37,8 @@ SSyncLogStore* logStoreCreate(SSyncNode* pSyncNode) {
     return NULL;
   }
 
-  pLogStore->pCache = taosLRUCacheInit(10 * 1024 * 1024, 1, .5);
+  // pLogStore->pCache = taosLRUCacheInit(10 * 1024 * 1024, 1, .5);
+  pLogStore->pCache = taosLRUCacheInit(100 * 1024 * 1024, 1, .5);
   if (pLogStore->pCache == NULL) {
     taosMemoryFree(pLogStore);
     terrno = TSDB_CODE_WAL_OUT_OF_MEMORY;
@@ -321,6 +322,17 @@ static int32_t raftLogTruncate(struct SSyncLogStore* pLogStore, SyncIndex fromIn
     return 0;
   }
 
+  // delete from cache
+  for (SyncIndex index = fromIndex; index <= wallastVer; ++index) {
+    SLRUCache* pCache = pData->pSyncNode->pLogStore->pCache;
+    LRUHandle* h = taosLRUCacheLookup(pCache, &index, sizeof(index));
+    if (h) {
+      sNTrace(pData->pSyncNode, "cache delete index:%" PRId64, index);
+
+      taosLRUCacheRelease(pData->pSyncNode->pLogStore->pCache, h, true);
+    }
+  }
+
   int32_t code = walRollback(pWal, fromIndex);
   if (code != 0) {
     int32_t     err = terrno;
diff --git a/source/libs/sync/src/syncReplication.c b/source/libs/sync/src/syncReplication.c
index 6a7a2c18c1..802595c55a 100644
--- a/source/libs/sync/src/syncReplication.c
+++ b/source/libs/sync/src/syncReplication.c
@@ -73,7 +73,20 @@ int32_t syncNodeReplicateOne(SSyncNode* pSyncNode, SRaftId* pDestId, bool snapsh
   SyncAppendEntries* pMsg = NULL;
 
   SSyncRaftEntry* pEntry = NULL;
-  int32_t         code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, nextIndex, &pEntry);
+  SLRUCache*      pCache = pSyncNode->pLogStore->pCache;
+  LRUHandle*      h = taosLRUCacheLookup(pCache, &nextIndex, sizeof(nextIndex));
+  int32_t         code = 0;
+  if (h) {
+    pEntry = (SSyncRaftEntry*)taosLRUCacheValue(pCache, h);
+    code = 0;
+
+    sNTrace(pSyncNode, "hit cache index:%" PRId64 ", bytes:%u, %p", nextIndex, pEntry->bytes, pEntry);
+
+  } else {
+    sNTrace(pSyncNode, "miss cache index:%" PRId64, nextIndex);
+
+    code = pSyncNode->pLogStore->syncLogGetEntry(pSyncNode->pLogStore, nextIndex, &pEntry);
+  }
 
   if (code == 0) {
     ASSERT(pEntry != NULL);
@@ -99,7 +112,11 @@ int32_t syncNodeReplicateOne(SSyncNode* pSyncNode, SRaftId* pDestId, bool snapsh
     }
   }
 
-  syncEntryDestory(pEntry);
+  if (h) {
+    taosLRUCacheRelease(pCache, h, false);
+  } else {
+    syncEntryDestory(pEntry);
+  }
 
   // prepare msg
   ASSERT(pMsg != NULL);
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index b9a271ab9d..fb1b07b0b6 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -212,7 +212,11 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNo
   }
 
   char cfgStr[1024];
-  syncCfg2SimpleStr(&(pNode->pRaftCfg->cfg), cfgStr, sizeof(cfgStr));
+  if (pNode->pRaftCfg != NULL) {
+    syncCfg2SimpleStr(&(pNode->pRaftCfg->cfg), cfgStr, sizeof(cfgStr));
+  } else {
+    return;
+  }
 
   char peerStr[1024] = "{";
   syncPeerState2Str(pNode, peerStr, sizeof(peerStr));
@@ -230,17 +234,19 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNo
   // restore error code
   terrno = errCode;
 
-  taosPrintLog(flags, level, dflag,
-               "vgId:%d, sync %s "
-               "%s"
-               ", tm:%" PRIu64 ", cmt:%" PRId64 ", fst:%" PRId64 ", lst:%" PRId64 ", min:%" PRId64 ", snap:%" PRId64
-               ", snap-tm:%" PRIu64 ", sby:%d, aq:%d, bch:%d, r-num:%d, lcfg:%" PRId64
-               ", chging:%d, rsto:%d, dquorum:%d, elt:%" PRId64 ", hb:%" PRId64 ", %s, %s",
-               pNode->vgId, syncStr(pNode->state), eventLog, currentTerm, pNode->commitIndex, logBeginIndex,
-               logLastIndex, pNode->minMatchIndex, snapshot.lastApplyIndex, snapshot.lastApplyTerm,
-               pNode->pRaftCfg->isStandBy, aqItems, pNode->pRaftCfg->batchSize, pNode->replicaNum,
-               pNode->pRaftCfg->lastConfigIndex, pNode->changing, pNode->restoreFinish, quorum,
-               pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser, peerStr, cfgStr);
+  if (pNode != NULL && pNode->pRaftCfg != NULL) {
+    taosPrintLog(flags, level, dflag,
+                 "vgId:%d, sync %s "
+                 "%s"
+                 ", tm:%" PRIu64 ", cmt:%" PRId64 ", fst:%" PRId64 ", lst:%" PRId64 ", min:%" PRId64 ", snap:%" PRId64
+                 ", snap-tm:%" PRIu64 ", sby:%d, aq:%d, bch:%d, r-num:%d, lcfg:%" PRId64
+                 ", chging:%d, rsto:%d, dquorum:%d, elt:%" PRId64 ", hb:%" PRId64 ", %s, %s",
+                 pNode->vgId, syncStr(pNode->state), eventLog, currentTerm, pNode->commitIndex, logBeginIndex,
+                 logLastIndex, pNode->minMatchIndex, snapshot.lastApplyIndex, snapshot.lastApplyTerm,
+                 pNode->pRaftCfg->isStandBy, aqItems, pNode->pRaftCfg->batchSize, pNode->replicaNum,
+                 pNode->pRaftCfg->lastConfigIndex, pNode->changing, pNode->restoreFinish, quorum,
+                 pNode->electTimerLogicClock, pNode->heartbeatTimerLogicClockUser, peerStr, cfgStr);
+  }
 }
 
 void syncPrintSnapshotSenderLog(const char* flags, ELogLevel level, int32_t dflag, SSyncSnapshotSender* pSender,
@@ -364,9 +370,9 @@ void syncLogSendAppendEntriesReply(SSyncNode* pSyncNode, const SyncAppendEntries
   syncUtilU642Addr(pMsg->destId.addr, host, sizeof(host), &port);
 
   sNTrace(pSyncNode,
-          "send sync-append-entries-reply to %s:%d, {term:%" PRId64 ", pterm:%" PRId64 ", success:%d, match:%" PRId64
-          "}, %s",
-          host, port, pMsg->term, pMsg->privateTerm, pMsg->success, pMsg->matchIndex, s);
+          "send sync-append-entries-reply to %s:%d, {term:%" PRId64 ", pterm:%" PRId64
+          ", success:%d, lsend-index:%" PRId64 ", match:%" PRId64 "}, %s",
+          host, port, pMsg->term, pMsg->privateTerm, pMsg->success, pMsg->lastSendIndex, pMsg->matchIndex, s);
 }
 
 void syncLogRecvAppendEntriesReply(SSyncNode* pSyncNode, const SyncAppendEntriesReply* pMsg, const char* s) {

From 20e31aacca9c3e5ca2d93c90853fa3524191efc4 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 15 Nov 2022 19:48:16 +0800
Subject: [PATCH 47/85] fix(wal): set commit ver and snapshot ver after restore

---
 source/libs/wal/src/walWrite.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 216dd5fcb1..1a75d5ed81 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -70,8 +70,8 @@ int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
   taosArrayClear(pWal->fileInfoSet);
   pWal->vers.firstVer = -1;
   pWal->vers.lastVer = ver;
-  pWal->vers.commitVer = ver - 1;
-  pWal->vers.snapshotVer = ver - 1;
+  pWal->vers.commitVer = ver;
+  pWal->vers.snapshotVer = ver;
   pWal->vers.verInSnapshotting = -1;
 
   taosThreadMutexUnlock(&pWal->mutex);

From d5080b5ce631d38b47c666948a1e347df53ad44e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 19:55:40 +0800
Subject: [PATCH 48/85] test: add asan case

---
 tests/parallel_test/cases.task | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index bfd93994eb..e4edc43600 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -228,7 +228,7 @@
 ,,y,script,./test.sh -f tsim/stream/partitionby.sim
 ,,y,script,./test.sh -f tsim/stream/partitionby1.sim
 ,,y,script,./test.sh -f tsim/stream/schedSnode.sim
-,,y,script,./test.sh -f tsim/stream/windowClose.sim
+,,,script,./test.sh -f tsim/stream/windowClose.sim
 ,,y,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
 ,,y,script,./test.sh -f tsim/stream/sliding.sim
 ,,y,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim

From 6c0bbe684b0e2bd1a150c4540efc158921278f41 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 22:28:03 +0800
Subject: [PATCH 49/85] fix: heap-use-after-free in syncNodeEqPingTimer

---
 source/libs/sync/src/syncMain.c | 6 +++---
 tests/parallel_test/cases.task  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index c39558ca1d..c623628978 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1842,7 +1842,7 @@ static void syncNodeEqPingTimer(void* param, void* tmrId) {
       return;
     }
 
-    sNTrace(pNode, "enqueue ping msg");
+    sTrace(pNode, "enqueue ping msg");
     code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
     if (code != 0) {
       sError("failed to sync enqueue ping msg since %s", terrstr());
@@ -1870,7 +1870,7 @@ static void syncNodeEqElectTimer(void* param, void* tmrId) {
   }
 
   SyncTimeout* pTimeout = rpcMsg.pCont;
-  sNTrace(pNode, "enqueue elect msg lc:%" PRId64, pTimeout->logicClock);
+  sTrace(pNode, "enqueue elect msg lc:%" PRId64, pTimeout->logicClock);
 
   code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
   if (code != 0) {
@@ -1894,7 +1894,7 @@ static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
         return;
       }
 
-      sNTrace(pNode, "enqueue heartbeat timer");
+      sTrace(pNode, "enqueue heartbeat timer");
       code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
       if (code != 0) {
         sError("failed to enqueue heartbeat msg since %s", terrstr());
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index e4edc43600..f0dff430b3 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -215,7 +215,7 @@
 ,,y,script,./test.sh -f tsim/stream/basic2.sim
 ,,,script,./test.sh -f tsim/stream/drop_stream.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic1.sim
-,,y,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
+,,,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
 ,,y,script,./test.sh -f tsim/stream/distributeInterval0.sim
 ,,y,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim

From aab1ec632c304d8d9bb3615a90cfb3349799b52a Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 15 Nov 2022 22:29:59 +0800
Subject: [PATCH 50/85] fix: heap-use-after-free in syncNodeEqPingTimer

---
 source/libs/sync/src/syncMain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index c623628978..514160235f 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1842,7 +1842,7 @@ static void syncNodeEqPingTimer(void* param, void* tmrId) {
       return;
     }
 
-    sTrace(pNode, "enqueue ping msg");
+    sTrace("enqueue ping msg");
     code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
     if (code != 0) {
       sError("failed to sync enqueue ping msg since %s", terrstr());
@@ -1870,7 +1870,7 @@ static void syncNodeEqElectTimer(void* param, void* tmrId) {
   }
 
   SyncTimeout* pTimeout = rpcMsg.pCont;
-  sTrace(pNode, "enqueue elect msg lc:%" PRId64, pTimeout->logicClock);
+  sTrace("enqueue elect msg lc:%" PRId64, pTimeout->logicClock);
 
   code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
   if (code != 0) {
@@ -1894,7 +1894,7 @@ static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
         return;
       }
 
-      sTrace(pNode, "enqueue heartbeat timer");
+      sTrace("enqueue heartbeat timer");
       code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
       if (code != 0) {
         sError("failed to enqueue heartbeat msg since %s", terrstr());

From 6478fcb2c11ddab16b3cf90413450533c90f29dd Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Tue, 15 Nov 2022 22:32:52 +0800
Subject: [PATCH 51/85] fix(stream): check task

---
 source/dnode/vnode/src/tq/tq.c | 2 +-
 source/libs/wal/src/walWrite.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tq/tq.c b/source/dnode/vnode/src/tq/tq.c
index 419d4c3b9b..092128fe6e 100644
--- a/source/dnode/vnode/src/tq/tq.c
+++ b/source/dnode/vnode/src/tq/tq.c
@@ -983,7 +983,7 @@ int32_t tqProcessStreamTaskCheckReq(STQ* pTq, SRpcMsg* pMsg) {
     rsp.status = 0;
   }
 
-  streamMetaReleaseTask(pTq->pStreamMeta, pTask);
+  if (pTask) streamMetaReleaseTask(pTq->pStreamMeta, pTask);
 
   tqDebug("tq recv task check req(reqId: %" PRId64 ") %d at node %d check req from task %d at node %d, status %d",
           rsp.reqId, rsp.downstreamTaskId, rsp.downstreamNodeId, rsp.upstreamTaskId, rsp.upstreamNodeId, rsp.status);
diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 7c3b4cba30..34195f0193 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -22,6 +22,8 @@
 int32_t walRestoreFromSnapshot(SWal *pWal, int64_t ver) {
   taosThreadMutexLock(&pWal->mutex);
 
+  wInfo("vgId:%d, restore from snapshot, version %" PRId64, pWal->cfg.vgId, ver);
+
   void *pIter = NULL;
   while (1) {
     pIter = taosHashIterate(pWal->pRefHash, pIter);

From 5cbbd9544900303b02153f282c5542067a212dd2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 09:41:02 +0800
Subject: [PATCH 52/85] test: add asan case

---
 tests/parallel_test/cases.task | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index f0dff430b3..b9d5e6c03f 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -118,8 +118,8 @@
 ,,,script,./test.sh -f tsim/parser/function.sim
 ,,y,script,./test.sh -f tsim/parser/groupby-basic.sim
 ,,,script,./test.sh -f tsim/parser/groupby.sim
-,,,script,./test.sh -f tsim/parser/having_child.sim
-,,,script,./test.sh -f tsim/parser/having.sim
+,,y,script,./test.sh -f tsim/parser/having_child.sim
+,,y,script,./test.sh -f tsim/parser/having.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit1.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit2.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit3.sim
@@ -173,7 +173,7 @@
 ,,y,script,./test.sh -f tsim/query/scalarFunction.sim
 ,,y,script,./test.sh -f tsim/query/scalarNull.sim
 ,,y,script,./test.sh -f tsim/query/session.sim
-,,,script,./test.sh -f tsim/query/udf.sim
+,,y,script,./test.sh -f tsim/query/udf.sim
 ,,y,script,./test.sh -f tsim/qnode/basic1.sim
 ,,y,script,./test.sh -f tsim/snode/basic1.sim
 ,,,script,./test.sh -f tsim/mnode/basic1.sim
@@ -215,11 +215,11 @@
 ,,y,script,./test.sh -f tsim/stream/basic2.sim
 ,,,script,./test.sh -f tsim/stream/drop_stream.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic1.sim
-,,,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
+,,y,script,./test.sh -f tsim/stream/fillHistoryBasic2.sim
 ,,y,script,./test.sh -f tsim/stream/fillHistoryBasic3.sim
 ,,y,script,./test.sh -f tsim/stream/distributeInterval0.sim
 ,,y,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
-,,,script,./test.sh -f tsim/stream/distributeSession0.sim
+,,y,script,./test.sh -f tsim/stream/distributeSession0.sim
 ,,,script,./test.sh -f tsim/stream/session0.sim
 ,,y,script,./test.sh -f tsim/stream/session1.sim
 ,,y,script,./test.sh -f tsim/stream/state0.sim
@@ -232,10 +232,10 @@
 ,,y,script,./test.sh -f tsim/stream/ignoreExpiredData.sim
 ,,y,script,./test.sh -f tsim/stream/sliding.sim
 ,,y,script,./test.sh -f tsim/stream/partitionbyColumnInterval.sim
-,,,script,./test.sh -f tsim/stream/partitionbyColumnSession.sim
+,,y,script,./test.sh -f tsim/stream/partitionbyColumnSession.sim
 ,,y,script,./test.sh -f tsim/stream/partitionbyColumnState.sim
 ,,y,script,./test.sh -f tsim/stream/deleteInterval.sim
-,,,script,./test.sh -f tsim/stream/deleteSession.sim
+,,y,script,./test.sh -f tsim/stream/deleteSession.sim
 ,,y,script,./test.sh -f tsim/stream/deleteState.sim
 ,,y,script,./test.sh -f tsim/stream/fillIntervalDelete0.sim
 ,,y,script,./test.sh -f tsim/stream/fillIntervalDelete1.sim

From 475919dd771eaf167c142e3a1879e62ca530cc0b Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 10:10:02 +0800
Subject: [PATCH 53/85] refactor(sync): add rtt trace log

---
 source/libs/sync/src/syncAppendEntriesReply.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/libs/sync/src/syncAppendEntriesReply.c b/source/libs/sync/src/syncAppendEntriesReply.c
index 875204c0a9..13ea250155 100644
--- a/source/libs/sync/src/syncAppendEntriesReply.c
+++ b/source/libs/sync/src/syncAppendEntriesReply.c
@@ -83,10 +83,14 @@ int32_t syncNodeOnAppendEntriesReply(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
     ASSERT(pState != NULL);
 
     if (pMsg->lastSendIndex == pState->lastSendIndex) {
+      int64_t timeNow = taosGetTimestampMs();
+      int64_t elapsed = timeNow - pState->lastSendTime;
+      sNTrace(ths, "sync-append-entries rtt elapsed:%" PRId64 ", index:%" PRId64, elapsed, pState->lastSendIndex);
+
       syncNodeReplicateOne(ths, &(pMsg->srcId), true);
     }
   }
 
   syncLogRecvAppendEntriesReply(ths, pMsg, "process");
   return 0;
-}
\ No newline at end of file
+}

From 023f61ccf5b775698a711d86db1df8880c047705 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 10:54:06 +0800
Subject: [PATCH 54/85] fix(sync): fix asan error, TD-20437

---
 source/libs/sync/src/syncSnapshot.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index 9bc0a07d48..222b7c4e1e 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -192,7 +192,9 @@ int32_t snapshotSend(SSyncSnapshotSender *pSender) {
 
   // pMsg->privateTerm = pSender->privateTerm;
 
-  memcpy(pMsg->data, pSender->pCurrentBlock, pSender->blockLen);
+  if (pSender->pCurrentBlock != NULL) {
+    memcpy(pMsg->data, pSender->pCurrentBlock, pSender->blockLen);
+  }
 
   // send msg
   syncNodeSendMsgById(&pMsg->destId, pSender->pSyncNode, &rpcMsg);

From 853c22de287bbe02260503fba38877c862493b13 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 10:55:19 +0800
Subject: [PATCH 55/85] fix: memory leak while create stream

---
 source/dnode/mnode/impl/src/mndScheduler.c | 1 +
 source/dnode/mnode/impl/src/mndStream.c    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/source/dnode/mnode/impl/src/mndScheduler.c b/source/dnode/mnode/impl/src/mndScheduler.c
index 7e7c6ee0b6..e1886511b7 100644
--- a/source/dnode/mnode/impl/src/mndScheduler.c
+++ b/source/dnode/mnode/impl/src/mndScheduler.c
@@ -508,6 +508,7 @@ int32_t mndScheduleStream(SMnode* pMnode, SStreamObj* pStream) {
         qDestroyQueryPlan(pPlan);
         return -1;
       }
+      sdbRelease(pSdb, pVgroup);
     }
   }
   qDestroyQueryPlan(pPlan);
diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c
index 2cfb81a817..62247f2c2a 100644
--- a/source/dnode/mnode/impl/src/mndStream.c
+++ b/source/dnode/mnode/impl/src/mndStream.c
@@ -295,6 +295,7 @@ static int32_t mndBuildStreamObjFromCreateReq(SMnode *pMnode, SStreamObj *pObj,
     return -1;
   }
   pObj->sourceDbUid = pSourceDb->uid;
+  mndReleaseDb(pMnode, pSourceDb);
 
   memcpy(pObj->targetSTbName, pCreate->targetStbFullName, TSDB_TABLE_FNAME_LEN);
 
@@ -307,6 +308,7 @@ static int32_t mndBuildStreamObjFromCreateReq(SMnode *pMnode, SStreamObj *pObj,
 
   pObj->targetStbUid = mndGenerateUid(pObj->targetSTbName, TSDB_TABLE_FNAME_LEN);
   pObj->targetDbUid = pTargetDb->uid;
+  mndReleaseDb(pMnode, pTargetDb);
 
   pObj->sql = pCreate->sql;
   pObj->ast = pCreate->ast;
@@ -523,6 +525,7 @@ static int32_t mndCreateStbForStream(SMnode *pMnode, STrans *pTrans, const SStre
 
   tFreeSMCreateStbReq(&createReq);
   mndFreeStb(&stbObj);
+  mndReleaseDb(pMnode, pDb);
 
   return 0;
 _OVER:

From 6c6d95d6cc2ff9d532da1c3de8b9022e60db4da7 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 10:55:49 +0800
Subject: [PATCH 56/85] test: add asan case

---
 tests/parallel_test/cases.task | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index f0dff430b3..e45e82b277 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -119,7 +119,7 @@
 ,,y,script,./test.sh -f tsim/parser/groupby-basic.sim
 ,,,script,./test.sh -f tsim/parser/groupby.sim
 ,,,script,./test.sh -f tsim/parser/having_child.sim
-,,,script,./test.sh -f tsim/parser/having.sim
+,,y,script,./test.sh -f tsim/parser/having.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit1.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit2.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit3.sim
@@ -220,7 +220,7 @@
 ,,y,script,./test.sh -f tsim/stream/distributeInterval0.sim
 ,,y,script,./test.sh -f tsim/stream/distributeIntervalRetrive0.sim
 ,,,script,./test.sh -f tsim/stream/distributeSession0.sim
-,,,script,./test.sh -f tsim/stream/session0.sim
+,,y,script,./test.sh -f tsim/stream/session0.sim
 ,,y,script,./test.sh -f tsim/stream/session1.sim
 ,,y,script,./test.sh -f tsim/stream/state0.sim
 ,,y,script,./test.sh -f tsim/stream/triggerInterval0.sim

From 3ada61c346f46257e9eb146cc12bd620c71f4e9d Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 11:13:53 +0800
Subject: [PATCH 57/85] restore some invalid code modify

---
 source/libs/sync/inc/syncInt.h  |  2 +-
 source/libs/sync/src/syncMain.c | 39 +++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index e4d4b28b6b..0e0042d526 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -70,7 +70,7 @@ typedef struct SSyncTimer {
   uint64_t          counter;
   int32_t           timerMS;
   SRaftId           destId;
-  SSyncHbTimerData  hbData;
+  void*             pData;
 } SSyncTimer;
 
 typedef struct SElectTimer {
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 514160235f..036127bf9c 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -665,12 +665,13 @@ static int32_t syncHbTimerInit(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer, SRa
 static int32_t syncHbTimerStart(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
   int32_t ret = 0;
   if (syncIsInit()) {
-    SSyncHbTimerData* pData = &pSyncTimer->hbData;
+    SSyncHbTimerData* pData = taosMemoryMalloc(sizeof(SSyncHbTimerData));
     pData->pSyncNode = pSyncNode;
     pData->pTimer = pSyncTimer;
     pData->destId = pSyncTimer->destId;
     pData->logicClock = pSyncTimer->logicClock;
 
+    pSyncTimer->pData = pData;
     taosTmrReset(pSyncTimer->timerCb, pSyncTimer->timerMS, pData, syncEnv()->pTimerManager, &pSyncTimer->pTimer);
   } else {
     sError("vgId:%d, start ctrl hb timer error, sync env is stop", pSyncNode->vgId);
@@ -1104,8 +1105,15 @@ int32_t syncNodeStartElectTimer(SSyncNode* pSyncNode, int32_t ms) {
   int32_t ret = 0;
   if (syncIsInit()) {
     pSyncNode->electTimerMS = ms;
-    taosTmrReset(pSyncNode->FpElectTimerCB, pSyncNode->electTimerMS, pSyncNode, syncEnv()->pTimerManager,
+
+    SElectTimer* pElectTimer = taosMemoryMalloc(sizeof(SElectTimer));
+    pElectTimer->logicClock = pSyncNode->electTimerLogicClock;
+    pElectTimer->pSyncNode = pSyncNode;
+    pElectTimer->pData = NULL;
+
+    taosTmrReset(pSyncNode->FpElectTimerCB, pSyncNode->electTimerMS, pElectTimer, syncEnv()->pTimerManager,
                  &pSyncNode->pElectTimer);
+
   } else {
     sError("vgId:%d, start elect timer error, sync env is stop", pSyncNode->vgId);
   }
@@ -1855,28 +1863,45 @@ static void syncNodeEqPingTimer(void* param, void* tmrId) {
 }
 
 static void syncNodeEqElectTimer(void* param, void* tmrId) {
-  SSyncNode* pNode = param;
-
   if (!syncIsInit()) return;
+
+  SElectTimer* pElectTimer = param;
+  SSyncNode*   pNode = pElectTimer->pSyncNode;
+
   if (pNode == NULL) return;
   if (pNode->syncEqMsg == NULL) return;
 
   SRpcMsg rpcMsg = {0};
-  int32_t code =
-      syncBuildTimeout(&rpcMsg, SYNC_TIMEOUT_ELECTION, pNode->electTimerLogicClock, pNode->electTimerMS, pNode);
+  int32_t code = syncBuildTimeout(&rpcMsg, SYNC_TIMEOUT_ELECTION, pElectTimer->logicClock, pNode->electTimerMS, pNode);
+
   if (code != 0) {
     sError("failed to build elect msg");
+    taosMemoryFree(pElectTimer);
     return;
   }
 
   SyncTimeout* pTimeout = rpcMsg.pCont;
-  sTrace("enqueue elect msg lc:%" PRId64, pTimeout->logicClock);
+  sNTrace(pNode, "enqueue elect msg lc:%" PRId64, pTimeout->logicClock);
 
   code = pNode->syncEqMsg(pNode->msgcb, &rpcMsg);
   if (code != 0) {
     sError("failed to sync enqueue elect msg since %s", terrstr());
     rpcFreeCont(rpcMsg.pCont);
+    taosMemoryFree(pElectTimer);
+    return;
   }
+
+  taosMemoryFree(pElectTimer);
+
+#if 0
+  // reset timer ms
+  if (syncIsInit() && pNode->electBaseLine > 0) {
+    pNode->electTimerMS = syncUtilElectRandomMS(pNode->electBaseLine, 2 * pNode->electBaseLine);
+    taosTmrReset(syncNodeEqElectTimer, pNode->electTimerMS, pNode, syncEnv()->pTimerManager, &pNode->pElectTimer);
+  } else {
+    sError("sync env is stop, syncNodeEqElectTimer");
+  }
+#endif
 }
 
 static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {

From 015c00aaca11002a77f99848ee655301353787da Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 16 Nov 2022 11:16:32 +0800
Subject: [PATCH 58/85] fix(stream): timer refer stream task

---
 source/libs/stream/src/stream.c     |  3 +++
 source/libs/stream/src/streamMeta.c |  9 +++++++++
 source/libs/wal/src/walWrite.c      | 12 ++++++++----
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/source/libs/stream/src/stream.c b/source/libs/stream/src/stream.c
index e6d5859163..79549675a3 100644
--- a/source/libs/stream/src/stream.c
+++ b/source/libs/stream/src/stream.c
@@ -51,6 +51,7 @@ void streamSchedByTimer(void* param, void* tmrId) {
   SStreamTask* pTask = (void*)param;
 
   if (atomic_load_8(&pTask->taskStatus) == TASK_STATUS__DROPPING) {
+    streamMetaReleaseTask(NULL, pTask);
     return;
   }
 
@@ -80,6 +81,8 @@ void streamSchedByTimer(void* param, void* tmrId) {
 
 int32_t streamSetupTrigger(SStreamTask* pTask) {
   if (pTask->triggerParam != 0) {
+    int32_t ref = atomic_add_fetch_32(&pTask->refCnt, 1);
+    ASSERT(ref == 2);
     pTask->timer = taosTmrStart(streamSchedByTimer, (int32_t)pTask->triggerParam, pTask, streamEnv.timer);
     pTask->triggerStatus = TASK_TRIGGER_STATUS__INACTIVE;
   }
diff --git a/source/libs/stream/src/streamMeta.c b/source/libs/stream/src/streamMeta.c
index 5ec8828c05..a864814a74 100644
--- a/source/libs/stream/src/streamMeta.c
+++ b/source/libs/stream/src/streamMeta.c
@@ -80,7 +80,12 @@ void streamMetaClose(SStreamMeta* pMeta) {
     pIter = taosHashIterate(pMeta->pTasks, pIter);
     if (pIter == NULL) break;
     SStreamTask* pTask = *(SStreamTask**)pIter;
+    if (pTask->timer) {
+      taosTmrStop(pTask->timer);
+      pTask->timer = NULL;
+    }
     tFreeSStreamTask(pTask);
+    /*streamMetaReleaseTask(pMeta, pTask);*/
   }
   taosHashCleanup(pMeta->pTasks);
   taosMemoryFree(pMeta->path);
@@ -202,6 +207,10 @@ void streamMetaRemoveTask1(SStreamMeta* pMeta, int32_t taskId) {
   if (ppTask) {
     SStreamTask* pTask = *ppTask;
     taosHashRemove(pMeta->pTasks, &taskId, sizeof(int32_t));
+    /*if (pTask->timer) {
+     * taosTmrStop(pTask->timer);*/
+    /*pTask->timer = NULL;*/
+    /*}*/
     atomic_store_8(&pTask->taskStatus, TASK_STATUS__DROPPING);
 
     taosWLockLatch(&pMeta->lock);
diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 34195f0193..0bc76e4084 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -102,6 +102,7 @@ int32_t walCommit(SWal *pWal, int64_t ver) {
 
 int32_t walRollback(SWal *pWal, int64_t ver) {
   taosThreadMutexLock(&pWal->mutex);
+  wInfo("vgId:%d, wal rollback for version %" PRId64, pWal->cfg.vgId, ver);
   int64_t code;
   char    fnameStr[WAL_FILE_LEN];
   if (ver > pWal->vers.lastVer || ver < pWal->vers.commitVer || ver <= pWal->vers.snapshotVer) {
@@ -123,8 +124,10 @@ int32_t walRollback(SWal *pWal, int64_t ver) {
     int fileSetSize = taosArrayGetSize(pWal->fileInfoSet);
     for (int i = pWal->writeCur + 1; i < fileSetSize; i++) {
       walBuildLogName(pWal, ((SWalFileInfo *)taosArrayGet(pWal->fileInfoSet, i))->firstVer, fnameStr);
+      wDebug("vgId:%d, wal remove file %s for rollback", pWal->cfg.vgId, fnameStr);
       taosRemoveFile(fnameStr);
       walBuildIdxName(pWal, ((SWalFileInfo *)taosArrayGet(pWal->fileInfoSet, i))->firstVer, fnameStr);
+      wDebug("vgId:%d, wal remove file %s for rollback", pWal->cfg.vgId, fnameStr);
       taosRemoveFile(fnameStr);
     }
     // pop from fileInfoSet
@@ -157,6 +160,7 @@ int32_t walRollback(SWal *pWal, int64_t ver) {
 
   walBuildLogName(pWal, walGetCurFileFirstVer(pWal), fnameStr);
   TdFilePtr pLogFile = taosOpenFile(fnameStr, TD_FILE_WRITE | TD_FILE_READ | TD_FILE_APPEND);
+  wDebug("vgId:%d, wal truncate file %s", pWal->cfg.vgId, fnameStr);
   if (pLogFile == NULL) {
     // TODO
     terrno = TAOS_SYSTEM_ERROR(errno);
@@ -324,9 +328,9 @@ int32_t walEndSnapshot(SWal *pWal) {
       pInfo++;
     }
     if (POINTER_DISTANCE(pInfo, pWal->fileInfoSet->pData) > 0) {
-      wDebug("vgId:%d, begin remove from %" PRId64, pWal->cfg.vgId, pInfo->firstVer);
+      wDebug("vgId:%d, wal end remove from %" PRId64, pWal->cfg.vgId, pInfo->firstVer);
     } else {
-      wDebug("vgId:%d, no remove", pWal->cfg.vgId);
+      wDebug("vgId:%d, wal no remove", pWal->cfg.vgId);
     }
     // iterate files, until the searched result
     for (SWalFileInfo *iter = pWal->fileInfoSet->pData; iter < pInfo; iter++) {
@@ -343,12 +347,12 @@ int32_t walEndSnapshot(SWal *pWal) {
     for (int i = 0; i < deleteCnt; i++) {
       pInfo = taosArrayGet(pWal->fileInfoSet, i);
       walBuildLogName(pWal, pInfo->firstVer, fnameStr);
-      wDebug("vgId:%d, remove file %s", pWal->cfg.vgId, fnameStr);
+      wDebug("vgId:%d, wal remove file %s", pWal->cfg.vgId, fnameStr);
       if (taosRemoveFile(fnameStr) < 0) {
         goto UPDATE_META;
       }
       walBuildIdxName(pWal, pInfo->firstVer, fnameStr);
-      wDebug("vgId:%d, remove file %s", pWal->cfg.vgId, fnameStr);
+      wDebug("vgId:%d, wal remove file %s", pWal->cfg.vgId, fnameStr);
       if (taosRemoveFile(fnameStr) < 0) {
         ASSERT(0);
       }

From cf7fe5bb1f59311ce14291b72fa6ba11f93d52af Mon Sep 17 00:00:00 2001
From: Huo Linhe <linhehuo@gmail.com>
Date: Wed, 16 Nov 2022 11:23:15 +0800
Subject: [PATCH 59/85] fix(ws): fix websocket connection error on windows
 release build

Close [TS-2060](https://jira.taosdata.com:18080/browse/TS-2060)
---
 cmake/taosws_CMakeLists.txt.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/taosws_CMakeLists.txt.in b/cmake/taosws_CMakeLists.txt.in
index 5c448e2c1d..7d48eb9d8a 100644
--- a/cmake/taosws_CMakeLists.txt.in
+++ b/cmake/taosws_CMakeLists.txt.in
@@ -2,7 +2,7 @@
 # taosws-rs
 ExternalProject_Add(taosws-rs
         GIT_REPOSITORY https://github.com/taosdata/taos-connector-rust.git
-        GIT_TAG 7664c41
+        GIT_TAG 9843872
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taosws-rs"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

From 70f7d46bc7fd77de1edc034a734e168a7a08ebbb Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 11:30:29 +0800
Subject: [PATCH 60/85] fix: asan script error

---
 tests/script/test.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/script/test.sh b/tests/script/test.sh
index 1e3319dd0a..3cc40a2927 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -7,6 +7,7 @@
 ##################################################
 
 set +e
+#set -x
 
 FILE_NAME=
 RELEASE=0
@@ -137,8 +138,15 @@ if [ -n "$FILE_NAME" ]; then
     $PROGRAM -c $CFG_DIR -f $FILE_NAME -v
   else
     echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f $FILE_NAME
-    $PROGRAM -c $CFG_DIR -f $FILE_NAME 2> $ASAN_DIR/tsim.asan 
-    $CODE_DIR/sh/checkAsan.sh
+    $PROGRAM -c $CFG_DIR -f $FILE_NAME 2> $ASAN_DIR/tsim.asan
+    result=$?
+    echo "Execute result: " $result
+
+    if [ $result -eq 0 ]; then
+      $CODE_DIR/sh/checkAsan.sh
+    else
+      exit 1
+    fi
   fi
 else
   echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f basicSuite.sim

From 6febcbcfe5bf99d68633990c1b7506d96f9b4d6f Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 12:33:30 +0800
Subject: [PATCH 61/85] fix: asan script error

---
 tests/script/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/script/test.sh b/tests/script/test.sh
index 3cc40a2927..b3a3b1d61a 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -7,7 +7,7 @@
 ##################################################
 
 set +e
-#set -x
+set -x
 
 FILE_NAME=
 RELEASE=0

From 6573e93b5441b83ca89fb1d0810d8dc9e1fe45a2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 12:52:47 +0800
Subject: [PATCH 62/85] fix: asan script error

---
 tests/script/test.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/script/test.sh b/tests/script/test.sh
index b3a3b1d61a..e1db1c14de 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -7,7 +7,7 @@
 ##################################################
 
 set +e
-set -x
+#set -x
 
 FILE_NAME=
 RELEASE=0
@@ -138,7 +138,8 @@ if [ -n "$FILE_NAME" ]; then
     $PROGRAM -c $CFG_DIR -f $FILE_NAME -v
   else
     echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f $FILE_NAME
-    $PROGRAM -c $CFG_DIR -f $FILE_NAME 2> $ASAN_DIR/tsim.asan
+    echo "AsanDir:" $ASAN_DIR/tsim.asan
+    eval $PROGRAM -c $CFG_DIR -f $FILE_NAME 2> $ASAN_DIR/tsim.asan
     result=$?
     echo "Execute result: " $result
 

From 8f6ba995a51b8deb0f8de05d2c526293d1f7a7ba Mon Sep 17 00:00:00 2001
From: slzhou <shenglian_zhou@163.com>
Date: Wed, 16 Nov 2022 13:27:53 +0800
Subject: [PATCH 63/85] fix: get group id from the group list when last row
 scan

---
 source/libs/executor/src/cachescanoperator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/executor/src/cachescanoperator.c b/source/libs/executor/src/cachescanoperator.c
index 6f9084ce52..b78ba8ac0a 100644
--- a/source/libs/executor/src/cachescanoperator.c
+++ b/source/libs/executor/src/cachescanoperator.c
@@ -208,7 +208,7 @@ SSDataBlock* doScanCache(SOperatorInfo* pOperator) {
         if (pInfo->pseudoExprSup.numOfExprs > 0) {
           SExprSupp* pSup = &pInfo->pseudoExprSup;
 
-          STableKeyInfo* pKeyInfo = &((STableKeyInfo*)pTableList)[0];
+          STableKeyInfo* pKeyInfo = &((STableKeyInfo*)pList)[0];
           pInfo->pRes->info.groupId = pKeyInfo->groupId;
 
           if (taosArrayGetSize(pInfo->pUidList) > 0) {

From 058788b2eb5630a713f7a63b26701ce83e771d60 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 13:28:29 +0800
Subject: [PATCH 64/85] test: update asan case

---
 tests/parallel_test/cases.task             | 16 ++++++++--------
 tests/script/tsim/compute/diff2.sim        |  2 +-
 tests/script/tsim/parser/function.sim      |  8 ++++----
 tests/script/tsim/parser/nestquery.sim     | 14 +++++++-------
 tests/script/tsim/valgrind/checkError6.sim |  2 +-
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index b9d5e6c03f..0567f05d55 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -37,10 +37,10 @@
 ,,y,script,./test.sh -f tsim/db/taosdlog.sim
 ,,,script,./test.sh -f tsim/dnode/balance_replica1.sim
 ,,,script,./test.sh -f tsim/dnode/balance_replica3.sim
-,,,script,./test.sh -f tsim/dnode/balance1.sim
-,,,script,./test.sh -f tsim/dnode/balance2.sim
-,,,script,./test.sh -f tsim/dnode/balance3.sim
-,,,script,./test.sh -f tsim/dnode/balancex.sim
+#,,,script,./test.sh -f tsim/dnode/balance1.sim
+#,,,script,./test.sh -f tsim/dnode/balance2.sim
+#,,,script,./test.sh -f tsim/dnode/balance3.sim
+#,,,script,./test.sh -f tsim/dnode/balancex.sim
 ,,y,script,./test.sh -f tsim/dnode/create_dnode.sim
 ,,y,script,./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim
 ,,y,script,./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim
@@ -55,7 +55,7 @@
 ,,,script,./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim
 ,,,script,./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v2.sim
 ,,,script,./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v3.sim
-,,,script,./test.sh -f tsim/dnode/vnode_clean.sim
+#,,,script,./test.sh -f tsim/dnode/vnode_clean.sim
 ,,,script,./test.sh -f tsim/dnode/use_dropped_dnode.sim 
 ,,,script,./test.sh -f tsim/dnode/split_vgroup_replica1.sim 
 ,,,script,./test.sh -f tsim/dnode/split_vgroup_replica3.sim 
@@ -115,7 +115,7 @@
 ,,y,script,./test.sh -f tsim/parser/interp.sim
 #,,y,script,./test.sh -f tsim/parser/limit2.sim
 ,,y,script,./test.sh -f tsim/parser/fourArithmetic-basic.sim
-,,,script,./test.sh -f tsim/parser/function.sim
+,,y,script,./test.sh -f tsim/parser/function.sim
 ,,y,script,./test.sh -f tsim/parser/groupby-basic.sim
 ,,,script,./test.sh -f tsim/parser/groupby.sim
 ,,y,script,./test.sh -f tsim/parser/having_child.sim
@@ -140,7 +140,7 @@
 ,,,script,./test.sh -f tsim/parser/limit1.sim
 ,,y,script,./test.sh -f tsim/parser/mixed_blocks.sim
 ,,y,script,./test.sh -f tsim/parser/nchar.sim
-,,,script,./test.sh -f tsim/parser/nestquery.sim
+,,y,script,./test.sh -f tsim/parser/nestquery.sim
 ,,y,script,./test.sh -f tsim/parser/null_char.sim
 ,,y,script,./test.sh -f tsim/parser/precision_ns.sim
 ,,y,script,./test.sh -f tsim/parser/projection_limit_offset.sim
@@ -296,7 +296,7 @@
 ,,y,script,./test.sh -f tsim/vnode/replica3_vgroup.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_many.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_import.sim
-,,,script,./test.sh -f tsim/vnode/stable_balance_replica1.sim
+#,,,script,./test.sh -f tsim/vnode/stable_balance_replica1.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2_stop.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode3.sim
diff --git a/tests/script/tsim/compute/diff2.sim b/tests/script/tsim/compute/diff2.sim
index 1cc2a87839..5848e05b1e 100644
--- a/tests/script/tsim/compute/diff2.sim
+++ b/tests/script/tsim/compute/diff2.sim
@@ -83,7 +83,7 @@ sql select diff(c1), diff(c2) from $tb
 sql select 2+diff(c1) from $tb
 sql select diff(c1+2) from $tb
 sql_error select diff(c1) from $tb where ts > 0 and ts < now + 100m interval(10m)
-sql select diff(c1) from $mt
+#sql select diff(c1) from $mt
 sql_error select diff(diff(c1)) from $tb
 sql_error select diff(c1) from m_di_tb1 where c2 like '2%'
 
diff --git a/tests/script/tsim/parser/function.sim b/tests/script/tsim/parser/function.sim
index ec9cdf2666..704b6eafb0 100644
--- a/tests/script/tsim/parser/function.sim
+++ b/tests/script/tsim/parser/function.sim
@@ -932,10 +932,10 @@ sql insert into t0 values('2020-1-1 1:4:10', 10);
 
 sql insert into t1 values('2020-1-1 1:1:2', 2);
 print ===========================>td-4739
-sql select diff(val) from (select derivative(k, 1s, 0) val from t1);
-if $rows != 0 then
-  return -1
-endi
+#sql select diff(val) from (select derivative(k, 1s, 0) val from t1);
+#if $rows != 0 then
+#  return -1
+#endi
 
 sql insert into t1 values('2020-1-1 1:1:4', 20);
 sql insert into t1 values('2020-1-1 1:1:6', 200);
diff --git a/tests/script/tsim/parser/nestquery.sim b/tests/script/tsim/parser/nestquery.sim
index dd7a0c6c81..494c3de99f 100644
--- a/tests/script/tsim/parser/nestquery.sim
+++ b/tests/script/tsim/parser/nestquery.sim
@@ -338,13 +338,13 @@ if $data03 != @20-09-15 00:00:00.000@ then
   return -1
 endi
 
-sql select diff(val) from (select c1 val from nest_tb0);
-if $rows != 9999 then
-  return -1
-endi
-if $data00 != 1 then
-  return -1
-endi
+#sql select diff(val) from (select c1 val from nest_tb0);
+#if $rows != 9999 then
+#  return -1
+#endi
+#if $data00 != 1 then
+#  return -1
+#endi
 
 sql_error select last_row(*) from (select * from nest_tb0) having c1 > 0
 
diff --git a/tests/script/tsim/valgrind/checkError6.sim b/tests/script/tsim/valgrind/checkError6.sim
index 89b6cadef8..9432991d1c 100644
--- a/tests/script/tsim/valgrind/checkError6.sim
+++ b/tests/script/tsim/valgrind/checkError6.sim
@@ -92,7 +92,7 @@ sql select avg(tbcol) as b from stb where ts <= 1601481840000 partition by tgcol
 sql show table distributed stb
 sql select count(1) from stb
 sql select count(tbcol) as b from stb where ts <= 1601481840000 partition by tgcol interval(1m)
-sql select diff(tbcol) from stb where ts <= 1601481840000 
+#sql select diff(tbcol) from stb where ts <= 1601481840000 
 sql select first(tbcol), last(tbcol) as c from stb group by tgcol
 sql select first(tbcol), last(tbcol) as b from stb where ts <= 1601481840000 and tbcol2 is null partition by tgcol interval(1m)
 sql select first(tbcol), last(tbcol) as b from stb where ts <= 1601481840000 partition by tgcol interval(1m)

From b9e5b1f167df14096170cd6bb2f234365cf3268e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 13:29:52 +0800
Subject: [PATCH 65/85] \est: update asan case

---
 tests/script/tsim/valgrind/checkError6.sim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/script/tsim/valgrind/checkError6.sim b/tests/script/tsim/valgrind/checkError6.sim
index 9432991d1c..ef8fe930b9 100644
--- a/tests/script/tsim/valgrind/checkError6.sim
+++ b/tests/script/tsim/valgrind/checkError6.sim
@@ -176,7 +176,7 @@ sql select avg(tbcol) as c from stb group by tgcol
 sql select avg(tbcol) as b from stb where ts <= 1601481840000 partition by tgcol interval(1m)
 sql show table distributed stb
 sql select count(tbcol) as b from stb where ts <= 1601481840000 partition by tgcol interval(1m)
-sql select diff(tbcol) from stb where ts <= 1601481840000 
+#sql select diff(tbcol) from stb where ts <= 1601481840000 
 sql select first(tbcol), last(tbcol) as c from stb group by tgcol
 sql select first(tbcol), last(tbcol) as b from stb where ts <= 1601481840000 and tbcol2 is null partition by tgcol interval(1m)
 sql select first(tbcol), last(tbcol) as b from stb where ts <= 1601481840000 partition by tgcol interval(1m)

From 78378845cc15a3eb4fb8c7a516143bc5b7b15a45 Mon Sep 17 00:00:00 2001
From: Xiaoyu Wang <xiaoyuwang@taosdata.com>
Date: Wed, 16 Nov 2022 13:57:24 +0800
Subject: [PATCH 66/85] fix: memory leak

---
 source/libs/planner/src/planSpliter.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/libs/planner/src/planSpliter.c b/source/libs/planner/src/planSpliter.c
index 249ba1815d..489046d88e 100644
--- a/source/libs/planner/src/planSpliter.c
+++ b/source/libs/planner/src/planSpliter.c
@@ -596,6 +596,7 @@ static int32_t stbSplSplitSessionForStream(SSplitContext* pCxt, SStableSplitInfo
     int32_t index = 0;
     int32_t code = stbSplAppendWEnd(pPartWin, &index);
     if (TSDB_CODE_SUCCESS == code) {
+      nodesDestroyNode(pMergeWin->pTsEnd);
       pMergeWin->pTsEnd = nodesCloneNode(nodesListGetNode(pPartWin->node.pTargets, index));
       if (NULL == pMergeWin->pTsEnd) {
         code = TSDB_CODE_OUT_OF_MEMORY;

From 7bcd13e82ae20e39d4b2217d79b8d7e8f9f94a87 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 14:05:34 +0800
Subject: [PATCH 67/85] fix(sync): fix elect timer memory leak

---
 source/libs/sync/inc/syncInt.h  | 14 +++++++----
 source/libs/sync/src/syncMain.c | 44 ++++++++++++++-------------------
 source/libs/sync/src/syncUtil.c |  4 +--
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index 0e0042d526..0507bb3661 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -41,7 +41,7 @@ typedef struct SSyncRespMgr           SSyncRespMgr;
 typedef struct SSyncSnapshotSender    SSyncSnapshotSender;
 typedef struct SSyncSnapshotReceiver  SSyncSnapshotReceiver;
 typedef struct SSyncTimer             SSyncTimer;
-typedef struct SSyncHbTimerData       SSyncHbTimerData;
+typedef struct SSyncHbTimerParam      SSyncHbTimerParam;
 typedef struct SyncSnapshotSend       SyncSnapshotSend;
 typedef struct SyncSnapshotRsp        SyncSnapshotRsp;
 typedef struct SyncLocalCmd           SyncLocalCmd;
@@ -56,12 +56,13 @@ typedef struct SRaftId {
   SyncGroupId vgId;
 } SRaftId;
 
-typedef struct SSyncHbTimerData {
+typedef struct SSyncHbTimerParam {
   SSyncNode*  pSyncNode;
   SSyncTimer* pTimer;
   SRaftId     destId;
   uint64_t    logicClock;
-} SSyncHbTimerData;
+  int64_t     executeTime;
+} SSyncHbTimerParam;
 
 typedef struct SSyncTimer {
   void*             pTimer;
@@ -73,11 +74,12 @@ typedef struct SSyncTimer {
   void*             pData;
 } SSyncTimer;
 
-typedef struct SElectTimer {
+typedef struct SElectTimerParam {
   uint64_t   logicClock;
   SSyncNode* pSyncNode;
+  int64_t    executeTime;
   void*      pData;
-} SElectTimer;
+} SElectTimerParam;
 
 typedef struct SPeerState {
   SyncIndex lastSendIndex;
@@ -153,6 +155,7 @@ typedef struct SSyncNode {
   uint64_t          electTimerLogicClock;
   TAOS_TMR_CALLBACK FpElectTimerCB;  // Timer Fp
   uint64_t          electTimerCounter;
+  SElectTimerParam  electTimerParam;
 
   // heartbeat timer
   tmr_h             pHeartbeatTimer;
@@ -161,6 +164,7 @@ typedef struct SSyncNode {
   uint64_t          heartbeatTimerLogicClockUser;
   TAOS_TMR_CALLBACK FpHeartbeatTimerCB;  // Timer Fp
   uint64_t          heartbeatTimerCounter;
+  SSyncHbTimerParam hbTimerParam;
 
   // peer heartbeat timer
   SSyncTimer peerHeartbeatTimerArr[TSDB_MAX_REPLICA];
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 036127bf9c..7484e93abe 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -665,7 +665,7 @@ static int32_t syncHbTimerInit(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer, SRa
 static int32_t syncHbTimerStart(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
   int32_t ret = 0;
   if (syncIsInit()) {
-    SSyncHbTimerData* pData = taosMemoryMalloc(sizeof(SSyncHbTimerData));
+    SSyncHbTimerParam* pData = taosMemoryMalloc(sizeof(SSyncHbTimerParam));
     pData->pSyncNode = pSyncNode;
     pData->pTimer = pSyncTimer;
     pData->destId = pSyncTimer->destId;
@@ -1106,12 +1106,13 @@ int32_t syncNodeStartElectTimer(SSyncNode* pSyncNode, int32_t ms) {
   if (syncIsInit()) {
     pSyncNode->electTimerMS = ms;
 
-    SElectTimer* pElectTimer = taosMemoryMalloc(sizeof(SElectTimer));
-    pElectTimer->logicClock = pSyncNode->electTimerLogicClock;
-    pElectTimer->pSyncNode = pSyncNode;
-    pElectTimer->pData = NULL;
+    int64_t execTime = taosGetTimestampMs() + ms;
+    atomic_store_64(&(pSyncNode->electTimerParam.executeTime), execTime);
+    atomic_store_64(&(pSyncNode->electTimerParam.logicClock), pSyncNode->electTimerLogicClock);
+    pSyncNode->electTimerParam.pSyncNode = pSyncNode;
+    pSyncNode->electTimerParam.pData = NULL;
 
-    taosTmrReset(pSyncNode->FpElectTimerCB, pSyncNode->electTimerMS, pElectTimer, syncEnv()->pTimerManager,
+    taosTmrReset(pSyncNode->FpElectTimerCB, pSyncNode->electTimerMS, pSyncNode, syncEnv()->pTimerManager,
                  &pSyncNode->pElectTimer);
 
   } else {
@@ -1865,18 +1866,21 @@ static void syncNodeEqPingTimer(void* param, void* tmrId) {
 static void syncNodeEqElectTimer(void* param, void* tmrId) {
   if (!syncIsInit()) return;
 
-  SElectTimer* pElectTimer = param;
-  SSyncNode*   pNode = pElectTimer->pSyncNode;
+  SSyncNode* pNode = (SSyncNode*)param;
 
   if (pNode == NULL) return;
   if (pNode->syncEqMsg == NULL) return;
 
+  int64_t tsNow = taosGetTimestampMs();
+  if (tsNow < pNode->electTimerParam.executeTime) return;
+
   SRpcMsg rpcMsg = {0};
-  int32_t code = syncBuildTimeout(&rpcMsg, SYNC_TIMEOUT_ELECTION, pElectTimer->logicClock, pNode->electTimerMS, pNode);
+  int32_t code =
+      syncBuildTimeout(&rpcMsg, SYNC_TIMEOUT_ELECTION, pNode->electTimerParam.logicClock, pNode->electTimerMS, pNode);
 
   if (code != 0) {
     sError("failed to build elect msg");
-    taosMemoryFree(pElectTimer);
+
     return;
   }
 
@@ -1887,21 +1891,9 @@ static void syncNodeEqElectTimer(void* param, void* tmrId) {
   if (code != 0) {
     sError("failed to sync enqueue elect msg since %s", terrstr());
     rpcFreeCont(rpcMsg.pCont);
-    taosMemoryFree(pElectTimer);
+
     return;
   }
-
-  taosMemoryFree(pElectTimer);
-
-#if 0
-  // reset timer ms
-  if (syncIsInit() && pNode->electBaseLine > 0) {
-    pNode->electTimerMS = syncUtilElectRandomMS(pNode->electBaseLine, 2 * pNode->electBaseLine);
-    taosTmrReset(syncNodeEqElectTimer, pNode->electTimerMS, pNode, syncEnv()->pTimerManager, &pNode->pElectTimer);
-  } else {
-    sError("sync env is stop, syncNodeEqElectTimer");
-  }
-#endif
 }
 
 static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
@@ -1938,9 +1930,9 @@ static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
 }
 
 static void syncNodeEqPeerHeartbeatTimer(void* param, void* tmrId) {
-  SSyncHbTimerData* pData = (SSyncHbTimerData*)param;
-  SSyncNode*        pSyncNode = pData->pSyncNode;
-  SSyncTimer*       pSyncTimer = pData->pTimer;
+  SSyncHbTimerParam* pData = (SSyncHbTimerParam*)param;
+  SSyncNode*         pSyncNode = pData->pSyncNode;
+  SSyncTimer*        pSyncTimer = pData->pTimer;
 
   if (pSyncNode == NULL) {
     return;
diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index fb1b07b0b6..1d0ad07c99 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -193,7 +193,7 @@ static void syncPeerState2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
 }
 
 void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNode* pNode, const char* format, ...) {
-  if (pNode == NULL || pNode->pRaftCfg != NULL && pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
+  if (pNode == NULL || pNode->pRaftCfg == NULL && pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
   int64_t currentTerm = pNode->pRaftStore->currentTerm;
 
   // save error code, otherwise it will be overwritten
@@ -554,4 +554,4 @@ void syncLogSendRequestVoteReply(SSyncNode* pSyncNode, const SyncRequestVoteRepl
   syncUtilU642Addr(pMsg->destId.addr, host, sizeof(host), &port);
   sNTrace(pSyncNode, "send sync-request-vote-reply to %s:%d {term:%" PRId64 ", grant:%d}, %s", host, port, pMsg->term,
           pMsg->voteGranted, s);
-}
\ No newline at end of file
+}

From 81592dfb09bc18b5ecc49e7efb21bf4c03fc32bb Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 14:25:21 +0800
Subject: [PATCH 68/85] fix(sync): fix hb-timer memory leak

---
 source/libs/sync/inc/syncInt.h  | 8 +++-----
 source/libs/sync/src/syncMain.c | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index 0507bb3661..b7ca735ade 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -56,13 +56,12 @@ typedef struct SRaftId {
   SyncGroupId vgId;
 } SRaftId;
 
-typedef struct SSyncHbTimerParam {
+typedef struct SSyncHbTimerData {
   SSyncNode*  pSyncNode;
   SSyncTimer* pTimer;
   SRaftId     destId;
   uint64_t    logicClock;
-  int64_t     executeTime;
-} SSyncHbTimerParam;
+} SSyncHbTimerData;
 
 typedef struct SSyncTimer {
   void*             pTimer;
@@ -71,7 +70,7 @@ typedef struct SSyncTimer {
   uint64_t          counter;
   int32_t           timerMS;
   SRaftId           destId;
-  void*             pData;
+  SSyncHbTimerData  hbData;
 } SSyncTimer;
 
 typedef struct SElectTimerParam {
@@ -164,7 +163,6 @@ typedef struct SSyncNode {
   uint64_t          heartbeatTimerLogicClockUser;
   TAOS_TMR_CALLBACK FpHeartbeatTimerCB;  // Timer Fp
   uint64_t          heartbeatTimerCounter;
-  SSyncHbTimerParam hbTimerParam;
 
   // peer heartbeat timer
   SSyncTimer peerHeartbeatTimerArr[TSDB_MAX_REPLICA];
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 7484e93abe..d47bf4f401 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -665,13 +665,12 @@ static int32_t syncHbTimerInit(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer, SRa
 static int32_t syncHbTimerStart(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
   int32_t ret = 0;
   if (syncIsInit()) {
-    SSyncHbTimerParam* pData = taosMemoryMalloc(sizeof(SSyncHbTimerParam));
+    SSyncHbTimerData* pData = &pSyncTimer->hbData;
     pData->pSyncNode = pSyncNode;
     pData->pTimer = pSyncTimer;
     pData->destId = pSyncTimer->destId;
     pData->logicClock = pSyncTimer->logicClock;
 
-    pSyncTimer->pData = pData;
     taosTmrReset(pSyncTimer->timerCb, pSyncTimer->timerMS, pData, syncEnv()->pTimerManager, &pSyncTimer->pTimer);
   } else {
     sError("vgId:%d, start ctrl hb timer error, sync env is stop", pSyncNode->vgId);
@@ -1930,9 +1929,9 @@ static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
 }
 
 static void syncNodeEqPeerHeartbeatTimer(void* param, void* tmrId) {
-  SSyncHbTimerParam* pData = (SSyncHbTimerParam*)param;
-  SSyncNode*         pSyncNode = pData->pSyncNode;
-  SSyncTimer*        pSyncTimer = pData->pTimer;
+  SSyncHbTimerData* pData = (SSyncHbTimerData*)param;
+  SSyncNode*        pSyncNode = pData->pSyncNode;
+  SSyncTimer*       pSyncTimer = pData->pTimer;
 
   if (pSyncNode == NULL) {
     return;

From 4c912aa95537baf46a7cdf4eb336e62652eff2ef Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 14:28:20 +0800
Subject: [PATCH 69/85] fix(sync): fix hb-timer memory leak

---
 source/libs/sync/inc/syncInt.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index b7ca735ade..362618fece 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -41,7 +41,7 @@ typedef struct SSyncRespMgr           SSyncRespMgr;
 typedef struct SSyncSnapshotSender    SSyncSnapshotSender;
 typedef struct SSyncSnapshotReceiver  SSyncSnapshotReceiver;
 typedef struct SSyncTimer             SSyncTimer;
-typedef struct SSyncHbTimerParam      SSyncHbTimerParam;
+typedef struct SSyncHbTimerData       SSyncHbTimerData;
 typedef struct SyncSnapshotSend       SyncSnapshotSend;
 typedef struct SyncSnapshotRsp        SyncSnapshotRsp;
 typedef struct SyncLocalCmd           SyncLocalCmd;

From 1114bdefb4db0fbc44deeae53a283fd49dbfae77 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 14:31:17 +0800
Subject: [PATCH 70/85] fix: invalid log print

---
 source/libs/sync/src/syncUtil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/libs/sync/src/syncUtil.c b/source/libs/sync/src/syncUtil.c
index 1d0ad07c99..b50336cd63 100644
--- a/source/libs/sync/src/syncUtil.c
+++ b/source/libs/sync/src/syncUtil.c
@@ -193,7 +193,7 @@ static void syncPeerState2Str(SSyncNode* pSyncNode, char* buf, int32_t bufLen) {
 }
 
 void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNode* pNode, const char* format, ...) {
-  if (pNode == NULL || pNode->pRaftCfg == NULL && pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
+  if (pNode == NULL || pNode->pRaftCfg == NULL || pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
   int64_t currentTerm = pNode->pRaftStore->currentTerm;
 
   // save error code, otherwise it will be overwritten
@@ -252,7 +252,7 @@ void syncPrintNodeLog(const char* flags, ELogLevel level, int32_t dflag, SSyncNo
 void syncPrintSnapshotSenderLog(const char* flags, ELogLevel level, int32_t dflag, SSyncSnapshotSender* pSender,
                                 const char* format, ...) {
   SSyncNode* pNode = pSender->pSyncNode;
-  if (pNode == NULL || pNode->pRaftCfg != NULL && pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
+  if (pNode == NULL || pNode->pRaftCfg == NULL || pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
 
   SSnapshot snapshot = {.data = NULL, .lastApplyIndex = -1, .lastApplyTerm = 0};
   if (pNode->pFsm != NULL && pNode->pFsm->FpGetSnapshotInfo != NULL) {
@@ -304,7 +304,7 @@ void syncPrintSnapshotSenderLog(const char* flags, ELogLevel level, int32_t dfla
 void syncPrintSnapshotReceiverLog(const char* flags, ELogLevel level, int32_t dflag, SSyncSnapshotReceiver* pReceiver,
                                   const char* format, ...) {
   SSyncNode* pNode = pReceiver->pSyncNode;
-  if (pNode == NULL || pNode->pRaftCfg != NULL && pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
+  if (pNode == NULL || pNode->pRaftCfg == NULL || pNode->pRaftStore == NULL || pNode->pLogStore == NULL) return;
 
   SSnapshot snapshot = {.data = NULL, .lastApplyIndex = -1, .lastApplyTerm = 0};
   if (pNode->pFsm != NULL && pNode->pFsm->FpGetSnapshotInfo != NULL) {

From aae3475900656d189ecaca5e46f36ce14ce0dcc6 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 16 Nov 2022 14:36:51 +0800
Subject: [PATCH 71/85] fix(query): ASAN heap buffer overflow

TD-20454
---
 source/libs/function/src/builtinsimpl.c |  9 +++++++--
 source/libs/scalar/src/sclfunc.c        | 11 +++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 10860d291f..ef04d2df65 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -4495,18 +4495,23 @@ bool histogramFunctionSetup(SqlFunctionCtx* pCtx, SResultRowEntryInfo* pResultIn
   pInfo->totalCount = 0;
   pInfo->normalized = 0;
 
-  int8_t binType = getHistogramBinType(varDataVal(pCtx->param[1].param.pz));
+  char *binTypeStr = strndup(varDataVal(pCtx->param[1].param.pz), varDataLen(pCtx->param[1].param.pz));
+  int8_t binType = getHistogramBinType(binTypeStr);
+  taosMemoryFree(binTypeStr);
+
   if (binType == UNKNOWN_BIN) {
     return false;
   }
-  char*   binDesc = varDataVal(pCtx->param[2].param.pz);
+  char*   binDesc = strndup(varDataVal(pCtx->param[2].param.pz), varDataLen(pCtx->param[2].param.pz));
   int64_t normalized = pCtx->param[3].param.i;
   if (normalized != 0 && normalized != 1) {
     return false;
   }
   if (!getHistogramBinDesc(pInfo, binDesc, binType, (bool)normalized)) {
+    taosMemoryFree(binDesc);
     return false;
   }
+  taosMemoryFree(binDesc);
 
   return true;
 }
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index 22fa99d75d..bb4a36a4ce 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -2748,14 +2748,19 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
   int32_t        numOfBins = 0;
   int32_t        totalCount = 0;
 
-  int8_t  binType = getHistogramBinType(varDataVal(pInput[1].columnData->pData));
-  char   *binDesc = varDataVal(pInput[2].columnData->pData);
+  char *binTypeStr = strndup(varDataVal(pInput[1].columnData->pData), varDataLen(pInput[1].columnData->pData));
+  int8_t binType = getHistogramBinType(binTypeStr);
+  taosMemoryFree(binTypeStr);
+
+  char   *binDesc = strndup(varDataVal(pInput[2].columnData->pData), varDataLen(pInput[2].columnData->pData));
   int64_t normalized = *(int64_t *)(pInput[3].columnData->pData);
 
   int32_t type = GET_PARAM_TYPE(pInput);
   if (!getHistogramBinDesc(&bins, &numOfBins, binDesc, binType, (bool)normalized)) {
+    taosMemoryFree(binDesc);
     return TSDB_CODE_FAILED;
   }
+  taosMemoryFree(binDesc);
 
   for (int32_t i = 0; i < pInput->numOfRows; ++i) {
     if (colDataIsNull_s(pInputData, i)) {
@@ -2785,6 +2790,8 @@ int32_t histogramScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarP
     }
   }
 
+  colInfoDataEnsureCapacity(pOutputData, numOfBins, false);
+
   for (int32_t k = 0; k < numOfBins; ++k) {
     int32_t len;
     char    buf[512] = {0};

From cf601b206fdad4b51a331a9257528f48ac8ea104 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Wed, 16 Nov 2022 14:36:51 +0800
Subject: [PATCH 72/85] fix(query): ASAN heap buffer overflow

TD-20454
---
 source/libs/function/src/builtinsimpl.c | 17 +++++++++++++++++
 source/libs/scalar/src/sclfunc.c        | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index ef04d2df65..4e1feb75b1 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -4366,6 +4366,7 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
     int32_t numOfParams = cJSON_GetArraySize(binDesc);
     int32_t startIndex;
     if (numOfParams != 4) {
+      cJSON_Delete(binDesc);
       return false;
     }
 
@@ -4376,15 +4377,18 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
     cJSON* infinity = cJSON_GetObjectItem(binDesc, "infinity");
 
     if (!cJSON_IsNumber(start) || !cJSON_IsNumber(count) || !cJSON_IsBool(infinity)) {
+      cJSON_Delete(binDesc);
       return false;
     }
 
     if (count->valueint <= 0 || count->valueint > 1000) {  // limit count to 1000
+      cJSON_Delete(binDesc);
       return false;
     }
 
     if (isinf(start->valuedouble) || (width != NULL && isinf(width->valuedouble)) ||
         (factor != NULL && isinf(factor->valuedouble)) || (count != NULL && isinf(count->valuedouble))) {
+      cJSON_Delete(binDesc);
       return false;
     }
 
@@ -4402,12 +4406,14 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
       // linear bin process
       if (width->valuedouble == 0) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       for (int i = 0; i < counter + 1; ++i) {
         intervals[startIndex] = start->valuedouble + i * width->valuedouble;
         if (isinf(intervals[startIndex])) {
           taosMemoryFree(intervals);
+          cJSON_Delete(binDesc);
           return false;
         }
         startIndex++;
@@ -4416,22 +4422,26 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
       // log bin process
       if (start->valuedouble == 0) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       if (factor->valuedouble < 0 || factor->valuedouble == 0 || factor->valuedouble == 1) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       for (int i = 0; i < counter + 1; ++i) {
         intervals[startIndex] = start->valuedouble * pow(factor->valuedouble, i * 1.0);
         if (isinf(intervals[startIndex])) {
           taosMemoryFree(intervals);
+          cJSON_Delete(binDesc);
           return false;
         }
         startIndex++;
       }
     } else {
       taosMemoryFree(intervals);
+      cJSON_Delete(binDesc);
       return false;
     }
 
@@ -4446,6 +4456,7 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
     }
   } else if (cJSON_IsArray(binDesc)) { /* user input bins */
     if (binType != USER_INPUT_BIN) {
+      cJSON_Delete(binDesc);
       return false;
     }
     numOfBins = cJSON_GetArraySize(binDesc);
@@ -4453,6 +4464,7 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
     cJSON* bin = binDesc->child;
     if (bin == NULL) {
       taosMemoryFree(intervals);
+      cJSON_Delete(binDesc);
       return false;
     }
     int i = 0;
@@ -4460,16 +4472,19 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
       intervals[i] = bin->valuedouble;
       if (!cJSON_IsNumber(bin)) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       if (i != 0 && intervals[i] <= intervals[i - 1]) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       bin = bin->next;
       i++;
     }
   } else {
+    cJSON_Delete(binDesc);
     return false;
   }
 
@@ -4482,6 +4497,8 @@ static bool getHistogramBinDesc(SHistoFuncInfo* pInfo, char* binDescStr, int8_t
   }
 
   taosMemoryFree(intervals);
+  cJSON_Delete(binDesc);
+
   return true;
 }
 
diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c
index bb4a36a4ce..336bc6d533 100644
--- a/source/libs/scalar/src/sclfunc.c
+++ b/source/libs/scalar/src/sclfunc.c
@@ -2620,6 +2620,7 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
     int32_t numOfParams = cJSON_GetArraySize(binDesc);
     int32_t startIndex;
     if (numOfParams != 4) {
+      cJSON_Delete(binDesc);
       return false;
     }
 
@@ -2630,15 +2631,18 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
     cJSON *infinity = cJSON_GetObjectItem(binDesc, "infinity");
 
     if (!cJSON_IsNumber(start) || !cJSON_IsNumber(count) || !cJSON_IsBool(infinity)) {
+      cJSON_Delete(binDesc);
       return false;
     }
 
     if (count->valueint <= 0 || count->valueint > 1000) {  // limit count to 1000
+      cJSON_Delete(binDesc);
       return false;
     }
 
     if (isinf(start->valuedouble) || (width != NULL && isinf(width->valuedouble)) ||
         (factor != NULL && isinf(factor->valuedouble)) || (count != NULL && isinf(count->valuedouble))) {
+      cJSON_Delete(binDesc);
       return false;
     }
 
@@ -2656,12 +2660,14 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
       // linear bin process
       if (width->valuedouble == 0) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       for (int i = 0; i < counter + 1; ++i) {
         intervals[startIndex] = start->valuedouble + i * width->valuedouble;
         if (isinf(intervals[startIndex])) {
           taosMemoryFree(intervals);
+          cJSON_Delete(binDesc);
           return false;
         }
         startIndex++;
@@ -2670,22 +2676,26 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
       // log bin process
       if (start->valuedouble == 0) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       if (factor->valuedouble < 0 || factor->valuedouble == 0 || factor->valuedouble == 1) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       for (int i = 0; i < counter + 1; ++i) {
         intervals[startIndex] = start->valuedouble * pow(factor->valuedouble, i * 1.0);
         if (isinf(intervals[startIndex])) {
           taosMemoryFree(intervals);
+          cJSON_Delete(binDesc);
           return false;
         }
         startIndex++;
       }
     } else {
       taosMemoryFree(intervals);
+      cJSON_Delete(binDesc);
       return false;
     }
 
@@ -2700,6 +2710,7 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
     }
   } else if (cJSON_IsArray(binDesc)) { /* user input bins */
     if (binType != USER_INPUT_BIN) {
+      cJSON_Delete(binDesc);
       return false;
     }
     numOfBins = cJSON_GetArraySize(binDesc);
@@ -2707,6 +2718,7 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
     cJSON *bin = binDesc->child;
     if (bin == NULL) {
       taosMemoryFree(intervals);
+      cJSON_Delete(binDesc);
       return false;
     }
     int i = 0;
@@ -2714,16 +2726,19 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
       intervals[i] = bin->valuedouble;
       if (!cJSON_IsNumber(bin)) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       if (i != 0 && intervals[i] <= intervals[i - 1]) {
         taosMemoryFree(intervals);
+        cJSON_Delete(binDesc);
         return false;
       }
       bin = bin->next;
       i++;
     }
   } else {
+    cJSON_Delete(binDesc);
     return false;
   }
 
@@ -2735,8 +2750,9 @@ static bool getHistogramBinDesc(SHistoFuncBin **bins, int32_t *binNum, char *bin
     (*bins)[i].count = 0;
   }
 
-  cJSON_Delete(binDesc);
   taosMemoryFree(intervals);
+  cJSON_Delete(binDesc);
+
   return true;
 }
 

From ab57d069d4fe954fc1cad1e9ceb8ea8cf828b670 Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 16 Nov 2022 15:18:31 +0800
Subject: [PATCH 73/85] enh(stream): add tbname map cache

---
 source/libs/executor/inc/executorimpl.h | 54 +++++++++++++------------
 source/libs/executor/src/scanoperator.c | 32 ++++++++++++---
 source/libs/wal/src/walWrite.c          |  2 +-
 3 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/source/libs/executor/inc/executorimpl.h b/source/libs/executor/inc/executorimpl.h
index b0da277cfb..0e2635459d 100644
--- a/source/libs/executor/inc/executorimpl.h
+++ b/source/libs/executor/inc/executorimpl.h
@@ -154,8 +154,8 @@ typedef struct {
 } SSchemaInfo;
 
 typedef struct {
-  int32_t  operatorType;
-  int64_t  refId;
+  int32_t operatorType;
+  int64_t refId;
 } SExchangeOpStopInfo;
 
 typedef struct {
@@ -261,10 +261,10 @@ typedef struct SLimitInfo {
 } SLimitInfo;
 
 typedef struct SExchangeInfo {
-  SArray*             pSources;
-  SArray*             pSourceDataInfo;
-  tsem_t              ready;
-  void*               pTransporter;
+  SArray* pSources;
+  SArray* pSourceDataInfo;
+  tsem_t  ready;
+  void*   pTransporter;
   // SArray<SSDataBlock*>, result block list, used to keep the multi-block that
   // passed by downstream operator
   SArray*             pResultBlockList;
@@ -275,7 +275,7 @@ typedef struct SExchangeInfo {
   SLoadRemoteDataInfo loadInfo;
   uint64_t            self;
   SLimitInfo          limitInfo;
-  int64_t             openedTs;         // start exec time stamp
+  int64_t             openedTs;  // start exec time stamp
 } SExchangeInfo;
 
 typedef struct SScanInfo {
@@ -310,9 +310,9 @@ typedef struct {
 } SAggOptrPushDownInfo;
 
 typedef struct STableMetaCacheInfo {
-  SLRUCache*             pTableMetaEntryCache; // 100 by default
-  uint64_t               metaFetch;
-  uint64_t               cacheHit;
+  SLRUCache* pTableMetaEntryCache;  // 100 by default
+  uint64_t   metaFetch;
+  uint64_t   cacheHit;
 } STableMetaCacheInfo;
 
 typedef struct STableScanInfo {
@@ -343,7 +343,7 @@ typedef struct STableMergeScanInfo {
   int32_t                tableEndIndex;
   bool                   hasGroupId;
   uint64_t               groupId;
-  SArray*                queryConds;   // array of queryTableDataCond
+  SArray*                queryConds;  // array of queryTableDataCond
   STsdbReader*           pReader;
   SReadHandle            readHandle;
   int32_t                bufPageSize;
@@ -358,7 +358,7 @@ typedef struct STableMergeScanInfo {
   int64_t                numOfRows;
   SScanInfo              scanInfo;
   int32_t                scanTimes;
-  SqlFunctionCtx*        pCtx;         // which belongs to the direct upstream operator operator query context
+  SqlFunctionCtx*        pCtx;  // which belongs to the direct upstream operator operator query context
   SResultRowInfo*        pResultRowInfo;
   int32_t*               rowEntryInfoOffset;
   SExprInfo*             pExpr;
@@ -504,6 +504,7 @@ typedef struct SStreamScanInfo {
   STimeWindow           updateWin;
   STimeWindowAggSupp    twAggSup;
   SSDataBlock*          pUpdateDataRes;
+  SHashObj*             pGroupIdTbNameMap;
   // status for tmq
   SNodeList* pGroupTags;
   SNode*     pTagCond;
@@ -550,10 +551,10 @@ typedef struct SSysTableScanInfo {
 } SSysTableScanInfo;
 
 typedef struct SBlockDistInfo {
-  SSDataBlock*   pResBlock;
-  STsdbReader*   pHandle;
-  SReadHandle    readHandle;
-  uint64_t       uid;  // table uid
+  SSDataBlock* pResBlock;
+  STsdbReader* pHandle;
+  SReadHandle  readHandle;
+  uint64_t     uid;  // table uid
 } SBlockDistInfo;
 
 // todo remove this
@@ -663,9 +664,9 @@ typedef struct SGroupbyOperatorInfo {
   SAggSupporter  aggSup;
   SArray*        pGroupCols;     // group by columns, SArray<SColumn>
   SArray*        pGroupColVals;  // current group column values, SArray<SGroupKeys>
-  bool           isInit;       // denote if current val is initialized or not
-  char*          keyBuf;       // group by keys for hash
-  int32_t        groupKeyLen;  // total group by column width
+  bool           isInit;         // denote if current val is initialized or not
+  char*          keyBuf;         // group by keys for hash
+  int32_t        groupKeyLen;    // total group by column width
   SGroupResInfo  groupResInfo;
   SExprSupp      scalarSup;
 } SGroupbyOperatorInfo;
@@ -890,14 +891,14 @@ STimeWindow getFirstQualifiedTimeWindow(int64_t ts, STimeWindow* pWindow, SInter
 int32_t getTableScanInfo(SOperatorInfo* pOperator, int32_t* order, int32_t* scanFlag);
 int32_t getBufferPgSize(int32_t rowSize, uint32_t* defaultPgsz, uint32_t* defaultBufsz);
 
-void    doDestroyExchangeOperatorInfo(void* param);
+void doDestroyExchangeOperatorInfo(void* param);
 
 void    setOperatorCompleted(SOperatorInfo* pOperator);
-void    setOperatorInfo(SOperatorInfo* pOperator, const char* name, int32_t type, bool blocking, int32_t status, void* pInfo,
-                        SExecTaskInfo* pTaskInfo);
+void    setOperatorInfo(SOperatorInfo* pOperator, const char* name, int32_t type, bool blocking, int32_t status,
+                        void* pInfo, SExecTaskInfo* pTaskInfo);
 void    doFilter(SSDataBlock* pBlock, SFilterInfo* pFilterInfo, SColMatchInfo* pColMatchInfo);
-int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int32_t numOfExpr,
-                               SSDataBlock* pBlock, int32_t rows, const char* idStr, STableMetaCacheInfo * pCache);
+int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int32_t numOfExpr, SSDataBlock* pBlock,
+                               int32_t rows, const char* idStr, STableMetaCacheInfo* pCache);
 
 void cleanupAggSup(SAggSupporter* pAggSup);
 void appendOneRowToDataBlock(SSDataBlock* pBlock, STupleHandle* pTupleHandle);
@@ -992,7 +993,7 @@ void setTaskKilled(SExecTaskInfo* pTaskInfo);
 void queryCostStatis(SExecTaskInfo* pTaskInfo);
 
 void    doDestroyTask(SExecTaskInfo* pTaskInfo);
-void destroyOperatorInfo(SOperatorInfo* pOperator);
+void    destroyOperatorInfo(SOperatorInfo* pOperator);
 int32_t getMaximumIdleDurationSec();
 
 /*
@@ -1038,6 +1039,7 @@ void appendOneRowToStreamSpecialBlock(SSDataBlock* pBlock, TSKEY* pStartTs, TSKE
                                       uint64_t* pGp, void* pTbName);
 void printDataBlock(SSDataBlock* pBlock, const char* flag);
 uint64_t calGroupIdByData(SPartitionBySupporter* pParSup, SExprSupp* pExprSup, SSDataBlock* pBlock, int32_t rowId);
+void     calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock);
 
 int32_t finalizeResultRows(SDiskbasedBuf* pBuf, SResultRowPosition* resultRowPosition, SExprSupp* pSup,
                            SSDataBlock* pBlock, SExecTaskInfo* pTaskInfo);
@@ -1061,7 +1063,7 @@ int32_t setOutputBuf(SStreamState* pState, STimeWindow* win, SResultRow** pResul
 int32_t releaseOutputBuf(SStreamState* pState, SWinKey* pKey, SResultRow* pResult);
 int32_t saveOutputBuf(SStreamState* pState, SWinKey* pKey, SResultRow* pResult, int32_t resSize);
 void    getNextIntervalWindow(SInterval* pInterval, STimeWindow* tw, int32_t order);
-int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo *pInfo);
+int32_t qAppendTaskStopInfo(SExecTaskInfo* pTaskInfo, SExchangeOpStopInfo* pInfo);
 
 #ifdef __cplusplus
 }
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index 77d2aeba28..c93ca2b3f8 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1515,10 +1515,17 @@ static int32_t generateDeleteResultBlock(SStreamScanInfo* pInfo, SSDataBlock* pS
   for (int32_t i = 0; i < pSrcBlock->info.rows; i++) {
     uint64_t srcUid = srcUidData[i];
     uint64_t groupId = srcGp[i];
+    char*    tbname[VARSTR_HEADER_SIZE + TSDB_TABLE_NAME_LEN] = {0};
     if (groupId == 0) {
       groupId = getGroupIdByData(pInfo, srcUid, srcStartTsCol[i], version);
     }
-    appendOneRowToStreamSpecialBlock(pDestBlock, srcStartTsCol + i, srcEndTsCol + i, srcUidData + i, &groupId, NULL);
+    if (pInfo->tbnameCalSup.pExprInfo) {
+      char* parTbname = taosHashGet(pInfo->pGroupIdTbNameMap, &groupId, sizeof(int64_t));
+      memcpy(varDataVal(tbname), parTbname, TSDB_TABLE_NAME_LEN);
+      varDataSetLen(tbname, strlen(varDataVal(tbname)));
+    }
+    appendOneRowToStreamSpecialBlock(pDestBlock, srcStartTsCol + i, srcEndTsCol + i, srcUidData + i, &groupId,
+                                     tbname[0] == 0 ? NULL : tbname);
   }
   return TSDB_CODE_SUCCESS;
 }
@@ -1562,9 +1569,16 @@ static void calBlockTag(SExprSupp* pTagCalSup, SSDataBlock* pBlock, SSDataBlock*
   blockDataDestroy(pSrcBlock);
 }
 
-static void calBlockTbName(SExprSupp* pTbNameCalSup, SSDataBlock* pBlock) {
+void calBlockTbName(SStreamScanInfo* pInfo, SSDataBlock* pBlock) {
+  SExprSupp* pTbNameCalSup = &pInfo->tbnameCalSup;
   if (pTbNameCalSup == NULL || pTbNameCalSup->numOfExprs == 0) return;
   if (pBlock == NULL || pBlock->info.rows == 0) return;
+  if (pBlock->info.groupId) {
+    char* tbname = taosHashGet(pInfo->pGroupIdTbNameMap, &pBlock->info.groupId, sizeof(int64_t));
+    if (tbname != NULL) {
+      memcpy(pBlock->info.parTbName, tbname, TSDB_TABLE_NAME_LEN);
+    }
+  }
 
   SSDataBlock* pSrcBlock = blockCopyOneRow(pBlock, 0);
   ASSERT(pSrcBlock->info.rows == 1);
@@ -1592,6 +1606,11 @@ static void calBlockTbName(SExprSupp* pTbNameCalSup, SSDataBlock* pBlock) {
     pBlock->info.parTbName[0] = 0;
   }
 
+  if (pBlock->info.groupId) {
+    taosHashPut(pInfo->pGroupIdTbNameMap, &pBlock->info.groupId, sizeof(int64_t), pBlock->info.parTbName,
+                TSDB_TABLE_NAME_LEN);
+  }
+
   blockDataDestroy(pSrcBlock);
   blockDataDestroy(pResBlock);
 }
@@ -1713,7 +1732,7 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
   blockDataUpdateTsWindow(pInfo->pRes, pInfo->primaryTsIndex);
   blockDataFreeRes((SSDataBlock*)pBlock);
 
-  calBlockTbName(&pInfo->tbnameCalSup, pInfo->pRes);
+  calBlockTbName(pInfo, pInfo->pRes);
   return 0;
 }
 
@@ -1960,7 +1979,7 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
   if (pTaskInfo->streamInfo.recoverStep == STREAM_RECOVER_STEP__SCAN) {
     SSDataBlock* pBlock = doTableScan(pInfo->pTableScanOp);
     if (pBlock != NULL) {
-      calBlockTbName(&pInfo->tbnameCalSup, pBlock);
+      calBlockTbName(pInfo, pBlock);
       updateInfoFillBlockData(pInfo->pUpdateInfo, pBlock, pInfo->primaryTsIndex);
       qDebug("stream recover scan get block, rows %d", pBlock->info.rows);
       return pBlock;
@@ -2081,7 +2100,7 @@ FETCH_NEXT_BLOCK:
           pSDB->info.type = pInfo->scanMode == STREAM_SCAN_FROM_DATAREADER_RANGE ? STREAM_NORMAL : STREAM_PULL_DATA;
           checkUpdateData(pInfo, true, pSDB, false);
           // printDataBlock(pSDB, "stream scan update");
-          calBlockTbName(&pInfo->tbnameCalSup, pSDB);
+          calBlockTbName(pInfo, pSDB);
           return pSDB;
         }
         blockDataCleanup(pInfo->pUpdateDataRes);
@@ -2386,6 +2405,7 @@ static void destroyStreamScanOperatorInfo(void* param) {
   }
 
   cleanupExprSupp(&pStreamScan->tbnameCalSup);
+  taosHashCleanup(pStreamScan->pGroupIdTbNameMap);
 
   updateInfoDestroy(pStreamScan->pUpdateInfo);
   blockDataDestroy(pStreamScan->pRes);
@@ -2443,6 +2463,8 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys
     if (initExprSupp(&pInfo->tbnameCalSup, pSubTableExpr, 1) != 0) {
       goto _error;
     }
+    pInfo->pGroupIdTbNameMap =
+        taosHashInit(1024, taosGetDefaultHashFunction(TSDB_DATA_TYPE_UBIGINT), false, HASH_NO_LOCK);
   }
 
   if (pTableScanNode->pTags != NULL) {
diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 0bc76e4084..4360141e74 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -328,7 +328,7 @@ int32_t walEndSnapshot(SWal *pWal) {
       pInfo++;
     }
     if (POINTER_DISTANCE(pInfo, pWal->fileInfoSet->pData) > 0) {
-      wDebug("vgId:%d, wal end remove from %" PRId64, pWal->cfg.vgId, pInfo->firstVer);
+      wDebug("vgId:%d, wal end remove for %" PRId64, pWal->cfg.vgId, pInfo->firstVer);
     } else {
       wDebug("vgId:%d, wal no remove", pWal->cfg.vgId);
     }

From 201ce10fbc1dd39492c6f159835dc478f34a1050 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 15:45:40 +0800
Subject: [PATCH 74/85] fix: restore wal info changes

---
 source/dnode/mgmt/mgmt_vnode/src/vmWorker.c |  2 +-
 source/libs/sync/src/syncMain.c             |  4 ++--
 source/libs/wal/src/walWrite.c              |  2 +-
 tests/parallel_test/cases.task              | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
index 17bc1526b5..24240e82ef 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c
@@ -287,7 +287,7 @@ int32_t vmGetQueueSize(SVnodeMgmt *pMgmt, int32_t vgId, EQueueType qtype) {
     vmReleaseVnode(pMgmt, pVnode);
   }
   if (size < 0) {
-    dError("vgId:%d, can't get size from queue since %s, qtype:%d", vgId, terrstr(), qtype);
+    dTrace("vgId:%d, can't get size from queue since %s, qtype:%d", vgId, terrstr(), qtype);
     size = 0;
   }
   return size;
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 514160235f..42bb500705 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -429,7 +429,7 @@ bool syncIsReadyForRead(int64_t rid) {
 
 int32_t syncNodeLeaderTransfer(SSyncNode* pSyncNode) {
   if (pSyncNode->peersNum == 0) {
-    sDebug("only one replica, cannot leader transfer");
+    sDebug("vgId:%d, only one replica, cannot leader transfer", pSyncNode->vgId);
     terrno = TSDB_CODE_SYN_ONE_REPLICA;
     return -1;
   }
@@ -445,7 +445,7 @@ int32_t syncNodeLeaderTransfer(SSyncNode* pSyncNode) {
 
 int32_t syncNodeLeaderTransferTo(SSyncNode* pSyncNode, SNodeInfo newLeader) {
   if (pSyncNode->replicaNum == 1) {
-    sDebug("only one replica, cannot leader transfer");
+    sDebug("vgId:%d, only one replica, cannot leader transfer", pSyncNode->vgId);
     terrno = TSDB_CODE_SYN_ONE_REPLICA;
     return -1;
   }
diff --git a/source/libs/wal/src/walWrite.c b/source/libs/wal/src/walWrite.c
index 317ad129b0..9aa3dabf0c 100644
--- a/source/libs/wal/src/walWrite.c
+++ b/source/libs/wal/src/walWrite.c
@@ -325,7 +325,7 @@ int32_t walEndSnapshot(SWal *pWal) {
   SWalFileInfo *pInfo = taosArraySearch(pWal->fileInfoSet, &tmp, compareWalFileInfo, TD_LE);
   if (pInfo) {
     if (ver >= pInfo->lastVer) {
-      pInfo++;
+      pInfo--;
     }
     if (POINTER_DISTANCE(pInfo, pWal->fileInfoSet->pData) > 0) {
       wDebug("vgId:%d, wal end remove from %" PRId64, pWal->cfg.vgId, pInfo->firstVer);
diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 0567f05d55..bb15cef204 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -37,10 +37,10 @@
 ,,y,script,./test.sh -f tsim/db/taosdlog.sim
 ,,,script,./test.sh -f tsim/dnode/balance_replica1.sim
 ,,,script,./test.sh -f tsim/dnode/balance_replica3.sim
-#,,,script,./test.sh -f tsim/dnode/balance1.sim
-#,,,script,./test.sh -f tsim/dnode/balance2.sim
-#,,,script,./test.sh -f tsim/dnode/balance3.sim
-#,,,script,./test.sh -f tsim/dnode/balancex.sim
+,,,script,./test.sh -f tsim/dnode/balance1.sim
+,,,script,./test.sh -f tsim/dnode/balance2.sim
+,,,script,./test.sh -f tsim/dnode/balance3.sim
+,,,script,./test.sh -f tsim/dnode/balancex.sim
 ,,y,script,./test.sh -f tsim/dnode/create_dnode.sim
 ,,y,script,./test.sh -f tsim/dnode/drop_dnode_has_mnode.sim
 ,,y,script,./test.sh -f tsim/dnode/drop_dnode_has_qnode_snode.sim
@@ -55,7 +55,7 @@
 ,,,script,./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v1_follower.sim
 ,,,script,./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v2.sim
 ,,,script,./test.sh -f tsim/dnode/redistribute_vgroup_replica3_v3.sim
-#,,,script,./test.sh -f tsim/dnode/vnode_clean.sim
+,,,script,./test.sh -f tsim/dnode/vnode_clean.sim
 ,,,script,./test.sh -f tsim/dnode/use_dropped_dnode.sim 
 ,,,script,./test.sh -f tsim/dnode/split_vgroup_replica1.sim 
 ,,,script,./test.sh -f tsim/dnode/split_vgroup_replica3.sim 
@@ -296,7 +296,7 @@
 ,,y,script,./test.sh -f tsim/vnode/replica3_vgroup.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_many.sim
 ,,y,script,./test.sh -f tsim/vnode/replica3_import.sim
-#,,,script,./test.sh -f tsim/vnode/stable_balance_replica1.sim
+,,,script,./test.sh -f tsim/vnode/stable_balance_replica1.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2_stop.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode2.sim
 ,,y,script,./test.sh -f tsim/vnode/stable_dnode3.sim

From 56db6e66300226550f29f992599f7adf0667730f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 16 Nov 2022 15:47:40 +0800
Subject: [PATCH 75/85] fix: omit sma for all NONE/NULL column

---
 source/dnode/vnode/src/tsdb/tsdbReaderWriter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
index 8c1b0004a3..294a4bd3e4 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReaderWriter.c
@@ -517,7 +517,7 @@ static int32_t tsdbWriteBlockSma(SDataFWriter *pWriter, SBlockData *pBlockData,
   for (int32_t iColData = 0; iColData < pBlockData->nColData; iColData++) {
     SColData *pColData = tBlockDataGetColDataByIdx(pBlockData, iColData);
 
-    if ((!pColData->smaOn) || IS_VAR_DATA_TYPE(pColData->type)) continue;
+    if ((!pColData->smaOn) || IS_VAR_DATA_TYPE(pColData->type) || ((pColData->flag & HAS_VALUE) == 0)) continue;
 
     SColumnDataAgg sma = {.colId = pColData->cid};
     tColDataCalcSMA[pColData->type](pColData, &sma.sum, &sma.max, &sma.min, &sma.numOfNull);

From 84c9b79b4dc55e4a952e3e47dc893ffa56043546 Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 16:12:35 +0800
Subject: [PATCH 76/85] fix(sync): fix hb-timer heap-use-after-free

---
 source/libs/sync/src/syncMain.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 514160235f..af033eb7b3 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -2059,6 +2059,7 @@ int32_t syncNodeOnHeartbeat(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
       SyncLocalCmd* pSyncMsg = rpcMsgLocalCmd.pCont;
       pSyncMsg->cmd = SYNC_LOCAL_CMD_FOLLOWER_CMT;
       pSyncMsg->fcIndex = pMsg->commitIndex;
+      SyncIndex fcIndex = pSyncMsg->fcIndex;
 
       if (ths->syncEqMsg != NULL && ths->msgcb != NULL) {
         int32_t code = ths->syncEqMsg(ths->msgcb, &rpcMsgLocalCmd);
@@ -2066,7 +2067,7 @@ int32_t syncNodeOnHeartbeat(SSyncNode* ths, const SRpcMsg* pRpcMsg) {
           sError("vgId:%d, sync enqueue fc-commit msg error, code:%d", ths->vgId, code);
           rpcFreeCont(rpcMsgLocalCmd.pCont);
         } else {
-          sTrace("vgId:%d, sync enqueue fc-commit msg, fc-index:%" PRId64, ths->vgId, pSyncMsg->fcIndex);
+          sTrace("vgId:%d, sync enqueue fc-commit msg, fc-index:%" PRId64, ths->vgId, fcIndex);
         }
       }
     }

From c928f03501a909c6625502722950b6b1a29f9387 Mon Sep 17 00:00:00 2001
From: WANG MINGMING <wangmm0220@gmail.com>
Date: Wed, 16 Nov 2022 17:02:52 +0800
Subject: [PATCH 77/85] Update 13-schemaless.md

---
 docs/zh/14-reference/13-schemaless/13-schemaless.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/zh/14-reference/13-schemaless/13-schemaless.md b/docs/zh/14-reference/13-schemaless/13-schemaless.md
index b89f625376..3aebd616a0 100644
--- a/docs/zh/14-reference/13-schemaless/13-schemaless.md
+++ b/docs/zh/14-reference/13-schemaless/13-schemaless.md
@@ -8,6 +8,8 @@ description: 'Schemaless 写入方式，可以免于预先创建超级表/子表
 
 无模式写入方式建立的超级表及其对应的子表与通过 SQL 直接建立的超级表和子表完全没有区别，你也可以通过，SQL 语句直接向其中写入数据。需要注意的是，通过无模式写入方式建立的表，其表名是基于标签值按照固定的映射规则生成，所以无法明确地进行表意，缺乏可读性。
 
+注意：无模式写入会自动建表，不需要手动建表，手动建表的话可能会出现未知的错误。
+
 ## 无模式写入行协议
 
 TDengine 的无模式写入的行协议兼容 InfluxDB 的 行协议（Line Protocol）、OpenTSDB 的 telnet 行协议、OpenTSDB 的 JSON 格式协议。但是使用这三种协议的时候，需要在 API 中指定输入内容使用解析协议的标准。

From 9dc37f2622fc22d43e9e5de530c2c4e7a9d83958 Mon Sep 17 00:00:00 2001
From: WANG MINGMING <wangmm0220@gmail.com>
Date: Wed, 16 Nov 2022 17:05:20 +0800
Subject: [PATCH 78/85] Update 13-schemaless.md

---
 docs/en/14-reference/13-schemaless/13-schemaless.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/en/14-reference/13-schemaless/13-schemaless.md b/docs/en/14-reference/13-schemaless/13-schemaless.md
index 5b7924ce56..10321ab083 100644
--- a/docs/en/14-reference/13-schemaless/13-schemaless.md
+++ b/docs/en/14-reference/13-schemaless/13-schemaless.md
@@ -8,6 +8,9 @@ will automatically add the required columns to ensure that the data written by t
 
 The schemaless writing method creates super tables and their corresponding subtables. These are completely indistinguishable from the super tables and subtables created directly via SQL. You can write data directly to them via SQL statements. Note that the names of tables created by schemaless writing are based on fixed mapping rules for tag values, so they are not explicitly ideographic and they lack readability.
 
+Tips:
+The schemaless write will automatically create a table. You do not need to create a table manually, or an unknown error may occur.
+
 ## Schemaless Writing Line Protocol
 
 TDengine's schemaless writing line protocol supports InfluxDB's Line Protocol, OpenTSDB's telnet line protocol, and OpenTSDB's JSON format protocol. However, when using these three protocols, you need to specify in the API the standard of the parsing protocol to be used for the input content.

From a0e22ca68191e3178c4d6ee018f9db7f5c9f1edf Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 16 Nov 2022 17:14:02 +0800
Subject: [PATCH 79/85] enh: check function state

---
 source/libs/function/src/builtinsimpl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c
index 35ad10ffbf..95f01b2127 100644
--- a/source/libs/function/src/builtinsimpl.c
+++ b/source/libs/function/src/builtinsimpl.c
@@ -2821,6 +2821,8 @@ static void firstlastSaveTupleData(const SSDataBlock* pSrcBlock, int32_t rowInde
 
   if (!pInfo->hasResult) {
     pInfo->pos = saveTupleData(pCtx, rowIndex, pSrcBlock, NULL);
+    ASSERT(pCtx->subsidiaries.buf != NULL);
+    ASSERT(pCtx->subsidiaries.rowLen > 0);
   } else {
     updateTupleData(pCtx, rowIndex, pSrcBlock, &pInfo->pos);
   }
@@ -5111,7 +5113,6 @@ int32_t sampleFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
   return pInfo->numSampled;
 }
 
-
 bool getTailFuncEnv(SFunctionNode* pFunc, SFuncExecEnv* pEnv) {
 #if 0
   SColumnNode* pCol = (SColumnNode*)nodesListGetNode(pFunc->pParameterList, 0);

From 636b3f6b30d86cb2529c2c6e00489f1fbe379910 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Wed, 16 Nov 2022 17:38:49 +0800
Subject: [PATCH 80/85] fix: add sc start/stop instruction to windows installer
 (#18211)

* fix: sc create service in tdengine.iss

* fix: upx on windows

* fix: add sc start/stop to installer
---
 packaging/tools/windows_before_install.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packaging/tools/windows_before_install.txt b/packaging/tools/windows_before_install.txt
index b793a3e801..ef783bf10b 100644
--- a/packaging/tools/windows_before_install.txt
+++ b/packaging/tools/windows_before_install.txt
@@ -1,3 +1,6 @@
 TDengine is a high-efficient, scalable, high-available distributed time-series database, which makes a lot of optimizations on inserting and querying data, which is far more efficient than normal regular databases. So TDengine can meet the high requirements of IOT and other areas on storing and querying a large amount of data. 
 
-TDengine will be installed under C:\TDengine, users can modify configuration file C:\TDengine\cfg\taos.cfg, set the log file path or other parameters.
\ No newline at end of file
+TDengine will be installed under C:\TDengine, users can modify configuration file C:\TDengine\cfg\taos.cfg, set the log file path or other parameters.
+To start/stop TDengine with administrator privileges:  sc start/stop taosd
+To start/stop taosAdapter with administrator privileges: sc start/stop taosadapter
+Please manually remove C:\TDengine from your system PATH environment after you remove TDengine software.

From 0154256507c45c2e6a60a3665c2098c2b32b8583 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 16 Nov 2022 18:13:26 +0800
Subject: [PATCH 81/85] test: add tsan case

---
 tests/parallel_test/cases.task | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 436f1882b0..4c9715270d 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -117,7 +117,7 @@
 ,,y,script,./test.sh -f tsim/parser/fourArithmetic-basic.sim
 ,,y,script,./test.sh -f tsim/parser/function.sim
 ,,y,script,./test.sh -f tsim/parser/groupby-basic.sim
-,,,script,./test.sh -f tsim/parser/groupby.sim
+,,y,script,./test.sh -f tsim/parser/groupby.sim
 ,,y,script,./test.sh -f tsim/parser/having_child.sim
 ,,y,script,./test.sh -f tsim/parser/having.sim
 ,,y,script,./test.sh -f tsim/parser/import_commit1.sim

From e2005cfa86a6c66603b3b1df80c10bd40277861c Mon Sep 17 00:00:00 2001
From: Liu Jicong <liujicong@qq.com>
Date: Wed, 16 Nov 2022 18:48:08 +0800
Subject: [PATCH 82/85] fix(stream): skip check update for scalar

---
 source/dnode/mnode/impl/src/mndSubscribe.c | 4 ++--
 source/libs/executor/src/scanoperator.c    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index fd79846104..58c89d76aa 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -996,7 +996,7 @@ static int32_t mndRetrieveSubscribe(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock
         pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
         colDataAppend(pColInfo, numOfRows, (const char *)&pConsumerEp->consumerId, false);
 
-        mDebug("mnd show subscrptions: topic %s, consumer %" PRId64 "cgroup %s vgid %d", varDataVal(topic),
+        mDebug("mnd show subscriptions: topic %s, consumer %" PRId64 " cgroup %s vgid %d", varDataVal(topic),
                pConsumerEp->consumerId, varDataVal(cgroup), pVgEp->vgId);
 
         // offset
@@ -1044,7 +1044,7 @@ static int32_t mndRetrieveSubscribe(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock
       pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
       colDataAppend(pColInfo, numOfRows, NULL, true);
 
-      mDebug("mnd show subscrptions(unassigned): topic %s, cgroup %s vgid %d", varDataVal(topic), varDataVal(cgroup),
+      mDebug("mnd show subscriptions(unassigned): topic %s, cgroup %s vgid %d", varDataVal(topic), varDataVal(cgroup),
              pVgEp->vgId);
 
       // offset
diff --git a/source/libs/executor/src/scanoperator.c b/source/libs/executor/src/scanoperator.c
index c93ca2b3f8..229effc96b 100644
--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c
@@ -1980,7 +1980,9 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
     SSDataBlock* pBlock = doTableScan(pInfo->pTableScanOp);
     if (pBlock != NULL) {
       calBlockTbName(pInfo, pBlock);
-      updateInfoFillBlockData(pInfo->pUpdateInfo, pBlock, pInfo->primaryTsIndex);
+      if (pInfo->pUpdateInfo) {
+        updateInfoFillBlockData(pInfo->pUpdateInfo, pBlock, pInfo->primaryTsIndex);
+      }
       qDebug("stream recover scan get block, rows %d", pBlock->info.rows);
       return pBlock;
     }

From a54275a7b502bdbe49db424e9e23fe44ca036de4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 16 Nov 2022 23:46:59 +0800
Subject: [PATCH 83/85] fix(query): support null columns sma optimization.

---
 source/dnode/vnode/src/tsdb/tsdbRead.c | 71 +++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 8 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index af368d33e0..54a0ee6c32 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -88,6 +88,7 @@ typedef struct SBlockLoadSuppInfo {
   int16_t*         colIds;  // column ids for loading file block data
   int32_t          numOfCols;
   char**           buildBuf;  // build string tmp buffer, todo remove it later after all string format being updated.
+  bool             smaValid;  // the sma on all queried columns are activated
 } SBlockLoadSuppInfo;
 
 typedef struct SLastBlockReader {
@@ -213,11 +214,10 @@ static bool          hasDataInFileBlock(const SBlockData* pBlockData, const SFil
 
 static bool outOfTimeWindow(int64_t ts, STimeWindow* pWindow) { return (ts > pWindow->ekey) || (ts < pWindow->skey); }
 
-static int32_t setColumnIdSlotList(STsdbReader* pReader, SSDataBlock* pBlock) {
-  SBlockLoadSuppInfo* pSupInfo = &pReader->suppInfo;
-
+static int32_t setColumnIdSlotList(SBlockLoadSuppInfo* pSupInfo, SSDataBlock* pBlock) {
   size_t numOfCols = blockDataGetNumOfCols(pBlock);
 
+  pSupInfo->smaValid = true;
   pSupInfo->numOfCols = numOfCols;
   pSupInfo->colIds = taosMemoryMalloc(numOfCols * sizeof(int16_t));
   pSupInfo->buildBuf = taosMemoryCalloc(numOfCols, POINTER_BYTES);
@@ -239,6 +239,28 @@ static int32_t setColumnIdSlotList(STsdbReader* pReader, SSDataBlock* pBlock) {
   return TSDB_CODE_SUCCESS;
 }
 
+static void updateBlockSMAInfo(STSchema* pSchema, SBlockLoadSuppInfo* pSupInfo) {
+  int32_t i = 0, j = 0;
+
+  while(i < pSchema->numOfCols && j < pSupInfo->numOfCols) {
+    STColumn* pTCol = &pSchema->columns[i];
+    if (pTCol->colId == pSupInfo->colIds[j]) {
+      if (!IS_BSMA_ON(pTCol)) {
+        pSupInfo->smaValid = false;
+        return;
+      }
+
+      i += 1;
+      j += 1;
+    } else if (pTCol->colId < pSupInfo->colIds[j]) {
+      // do nothing
+      i += 1;
+    } else {
+      ASSERT(0);
+    }
+  }
+}
+
 static int32_t initBlockScanInfoBuf(SBlockInfoBuf* pBuf, int32_t numOfTables) {
   int32_t num = numOfTables / pBuf->numPerBucket;
   int32_t remainder = numOfTables % pBuf->numPerBucket;
@@ -580,7 +602,7 @@ static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsd
 
   // allocate buffer in order to load data blocks from file
   SBlockLoadSuppInfo* pSup = &pReader->suppInfo;
-  pSup->pColAgg = taosArrayInit(4, sizeof(SColumnDataAgg));
+  pSup->pColAgg = taosArrayInit(pCond->numOfCols, sizeof(SColumnDataAgg));
   pSup->plist = taosMemoryCalloc(pCond->numOfCols, POINTER_BYTES);
   if (pSup->pColAgg == NULL || pSup->plist == NULL) {
     code = TSDB_CODE_OUT_OF_MEMORY;
@@ -601,7 +623,7 @@ static int32_t tsdbReaderCreate(SVnode* pVnode, SQueryTableDataCond* pCond, STsd
     goto _end;
   }
 
-  setColumnIdSlotList(pReader, pReader->pResBlock);
+  setColumnIdSlotList(&pReader->suppInfo, pReader->pResBlock);
 
   *ppReader = pReader;
   return code;
@@ -3763,6 +3785,10 @@ int32_t tsdbReaderOpen(SVnode* pVnode, SQueryTableDataCond* pCond, void* pTableL
     }
   }
 
+  if (pReader->pSchema != NULL) {
+    updateBlockSMAInfo(pReader->pSchema, &pReader->suppInfo);
+  }
+
   STsdbReader* p = pReader->innerReader[0] != NULL ? pReader->innerReader[0] : pReader;
 
   pReader->status.pTableMap = createDataBlockScanInfo(p, pTableList, numOfTables);
@@ -4020,7 +4046,7 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
   }
 
   // there is no statistics data for composed block
-  if (pReader->status.composedDataBlock) {
+  if (pReader->status.composedDataBlock || (!pReader->suppInfo.smaValid)) {
     *pBlockStatis = NULL;
     return TSDB_CODE_SUCCESS;
   }
@@ -4060,7 +4086,7 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
 
   int32_t i = 0, j = 0;
   size_t  size = taosArrayGetSize(pSup->pColAgg);
-
+#if 0
   while (j < numOfCols && i < size) {
     SColumnDataAgg* pAgg = taosArrayGet(pSup->pColAgg, i);
     if (pAgg->colId == pSup->colIds[j]) {
@@ -4068,6 +4094,7 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
         pSup->plist[j] = pAgg;
       } else {
         *allHave = false;
+        break;
       }
       i += 1;
       j += 1;
@@ -4077,12 +4104,40 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
       j += 1;
     }
   }
+#else
+
+  // fill the all null data column
+  SArray* pNewAggList = taosArrayInit(numOfCols, sizeof(SColumnDataAgg));
+
+  while (j < numOfCols && i < size) {
+    SColumnDataAgg* pAgg = taosArrayGet(pSup->pColAgg, i);
+    if (pAgg->colId == pSup->colIds[j]) {
+      taosArrayPush(pNewAggList, pAgg);
+      i += 1;
+      j += 1;
+    } else if (pAgg->colId < pSup->colIds[j]) {
+      i += 1;
+    } else if (pSup->colIds[j] < pAgg->colId) {
+      // all date in this block are null
+      SColumnDataAgg nullColAgg = {.colId = pSup->colIds[j], .numOfNull = pBlock->nRow};
+      taosArrayPush(pNewAggList, &nullColAgg);
+      j += 1;
+    }
+  }
+
+  taosArrayClear(pSup->pColAgg);
+  taosArrayAddAll(pSup->pColAgg, pNewAggList);
+
+  for(int32_t k = 0; k < numOfCols; ++k) {
+    pSup->plist[k] = taosArrayGet(pSup->pColAgg, k);
+  }
+
+#endif
 
   pReader->cost.smaDataLoad += 1;
   *pBlockStatis = pSup->plist;
 
   tsdbDebug("vgId:%d, succeed to load block SMA for uid %" PRIu64 ", %s", 0, pFBlock->uid, pReader->idStr);
-
   return code;
 }
 

From 9c459a24e22932b0f7628f291a978683a3fc7fbb Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 17 Nov 2022 00:38:35 +0800
Subject: [PATCH 84/85] fix(query): fix memory leak.

---
 source/dnode/vnode/src/tsdb/tsdbRead.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 54a0ee6c32..1f200ea5d7 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -4132,6 +4132,8 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
     pSup->plist[k] = taosArrayGet(pSup->pColAgg, k);
   }
 
+  taosArrayDestroy(pNewAggList);
+
 #endif
 
   pReader->cost.smaDataLoad += 1;

From a464053692a622e10c6023bb42b1c4a9bcc3466c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 17 Nov 2022 00:46:06 +0800
Subject: [PATCH 85/85] fix(query): set correct size of array list.

---
 source/dnode/vnode/src/tsdb/tsdbRead.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead.c b/source/dnode/vnode/src/tsdb/tsdbRead.c
index 1f200ea5d7..986cba8b17 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -4128,7 +4128,8 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
   taosArrayClear(pSup->pColAgg);
   taosArrayAddAll(pSup->pColAgg, pNewAggList);
 
-  for(int32_t k = 0; k < numOfCols; ++k) {
+  size_t num = taosArrayGetSize(pSup->pColAgg);
+  for(int32_t k = 0; k < num; ++k) {
     pSup->plist[k] = taosArrayGet(pSup->pColAgg, k);
   }