From 3626a2de181af79b9bf13adce6102b0ad7941e8f Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Wed, 23 Jun 2021 10:12:45 +0800
Subject: [PATCH 01/71] update docker cluster script

---
 .../OneMnodeMultipleVnodesTest.py             |  5 ++--
 tests/pytest/dockerCluster/basic.py           | 27 ++++++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py b/tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
index ee663f89b0..43e281f437 100644
--- a/tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
+++ b/tests/pytest/dockerCluster/OneMnodeMultipleVnodesTest.py
@@ -12,9 +12,6 @@
 # -*- coding: utf-8 -*-
 
 from basic import *
-from util.sql import tdSql
-
-
 
 class TDTestCase:
 
@@ -36,4 +33,6 @@ td = TDTestCase()
 td.init()
 
 
+## usage:  python3 OneMnodeMultipleVnodesTest.py 
+
 
diff --git a/tests/pytest/dockerCluster/basic.py b/tests/pytest/dockerCluster/basic.py
index 50914b0be9..871d69790d 100644
--- a/tests/pytest/dockerCluster/basic.py
+++ b/tests/pytest/dockerCluster/basic.py
@@ -44,7 +44,16 @@ class BuildDockerCluser:
             "jnidebugFlag":"135",
             "qdebugFlag":"135",
             "maxSQLLength":"1048576"
-        }     
+        }
+        cmd = "mkdir -p %s" % self.dockerDir
+        self.execCmd(cmd)
+
+        cmd = "cp *.yml %s" % self.dockerDir
+        self.execCmd(cmd)
+
+        cmd = "cp Dockerfile %s" % self.dockerDir
+        self.execCmd(cmd)
+
 
     # execute command, and return the output 
     # ref: https://blog.csdn.net/wowocpp/article/details/80775650  
@@ -81,7 +90,7 @@ class BuildDockerCluser:
     def removeFile(self, rootDir, index, dir):
         cmd = "rm -rf %s/node%d/%s/*" % (rootDir, index, dir)        
         self.execCmd(cmd)
-
+    
     def clearEnv(self):
         cmd = "cd %s && docker-compose down --remove-orphans" % self.dockerDir
         self.execCmd(cmd)
@@ -108,10 +117,14 @@ class BuildDockerCluser:
         self.execCmd(cmd)
     
     def updateLocalhosts(self):
-        cmd = "grep '172.27.0.7 *tdnode1' /etc/hosts"
+        cmd = "grep '172.27.0.7 *tdnode1' /etc/hosts | sed 's: ::g'"
         result = self.execCmdAndGetOutput(cmd)
-        if result and not result.isspace():
+        print(result)
+        if result is None or result.isspace():
+            print("==========")
             cmd = "echo '172.27.0.7 tdnode1' >> /etc/hosts"
+            display = "echo %s" % cmd
+            self.execCmd(display)
             self.execCmd(cmd)
     
     def deploy(self):
@@ -138,13 +151,13 @@ class BuildDockerCluser:
         if self.numOfNodes < 2 or self.numOfNodes > 10:
             print("the number of nodes must be between 2 and 10")
             exit(0)
-        self.clearEnv()
-        self.createDirs()
         self.updateLocalhosts()
         self.deploy()
 
     def run(self):           
-        cmd = "./buildClusterEnv.sh -n %d -v %s -d %s" % (self.numOfNodes, self.getTaosdVersion(), self.dockerDir)        
+        cmd = "./buildClusterEnv.sh -n %d -v %s -d %s" % (self.numOfNodes, self.getTaosdVersion(), self.dockerDir)
+        display = "echo %s" % cmd
+        self.execCmd(display)
         self.execCmd(cmd)
         self.getConnection()
         self.createDondes()

From 15014c2e19e51353e1a2f49a5d1bf6d3a9729733 Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Thu, 24 Jun 2021 10:50:10 +0800
Subject: [PATCH 02/71] fix bug

---
 src/client/src/tscSubquery.c | 2 +-
 src/query/inc/qExecutor.h    | 1 +
 src/query/src/qExecutor.c    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index c3df4773e1..4d97fef52f 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -3604,10 +3604,10 @@ void* createQInfoFromQueryNode(SQueryInfo* pQueryInfo, STableGroupInfo* pTableGr
 
   // todo refactor: filter should not be applied here.
   createFilterInfo(pQueryAttr, 0);
-  pQueryAttr->numOfFilterCols = 0;
 
   SArray* pa = NULL;
   if (stage == MASTER_SCAN) {
+    pQueryAttr->createFilterOperator = false;  // no need for parent query
     pa = createExecOperatorPlan(pQueryAttr);
   } else {
     pa = createGlobalMergePlan(pQueryAttr);
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 9cd1c5b033..dbee1a7812 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -192,6 +192,7 @@ typedef struct SQueryAttr {
   bool             needReverseScan;  // need reverse scan
   bool             distinctTag;      // distinct tag query
   bool             stateWindow;       // window State on sub/normal table
+  bool             createFilterOperator; // if filter operator is needed
   int32_t          interBufSize;     // intermediate buffer sizse
 
   int32_t          havingNum;        // having expr number
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 97a6cf807c..63e0025550 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -7045,6 +7045,8 @@ int32_t createFilterInfo(SQueryAttr* pQueryAttr, uint64_t qId) {
   doCreateFilterInfo(pQueryAttr->tableCols, pQueryAttr->numOfCols, pQueryAttr->numOfFilterCols,
                      &pQueryAttr->pFilterInfo, qId);
 
+  pQueryAttr->createFilterOperator = true;
+
   return TSDB_CODE_SUCCESS;
 }
 

From d02ce1e2dfb6a885afef0b13b0b601bc75cb7e75 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 24 Jun 2021 15:23:33 +0800
Subject: [PATCH 03/71] Hotfix/sangshuduo/td 4823 taosdemo gettablename (#6606)

* [TD-4823]<fix>: taosdemo getTableName return empty.

* fix typo.

* check table name is empty in early stage.
---
 src/kit/taosdemo/taosdemo.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 6b12e66cb9..6314aa6a00 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -2497,6 +2497,13 @@ static int getChildNameOfSuperTableWithLimitAndOffset(TAOS * taos,
   char* pTblName = childTblName;
   while((row = taos_fetch_row(res)) != NULL) {
     int32_t* len = taos_fetch_lengths(res);
+
+    if (0 == strlen((char *)row[0])) {
+        errorPrint("%s() LN%d, No.%"PRId64" table return empty name\n",
+            __func__, __LINE__, count);
+        exit(-1);
+    }
+
     tstrncpy(pTblName, (char *)row[0], len[0]+1);
     //printf("==== sub table name: %s\n", pTblName);
     count++;
@@ -6296,16 +6303,6 @@ static void startMultiThreadInsertData(int threads, char* db_name,
     }
   }
 
-  // read sample data from file first
-  if ((superTblInfo) && (0 == strncasecmp(superTblInfo->dataSource,
-              "sample", strlen("sample")))) {
-    if (0 != prepareSampleDataForSTable(superTblInfo)) {
-      errorPrint("%s() LN%d, prepare sample data for stable failed!\n",
-              __func__, __LINE__);
-      exit(-1);
-    }
-  }
-
   TAOS* taos0 = taos_connect(
               g_Dbs.host, g_Dbs.user,
               g_Dbs.password, db_name, g_Dbs.port);

From eed57b8a5b46aeaed9231973fcd214eef03603ff Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Thu, 24 Jun 2021 15:28:26 +0800
Subject: [PATCH 04/71] fix bug

---
 src/query/src/qPlan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/query/src/qPlan.c b/src/query/src/qPlan.c
index ee587a515d..d2eb9afb22 100644
--- a/src/query/src/qPlan.c
+++ b/src/query/src/qPlan.c
@@ -623,7 +623,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
       taosArrayPush(plan, &op);
     }
   } else {  // diff/add/multiply/subtract/division
-    if (pQueryAttr->numOfFilterCols > 0 && pQueryAttr->vgId == 0) { // todo refactor
+    if (pQueryAttr->numOfFilterCols > 0 && pQueryAttr->createFilterOperator && pQueryAttr->vgId == 0) { // todo refactor
       op = OP_Filter;
       taosArrayPush(plan, &op);
     } else {

From b945a7fd333dbabb6bf0f8216e5a9cea03c0e5c2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 24 Jun 2021 16:33:57 +0800
Subject: [PATCH 05/71] [td-4791] check sql function in outer query.

---
 src/client/src/tscSQLParser.c             | 58 ++++++++++--------
 src/query/inc/qExecutor.h                 |  8 +--
 src/query/src/qAggMain.c                  |  1 -
 src/query/src/qExecutor.c                 | 54 ++++++++---------
 src/query/src/qPlan.c                     | 14 ++---
 tests/script/general/parser/nestquery.sim | 72 +++++++++++++++++++++--
 6 files changed, 138 insertions(+), 69 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index e94f77d254..815442a038 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -2069,33 +2069,29 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS
                                        const char* name, int32_t resColIdx, SColumnIndex* pColIndex, bool finalResult) {
   const char* msg1 = "not support column types";
 
-  int16_t type = 0;
-  int16_t bytes = 0;
-  int32_t functionID = cvtFunc.execFuncId;
-
-  if (functionID == TSDB_FUNC_SPREAD) {
+  int32_t f = cvtFunc.execFuncId;
+  if (f == TSDB_FUNC_SPREAD) {
     int32_t t1 = pSchema->type;
-    if (t1 == TSDB_DATA_TYPE_BINARY || t1 == TSDB_DATA_TYPE_NCHAR || t1 == TSDB_DATA_TYPE_BOOL) {
+    if (IS_VAR_DATA_TYPE(t1) || t1 == TSDB_DATA_TYPE_BOOL) {
       invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
       return -1;
-    } else {
-      type = TSDB_DATA_TYPE_DOUBLE;
-      bytes = tDataTypes[type].bytes;
     }
-  } else {
-    type = pSchema->type;
-    bytes = pSchema->bytes;
   }
 
-  SExprInfo* pExpr = tscExprAppend(pQueryInfo, functionID, pColIndex, type, bytes, getNewResColId(pCmd), bytes, false);
+  int16_t resType = 0;
+  int16_t resBytes = 0;
+  int32_t interBufSize = 0;
+
+  getResultDataInfo(pSchema->type, pSchema->bytes, f, 0, &resType, &resBytes, &interBufSize, 0, false);
+  SExprInfo* pExpr = tscExprAppend(pQueryInfo, f, pColIndex, resType, resBytes, getNewResColId(pCmd), interBufSize, false);
   tstrncpy(pExpr->base.aliasName, name, tListLen(pExpr->base.aliasName));
 
-  if (cvtFunc.originFuncId == TSDB_FUNC_LAST_ROW && cvtFunc.originFuncId != functionID) {
+  if (cvtFunc.originFuncId == TSDB_FUNC_LAST_ROW && cvtFunc.originFuncId != f) {
     pExpr->base.colInfo.flag |= TSDB_COL_NULL;
   }
 
   // set reverse order scan data blocks for last query
-  if (functionID == TSDB_FUNC_LAST) {
+  if (f == TSDB_FUNC_LAST) {
     pExpr->base.numOfParams = 1;
     pExpr->base.param[0].i64 = TSDB_ORDER_DESC;
     pExpr->base.param[0].nType = TSDB_DATA_TYPE_INT;
@@ -2108,7 +2104,7 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS
   // if it is not in the final result, do not add it
   SColumnList ids = createColumnList(1, pColIndex->tableIndex, pColIndex->columnIndex);
   if (finalResult) {
-    insertResultField(pQueryInfo, resColIdx, &ids, bytes, (int8_t)type, pExpr->base.aliasName, pExpr);
+    insertResultField(pQueryInfo, resColIdx, &ids, pSchema->bytes, (int8_t)pSchema->type, pExpr->base.aliasName, pExpr);
   } else {
     tscColumnListInsert(pQueryInfo->colList, ids.ids[0].columnIndex, pExpr->base.uid, pSchema);
   }
@@ -2557,8 +2553,9 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
 
       tVariant* pVariant = &pParamElem[1].pNode->value;
 
-      int8_t  resultType = pSchema->type;
-      int16_t resultSize = pSchema->bytes;
+      int16_t  resultType = pSchema->type;
+      int16_t  resultSize = pSchema->bytes;
+      int32_t  interResult = 0;
 
       char val[8] = {0};
 
@@ -2571,8 +2568,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
           return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
         }
 
-        resultSize = sizeof(double);
-        resultType = TSDB_DATA_TYPE_DOUBLE;
+        getResultDataInfo(pSchema->type, pSchema->bytes, functionId, 0, &resultType, &resultSize, &interResult, 0, false);
 
         /*
          * sql function transformation
@@ -2582,7 +2578,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
         tscInsertPrimaryTsSourceColumn(pQueryInfo, pTableMetaInfo->pTableMeta->id.uid);
         colIndex += 1;  // the first column is ts
 
-        pExpr = tscExprAppend(pQueryInfo, functionId, &index, resultType, resultSize, getNewResColId(pCmd), resultSize, false);
+        pExpr = tscExprAppend(pQueryInfo, functionId, &index, resultType, resultSize, getNewResColId(pCmd), interResult, false);
         tscExprAddParams(&pExpr->base, val, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
       } else {
         tVariantDump(pVariant, val, TSDB_DATA_TYPE_BIGINT, true);
@@ -7784,8 +7780,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
   const char* msg3 = "start(end) time of query range required or time range too large";
   const char* msg4 = "interval query not supported, since the result of sub query not include valid timestamp column";
   const char* msg5 = "only tag query not compatible with normal column filter";
-  const char* msg6 = "not support stddev/percentile in outer query yet";
-  const char* msg7 = "drivative requires timestamp column exists in subquery";
+  const char* msg6 = "not support stddev/percentile/interp in the outer query yet";
+  const char* msg7 = "derivative/twa/irate requires timestamp column exists in subquery";
 
   int32_t code = TSDB_CODE_SUCCESS;
 
@@ -7828,15 +7824,17 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, timeWindowQuery) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
+
     // parse the window_state
     if (validateStateWindowNode(pCmd, pQueryInfo, pSqlNode, false) != TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
+
     // todo NOT support yet
     for(int32_t i = 0; i < tscNumOfExprs(pQueryInfo); ++i) {
       SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
       int32_t f = pExpr->base.functionId;
-      if (f == TSDB_FUNC_STDDEV || f == TSDB_FUNC_PERCT) {
+      if (f == TSDB_FUNC_STDDEV || f == TSDB_FUNC_PERCT || f == TSDB_FUNC_INTERP) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
       } 
 
@@ -7851,9 +7849,17 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
     SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, 0);
 
-    if (tscNumOfExprs(pQueryInfo) > 1) {
+    int32_t numOfExprs = tscNumOfExprs(pQueryInfo);
+    if (numOfExprs == 1) {
+      SExprInfo* pExpr = tscExprGet(pQueryInfo, 0);
+      int32_t f = pExpr->base.functionId;
+      if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
+      }
+    } else {
       SExprInfo* pExpr = tscExprGet(pQueryInfo, 1);
-      if (pExpr->base.functionId == TSDB_FUNC_DERIVATIVE && pSchema->type != TSDB_DATA_TYPE_TIMESTAMP) {
+      int32_t f = pExpr->base.functionId;
+      if ((f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE) && pSchema->type != TSDB_DATA_TYPE_TIMESTAMP) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
       }
     }
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 9cd1c5b033..1f1f9f3e60 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -285,7 +285,7 @@ enum OPERATOR_TYPE_E {
   OP_TagScan           = 4,
   OP_TableBlockInfoScan= 5,
   OP_Aggregate         = 6,
-  OP_Arithmetic        = 7,
+  OP_Project           = 7,
   OP_Groupby           = 8,
   OP_Limit             = 9,
   OP_SLimit            = 10,
@@ -413,13 +413,13 @@ typedef struct SAggOperatorInfo {
   uint32_t       seed;
 } SAggOperatorInfo;
 
-typedef struct SArithOperatorInfo {
+typedef struct SProjectOperatorInfo {
   SOptrBasicInfo binfo;
   int32_t        bufCapacity;
   uint32_t       seed;
 
   SSDataBlock   *existDataBlock;
-} SArithOperatorInfo;
+} SProjectOperatorInfo;
 
 typedef struct SLimitOperatorInfo {
   int64_t   limit;
@@ -513,7 +513,7 @@ SOperatorInfo* createTableScanOperator(void* pTsdbQueryHandle, SQueryRuntimeEnv*
 SOperatorInfo* createTableSeqScanOperator(void* pTsdbQueryHandle, SQueryRuntimeEnv* pRuntimeEnv);
 
 SOperatorInfo* createAggregateOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
-SOperatorInfo* createArithOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
+SOperatorInfo* createProjectOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
 SOperatorInfo* createLimitOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream);
 SOperatorInfo* createTimeIntervalOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
 SOperatorInfo* createSWindowOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput);
diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index 8efc4aad4c..676e5b6ce6 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -74,7 +74,6 @@
   } while (0);
 
 void noop1(SQLFunctionCtx *UNUSED_PARAM(pCtx)) {}
-void noop2(SQLFunctionCtx *UNUSED_PARAM(pCtx), int32_t UNUSED_PARAM(index)) {}
 
 void doFinalizer(SQLFunctionCtx *pCtx) { RESET_RESULT_INFO(GET_RES_INFO(pCtx)); }
 
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 97a6cf807c..49ab0af680 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -184,7 +184,7 @@ static int32_t getNumOfScanTimes(SQueryAttr* pQueryAttr);
 static void destroyBasicOperatorInfo(void* param, int32_t numOfOutput);
 static void destroySFillOperatorInfo(void* param, int32_t numOfOutput);
 static void destroyGroupbyOperatorInfo(void* param, int32_t numOfOutput);
-static void destroyArithOperatorInfo(void* param, int32_t numOfOutput);
+static void destroyProjectOperatorInfo(void* param, int32_t numOfOutput);
 static void destroyTagScanOperatorInfo(void* param, int32_t numOfOutput);
 static void destroySWindowOperatorInfo(void* param, int32_t numOfOutput);
 static void destroyStateWindowOperatorInfo(void* param, int32_t numOfOutput);
@@ -912,7 +912,7 @@ void setInputDataBlock(SOperatorInfo* pOperator, SQLFunctionCtx* pCtx, SSDataBlo
       doSetInputDataBlockInfo(pOperator, pCtx, pBlock, order);
     }
   } else {
-    if (/*pCtx[0].pInput == NULL && */pBlock->pDataBlock != NULL) {
+    if (pBlock->pDataBlock != NULL) {
       doSetInputDataBlock(pOperator, pCtx, pBlock, order);
     } else {
       doSetInputDataBlockInfo(pOperator, pCtx, pBlock, order);
@@ -978,7 +978,7 @@ static void doAggregateImpl(SOperatorInfo* pOperator, TSKEY startTs, SQLFunction
   }
 }
 
-static void arithmeticApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t numOfOutput) {
+static void projectApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx *pCtx, int32_t numOfOutput) {
   SQueryAttr *pQueryAttr = pRuntimeEnv->pQueryAttr;
 
   for (int32_t k = 0; k < numOfOutput; ++k) {
@@ -1806,17 +1806,17 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int32_t numOf
         break;
       }
 
-      case OP_Arithmetic: {  // TODO refactor to remove arith operator.
+      case OP_Project: {  // TODO refactor to remove arith operator.
         SOperatorInfo* prev = pRuntimeEnv->proot;
         if (i == 0) {
-          pRuntimeEnv->proot = createArithOperatorInfo(pRuntimeEnv, prev, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
+          pRuntimeEnv->proot = createProjectOperatorInfo(pRuntimeEnv, prev, pQueryAttr->pExpr1, pQueryAttr->numOfOutput);
           if (pRuntimeEnv->proot != NULL && prev->operatorType != OP_DummyInput && prev->operatorType != OP_Join) {  // TODO refactor
             setTableScanFilterOperatorInfo(prev->info, pRuntimeEnv->proot);
           }
         } else {
           prev = pRuntimeEnv->proot;
           assert(pQueryAttr->pExpr2 != NULL);
-          pRuntimeEnv->proot = createArithOperatorInfo(pRuntimeEnv, prev, pQueryAttr->pExpr2, pQueryAttr->numOfExpr2);
+          pRuntimeEnv->proot = createProjectOperatorInfo(pRuntimeEnv, prev, pQueryAttr->pExpr2, pQueryAttr->numOfExpr2);
         }
         break;
       }
@@ -4578,8 +4578,8 @@ void setTableScanFilterOperatorInfo(STableScanInfo* pTableScanInfo, SOperatorInf
     pTableScanInfo->pResultRowInfo = &pInfo->resultRowInfo;
     pTableScanInfo->rowCellInfoOffset = pInfo->rowCellInfoOffset;
 
-  } else if (pDownstream->operatorType == OP_Arithmetic) {
-    SArithOperatorInfo *pInfo = pDownstream->info;
+  } else if (pDownstream->operatorType == OP_Project) {
+    SProjectOperatorInfo *pInfo = pDownstream->info;
 
     pTableScanInfo->pCtx = pInfo->binfo.pCtx;
     pTableScanInfo->pResultRowInfo = &pInfo->binfo.resultRowInfo;
@@ -4934,23 +4934,23 @@ static SSDataBlock* doSTableAggregate(void* param, bool* newgroup) {
   return pInfo->pRes;
 }
 
-static SSDataBlock* doArithmeticOperation(void* param, bool* newgroup) {
+static SSDataBlock* doProjectOperation(void* param, bool* newgroup) {
   SOperatorInfo* pOperator = (SOperatorInfo*) param;
 
-  SArithOperatorInfo* pArithInfo = pOperator->info;
+  SProjectOperatorInfo* pProjectInfo = pOperator->info;
   SQueryRuntimeEnv* pRuntimeEnv = pOperator->pRuntimeEnv;
-  SOptrBasicInfo *pInfo = &pArithInfo->binfo;
+  SOptrBasicInfo *pInfo = &pProjectInfo->binfo;
 
   SSDataBlock* pRes = pInfo->pRes;
   int32_t order = pRuntimeEnv->pQueryAttr->order.order;
 
   pRes->info.rows = 0;
 
-  if (pArithInfo->existDataBlock) {  // TODO refactor
+  if (pProjectInfo->existDataBlock) {  // TODO refactor
     STableQueryInfo* pTableQueryInfo = pRuntimeEnv->current;
 
-    SSDataBlock* pBlock = pArithInfo->existDataBlock;
-    pArithInfo->existDataBlock = NULL;
+    SSDataBlock* pBlock = pProjectInfo->existDataBlock;
+    pProjectInfo->existDataBlock = NULL;
     *newgroup = true;
 
     // todo dynamic set tags
@@ -4960,9 +4960,9 @@ static SSDataBlock* doArithmeticOperation(void* param, bool* newgroup) {
 
     // the pDataBlock are always the same one, no need to call this again
     setInputDataBlock(pOperator, pInfo->pCtx, pBlock, order);
-    updateOutputBuf(&pArithInfo->binfo, &pArithInfo->bufCapacity, pBlock->info.rows);
+    updateOutputBuf(&pProjectInfo->binfo, &pProjectInfo->bufCapacity, pBlock->info.rows);
 
-    arithmeticApplyFunctions(pRuntimeEnv, pInfo->pCtx, pOperator->numOfOutput);
+    projectApplyFunctions(pRuntimeEnv, pInfo->pCtx, pOperator->numOfOutput);
     if (pTableQueryInfo != NULL) {
       updateTableIdInfo(pTableQueryInfo, pBlock, pRuntimeEnv->pTableRetrieveTsMap, order);
     }
@@ -4990,7 +4990,7 @@ static SSDataBlock* doArithmeticOperation(void* param, bool* newgroup) {
     // Return result of the previous group in the firstly.
     if (*newgroup) {
       if (pRes->info.rows > 0) {
-        pArithInfo->existDataBlock = pBlock;
+        pProjectInfo->existDataBlock = pBlock;
         clearNumOfRes(pInfo->pCtx, pOperator->numOfOutput);
         return pInfo->pRes;
       } else { // init output buffer for a new group data
@@ -5010,9 +5010,9 @@ static SSDataBlock* doArithmeticOperation(void* param, bool* newgroup) {
 
     // the pDataBlock are always the same one, no need to call this again
     setInputDataBlock(pOperator, pInfo->pCtx, pBlock, order);
-    updateOutputBuf(&pArithInfo->binfo, &pArithInfo->bufCapacity, pBlock->info.rows);
+    updateOutputBuf(&pProjectInfo->binfo, &pProjectInfo->bufCapacity, pBlock->info.rows);
 
-    arithmeticApplyFunctions(pRuntimeEnv, pInfo->pCtx, pOperator->numOfOutput);
+    projectApplyFunctions(pRuntimeEnv, pInfo->pCtx, pOperator->numOfOutput);
     if (pTableQueryInfo != NULL) {
       updateTableIdInfo(pTableQueryInfo, pBlock, pRuntimeEnv->pTableRetrieveTsMap, order);
     }
@@ -5649,8 +5649,8 @@ static void destroyGroupbyOperatorInfo(void* param, int32_t numOfOutput) {
   tfree(pInfo->prevData);
 }
 
-static void destroyArithOperatorInfo(void* param, int32_t numOfOutput) {
-  SArithOperatorInfo* pInfo = (SArithOperatorInfo*) param;
+static void destroyProjectOperatorInfo(void* param, int32_t numOfOutput) {
+  SProjectOperatorInfo* pInfo = (SProjectOperatorInfo*) param;
   doDestroyBasicInfo(&pInfo->binfo, numOfOutput);
 }
 
@@ -5696,8 +5696,8 @@ SOperatorInfo* createMultiTableAggOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SO
   return pOperator;
 }
 
-SOperatorInfo* createArithOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) {
-  SArithOperatorInfo* pInfo = calloc(1, sizeof(SArithOperatorInfo));
+SOperatorInfo* createProjectOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorInfo* upstream, SExprInfo* pExpr, int32_t numOfOutput) {
+  SProjectOperatorInfo* pInfo = calloc(1, sizeof(SProjectOperatorInfo));
 
   pInfo->seed = rand();
   pInfo->bufCapacity = pRuntimeEnv->resultInfo.capacity;
@@ -5710,8 +5710,8 @@ SOperatorInfo* createArithOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorI
   setDefaultOutputBuf(pRuntimeEnv, pBInfo, pInfo->seed, MASTER_SCAN);
 
   SOperatorInfo* pOperator = calloc(1, sizeof(SOperatorInfo));
-  pOperator->name         = "ArithmeticOperator";
-  pOperator->operatorType = OP_Arithmetic;
+  pOperator->name         = "ProjectOperator";
+  pOperator->operatorType = OP_Project;
   pOperator->blockingOptr = false;
   pOperator->status       = OP_IN_EXECUTING;
   pOperator->info         = pInfo;
@@ -5719,8 +5719,8 @@ SOperatorInfo* createArithOperatorInfo(SQueryRuntimeEnv* pRuntimeEnv, SOperatorI
   pOperator->numOfOutput  = numOfOutput;
   pOperator->pRuntimeEnv  = pRuntimeEnv;
 
-  pOperator->exec         = doArithmeticOperation;
-  pOperator->cleanup      = destroyArithOperatorInfo;
+  pOperator->exec         = doProjectOperation;
+  pOperator->cleanup      = destroyProjectOperatorInfo;
   appendUpstream(pOperator, upstream);
 
   return pOperator;
diff --git a/src/query/src/qPlan.c b/src/query/src/qPlan.c
index ee587a515d..214ef32cd4 100644
--- a/src/query/src/qPlan.c
+++ b/src/query/src/qPlan.c
@@ -565,7 +565,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
       taosArrayPush(plan, &op);
 
       if (pQueryAttr->pExpr2 != NULL) {
-        op = OP_Arithmetic;
+        op = OP_Project;
         taosArrayPush(plan, &op);
       }
 
@@ -585,7 +585,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
     }
 
     if (pQueryAttr->pExpr2 != NULL) {
-      op = OP_Arithmetic;
+      op = OP_Project;
       taosArrayPush(plan, &op);
     }
   } else if (pQueryAttr->sw.gap > 0) {
@@ -593,7 +593,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
     taosArrayPush(plan, &op);
 
     if (pQueryAttr->pExpr2 != NULL) {
-      op = OP_Arithmetic;
+      op = OP_Project;
       taosArrayPush(plan, &op);
     }
   } else if (pQueryAttr->stateWindow) {
@@ -601,7 +601,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
     taosArrayPush(plan, &op);
 
     if (pQueryAttr->pExpr2 != NULL) {
-      op = OP_Arithmetic;
+      op = OP_Project;
       taosArrayPush(plan, &op);
     }
   } else if (pQueryAttr->simpleAgg) {
@@ -619,7 +619,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
     }
 
     if (pQueryAttr->pExpr2 != NULL && !pQueryAttr->stableQuery) {
-      op = OP_Arithmetic;
+      op = OP_Project;
       taosArrayPush(plan, &op);
     }
   } else {  // diff/add/multiply/subtract/division
@@ -627,7 +627,7 @@ SArray* createExecOperatorPlan(SQueryAttr* pQueryAttr) {
       op = OP_Filter;
       taosArrayPush(plan, &op);
     } else {
-      op = OP_Arithmetic;
+      op = OP_Project;
       taosArrayPush(plan, &op);
     }
   }
@@ -665,7 +665,7 @@ SArray* createGlobalMergePlan(SQueryAttr* pQueryAttr) {
     }
 
     if (pQueryAttr->pExpr2 != NULL) {
-      op = OP_Arithmetic;
+      op = OP_Project;
       taosArrayPush(plan, &op);
     }
   }
diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/general/parser/nestquery.sim
index 8249d9197f..fd56a91dd6 100644
--- a/tests/script/general/parser/nestquery.sim
+++ b/tests/script/general/parser/nestquery.sim
@@ -180,20 +180,82 @@ if $data21 != 49.500000000 then
 endi
 
 #define TSDB_FUNC_APERCT       7
-#define TSDB_FUNC_LAST_ROW     10
 #define TSDB_FUNC_TWA          14
 #define TSDB_FUNC_LEASTSQR     15
-#define TSDB_FUNC_ARITHM       23
 #define TSDB_FUNC_DIFF         24
 #define TSDB_FUNC_INTERP       28
-#define TSDB_FUNC_RATE         29
 #define TSDB_FUNC_IRATE        30
 #define TSDB_FUNC_DERIVATIVE   32
 
 sql_error select stddev(c1) from (select c1 from nest_tb0);
 sql_error select percentile(c1, 20) from (select * from nest_tb0);
+sql_error select interp(c1) from (select * from nest_tb0);
+sql_error select derivative(val, 1s, 0) from (select c1 val from nest_tb0);
+sql_error select twa(c1) from (select c1 from nest_tb0);
+sql_error select irate(c1) from (select c1 from nest_tb0);
+sql_error select diff(c1), twa(c1) from (select * from nest_tb0);
+sql_error select irate(c1), interp(c1), twa(c1) from (select * from nest_tb0);
+
+sql select apercentile(c1, 50) from (select * from nest_tb0) interval(1d)
+sql select twa(c1) from (select * from nest_tb0);
+sql select leastsquares(c1, 1, 1) from (select * from nest_tb0);
+sql select irate(c1) from (select * from nest_tb0);
 
 sql select avg(c1),sum(c2), max(c3), min(c4), count(*), first(c7), last(c7),spread(c6) from (select * from nest_tb0) interval(1d);
+if $rows != 7 then
+  return -1
+endi
+
+if $data00 != @20-09-15 00:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 48.666666667 then
+  print expect 48.666666667, actual: $data01
+  return -1
+endi
+
+if $data02 != 70080.000000000 then
+  return -1
+endi
+
+if $data03 != 99 then
+  return -1
+endi
+
+if $data04 != 0 then
+  return -1
+endi
+
+if $data05 != 1440 then
+  return -1
+endi
+
+if $data06 != 0 then
+  print $data06
+  return -1
+endi
+
+if $data07 != 1 then
+  return -1
+endi
+
+if $data08 != 99.000000000 then
+  print expect 99.000000000, actual: $data08
+  return -1
+endi
+
+if $data10 != @20-09-16 00:00:00.000@ then
+  return -1
+endi
+
+if $data11 != 49.777777778 then
+  return -1
+endi
+
+if $data12 != 71680.000000000 then
+  return -1
+endi
 
 sql select top(x, 20) from (select c1 x from nest_tb0);
 
@@ -207,6 +269,9 @@ print ===================> group by + having
 
 
 
+print =========================> ascending order/descending order
+
+
 
 
 print =========================> nest query join
@@ -273,7 +338,6 @@ if $data03 != @20-09-15 00:00:00.000@ then
   return -1
 endi
 
-sql_error select derivative(val, 1s, 0) from (select c1 val from nest_tb0);
 sql select diff(val) from (select c1 val from nest_tb0);
 if $rows != 9999 then
   return -1

From 44621d8a0f8b1da94bae86b9e3b145ab513baed9 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Thu, 24 Jun 2021 22:44:46 +0800
Subject: [PATCH 06/71] Hotfix/sangshuduo/td 4892 taosdemo sub fetch (#6614)

* [TD-4892]<fix>: taosdemo subscribe fetch result.

* fix stbname length.

* restrict prefix length.

* submit empty

* fix minor code.
---
 src/kit/taosdemo/taosdemo.c | 127 ++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 71 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 6314aa6a00..abf3c74436 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -79,10 +79,9 @@ enum TEST_MODE {
 
 #define MAX_SQL_SIZE       65536
 #define BUFFER_SIZE        (65536*2)
-#define COND_BUF_LEN        BUFFER_SIZE - 30
+#define COND_BUF_LEN       (BUFFER_SIZE - 30)
 #define MAX_USERNAME_SIZE  64
 #define MAX_PASSWORD_SIZE  64
-#define MAX_DB_NAME_SIZE   64
 #define MAX_HOSTNAME_SIZE  64
 #define MAX_TB_NAME_SIZE   64
 #define MAX_DATA_SIZE      (16*1024)+20     // max record len: 16*1024, timestamp string and ,('') need extra space
@@ -90,7 +89,7 @@ enum TEST_MODE {
 #define OPT_ABORT          1 /* –abort */
 #define STRING_LEN         60000
 #define MAX_PREPARED_RAND  1000000
-#define MAX_FILE_NAME_LEN  256
+#define MAX_FILE_NAME_LEN  256              // max file name length on linux is 255.
 
 #define   MAX_SAMPLES_ONCE_FROM_FILE   10000
 #define   MAX_NUM_DATATYPE 10
@@ -195,13 +194,6 @@ enum _describe_table_index {
   TSDB_MAX_DESCRIBE_METRIC
 };
 
-typedef struct {
-  char field[TSDB_COL_NAME_LEN + 1];
-  char type[16];
-  int length;
-  char note[128];
-} SColDes;
-
 /* Used by main to communicate with parse_opt. */
 static char *g_dupstr = NULL;
 
@@ -247,16 +239,16 @@ typedef struct SArguments_S {
 } SArguments;
 
 typedef struct SColumn_S {
-  char      field[TSDB_COL_NAME_LEN + 1];
-  char      dataType[MAX_TB_NAME_SIZE];
+  char      field[TSDB_COL_NAME_LEN];
+  char      dataType[16];
   uint32_t  dataLen;
   char      note[128];
 } StrColumn;
 
 typedef struct SSuperTable_S {
-  char         sTblName[MAX_TB_NAME_SIZE+1];
-  char         dataSource[MAX_TB_NAME_SIZE+1];  // rand_gen or sample
-  char         childTblPrefix[MAX_TB_NAME_SIZE];
+  char         sTblName[TSDB_TABLE_NAME_LEN];
+  char         dataSource[MAX_TB_NAME_SIZE];  // rand_gen or sample
+  char         childTblPrefix[TSDB_TABLE_NAME_LEN - 20]; // 20 characters reserved for seq
   char         insertMode[MAX_TB_NAME_SIZE];    // taosc, rest
   uint16_t     childTblExists;
   int64_t      childTblCount;
@@ -277,8 +269,8 @@ typedef struct SSuperTable_S {
   int64_t      timeStampStep;
   char         startTimestamp[MAX_TB_NAME_SIZE];
   char         sampleFormat[MAX_TB_NAME_SIZE];  // csv, json
-  char         sampleFile[MAX_FILE_NAME_LEN+1];
-  char         tagsFile[MAX_FILE_NAME_LEN+1];
+  char         sampleFile[MAX_FILE_NAME_LEN];
+  char         tagsFile[MAX_FILE_NAME_LEN];
 
   uint32_t     columnCount;
   StrColumn    columns[MAX_COLUMN_COUNT];
@@ -305,7 +297,7 @@ typedef struct SSuperTable_S {
 } SSuperTable;
 
 typedef struct {
-  char     name[TSDB_DB_NAME_LEN + 1];
+  char     name[TSDB_DB_NAME_LEN];
   char     create_time[32];
   int64_t  ntables;
   int32_t  vgroups;
@@ -341,11 +333,11 @@ typedef struct SDbCfg_S {
   int       cache;
   int       blocks;
   int       quorum;
-  char      precision[MAX_TB_NAME_SIZE];
+  char      precision[8];
 } SDbCfg;
 
 typedef struct SDataBase_S {
-  char         dbName[MAX_DB_NAME_SIZE];
+  char         dbName[TSDB_DB_NAME_LEN];
   bool         drop;  // 0: use exists, 1: if exists, drop then new create
   SDbCfg       dbCfg;
   uint64_t     superTblCount;
@@ -353,14 +345,14 @@ typedef struct SDataBase_S {
 } SDataBase;
 
 typedef struct SDbs_S {
-  char         cfgDir[MAX_FILE_NAME_LEN+1];
+  char         cfgDir[MAX_FILE_NAME_LEN];
   char         host[MAX_HOSTNAME_SIZE];
   struct sockaddr_in serv_addr;
 
   uint16_t     port;
   char         user[MAX_USERNAME_SIZE];
   char         password[MAX_PASSWORD_SIZE];
-  char         resultFile[MAX_FILE_NAME_LEN+1];
+  char         resultFile[MAX_FILE_NAME_LEN];
   bool         use_metric;
   bool         insert_only;
   bool         do_aggreFunc;
@@ -387,7 +379,7 @@ typedef struct SpecifiedQueryInfo_S {
   bool         subscribeRestart;
   int          subscribeKeepProgress;
   char         sql[MAX_QUERY_SQL_COUNT][MAX_QUERY_SQL_LENGTH+1];
-  char         result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN+1];
+  char         result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN];
   int          resubAfterConsume[MAX_QUERY_SQL_COUNT];
   int          endAfterConsume[MAX_QUERY_SQL_COUNT];
   TAOS_SUB*    tsub[MAX_QUERY_SQL_COUNT];
@@ -398,7 +390,7 @@ typedef struct SpecifiedQueryInfo_S {
 } SpecifiedQueryInfo;
 
 typedef struct SuperQueryInfo_S {
-  char         sTblName[MAX_TB_NAME_SIZE+1];
+  char         sTblName[TSDB_TABLE_NAME_LEN];
   uint64_t     queryInterval;  // 0: unlimit  > 0   loop/s
   uint32_t     threadCnt;
   uint32_t     asyncMode; // 0: sync, 1: async
@@ -407,10 +399,10 @@ typedef struct SuperQueryInfo_S {
   int          subscribeKeepProgress;
   uint64_t     queryTimes;
   int64_t      childTblCount;
-  char         childTblPrefix[MAX_TB_NAME_SIZE];
+  char         childTblPrefix[TSDB_TABLE_NAME_LEN - 20];    // 20 characters reserved for seq
   int          sqlCount;
   char         sql[MAX_QUERY_SQL_COUNT][MAX_QUERY_SQL_LENGTH+1];
-  char         result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN+1];
+  char         result[MAX_QUERY_SQL_COUNT][MAX_FILE_NAME_LEN];
   int          resubAfterConsume;
   int          endAfterConsume;
   TAOS_SUB*    tsub[MAX_QUERY_SQL_COUNT];
@@ -420,13 +412,13 @@ typedef struct SuperQueryInfo_S {
 } SuperQueryInfo;
 
 typedef struct SQueryMetaInfo_S {
-  char         cfgDir[MAX_FILE_NAME_LEN+1];
+  char         cfgDir[MAX_FILE_NAME_LEN];
   char         host[MAX_HOSTNAME_SIZE];
   uint16_t     port;
   struct       sockaddr_in serv_addr;
   char         user[MAX_USERNAME_SIZE];
   char         password[MAX_PASSWORD_SIZE];
-  char         dbName[MAX_DB_NAME_SIZE+1];
+  char         dbName[TSDB_DB_NAME_LEN];
   char         queryMode[MAX_TB_NAME_SIZE];  // taosc, rest
 
   SpecifiedQueryInfo  specifiedQueryInfo;
@@ -438,11 +430,11 @@ typedef struct SThreadInfo_S {
   TAOS *    taos;
   TAOS_STMT *stmt;
   int       threadID;
-  char      db_name[MAX_DB_NAME_SIZE+1];
+  char      db_name[TSDB_DB_NAME_LEN];
   uint32_t  time_precision;
   char      filePath[4096];
   FILE      *fp;
-  char      tb_prefix[MAX_TB_NAME_SIZE];
+  char      tb_prefix[TSDB_TABLE_NAME_LEN];
   uint64_t  start_table_from;
   uint64_t  end_table_to;
   int64_t   ntables;
@@ -608,7 +600,7 @@ SArguments g_args = {
                      1,               // query_times
                      0,               // interlace_rows;
                      30000,           // num_of_RPR
-                     (1024*1024),         // max_sql_len
+                     (1024*1024),     // max_sql_len
                      10000,           // num_of_tables
                      10000,           // num_of_DPT
                      0,               // abort
@@ -3038,7 +3030,7 @@ static int startMultiThreadCreateChildTable(
   for (int64_t i = 0; i < threads; i++) {
     threadInfo *pThreadInfo = infos + i;
     pThreadInfo->threadID = i;
-    tstrncpy(pThreadInfo->db_name, db_name, MAX_DB_NAME_SIZE);
+    tstrncpy(pThreadInfo->db_name, db_name, TSDB_DB_NAME_LEN);
     pThreadInfo->superTblInfo = superTblInfo;
     verbosePrint("%s() %d db_name: %s\n", __func__, __LINE__, db_name);
     pThreadInfo->taos = taos_connect(
@@ -3329,7 +3321,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(
       goto PARSE_OVER;
     }
     //tstrncpy(superTbls->columns[k].dataType, dataType->valuestring, MAX_TB_NAME_SIZE);
-    tstrncpy(columnCase.dataType, dataType->valuestring, MAX_TB_NAME_SIZE);
+    tstrncpy(columnCase.dataType, dataType->valuestring, strlen(dataType->valuestring) + 1);
 
     cJSON* dataLen = cJSON_GetObjectItem(column, "len");
     if (dataLen && dataLen->type == cJSON_Number) {
@@ -3344,7 +3336,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(
 
     for (int n = 0; n < count; ++n) {
       tstrncpy(superTbls->columns[index].dataType,
-              columnCase.dataType, MAX_TB_NAME_SIZE);
+              columnCase.dataType, strlen(columnCase.dataType) + 1);
       superTbls->columns[index].dataLen = columnCase.dataLen;
       index++;
     }
@@ -3400,7 +3392,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(
           __func__, __LINE__);
       goto PARSE_OVER;
     }
-    tstrncpy(columnCase.dataType, dataType->valuestring, MAX_TB_NAME_SIZE);
+    tstrncpy(columnCase.dataType, dataType->valuestring, strlen(dataType->valuestring) + 1);
 
     cJSON* dataLen = cJSON_GetObjectItem(tag, "len");
     if (dataLen && dataLen->type == cJSON_Number) {
@@ -3415,7 +3407,7 @@ static bool getColumnAndTagTypeFromInsertJsonFile(
 
     for (int n = 0; n < count; ++n) {
       tstrncpy(superTbls->tags[index].dataType, columnCase.dataType,
-          MAX_TB_NAME_SIZE);
+          strlen(columnCase.dataType) + 1);
       superTbls->tags[index].dataLen = columnCase.dataLen;
       index++;
     }
@@ -3638,7 +3630,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       printf("ERROR: failed to read json, db name not found\n");
       goto PARSE_OVER;
     }
-    tstrncpy(g_Dbs.db[i].dbName, dbName->valuestring, MAX_DB_NAME_SIZE);
+    tstrncpy(g_Dbs.db[i].dbName, dbName->valuestring, TSDB_DB_NAME_LEN);
 
     cJSON *drop = cJSON_GetObjectItem(dbinfo, "drop");
     if (drop && drop->type == cJSON_String && drop->valuestring != NULL) {
@@ -3659,10 +3651,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
     if (precision && precision->type == cJSON_String
             && precision->valuestring != NULL) {
       tstrncpy(g_Dbs.db[i].dbCfg.precision, precision->valuestring,
-              MAX_DB_NAME_SIZE);
+              8);
     } else if (!precision) {
-      //tstrncpy(g_Dbs.db[i].dbCfg.precision, "ms", MAX_DB_NAME_SIZE);
-      memset(g_Dbs.db[i].dbCfg.precision, 0, MAX_DB_NAME_SIZE);
+      memset(g_Dbs.db[i].dbCfg.precision, 0, 8);
     } else {
       printf("ERROR: failed to read json, precision not found\n");
       goto PARSE_OVER;
@@ -3839,7 +3830,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
         goto PARSE_OVER;
       }
       tstrncpy(g_Dbs.db[i].superTbls[j].sTblName, stbName->valuestring,
-              MAX_TB_NAME_SIZE);
+              TSDB_TABLE_NAME_LEN);
 
       cJSON *prefix = cJSON_GetObjectItem(stbInfo, "childtable_prefix");
       if (!prefix || prefix->type != cJSON_String || prefix->valuestring == NULL) {
@@ -3847,7 +3838,7 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
         goto PARSE_OVER;
       }
       tstrncpy(g_Dbs.db[i].superTbls[j].childTblPrefix, prefix->valuestring,
-              MAX_DB_NAME_SIZE);
+              TSDB_TABLE_NAME_LEN - 20);
 
       cJSON *autoCreateTbl = cJSON_GetObjectItem(stbInfo, "auto_create_table");
       if (autoCreateTbl
@@ -3915,9 +3906,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       if (dataSource && dataSource->type == cJSON_String
               && dataSource->valuestring != NULL) {
         tstrncpy(g_Dbs.db[i].superTbls[j].dataSource,
-                dataSource->valuestring, MAX_DB_NAME_SIZE);
+                dataSource->valuestring, TSDB_DB_NAME_LEN);
       } else if (!dataSource) {
-        tstrncpy(g_Dbs.db[i].superTbls[j].dataSource, "rand", MAX_DB_NAME_SIZE);
+        tstrncpy(g_Dbs.db[i].superTbls[j].dataSource, "rand", TSDB_DB_NAME_LEN);
       } else {
         errorPrint("%s() LN%d, failed to read json, data_source not found\n",
             __func__, __LINE__);
@@ -3975,10 +3966,10 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       cJSON *ts = cJSON_GetObjectItem(stbInfo, "start_timestamp");
       if (ts && ts->type == cJSON_String && ts->valuestring != NULL) {
         tstrncpy(g_Dbs.db[i].superTbls[j].startTimestamp,
-                ts->valuestring, MAX_DB_NAME_SIZE);
+                ts->valuestring, TSDB_DB_NAME_LEN);
       } else if (!ts) {
         tstrncpy(g_Dbs.db[i].superTbls[j].startTimestamp,
-                "now", MAX_DB_NAME_SIZE);
+                "now", TSDB_DB_NAME_LEN);
       } else {
         printf("ERROR: failed to read json, start_timestamp not found\n");
         goto PARSE_OVER;
@@ -3998,9 +3989,9 @@ static bool getMetaFromInsertJsonFile(cJSON* root) {
       if (sampleFormat && sampleFormat->type
               == cJSON_String && sampleFormat->valuestring != NULL) {
         tstrncpy(g_Dbs.db[i].superTbls[j].sampleFormat,
-                sampleFormat->valuestring, MAX_DB_NAME_SIZE);
+                sampleFormat->valuestring, TSDB_DB_NAME_LEN);
       } else if (!sampleFormat) {
-        tstrncpy(g_Dbs.db[i].superTbls[j].sampleFormat, "csv", MAX_DB_NAME_SIZE);
+        tstrncpy(g_Dbs.db[i].superTbls[j].sampleFormat, "csv", TSDB_DB_NAME_LEN);
       } else {
         printf("ERROR: failed to read json, sample_format not found\n");
         goto PARSE_OVER;
@@ -4245,7 +4236,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
 
   cJSON* dbs = cJSON_GetObjectItem(root, "databases");
   if (dbs && dbs->type == cJSON_String && dbs->valuestring != NULL) {
-    tstrncpy(g_queryInfo.dbName, dbs->valuestring, MAX_DB_NAME_SIZE);
+    tstrncpy(g_queryInfo.dbName, dbs->valuestring, TSDB_DB_NAME_LEN);
   } else if (!dbs) {
     printf("ERROR: failed to read json, databases not found\n");
     goto PARSE_OVER;
@@ -4495,7 +4486,7 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
     if (stblname && stblname->type == cJSON_String
         && stblname->valuestring != NULL) {
       tstrncpy(g_queryInfo.superQueryInfo.sTblName, stblname->valuestring,
-          MAX_TB_NAME_SIZE);
+          TSDB_TABLE_NAME_LEN);
     } else {
       errorPrint("%s() LN%d, failed to read json, super table name input error\n",
           __func__, __LINE__);
@@ -6408,7 +6399,7 @@ static void startMultiThreadInsertData(int threads, char* db_name,
   for (int i = 0; i < threads; i++) {
     threadInfo *pThreadInfo = infos + i;
     pThreadInfo->threadID = i;
-    tstrncpy(pThreadInfo->db_name, db_name, MAX_DB_NAME_SIZE);
+    tstrncpy(pThreadInfo->db_name, db_name, TSDB_DB_NAME_LEN);
     pThreadInfo->time_precision = timePrec;
     pThreadInfo->superTblInfo = superTblInfo;
 
@@ -6852,7 +6843,7 @@ static void *specifiedTableQuery(void *sarg) {
     }
   }
 
-  char sqlStr[MAX_DB_NAME_SIZE + 5];
+  char sqlStr[TSDB_DB_NAME_LEN + 5];
   sprintf(sqlStr, "use %s", g_queryInfo.dbName);
   if (0 != queryDbExec(pThreadInfo->taos, sqlStr, NO_INSERT_TYPE, false)) {
     taos_close(pThreadInfo->taos);
@@ -7328,12 +7319,6 @@ static void *superSubscribe(void *sarg) {
       performancePrint("st: %"PRIu64" et: %"PRIu64" delta: %"PRIu64"\n", st, et, (et - st));
 
       if (res) {
-          if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-              sprintf(pThreadInfo->filePath, "%s-%d",
-                      g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
-                      pThreadInfo->threadID);
-              fetchResult(res, pThreadInfo);
-          }
           if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
               sprintf(pThreadInfo->filePath, "%s-%d",
                       g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
@@ -7440,10 +7425,10 @@ static void *specifiedSubscribe(void *sarg) {
               sprintf(pThreadInfo->filePath, "%s-%d",
                       g_queryInfo.specifiedQueryInfo.result[pThreadInfo->querySeq],
                       pThreadInfo->threadID);
-              fetchResult(
-                      g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID],
-                      pThreadInfo);
           }
+          fetchResult(
+                  g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID],
+                  pThreadInfo);
 
           g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID] ++;
           if ((g_queryInfo.specifiedQueryInfo.resubAfterConsume[pThreadInfo->querySeq] != -1)
@@ -7680,9 +7665,9 @@ static void setParaFromArg(){
   g_Dbs.dbCount = 1;
   g_Dbs.db[0].drop = true;
 
-  tstrncpy(g_Dbs.db[0].dbName, g_args.database, MAX_DB_NAME_SIZE);
+  tstrncpy(g_Dbs.db[0].dbName, g_args.database, TSDB_DB_NAME_LEN);
   g_Dbs.db[0].dbCfg.replica = g_args.replica;
-  tstrncpy(g_Dbs.db[0].dbCfg.precision, "ms", MAX_DB_NAME_SIZE);
+  tstrncpy(g_Dbs.db[0].dbCfg.precision, "ms", 8);
 
   tstrncpy(g_Dbs.resultFile, g_args.output_file, MAX_FILE_NAME_LEN);
 
@@ -7704,7 +7689,7 @@ static void setParaFromArg(){
 
   if (g_args.use_metric) {
     g_Dbs.db[0].superTblCount = 1;
-    tstrncpy(g_Dbs.db[0].superTbls[0].sTblName, "meters", MAX_TB_NAME_SIZE);
+    tstrncpy(g_Dbs.db[0].superTbls[0].sTblName, "meters", TSDB_TABLE_NAME_LEN);
     g_Dbs.db[0].superTbls[0].childTblCount = g_args.num_of_tables;
     g_Dbs.threadCount = g_args.num_of_threads;
     g_Dbs.threadCountByCreateTbl = g_args.num_of_threads;
@@ -7715,7 +7700,7 @@ static void setParaFromArg(){
     g_Dbs.db[0].superTbls[0].disorderRange = g_args.disorderRange;
     g_Dbs.db[0].superTbls[0].disorderRatio = g_args.disorderRatio;
     tstrncpy(g_Dbs.db[0].superTbls[0].childTblPrefix,
-            g_args.tb_prefix, MAX_TB_NAME_SIZE);
+            g_args.tb_prefix, TSDB_TABLE_NAME_LEN - 20);
     tstrncpy(g_Dbs.db[0].superTbls[0].dataSource, "rand", MAX_TB_NAME_SIZE);
     g_Dbs.db[0].superTbls[0].iface = g_args.iface;
     tstrncpy(g_Dbs.db[0].superTbls[0].startTimestamp,
@@ -7732,7 +7717,7 @@ static void setParaFromArg(){
       }
 
       tstrncpy(g_Dbs.db[0].superTbls[0].columns[i].dataType,
-              data_type[i], MAX_TB_NAME_SIZE);
+              data_type[i], strlen(data_type[i]) + 1);
       g_Dbs.db[0].superTbls[0].columns[i].dataLen = g_args.len_of_binary;
       g_Dbs.db[0].superTbls[0].columnCount++;
     }
@@ -7743,18 +7728,18 @@ static void setParaFromArg(){
       for (int i = g_Dbs.db[0].superTbls[0].columnCount;
               i < g_args.num_of_CPR; i++) {
         tstrncpy(g_Dbs.db[0].superTbls[0].columns[i].dataType,
-                "INT", MAX_TB_NAME_SIZE);
+                "INT", strlen("INT") + 1);
         g_Dbs.db[0].superTbls[0].columns[i].dataLen = 0;
         g_Dbs.db[0].superTbls[0].columnCount++;
       }
     }
 
     tstrncpy(g_Dbs.db[0].superTbls[0].tags[0].dataType,
-            "INT", MAX_TB_NAME_SIZE);
+            "INT", strlen("INT") + 1);
     g_Dbs.db[0].superTbls[0].tags[0].dataLen = 0;
 
     tstrncpy(g_Dbs.db[0].superTbls[0].tags[1].dataType,
-            "BINARY", MAX_TB_NAME_SIZE);
+            "BINARY", strlen("BINARY") + 1);
     g_Dbs.db[0].superTbls[0].tags[1].dataLen = g_args.len_of_binary;
     g_Dbs.db[0].superTbls[0].tagCount = 2;
   } else {
@@ -7890,11 +7875,11 @@ static void queryResult() {
     pThreadInfo->end_table_to = g_Dbs.db[0].superTbls[0].childTblCount - 1;
     pThreadInfo->superTblInfo = &g_Dbs.db[0].superTbls[0];
     tstrncpy(pThreadInfo->tb_prefix,
-          g_Dbs.db[0].superTbls[0].childTblPrefix, MAX_TB_NAME_SIZE);
+          g_Dbs.db[0].superTbls[0].childTblPrefix, TSDB_TABLE_NAME_LEN - 20);
   } else {
     pThreadInfo->ntables = g_args.num_of_tables;
     pThreadInfo->end_table_to = g_args.num_of_tables -1;
-    tstrncpy(pThreadInfo->tb_prefix, g_args.tb_prefix, MAX_TB_NAME_SIZE);
+    tstrncpy(pThreadInfo->tb_prefix, g_args.tb_prefix, TSDB_TABLE_NAME_LEN);
   }
 
   pThreadInfo->taos = taos_connect(

From 5628cb20913c50e2607325742fb6f5c764391e36 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Fri, 25 Jun 2021 10:16:18 +0800
Subject: [PATCH 07/71] [TD-4895]<fix>: more checking for creating mnode

---
 src/balance/src/bnMain.c   | 21 ++++++++++++++-------
 src/inc/tbn.h              |  1 +
 src/mnode/src/mnodeDnode.c |  4 ++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/balance/src/bnMain.c b/src/balance/src/bnMain.c
index f022fff6d8..9997d44ca5 100644
--- a/src/balance/src/bnMain.c
+++ b/src/balance/src/bnMain.c
@@ -637,6 +637,19 @@ int32_t bnDropDnode(SDnodeObj *pDnode) {
   return TSDB_CODE_SUCCESS;
 }
 
+int32_t bnDnodeCanCreateMnode(struct SDnodeObj *pDnode) {
+  if (pDnode == NULL)
+    return 0;
+
+  if (pDnode->isMgmt || pDnode->alternativeRole == TAOS_DN_ALTERNATIVE_ROLE_VNODE
+      || pDnode->status == TAOS_DN_STATUS_DROPPING
+      || pDnode->status == TAOS_DN_STATUS_OFFLINE) {
+    return 0;
+  } else {
+    return 1;
+  }
+}
+
 static void bnMonitorDnodeModule() {
   int32_t numOfMnodes = mnodeGetMnodesNum();
   if (numOfMnodes >= tsNumOfMnodes) return;
@@ -645,13 +658,7 @@ static void bnMonitorDnodeModule() {
     SDnodeObj *pDnode = tsBnDnodes.list[i];
     if (pDnode == NULL) break;
 
-    if (pDnode->isMgmt || pDnode->status == TAOS_DN_STATUS_DROPPING || pDnode->status == TAOS_DN_STATUS_OFFLINE) {
-      continue;
-    }
-
-    if (pDnode->alternativeRole == TAOS_DN_ALTERNATIVE_ROLE_VNODE) {
-      continue;
-    }
+    if (!bnDnodeCanCreateMnode(pDnode)) continue;
 
     mLInfo("dnode:%d, numOfMnodes:%d expect:%d, create mnode in this dnode", pDnode->dnodeId, numOfMnodes, tsNumOfMnodes);
     mnodeCreateMnode(pDnode->dnodeId, pDnode->dnodeEp, true);
diff --git a/src/inc/tbn.h b/src/inc/tbn.h
index b9f4e3c608..b35f90eb15 100644
--- a/src/inc/tbn.h
+++ b/src/inc/tbn.h
@@ -31,6 +31,7 @@ void    bnReset();
 int32_t bnAllocVnodes(struct SVgObj *pVgroup);
 int32_t bnAlterDnode(struct SDnodeObj *pDnode, int32_t vnodeId, int32_t dnodeId);
 int32_t bnDropDnode(struct SDnodeObj *pDnode);
+int32_t bnDnodeCanCreateMnode(struct SDnodeObj *pDnode);
 
 #ifdef __cplusplus
 }
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index ce21af49c2..2325122830 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -16,7 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "tgrant.h"
-#include "tbn.h"
 #include "tglobal.h"
 #include "tconfig.h"
 #include "tutil.h"
@@ -632,7 +631,8 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
   }
 
   int32_t numOfMnodes = mnodeGetMnodesNum();
-  if (numOfMnodes < tsNumOfMnodes && numOfMnodes < mnodeGetOnlineDnodesNum() && !pDnode->isMgmt) {
+  if (numOfMnodes < tsNumOfMnodes && numOfMnodes < mnodeGetOnlineDnodesNum()
+      && bnDnodeCanCreateMnode(pDnode)) {
     bnNotify();
   }
 

From 795bd8c07676bac3d0a163b862be7ed2d2f4c1e6 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Fri, 25 Jun 2021 10:39:17 +0800
Subject: [PATCH 08/71] [TD-4098]<fix> unsigned date type not found

---
 src/client/src/tscSQLParser.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index e94f77d254..5107884422 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -165,6 +165,7 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType,
   } else {
     tbufWriteUint32(&bw, colType);
   }
+
   tbufWriteInt32(&bw, (int32_t)(pList->size));
 
   for (int32_t i = 0; i < (int32_t)pList->size; i++) {
@@ -181,10 +182,11 @@ bool serializeExprListToVariant(SArray* pList, tVariant **dst, int16_t colType,
       }  
       tbufWriteInt64(&bw, var->i64);        
     } else if (IS_UNSIGNED_NUMERIC_TYPE(colType)) {
-      if (IS_SIGNED_NUMERIC_TYPE(var->nType) && IS_UNSIGNED_NUMERIC_TYPE(var->nType)) {
+      if (IS_SIGNED_NUMERIC_TYPE(var->nType) || IS_UNSIGNED_NUMERIC_TYPE(var->nType)) {
+        tbufWriteUint64(&bw, var->u64);        
+      } else {
         break;
-      } 
-      tbufWriteUint64(&bw, var->u64);        
+      }
     } else if (colType == TSDB_DATA_TYPE_DOUBLE || colType == TSDB_DATA_TYPE_FLOAT) {
       if (IS_SIGNED_NUMERIC_TYPE(var->nType) || IS_UNSIGNED_NUMERIC_TYPE(var->nType)) {
         tbufWriteDouble(&bw, (double)(var->i64));

From 71bc5842d0ecb3de19da2711374c88281dea4e34 Mon Sep 17 00:00:00 2001
From: zhaoyanggh <yzhao@taosdata.com>
Date: Fri, 25 Jun 2021 15:02:59 +0800
Subject: [PATCH 09/71] [TD-4868]add taosdump test to full test

---
 tests/pytest/fulltest.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index c66ccc5477..88c5909863 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -150,6 +150,7 @@ python3 ./test.py -f import_merge/importCSV.py
 #======================p2-start===============
 # tools
 python3 test.py -f tools/taosdumpTest.py
+python3 test.py -f tools/taosdumpTest2.py
 
 python3 test.py -f tools/taosdemoTest.py
 python3 test.py -f tools/taosdemoTestWithoutMetric.py

From 2555665a8e33a8a8774b41acbb181f6fd265f036 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Fri, 25 Jun 2021 15:22:22 +0800
Subject: [PATCH 10/71] [TD-4897] <docs>: clients should process result set
 ASAP after calling "taos_consume()".

---
 documentation20/cn/08.connector/docs.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index 2d76c866d1..aa5fa50b66 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -427,12 +427,15 @@ TDengine提供时间驱动的实时流式计算API。可以每隔一指定的时
     * res：查询结果集，注意结果集中可能没有记录
     * param：调用 `taos_subscribe`时客户程序提供的附加参数
     * code：错误码
+  
   **注意**：在这个回调函数里不可以做耗时过长的处理，尤其是对于返回的结果集中数据较多的情况，否则有可能导致客户端阻塞等异常状态。如果必须进行复杂计算，则建议在另外的线程中进行处理。
 
 * `TAOS_RES *taos_consume(TAOS_SUB *tsub)`
 
   同步模式下，该函数用来获取订阅的结果。 用户应用程序将其置于一个循环之中。 如两次调用`taos_consume`的间隔小于订阅的轮询周期，API将会阻塞，直到时间间隔超过此周期。 如果数据库有新记录到达，该API将返回该最新的记录，否则返回一个没有记录的空结果集。 如果返回值为 `NULL`，说明系统出错。 异步模式下，用户程序不应调用此API。
 
+  **注意**：在调用 `taos_consume()` 之后，用户应用应确保尽快调用 `taos_fetch_row()` 或 `taos_fetch_block()` 来处理订阅结果，否则服务端会持续缓存查询结果数据等待客户端读取，极端情况下会导致服务端内存消耗殆尽，影响服务稳定性。
+
 * `void taos_unsubscribe(TAOS_SUB *tsub, int keepProgress)`
 
   取消订阅。 如参数 `keepProgress` 不为0，API会保留订阅的进度信息，后续调用 `taos_subscribe` 时可以基于此进度继续；否则将删除进度信息，后续只能重新开始读取数据。

From 022d6ea765ec90e23968cedb95eabac6fbd3f2e4 Mon Sep 17 00:00:00 2001
From: bryanchang0603 <changb9@mcamster.ca>
Date: Fri, 25 Jun 2021 15:41:47 +0800
Subject: [PATCH 11/71] taosdemoCfg adding how to use and minor bug fix

---
 tests/pytest/util/taosdemoCfg.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/pytest/util/taosdemoCfg.py b/tests/pytest/util/taosdemoCfg.py
index 5071e915a5..d211f86b81 100644
--- a/tests/pytest/util/taosdemoCfg.py
+++ b/tests/pytest/util/taosdemoCfg.py
@@ -25,6 +25,21 @@ from multiprocessing import cpu_count
 
 # TODO: fully test the function. Handle exceptions.
 #       Handle json format not accepted by taosdemo
+
+### How to use TaosdemoCfg:
+#   Before you start: 
+#       Make sure you understand how is taosdemo's JSON file structured. Because the python used does
+#       not support directory in directory for self objects, the config is being tear to different parts.
+#       Please make sure you understand which directory represent which part of which type of the file 
+#       This module will reassemble the parts when creating the JSON file.
+#
+#   Basic use example
+#   step 1:use self.append_sql_stb() to append the insert/query/subscribe directory into the module
+#       you can append many insert/query/subscribe directory, but pay attention about taosdemo's limit
+#   step 2:use alter function to alter the specific config 
+#   step 3:use the generation function to generate the files
+#
+#   step 1 and step 2 can be replaced with using import functions
 class TDTaosdemoCfg:
     def __init__(self):
         self.insert_cfg = {
@@ -264,7 +279,7 @@ class TDTaosdemoCfg:
         elif key == "super_table_query":
             self.query_cfg["super_table_query"] = self.stable_query
         else:
-            self.table_query[key] = value
+            self.query_cfg[key] = value
 
     def alter_sub_cfg(self, key, value):
         if key == "specified_table_query":
@@ -272,7 +287,7 @@ class TDTaosdemoCfg:
         elif key == "super_table_query":
             self.sub_cfg["super_table_query"] = self.stable_sub
         else:
-            self.table_query[key] = value
+            self.sub_cfg[key] = value
 
     def alter_sub_stb(self, key, value):
         if key == "sqls":

From d8570135179a1c237997dbad40100106b9ec6111 Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Fri, 25 Jun 2021 17:05:37 +0800
Subject: [PATCH 12/71] fix double free issue

---
 src/client/src/tscSQLParser.c | 7 ++++++-
 src/client/src/tscUtil.c      | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index e94f77d254..b388c21599 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7786,7 +7786,8 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
   const char* msg5 = "only tag query not compatible with normal column filter";
   const char* msg6 = "not support stddev/percentile in outer query yet";
   const char* msg7 = "drivative requires timestamp column exists in subquery";
-
+  const char* msg8 = "condition missing for join query";
+  
   int32_t code = TSDB_CODE_SUCCESS;
 
   SSqlCmd* pCmd = &pSql->cmd;
@@ -7863,6 +7864,10 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       if (validateWhereNode(pQueryInfo, &pSqlNode->pWhere, pSql) != TSDB_CODE_SUCCESS) {
         return TSDB_CODE_TSC_INVALID_OPERATION;
       }
+    } else {
+      if (pQueryInfo->numOfTables > 1) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg8);
+      }
     }
 
     // validate the interval info
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 74dbe42eeb..83be33ffef 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -4077,7 +4077,10 @@ SVgroupsInfo* tscVgroupsInfoDup(SVgroupsInfo* pVgroupsInfo) {
 
   size_t size = sizeof(SVgroupInfo) * pVgroupsInfo->numOfVgroups + sizeof(SVgroupsInfo);
   SVgroupsInfo* pInfo = calloc(1, size);
-  memcpy(pInfo, pVgroupsInfo, size);
+  pInfo->numOfVgroups = pVgroupsInfo->numOfVgroups;
+  for (int32_t m = 0; m < pVgroupsInfo->numOfVgroups; ++m) {
+    tscSVgroupInfoCopy(&pInfo->vgroups[m], &pVgroupsInfo->vgroups[m]);
+  }
   return pInfo;
 }
 

From 0ecaba7e9ea4050d2ab813e35469164d6c0efb8a Mon Sep 17 00:00:00 2001
From: shenglian zhou <slzhou@taosdata.com>
Date: Mon, 21 Jun 2021 11:18:17 +0800
Subject: [PATCH 13/71] [TD-4756]<fix>: nanosecond precison on gcBuildQueryJson
 in http plugin

---
 src/plugins/http/src/httpGcJson.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/http/src/httpGcJson.c b/src/plugins/http/src/httpGcJson.c
index 397791706d..f33a994465 100644
--- a/src/plugins/http/src/httpGcJson.c
+++ b/src/plugins/http/src/httpGcJson.c
@@ -228,13 +228,11 @@ bool gcBuildQueryJson(HttpContext *pContext, HttpSqlCmd *cmd, TAOS_RES *result,
         case TSDB_DATA_TYPE_NCHAR:
           httpJsonStringForTransMean(jsonBuf, (char *)row[i], fields[i].bytes);
           break;
-        case TSDB_DATA_TYPE_TIMESTAMP:
-          if (precision == TSDB_TIME_PRECISION_MILLI) {  // ms
-            httpJsonInt64(jsonBuf, *((int64_t *)row[i]));
-          } else {
-            httpJsonInt64(jsonBuf, *((int64_t *)row[i]) / 1000);
-          }
+        case TSDB_DATA_TYPE_TIMESTAMP: {
+          int64_t ts = convertTimePrecision(*((int64_t *)row[i]), precision, TSDB_TIME_PRECISION_MILLI);
+          httpJsonInt64(jsonBuf, ts);
           break;
+        }
         default:
           httpJsonString(jsonBuf, "-", 1);
           break;

From 2361040efe22c4abeeb17f5f2ceef6e60e6c387b Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Fri, 25 Jun 2021 18:09:37 +0800
Subject: [PATCH 14/71] [TD-4793] <docs>: describe SQL function IRATE().

---
 documentation20/cn/12.taos-sql/docs.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index 5904abbbaa..5ab055bcda 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -854,7 +854,23 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
 
     应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
 
-    适用于：**表**。
+    适用于：**表、（超级表）**。
+
+    说明：从 2.1.3.0 版本开始，TWA 函数可以在由 GROUP BY 划分出单独时间线的情况下用于超级表（也即 GROUP BY tbname）。
+
+- **IRATE**
+    ```mysql
+    SELECT IRATE(field_name) FROM tb_name WHERE clause;
+    ```
+    功能说明：计算瞬时增长率。使用时间区间中最后两个样本数据来计算瞬时增长速率；如果这两个值呈递减关系，那么只取最后一个数用于计算，而不是使用二者差值。
+
+    返回结果数据类型：双精度浮点数Double。
+
+    应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
+
+    适用于：**表、（超级表）**。
+
+    说明：从 2.1.3.0 版本开始新增此函数。IRATE 可以在由 GROUP BY 划分出单独时间线的情况下用于超级表（也即 GROUP BY tbname）。
 
 - **SUM**
     ```mysql

From 41e1d2dd9689cd93fc1a65c88ef5f8d3f9d54953 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Fri, 25 Jun 2021 18:55:01 +0800
Subject: [PATCH 15/71] [TD-4555] <docs>: describe SQL function DERIVATIVE().

---
 documentation20/cn/12.taos-sql/docs.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index 5ab055bcda..844865f6db 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -870,7 +870,7 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
 
     适用于：**表、（超级表）**。
 
-    说明：从 2.1.3.0 版本开始新增此函数。IRATE 可以在由 GROUP BY 划分出单独时间线的情况下用于超级表（也即 GROUP BY tbname）。
+    说明：（从 2.1.3.0 版本开始新增此函数）IRATE 可以在由 GROUP BY 划分出单独时间线的情况下用于超级表（也即 GROUP BY tbname）。
 
 - **SUM**
     ```mysql
@@ -1219,13 +1219,14 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
     ```
 
 ### 计算函数
+
 - **DIFF**
     ```mysql
     SELECT DIFF(field_name) FROM tb_name [WHERE clause];
     ```
     功能说明：统计表中某列的值与前一行对应值的差。
 
-    返回结果数据类型： 同应用字段。
+    返回结果数据类型：同应用字段。
 
     应用字段：不能应用在timestamp、binary、nchar、bool类型字段。
 
@@ -1243,13 +1244,27 @@ TDengine支持针对数据的聚合查询。提供支持的聚合和选择函数
     Query OK, 2 row(s) in set (0.001162s)
     ```
 
+- **DERIVATIVE**
+    ```mysql
+    SELECT DERIVATIVE(field_name, time_interval, ignore_negative) FROM tb_name [WHERE clause];
+    ```
+    功能说明：统计表中某列数值的单位变化率。其中单位时间区间的长度可以通过 time_interval 参数指定，最小可以是 1 秒（1s）；ignore_negative 参数的值可以是 0 或 1，为 1 时表示忽略负值。
+
+    返回结果数据类型：双精度浮点数。
+
+    应用字段：不能应用在 timestamp、binary、nchar、bool 类型字段。
+
+    适用于：**表、（超级表）**。
+
+    说明：（从 2.1.3.0 版本开始新增此函数）输出结果行数是范围内总行数减一，第一行没有结果输出。DERIVATIVE 函数可以在由 GROUP BY 划分出单独时间线的情况下用于超级表（也即 GROUP BY tbname）。
+
 - **SPREAD**
     ```mysql
     SELECT SPREAD(field_name) FROM { tb_name | stb_name } [WHERE clause];
     ```
     功能说明：统计表/超级表中某列的最大值和最小值之差。
 
-    返回结果数据类型： 双精度浮点数。
+    返回结果数据类型：双精度浮点数。
 
     应用字段：不能应用在binary、nchar、bool类型字段。
 

From 11761d016d01159a0c5bb56c1b646bd9ffa996a9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 25 Jun 2021 23:10:10 +0800
Subject: [PATCH 16/71] [td-4894]<fix>:fix bug in group by normal columns.

---
 src/query/src/qExecutor.c               | 18 ++++-------
 tests/script/general/parser/groupby.sim | 40 +++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 0742d3eb81..e7f63a027d 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1282,11 +1282,8 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn
     return;
   }
 
-  int64_t* tsList = NULL;
   SColumnInfoData* pFirstColData = taosArrayGet(pSDataBlock->pDataBlock, 0);
-  if (pFirstColData->info.type == TSDB_DATA_TYPE_TIMESTAMP) {
-    tsList = (int64_t*) pFirstColData->pData;
-  }
+  int64_t* tsList = (pFirstColData->info.type == TSDB_DATA_TYPE_TIMESTAMP)? (int64_t*) pFirstColData->pData:NULL;
 
   STimeWindow w = TSWINDOW_INITIALIZER;
 
@@ -1319,12 +1316,10 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn
     }
 
     if (pQueryAttr->stableQuery && pQueryAttr->stabledev && (pRuntimeEnv->prevResult != NULL)) {
-      setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, pInfo->prevData,
-                                       bytes);
+      setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, pInfo->prevData, bytes);
     }
 
-    int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, pInfo->prevData, type, bytes,
-                                          item->groupIndex);
+    int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, pInfo->prevData, type, bytes, item->groupIndex);
     if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
       longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
     }
@@ -1340,17 +1335,16 @@ static void doHashGroupbyAgg(SOperatorInfo* pOperator, SGroupbyOperatorInfo *pIn
     memcpy(pInfo->prevData, val, bytes);
 
     if (pQueryAttr->stableQuery && pQueryAttr->stabledev && (pRuntimeEnv->prevResult != NULL)) {
-      setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, val,
-                                       bytes);
+      setParamForStableStddevByColData(pRuntimeEnv, pInfo->binfo.pCtx, pOperator->numOfOutput, pOperator->pExpr, val, bytes);
     }
 
-    int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, val, type, bytes,
-                                          item->groupIndex);
+    int32_t ret = setGroupResultOutputBuf(pRuntimeEnv, &(pInfo->binfo), pOperator->numOfOutput, val, type, bytes, item->groupIndex);
     if (ret != TSDB_CODE_SUCCESS) {  // null data, too many state code
       longjmp(pRuntimeEnv->env, TSDB_CODE_QRY_APP_ERROR);
     }
 
     doApplyFunctions(pRuntimeEnv, pInfo->binfo.pCtx, &w, pSDataBlock->info.rows - num, num, tsList, pSDataBlock->info.rows, pOperator->numOfOutput);
+    tfree(pInfo->prevData);
   }
 }
 
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 507431f536..6ae5d420d8 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -741,4 +741,44 @@ if $data14 != 2 then
   return -1
 endi
 
+sql create table m1 (ts timestamp, k int, f1 int) tags(a int);
+sql create table tm0 using m1 tags(0);
+sql create table tm1 using m1 tags(1);
+
+sql insert into tm0 values('2020-1-1 1:1:1', 1, 10);
+sql insert into tm0 values('2020-1-1 1:1:2', 1, 20);
+sql insert into tm1 values('2020-2-1 1:1:1', 2, 10);
+sql insert into tm1 values('2020-2-1 1:1:2', 2, 20);
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+sleep 100
+system sh/exec.sh -n dnode1 -s start
+sleep 100
+
+sql connect
+sleep 100
+sql use group_db0;
+
+print =========================>TD-4894
+sql select count(*),k from m1 group by k;
+if $rows != 2 then
+  return -1
+endi
+
+if $data00 != 2 then
+  return -1
+endi
+
+if $data01 != 1 then
+  return -1
+endi
+
+if $data10 != 2 then
+  return -1
+endi
+
+if $data11 != 2 then
+  return -1
+endi
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

From 782e498d1fac32243305ea646f45da8ba2935e8c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 25 Jun 2021 23:22:22 +0800
Subject: [PATCH 17/71] [td-225]fix compiler error.

---
 src/client/src/tscSQLParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 815442a038..805fd9dfe4 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -2613,7 +2613,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
       SColumnList ids = createColumnList(1, index.tableIndex, index.columnIndex);
 
       if (finalResult) {
-        insertResultField(pQueryInfo, colIndex, &ids, resultSize, resultType, pExpr->base.aliasName, pExpr);
+        insertResultField(pQueryInfo, colIndex, &ids, resultSize, (int8_t)resultType, pExpr->base.aliasName, pExpr);
       } else {
         assert(ids.num == 1);
         tscColumnListInsert(pQueryInfo->colList, ids.ids[0].columnIndex, pExpr->base.uid, pSchema);

From 9094bf8849d50721dc1996d2798ad938864b97ae Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 25 Jun 2021 23:42:15 +0800
Subject: [PATCH 18/71] [td-225]fix compiler error.

---
 src/client/src/tscSQLParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 805fd9dfe4..da02d63f1e 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7849,7 +7849,7 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
     SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, 0);
 
-    int32_t numOfExprs = tscNumOfExprs(pQueryInfo);
+    int32_t numOfExprs = (int32_t) tscNumOfExprs(pQueryInfo);
     if (numOfExprs == 1) {
       SExprInfo* pExpr = tscExprGet(pQueryInfo, 0);
       int32_t f = pExpr->base.functionId;

From 2f37ebf686889b600398987d628f84b375e3c4e7 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sat, 26 Jun 2021 09:08:59 +0800
Subject: [PATCH 19/71] [TD-4825]<feature> order by col after group-by

---
 src/client/src/tscSQLParser.c | 40 +++++++++++++++++----
 src/query/src/qExecutor.c     | 67 +++++++++++++++++++++++++++++++++--
 src/util/inc/tarray.h         | 13 +++++++
 src/util/src/tarray.c         | 52 ++++++++++++++++++++++++++-
 4 files changed, 163 insertions(+), 9 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index b2b188661d..76a56a79d0 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5110,7 +5110,7 @@ static void setDefaultOrderInfo(SQueryInfo* pQueryInfo) {
 int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSqlNode, SSchema* pSchema) {
   const char* msg0 = "only support order by primary timestamp";
   const char* msg1 = "invalid column name";
-  const char* msg2 = "order by primary timestamp or first tag in groupby clause allowed";
+  const char* msg2 = "order by primary timestamp, first tag or groupby column in groupby clause allowed";
   const char* msg3 = "invalid column in order by clause, only primary timestamp or first tag in groupby clause allowed";
 
   setDefaultOrderInfo(pQueryInfo);
@@ -5163,6 +5163,7 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
 
     bool orderByTags = false;
     bool orderByTS = false;
+    bool orderByGroupbyCol = false;
 
     if (index.columnIndex >= tscGetNumOfColumns(pTableMetaInfo->pTableMeta)) {
       int32_t relTagIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
@@ -5182,11 +5183,18 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
     if (PRIMARYKEY_TIMESTAMP_COL_INDEX == index.columnIndex) {
       orderByTS = true;
     }
-
-    if (!(orderByTags || orderByTS) && !isTopBottomQuery(pQueryInfo)) {
+    
+    SArray *columnInfo = pQueryInfo->groupbyExpr.columnInfo;
+    if (columnInfo != NULL && taosArrayGetSize(columnInfo) > 0) {
+      SColIndex* pColIndex = taosArrayGet(columnInfo, 0);
+      if (pColIndex->colIndex == index.columnIndex) {
+        orderByGroupbyCol = true; 
+      }
+    } 
+    if (!(orderByTags || orderByTS || orderByGroupbyCol) && !isTopBottomQuery(pQueryInfo)) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
     } else {  // order by top/bottom result value column is not supported in case of interval query.
-      assert(!(orderByTags && orderByTS));
+      assert(!(orderByTags && orderByTS && orderByGroupbyCol));
     }
 
     size_t s = taosArrayGetSize(pSortorder);
@@ -5196,6 +5204,11 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
 
         tVariantListItem* p1 = taosArrayGet(pSqlNode->pSortOrder, 0);
         pQueryInfo->groupbyExpr.orderType = p1->sortOrder;
+      } else if (orderByGroupbyCol) {
+        tVariantListItem* p1 = taosArrayGet(pSqlNode->pSortOrder, 0);
+
+        pQueryInfo->groupbyExpr.orderType = p1->sortOrder;
+        pQueryInfo->order.orderColId = pSchema[index.columnIndex].colId;
       } else if (isTopBottomQuery(pQueryInfo)) {
         /* order of top/bottom query in interval is not valid  */
         SExprInfo* pExpr = tscExprGet(pQueryInfo, 0);
@@ -5228,6 +5241,9 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
       if (orderByTags) {
         pQueryInfo->groupbyExpr.orderIndex = index.columnIndex - tscGetNumOfColumns(pTableMetaInfo->pTableMeta);
         pQueryInfo->groupbyExpr.orderType = pItem->sortOrder;
+      } else if (orderByGroupbyCol){
+        pQueryInfo->order.order = pItem->sortOrder;
+        pQueryInfo->order.orderColId = index.columnIndex;
       } else {
         pQueryInfo->order.order = pItem->sortOrder;
         pQueryInfo->order.orderColId = PRIMARYKEY_TIMESTAMP_COL_INDEX;
@@ -5253,9 +5269,20 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
     if (getColumnIndexByName(pCmd, &columnName, pQueryInfo, &index) != TSDB_CODE_SUCCESS) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
-
     if (index.columnIndex != PRIMARYKEY_TIMESTAMP_COL_INDEX && !isTopBottomQuery(pQueryInfo)) {
-      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      bool validOrder = false;
+      SArray *columnInfo = pQueryInfo->groupbyExpr.columnInfo;
+      if (columnInfo != NULL && taosArrayGetSize(columnInfo) > 0) {
+        SColIndex* pColIndex = taosArrayGet(columnInfo, 0);
+        validOrder = (pColIndex->colIndex == index.columnIndex); 
+      }  
+      if (!validOrder) {
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
+      }     
+      tVariantListItem* p1 = taosArrayGet(pSqlNode->pSortOrder, 0);
+      pQueryInfo->groupbyExpr.orderIndex = pSchema[index.columnIndex].colId; 
+      pQueryInfo->groupbyExpr.orderType = p1->sortOrder; 
+      
     }
 
     if (isTopBottomQuery(pQueryInfo)) {
@@ -5276,6 +5303,7 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
 
     tVariantListItem* pItem = taosArrayGet(pSqlNode->pSortOrder, 0);
     pQueryInfo->order.order = pItem->sortOrder;
+    pQueryInfo->order.orderColId = pSchema[index.columnIndex].colId;
   }
 
   return TSDB_CODE_SUCCESS;
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 69b17504d3..c0fe7b128a 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -16,6 +16,7 @@
 #include "qFill.h"
 #include "taosmsg.h"
 #include "tglobal.h"
+#include "talgo.h"
 
 #include "exception.h"
 #include "hash.h"
@@ -26,6 +27,7 @@
 #include "queryLog.h"
 #include "tlosertree.h"
 #include "ttype.h"
+#include "tcompare.h"
 #include "tscompression.h"
 
 #define IS_MASTER_SCAN(runtime)        ((runtime)->scanFlag == MASTER_SCAN)
@@ -207,7 +209,65 @@ static void doSetTableGroupOutputBuf(SQueryRuntimeEnv* pRuntimeEnv, SResultRowIn
                                      SQLFunctionCtx* pCtx, int32_t* rowCellInfoOffset, int32_t numOfOutput,
                                      int32_t groupIndex);
 
-// setup the output buffer for each operator
+SArray* getOrderCheckColumns(SQueryAttr* pQuery);
+
+
+typedef struct SRowCompSupporter {
+  SQueryRuntimeEnv *pRuntimeEnv; 
+  int16_t           dataOffset;
+  __compar_fn_t     comFunc; 
+} SRowCompSupporter;
+
+static int compareRowData(const void *a, const void *b, const void *userData) {
+  const SResultRow *pRow1 = (const SResultRow *)a; 
+  const SResultRow *pRow2 = (const SResultRow *)b;
+
+  SRowCompSupporter *supporter  = (SRowCompSupporter *)userData; 
+  SQueryRuntimeEnv* pRuntimeEnv =  supporter->pRuntimeEnv;   
+  
+  tFilePage *page1 = getResBufPage(pRuntimeEnv->pResultBuf, pRow1->pageId);
+  tFilePage *page2 = getResBufPage(pRuntimeEnv->pResultBuf, pRow2->pageId);
+
+  int16_t offset = supporter->dataOffset; 
+  char *in1  = getPosInResultPage(pRuntimeEnv->pQueryAttr, page1, pRow1->offset, offset);
+  char *in2  = getPosInResultPage(pRuntimeEnv->pQueryAttr, page2, pRow2->offset, offset);   
+
+  return (in1 != NULL && in2 != NULL) ? supporter->comFunc(in1, in2) : 0;
+}
+
+static void sortGroupResByOrderList(SGroupResInfo *pGroupResInfo, SQueryRuntimeEnv *pRuntimeEnv, SSDataBlock* pDataBlock) {
+  SArray *columnOrderList = getOrderCheckColumns(pRuntimeEnv->pQueryAttr);
+  if (taosArrayGetSize(columnOrderList) <= 0) {
+    return;
+  }
+  int32_t orderId = pRuntimeEnv->pQueryAttr->order.orderColId;
+  if (orderId <= 0) {
+    return;
+  } 
+  bool found = false;
+  int16_t dataOffset = 0;
+   
+  //SColIndex *index = taosArrayGet(columnOrderList, 0);
+  for (int32_t j = 0; j < pDataBlock->info.numOfCols; ++j) {
+    SColumnInfoData* pColInfoData = (SColumnInfoData *)taosArrayGet(pDataBlock->pDataBlock, j);
+    if (orderId == j) {
+      found = true;
+      break;
+    }
+    dataOffset += pColInfoData->info.bytes;
+  }  
+
+  if (found == false) {
+    return;
+  }
+  int16_t type = pRuntimeEnv->pQueryAttr->pExpr1[orderId].base.resType;
+   
+  SRowCompSupporter support = {.pRuntimeEnv = pRuntimeEnv, .dataOffset = dataOffset, .comFunc = getComparFunc(type, 0)};  
+   
+  return taosArraySortPWithExt(pGroupResInfo->pRows, compareRowData, &support);
+  
+}
+//setup the output buffer for each operator
 SSDataBlock* createOutputBuf(SExprInfo* pExpr, int32_t numOfOutput, int32_t numOfRows) {
   const static int32_t minSize = 8;
 
@@ -5416,8 +5476,11 @@ static SSDataBlock* hashGroupbyAggregate(void* param, bool* newgroup) {
   }
 
   initGroupResInfo(&pRuntimeEnv->groupResInfo, &pInfo->binfo.resultRowInfo);
+  if (!pRuntimeEnv->pQueryAttr->stableQuery) {
+    sortGroupResByOrderList(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pInfo->binfo.pRes);
+  }
   toSSDataBlock(&pRuntimeEnv->groupResInfo, pRuntimeEnv, pInfo->binfo.pRes);
-
+  
   if (pInfo->binfo.pRes->info.rows == 0 || !hasRemainDataInCurrentGroup(&pRuntimeEnv->groupResInfo)) {
     pOperator->status = OP_EXEC_DONE;
   }
diff --git a/src/util/inc/tarray.h b/src/util/inc/tarray.h
index fc7b6b8584..63cadf39a3 100644
--- a/src/util/inc/tarray.h
+++ b/src/util/inc/tarray.h
@@ -197,8 +197,21 @@ void* taosArraySearch(const SArray* pArray, const void* key, __compar_fn_t compa
  */
 char* taosArraySearchString(const SArray* pArray, const char* key, __compar_fn_t comparFn, int flags);
 
+
+/**
+ * sort the pointer data in the array
+ * @param pArray
+ * @param compar 
+ * @param param  
+ * @return
+ */
+
+void taosArraySortPWithExt(SArray* pArray, __ext_compar_fn_t fn, const void *param);
+
 #ifdef __cplusplus
 }
 #endif
 
+
+
 #endif  // TDENGINE_TAOSARRAY_H
diff --git a/src/util/src/tarray.c b/src/util/src/tarray.c
index 5e7d9d14da..a59e36d29f 100644
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
@@ -15,6 +15,7 @@
 
 #include "os.h"
 #include "tarray.h"
+#include "talgo.h"
 
 void* taosArrayInit(size_t size, size_t elemSize) {
   assert(elemSize > 0);
@@ -249,4 +250,53 @@ char* taosArraySearchString(const SArray* pArray, const char* key, __compar_fn_t
     return NULL;
   }
   return *(char**)p;
-}
\ No newline at end of file
+}
+
+static int taosArrayPartition(SArray *pArray, int i, int j, __ext_compar_fn_t fn, const void *userData) {
+  void* key = taosArrayGetP(pArray, i);  
+  while (i < j) {
+    while (i < j && fn(taosArrayGetP(pArray, j), key, userData) >= 0) { j--; }
+    if (i < j) { 
+      void *a = taosArrayGetP(pArray, j); 
+      taosArraySet(pArray, i, &a);
+    }
+    while (i < j && fn(taosArrayGetP(pArray, i), key, userData) <= 0) { i++;} 
+    if (i < j) {
+      void *a = taosArrayGetP(pArray, i);
+      taosArraySet(pArray, j, &a);
+    }
+  }
+  taosArraySet(pArray, i, &key); 
+  return i;
+}
+
+static void taosArrayQuicksortHelper(SArray *pArray, int low, int high, __ext_compar_fn_t fn, const void *param) {
+  if (low < high) {
+    int idx = taosArrayPartition(pArray, low, high, fn, param);
+    taosArrayQuicksortHelper(pArray, low, idx - 1, fn, param);
+    taosArrayQuicksortHelper(pArray, idx + 1, high, fn, param);
+  } 
+}
+
+static void taosArrayQuickSort(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
+  return taosArrayQuicksortHelper(pArray, 0, taosArrayGetSize(pArray) - 1,  fn, param); 
+}
+static void taosArrayInsertSort(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
+  for (int i = 1; i <= pArray->size - 1; ++i) {
+    for (int j = i; j > 0; --j) {
+      if (fn(taosArrayGetP(pArray, j), taosArrayGetP(pArray, j - 1), param) == -1) {
+        void *a = taosArrayGetP(pArray, j);  
+        void *b = taosArrayGetP(pArray, j - 1);
+        taosArraySet(pArray, j - 1, &a);
+        taosArraySet(pArray, j, &b);
+      } else {
+        break;
+      }
+    }
+  }
+   
+} 
+void taosArraySortPWithExt(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
+  return taosArrayGetSize(pArray) > 8 ? 
+    taosArrayQuickSort(pArray, fn, param) : taosArrayInsertSort(pArray, fn, param);
+}

From e6273a38dbd9a1dc1971cf3644488a213891fe01 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sat, 26 Jun 2021 13:43:48 +0800
Subject: [PATCH 20/71] [TD-4915]<fix> fix show create database except

---
 src/client/src/tscLocal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index 2c9717306f..668a9e9406 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -485,6 +485,7 @@ static int32_t tscGetDBInfo(SCreateBuilder *builder, char *result) {
 
   char buf[TSDB_DB_NAME_LEN + 64] = {0}; 
   do {
+    memset(buf, 0, sizeof(buf));
     int32_t* lengths = taos_fetch_lengths(pSql);  
     int32_t ret = tscGetNthFieldResult(row, fields, lengths, 0, buf);
     if (0 == ret && STR_NOCASE_EQUAL(buf, strlen(buf), builder->buf, strlen(builder->buf))) {

From 14d9473b5a56200e43a4c86c8349b6a7bb3cb115 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Sat, 26 Jun 2021 15:43:08 +0800
Subject: [PATCH 21/71] [td-225]fix the bug found by regression test.

---
 src/client/src/tscSQLParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index da02d63f1e..cf72b7abd9 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -2104,7 +2104,7 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SS
   // if it is not in the final result, do not add it
   SColumnList ids = createColumnList(1, pColIndex->tableIndex, pColIndex->columnIndex);
   if (finalResult) {
-    insertResultField(pQueryInfo, resColIdx, &ids, pSchema->bytes, (int8_t)pSchema->type, pExpr->base.aliasName, pExpr);
+    insertResultField(pQueryInfo, resColIdx, &ids, resBytes, (int8_t)resType, pExpr->base.aliasName, pExpr);
   } else {
     tscColumnListInsert(pQueryInfo->colList, ids.ids[0].columnIndex, pExpr->base.uid, pSchema);
   }

From a2c1754168c35840a2c31c765c674d5465f1a9e7 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 26 Jun 2021 22:34:30 +0800
Subject: [PATCH 22/71] Hotfix/sangshuduo/td 4892 taosdemo sub fetch (#6634)

* [TD-4892]<fix>: taosdemo subscribe fetch result.

* fix stbname length.

* restrict prefix length.

* submit empty

* fix minor code.

* fix crash if no result file.
---
 src/kit/taosdemo/taosdemo.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index abf3c74436..b5781c6070 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -1204,23 +1204,24 @@ static void fetchResult(TAOS_RES *res, threadInfo* pThreadInfo) {
     return ;
   }
 
-  int   totalLen = 0;
-  char  temp[16000];
+  int64_t   totalLen = 0;
 
   // fetch the records row by row
   while((row = taos_fetch_row(res))) {
-    if ((strlen(pThreadInfo->filePath) > 0)
-            && (totalLen >= 100*1024*1024 - 32000)) {
-        appendResultBufToFile(databuf, pThreadInfo);
+    if (totalLen >= 100*1024*1024 - 32000) {
+        if (strlen(pThreadInfo->filePath) > 0)
+            appendResultBufToFile(databuf, pThreadInfo);
         totalLen = 0;
         memset(databuf, 0, 100*1024*1024);
     }
     num_rows++;
+    char  temp[16000] = {0};
     int len = taos_print_row(temp, row, fields, num_fields);
     len += sprintf(temp + len, "\n");
     //printf("query result:%s\n", temp);
     memcpy(databuf + totalLen, temp, len);
     totalLen += len;
+    debugPrint("totalLen: %"PRId64"\n", totalLen);
   }
 
   verbosePrint("%s() LN%d, databuf=%s resultFile=%s\n",

From 09ae4a83f0209c4809fbbf56fd96044d40c655ec Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sat, 26 Jun 2021 22:34:50 +0800
Subject: [PATCH 23/71] Hotfix/sangshuduo/td 4892 taosdemo sub fetch for
 develop (#6635)

* fix crash if no result file.

* make taosdemo same as master branch.
---
 src/kit/taosdemo/taosdemo.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 0eac1518a7..b2ac11b2ca 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -1204,23 +1204,24 @@ static void fetchResult(TAOS_RES *res, threadInfo* pThreadInfo) {
     return ;
   }
 
-  int   totalLen = 0;
+  int64_t   totalLen = 0;
 
   // fetch the records row by row
   while((row = taos_fetch_row(res))) {
-    if ((strlen(pThreadInfo->filePath) > 0)
-            && (totalLen >= 100*1024*1024 - 32000)) {
-        appendResultBufToFile(databuf, pThreadInfo);
+    if (totalLen >= 100*1024*1024 - 32000) {
+        if (strlen(pThreadInfo->filePath) > 0)
+            appendResultBufToFile(databuf, pThreadInfo);
         totalLen = 0;
         memset(databuf, 0, 100*1024*1024);
     }
     num_rows++;
-    char temp[16000] = {0};
+    char  temp[16000] = {0};
     int len = taos_print_row(temp, row, fields, num_fields);
     len += sprintf(temp + len, "\n");
     //printf("query result:%s\n", temp);
     memcpy(databuf + totalLen, temp, len);
     totalLen += len;
+    debugPrint("totalLen: %"PRId64"\n", totalLen);
   }
 
   verbosePrint("%s() LN%d, databuf=%s resultFile=%s\n",

From 7145bc5fc2bdb31bc6ab628263829afa3473aebd Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sun, 27 Jun 2021 03:53:30 +0800
Subject: [PATCH 24/71] [TD-4825]<feature> order by col after group-by

---
 src/util/src/tarray.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/util/src/tarray.c b/src/util/src/tarray.c
index a59e36d29f..15fda4ab51 100644
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
@@ -279,9 +279,15 @@ static void taosArrayQuicksortHelper(SArray *pArray, int low, int high, __ext_co
 }
 
 static void taosArrayQuickSort(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
-  return taosArrayQuicksortHelper(pArray, 0, taosArrayGetSize(pArray) - 1,  fn, param); 
+  if (pArray->size <= 0) {
+    return;
+  } 
+  taosArrayQuicksortHelper(pArray, 0, taosArrayGetSize(pArray) - 1,  fn, param); 
 }
 static void taosArrayInsertSort(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
+  if (pArray->size <= 0) {
+    return;
+  } 
   for (int i = 1; i <= pArray->size - 1; ++i) {
     for (int j = i; j > 0; --j) {
       if (fn(taosArrayGetP(pArray, j), taosArrayGetP(pArray, j - 1), param) == -1) {
@@ -294,9 +300,12 @@ static void taosArrayInsertSort(SArray* pArray, __ext_compar_fn_t fn, const void
       }
     }
   }
+  return;
    
 } 
+// order array<void *type>  
 void taosArraySortPWithExt(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
-  return taosArrayGetSize(pArray) > 8 ? 
+  taosArrayGetSize(pArray) > 8 ? 
     taosArrayQuickSort(pArray, fn, param) : taosArrayInsertSort(pArray, fn, param);
 }
+//TODO(yihaoDeng) order array<type> 

From a2edc05ba0ee80762dadbd00736c840f28f15829 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sun, 27 Jun 2021 04:46:51 +0800
Subject: [PATCH 25/71] [TD-4825]<feature> order by col after group-by

---
 src/util/src/tarray.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/util/src/tarray.c b/src/util/src/tarray.c
index 15fda4ab51..fe529edaac 100644
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
@@ -279,13 +279,13 @@ static void taosArrayQuicksortHelper(SArray *pArray, int low, int high, __ext_co
 }
 
 static void taosArrayQuickSort(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
-  if (pArray->size <= 0) {
+  if (pArray->size <= 1) {
     return;
   } 
-  taosArrayQuicksortHelper(pArray, 0, taosArrayGetSize(pArray) - 1,  fn, param); 
+  taosArrayQuicksortHelper(pArray, 0, (int)(taosArrayGetSize(pArray) - 1),  fn, param); 
 }
 static void taosArrayInsertSort(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
-  if (pArray->size <= 0) {
+  if (pArray->size <= 1) {
     return;
   } 
   for (int i = 1; i <= pArray->size - 1; ++i) {
@@ -303,9 +303,9 @@ static void taosArrayInsertSort(SArray* pArray, __ext_compar_fn_t fn, const void
   return;
    
 } 
-// order array<void *type>  
+// order array<type *>  
 void taosArraySortPWithExt(SArray* pArray, __ext_compar_fn_t fn, const void *param) {
   taosArrayGetSize(pArray) > 8 ? 
     taosArrayQuickSort(pArray, fn, param) : taosArrayInsertSort(pArray, fn, param);
 }
-//TODO(yihaoDeng) order array<type> 
+//TODO(yihaoDeng) add order array<type> 

From b2975b7c4d4dac617f270c3940e86c6f24af8e6e Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Sun, 27 Jun 2021 05:04:33 +0800
Subject: [PATCH 26/71] [TD-4825]<feature> order by col after group-by

---
 src/query/src/qExecutor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index c0fe7b128a..aa5ce4fa57 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -264,7 +264,8 @@ static void sortGroupResByOrderList(SGroupResInfo *pGroupResInfo, SQueryRuntimeE
    
   SRowCompSupporter support = {.pRuntimeEnv = pRuntimeEnv, .dataOffset = dataOffset, .comFunc = getComparFunc(type, 0)};  
    
-  return taosArraySortPWithExt(pGroupResInfo->pRows, compareRowData, &support);
+  taosArraySortPWithExt(pGroupResInfo->pRows, compareRowData, &support);
+  return;
   
 }
 //setup the output buffer for each operator

From ae972e2fb44e63bf56a08441dd2db9eac3cc5169 Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Sun, 27 Jun 2021 09:12:14 +0800
Subject: [PATCH 27/71] [TD-4926]<fix>:fix core during operator time usage
 calculate

---
 src/query/src/qExecutor.c | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 1cd50df46b..336925c797 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3792,7 +3792,9 @@ void publishOperatorProfEvent(SOperatorInfo* operatorInfo, EQueryProfEventType e
   event.operatorType = operatorInfo->operatorType;
 
   SQInfo* qInfo = operatorInfo->pRuntimeEnv->qinfo;
-  taosArrayPush(qInfo->summary.queryProfEvents, &event);
+  if (qInfo->summary.queryProfEvents) {
+    taosArrayPush(qInfo->summary.queryProfEvents, &event);
+  }
 }
 
 void publishQueryAbortEvent(SQInfo* pQInfo, int32_t code) {
@@ -3801,7 +3803,9 @@ void publishQueryAbortEvent(SQInfo* pQInfo, int32_t code) {
   event.eventTime = taosGetTimestampUs();
   event.abortCode = code;
 
-  taosArrayPush(pQInfo->summary.queryProfEvents, &event);
+  if (pQInfo->summary.queryProfEvents) {
+    taosArrayPush(pQInfo->summary.queryProfEvents, &event);
+  }
 }
 
 typedef struct  {
@@ -3837,10 +3841,21 @@ static void doOperatorExecProfOnce(SOperatorStackItem* item, SQueryProfEvent* ev
 }
 
 void calculateOperatorProfResults(SQInfo* pQInfo) {
+  if (pQInfo->summary.queryProfEvents == NULL) {
+    qDebug("query prof events array is null");
+    return;
+  }
+
+  if (pQInfo->summary.operatorProfResults == NULL) {
+    qDebug("operator prof results hash is null");
+    return;
+  }
+  
   SArray* opStack = taosArrayInit(32, sizeof(SOperatorStackItem));
   if (opStack == NULL) {
     return;
   }
+
   size_t size = taosArrayGetSize(pQInfo->summary.queryProfEvents);
   SHashObj* profResults = pQInfo->summary.operatorProfResults;
 
@@ -3897,11 +3912,13 @@ void queryCostStatis(SQInfo *pQInfo) {
   qDebug("QInfo:0x%"PRIx64" :cost summary: winResPool size:%.2f Kb, numOfWin:%"PRId64", tableInfoSize:%.2f Kb, hashTable:%.2f Kb", pQInfo->qId, pSummary->winInfoSize/1024.0,
       pSummary->numOfTimeWindows, pSummary->tableInfoSize/1024.0, pSummary->hashSize/1024.0);
 
-  SOperatorProfResult* opRes = taosHashIterate(pSummary->operatorProfResults, NULL);
-  while (opRes != NULL) {
-    qDebug("QInfo:0x%"PRIx64" :cost summary: operator : %d, exec times: %"PRId64", self time: %"PRId64, pQInfo->qId,
-           opRes->operatorType, opRes->sumRunTimes, opRes->sumSelfTime );
-    opRes = taosHashIterate(pSummary->operatorProfResults, opRes);
+  if (pSummary->operatorProfResults) {
+    SOperatorProfResult* opRes = taosHashIterate(pSummary->operatorProfResults, NULL);
+    while (opRes != NULL) {
+      qDebug("QInfo:0x%" PRIx64 " :cost summary: operator : %d, exec times: %" PRId64 ", self time: %" PRId64,
+             pQInfo->qId, opRes->operatorType, opRes->sumRunTimes, opRes->sumSelfTime);
+      opRes = taosHashIterate(pSummary->operatorProfResults, opRes);
+    }
   }
 }
 
@@ -4305,8 +4322,14 @@ int32_t doInitQInfo(SQInfo* pQInfo, STSBuf* pTsBuf, void* tsdb, void* sourceOptr
   int32_t numOfTables = (int32_t)pQueryAttr->tableGroupInfo.numOfTables;
   pQInfo->summary.tableInfoSize += (numOfTables * sizeof(STableQueryInfo));
   pQInfo->summary.queryProfEvents = taosArrayInit(512, sizeof(SQueryProfEvent));
+  if (pQInfo->summary.queryProfEvents == NULL) {
+    qDebug("failed to allocate query prof events array");
+  }
   pQInfo->summary.operatorProfResults =
       taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_TINYINT), true, HASH_NO_LOCK);
+  if (pQInfo->summary.operatorProfResults == NULL) {
+    qDebug("failed to allocate operator prof results hash");
+  }
 
   code = setupQueryRuntimeEnv(pRuntimeEnv, (int32_t) pQueryAttr->tableGroupInfo.numOfTables, pOperator, param);
   if (code != TSDB_CODE_SUCCESS) {

From 3451e7fba9a7a4652232303cd38988cbbf4dfb0c Mon Sep 17 00:00:00 2001
From: shenglian zhou <shenglian_zhou@163.com>
Date: Sun, 27 Jun 2021 14:16:22 +0800
Subject: [PATCH 28/71] [TD-4926]<fix>:follow log format convention

---
 src/query/src/qExecutor.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 336925c797..4aca4d3534 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3842,12 +3842,12 @@ static void doOperatorExecProfOnce(SOperatorStackItem* item, SQueryProfEvent* ev
 
 void calculateOperatorProfResults(SQInfo* pQInfo) {
   if (pQInfo->summary.queryProfEvents == NULL) {
-    qDebug("query prof events array is null");
+    qDebug("QInfo:0x%"PRIx64" query prof events array is null", pQInfo->qId);
     return;
   }
 
   if (pQInfo->summary.operatorProfResults == NULL) {
-    qDebug("operator prof results hash is null");
+    qDebug("QInfo:0x%"PRIx64" operator prof results hash is null", pQInfo->qId);
     return;
   }
   
@@ -4323,12 +4323,12 @@ int32_t doInitQInfo(SQInfo* pQInfo, STSBuf* pTsBuf, void* tsdb, void* sourceOptr
   pQInfo->summary.tableInfoSize += (numOfTables * sizeof(STableQueryInfo));
   pQInfo->summary.queryProfEvents = taosArrayInit(512, sizeof(SQueryProfEvent));
   if (pQInfo->summary.queryProfEvents == NULL) {
-    qDebug("failed to allocate query prof events array");
+    qDebug("QInfo:0x%"PRIx64" failed to allocate query prof events array", pQInfo->qId);
   }
   pQInfo->summary.operatorProfResults =
       taosHashInit(8, taosGetDefaultHashFunction(TSDB_DATA_TYPE_TINYINT), true, HASH_NO_LOCK);
   if (pQInfo->summary.operatorProfResults == NULL) {
-    qDebug("failed to allocate operator prof results hash");
+    qDebug("QInfo:0x%"PRIx64" failed to allocate operator prof results hash", pQInfo->qId);
   }
 
   code = setupQueryRuntimeEnv(pRuntimeEnv, (int32_t) pQueryAttr->tableGroupInfo.numOfTables, pOperator, param);

From 9a06248432a70b29ce76b4d77331e1056ba21726 Mon Sep 17 00:00:00 2001
From: Jun Li <jun.li@convoy.com>
Date: Sun, 27 Jun 2021 06:13:33 -0700
Subject: [PATCH 29/71] Rename file and add some comment/changes (#6587)

1. rename semphone to semaphore
2. add comment for tsched.h
3. change the function signature for taosSchedulerTask, changing from
return int to void. We currently don't check any return code of the function.
4. add some error handlings. For fatal error, just exit the process because
the program may run into a random state.
---
 src/os/inc/os.h                               |  2 +-
 src/os/inc/{osSemphone.h => osSemaphore.h}    |  4 +-
 .../darwin/{dwSemphone.c => dwSemaphore.c}    |  0
 .../detail/{osSemphone.c => osSemaphore.c}    |  0
 .../src/windows/{wSemphone.c => wSemaphore.c} |  0
 src/util/inc/tsched.h                         | 39 +++++++++--
 src/util/src/tsched.c                         | 67 ++++++++++++-------
 7 files changed, 79 insertions(+), 33 deletions(-)
 rename src/os/inc/{osSemphone.h => osSemaphore.h} (97%)
 rename src/os/src/darwin/{dwSemphone.c => dwSemaphore.c} (100%)
 rename src/os/src/detail/{osSemphone.c => osSemaphore.c} (100%)
 rename src/os/src/windows/{wSemphone.c => wSemaphore.c} (100%)

diff --git a/src/os/inc/os.h b/src/os/inc/os.h
index 6731ca6d7d..903e80d5c7 100644
--- a/src/os/inc/os.h
+++ b/src/os/inc/os.h
@@ -29,7 +29,7 @@ extern "C" {
 #include "osMath.h"
 #include "osMemory.h"
 #include "osRand.h"
-#include "osSemphone.h"
+#include "osSemaphore.h"
 #include "osSignal.h"
 #include "osSleep.h"
 #include "osSocket.h"
diff --git a/src/os/inc/osSemphone.h b/src/os/inc/osSemaphore.h
similarity index 97%
rename from src/os/inc/osSemphone.h
rename to src/os/inc/osSemaphore.h
index fe59095205..10d14700e0 100644
--- a/src/os/inc/osSemphone.h
+++ b/src/os/inc/osSemaphore.h
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TDENGINE_OS_SEMPHONE_H
-#define TDENGINE_OS_SEMPHONE_H
+#ifndef TDENGINE_OS_SEMAPHORE_H
+#define TDENGINE_OS_SEMAPHORE_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/os/src/darwin/dwSemphone.c b/src/os/src/darwin/dwSemaphore.c
similarity index 100%
rename from src/os/src/darwin/dwSemphone.c
rename to src/os/src/darwin/dwSemaphore.c
diff --git a/src/os/src/detail/osSemphone.c b/src/os/src/detail/osSemaphore.c
similarity index 100%
rename from src/os/src/detail/osSemphone.c
rename to src/os/src/detail/osSemaphore.c
diff --git a/src/os/src/windows/wSemphone.c b/src/os/src/windows/wSemaphore.c
similarity index 100%
rename from src/os/src/windows/wSemphone.c
rename to src/os/src/windows/wSemaphore.c
diff --git a/src/util/inc/tsched.h b/src/util/inc/tsched.h
index 3e481cbc32..a1591512c1 100644
--- a/src/util/inc/tsched.h
+++ b/src/util/inc/tsched.h
@@ -28,10 +28,41 @@ typedef struct SSchedMsg {
   void *thandle;
 } SSchedMsg;
 
-void *taosInitScheduler(int queueSize, int numOfThreads, const char *label);
-void *taosInitSchedulerWithInfo(int queueSize, int numOfThreads, const char *label, void *tmrCtrl);
-int  taosScheduleTask(void *qhandle, SSchedMsg *pMsg);
-void taosCleanUpScheduler(void *param);
+/**
+ * Create a thread-safe ring-buffer based task queue and return the instance. A thread
+ * pool will be created to consume the messages in the queue.
+ * @param capacity the queue capacity
+ * @param numOfThreads the number of threads for the thread pool
+ * @param label the label of the queue
+ * @return the created queue scheduler
+ */
+void *taosInitScheduler(int capacity, int numOfThreads, const char *label);
+
+/**
+ * Create a thread-safe ring-buffer based task queue and return the instance.
+ * Same as taosInitScheduler, and it also print the queue status every 1 minite.
+ * @param capacity the queue capacity
+ * @param numOfThreads the number of threads for the thread pool
+ * @param label the label of the queue
+ * @param tmrCtrl the timer controller, tmr_ctrl_t*
+ * @return the created queue scheduler
+ */
+void *taosInitSchedulerWithInfo(int capacity, int numOfThreads, const char *label, void *tmrCtrl);
+
+/**
+ * Clean up the queue scheduler instance and free the memory.
+ * @param queueScheduler the queue scheduler to free
+ */
+void taosCleanUpScheduler(void *queueScheduler);
+
+/**
+ * Schedule a new task to run, the task is described by pMsg.
+ * The function may be blocked if no thread is available to execute the task.
+ * That may happen when all threads are busy.
+ * @param queueScheduler the queue scheduler instance
+ * @param pMsg the message for the task
+ */
+void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg);
 
 #ifdef __cplusplus
 }
diff --git a/src/util/src/tsched.c b/src/util/src/tsched.c
index f014dd0fab..16142470c9 100644
--- a/src/util/src/tsched.c
+++ b/src/util/src/tsched.c
@@ -108,39 +108,47 @@ void *taosInitScheduler(int queueSize, int numOfThreads, const char *label) {
 
 void *taosInitSchedulerWithInfo(int queueSize, int numOfThreads, const char *label, void *tmrCtrl) {
   SSchedQueue* pSched = taosInitScheduler(queueSize, numOfThreads, label);
-  
+
   if (tmrCtrl != NULL && pSched != NULL) {
     pSched->pTmrCtrl = tmrCtrl;
     taosTmrReset(taosDumpSchedulerStatus, DUMP_SCHEDULER_TIME_WINDOW, pSched, pSched->pTmrCtrl, &pSched->pTimer);
   }
-  
+
   return pSched;
 }
 
-void *taosProcessSchedQueue(void *param) {
+void *taosProcessSchedQueue(void *scheduler) {
   SSchedMsg    msg;
-  SSchedQueue *pSched = (SSchedQueue *)param;
+  SSchedQueue *pSched = (SSchedQueue *)scheduler;
+  int ret = 0;
 
   while (1) {
-    if (tsem_wait(&pSched->fullSem) != 0) {
-      uError("wait %s fullSem failed(%s)", pSched->label, strerror(errno));
+    if ((ret = tsem_wait(&pSched->fullSem)) != 0) {
+      uFatal("wait %s fullSem failed(%s)", pSched->label, strerror(errno));
+      exit(ret);
     }
     if (pSched->stop) {
       break;
     }
 
-    if (pthread_mutex_lock(&pSched->queueMutex) != 0)
-      uError("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+    if ((ret = pthread_mutex_lock(&pSched->queueMutex)) != 0) {
+      uFatal("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+      exit(ret);
+    }
 
     msg = pSched->queue[pSched->fullSlot];
     memset(pSched->queue + pSched->fullSlot, 0, sizeof(SSchedMsg));
     pSched->fullSlot = (pSched->fullSlot + 1) % pSched->queueSize;
 
-    if (pthread_mutex_unlock(&pSched->queueMutex) != 0)
-      uError("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+    if ((ret = pthread_mutex_unlock(&pSched->queueMutex)) != 0) {
+      uFatal("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+      exit(ret);
+    }
 
-    if (tsem_post(&pSched->emptySem) != 0)
-      uError("post %s emptySem failed(%s)", pSched->label, strerror(errno));
+    if ((ret = tsem_post(&pSched->emptySem)) != 0) {
+      uFatal("post %s emptySem failed(%s)", pSched->label, strerror(errno));
+      exit(ret);
+    }
 
     if (msg.fp)
       (*(msg.fp))(&msg);
@@ -151,30 +159,37 @@ void *taosProcessSchedQueue(void *param) {
   return NULL;
 }
 
-int taosScheduleTask(void *qhandle, SSchedMsg *pMsg) {
-  SSchedQueue *pSched = (SSchedQueue *)qhandle;
+void taosScheduleTask(void *queueScheduler, SSchedMsg *pMsg) {
+  SSchedQueue *pSched = (SSchedQueue *)queueScheduler;
+  int ret = 0;
+
   if (pSched == NULL) {
     uError("sched is not ready, msg:%p is dropped", pMsg);
-    return 0;
+    return;
   }
 
-  if (tsem_wait(&pSched->emptySem) != 0) {
-    uError("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
+  if ((ret = tsem_wait(&pSched->emptySem)) != 0) {
+    uFatal("wait %s emptySem failed(%s)", pSched->label, strerror(errno));
+    exit(ret);
   }
 
-  if (pthread_mutex_lock(&pSched->queueMutex) != 0)
-    uError("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+  if ((ret = pthread_mutex_lock(&pSched->queueMutex)) != 0) {
+    uFatal("lock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+    exit(ret);
+  }
 
   pSched->queue[pSched->emptySlot] = *pMsg;
   pSched->emptySlot = (pSched->emptySlot + 1) % pSched->queueSize;
 
-  if (pthread_mutex_unlock(&pSched->queueMutex) != 0)
-    uError("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+  if ((ret = pthread_mutex_unlock(&pSched->queueMutex)) != 0) {
+    uFatal("unlock %s queueMutex failed(%s)", pSched->label, strerror(errno));
+    exit(ret);
+  }
 
-  if (tsem_post(&pSched->fullSem) != 0) 
-    uError("post %s fullSem failed(%s)", pSched->label, strerror(errno));
-
-  return 0;
+  if ((ret = tsem_post(&pSched->fullSem)) != 0) {
+    uFatal("post %s fullSem failed(%s)", pSched->label, strerror(errno));
+    exit(ret);
+  }
 }
 
 void taosCleanUpScheduler(void *param) {
@@ -219,4 +234,4 @@ void taosDumpSchedulerStatus(void *qhandle, void *tmrId) {
   }
   
   taosTmrReset(taosDumpSchedulerStatus, DUMP_SCHEDULER_TIME_WINDOW, pSched, pSched->pTmrCtrl, &pSched->pTimer);
-}
+}
\ No newline at end of file

From 55d3e7a2ea682a682b5d81ac55f9bb8dafd58ee7 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sun, 27 Jun 2021 21:45:18 +0800
Subject: [PATCH 30/71] Hotfix/sangshuduo/td 4902 for mastere (#6623)

* [TD-4902] FIX with 1 char

* Fix prompt of -m @ taosdemo

Co-authored-by: SunShine Chan <chenweican@gmail.com>
Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 src/kit/taosdemo/taosdemo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index b5781c6070..743c4ac668 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -982,9 +982,9 @@ static void parse_args(int argc, char *argv[], SArguments *arguments) {
       arguments->len_of_binary = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-m") == 0) {
       if ((argc == i+1) ||
-        (!isStringNumber(argv[i+1]))) {
+        (isStringNumber(argv[i+1]))) {
         printHelp();
-        errorPrint("%s", "\n\t-m need a number following!\n");
+        errorPrint("%s", "\n\t-m need a letter-initial string following!\n");
         exit(EXIT_FAILURE);
       }
       arguments->tb_prefix = argv[++i];

From f48783df4f7b20bf291f6ba9bb4e6a86b66d4040 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Sun, 27 Jun 2021 22:45:38 +0800
Subject: [PATCH 31/71] fix converity scan issue. (#6641)

---
 src/kit/taosdump/taosdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index 05c6b1efbb..33118ce311 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -1126,7 +1126,7 @@ int taosGetTableDes(
     strncpy(tableDes->cols[count].field, (char *)row[TSDB_DESCRIBE_METRIC_FIELD_INDEX],
             fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
     strncpy(tableDes->cols[count].type, (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
-            min(16, fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes));
+            min(15, fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes));
     tableDes->cols[count].length = *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
     strncpy(tableDes->cols[count].note, (char *)row[TSDB_DESCRIBE_METRIC_NOTE_INDEX],
             fields[TSDB_DESCRIBE_METRIC_NOTE_INDEX].bytes);

From 3d1f8f8bcf9d12ca220512e3ba0b13e2d13c28a2 Mon Sep 17 00:00:00 2001
From: wpan <wpan@taosdata.com>
Date: Mon, 28 Jun 2021 08:33:20 +0800
Subject: [PATCH 32/71] fix mem leak

---
 src/client/src/tscUtil.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 83be33ffef..937fe1000a 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1304,7 +1304,7 @@ void tscResetSqlCmd(SSqlCmd* pCmd, bool clearCachedMeta) {
   if (pCmd->pTableMetaMap != NULL) {
     STableMetaVgroupInfo* p = taosHashIterate(pCmd->pTableMetaMap, NULL);
     while (p) {
-      tfree(p->pVgroupInfo);
+      tscVgroupInfoClear(p->pVgroupInfo);
       tfree(p->pTableMeta);
       p = taosHashIterate(pCmd->pTableMetaMap, p);
     }

From b62a1d8baee2d23dcfd2ce149490a8001082e706 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Mon, 28 Jun 2021 10:54:03 +0800
Subject: [PATCH 33/71] [TD-2639] <docs>: fix typo in doc index.

---
 documentation20/cn/00.index/docs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation20/cn/00.index/docs.md b/documentation20/cn/00.index/docs.md
index c900cd373d..ed7156be17 100644
--- a/documentation20/cn/00.index/docs.md
+++ b/documentation20/cn/00.index/docs.md
@@ -63,7 +63,7 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 ## [高级功能](/advanced-features)
 
 * [连续查询(Continuous Query)](/advanced-features#continuous-query)：基于滑动窗口，定时自动的对数据流进行查询计算
-* [数据订阅(Publisher/Subscriber)](/advanced-features#subscribe)：象典型的消息队列，应用可订阅接收到的最新数据
+* [数据订阅(Publisher/Subscriber)](/advanced-features#subscribe)：类似典型的消息队列，应用可订阅接收到的最新数据
 * [缓存(Cache)](/advanced-features#cache)：每个设备最新的数据都会缓存在内存中，可快速获取
 * [报警监测](/advanced-features#alert)：根据配置规则，自动监测超限行为数据，并主动推送
 

From 1d5b8fa83c0457054156010bc657c7e3d70d0a56 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Mon, 28 Jun 2021 11:01:09 +0800
Subject: [PATCH 34/71] [TD-4928] <docs>: update version dependency about JDBC
 driver  & TDengine server.

---
 documentation20/cn/08.connector/01.java/docs.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md
index fb47d79268..546e2dbcd3 100644
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -532,8 +532,9 @@ Query OK, 1 row(s) in set (0.000141s)
 
 | taos-jdbcdriver 版本 | TDengine 版本     | JDK 版本 |
 | -------------------- | ----------------- | -------- |
-| 2.0.22              | 2.0.18.0 及以上     | 1.8.x    |
-| 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.0 | 1.8.x    |
+| 2.0.31              | 2.1.3.0 及以上      | 1.8.x    |
+| 2.0.22 - 20.0.30    | 2.0.18.0 - 2.1.2.x | 1.8.x    |
+| 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.x | 1.8.x    |
 | 2.0.4 - 2.0.11       | 2.0.0.0 - 2.0.7.x | 1.8.x    |
 | 1.0.3                | 1.6.1.x 及以上    | 1.8.x    |
 | 1.0.2                | 1.6.1.x 及以上    | 1.8.x    |

From 839ad25feeb1ae8842ac2775cb95bd2c67799a05 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 28 Jun 2021 11:12:39 +0800
Subject: [PATCH 35/71] [td-4905]<fix>:fix import caused crash.

---
 src/client/src/tscParseInsert.c             |  1 -
 src/client/src/tscUtil.c                    |  2 +
 tests/script/general/parser/gendata.sh      |  2 +
 tests/script/general/parser/import_file.sim | 45 +++++++++++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index a158162dc5..137a7be7c7 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -1580,7 +1580,6 @@ void tscImportDataFromFile(SSqlObj *pSql) {
 
   SImportFileSupport *pSupporter = calloc(1, sizeof(SImportFileSupport));
   SSqlObj *pNew = createSubqueryObj(pSql, 0, parseFileSendDataBlock, pSupporter, TSDB_SQL_INSERT, NULL);
-  pCmd->count = 1;
 
   FILE *fp = fopen(pCmd->payload, "rb");
   if (fp == NULL) {
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 74dbe42eeb..52d1092107 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3278,6 +3278,8 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, __async_cb_func_t
   pnCmd->insertParam.pTableNameList = NULL;
   pnCmd->insertParam.pTableBlockHashList = NULL;
 
+  memset(&pnCmd->insertParam.tagData, 0, sizeof(STagData));
+
   if (tscAddQueryInfo(pnCmd) != TSDB_CODE_SUCCESS) {
     terrno = TSDB_CODE_TSC_OUT_OF_MEMORY;
     goto _error;
diff --git a/tests/script/general/parser/gendata.sh b/tests/script/general/parser/gendata.sh
index f56fdc3468..b2074147ca 100755
--- a/tests/script/general/parser/gendata.sh
+++ b/tests/script/general/parser/gendata.sh
@@ -4,3 +4,5 @@ Cur_Dir=$(pwd)
 echo $Cur_Dir
 
 echo "'2020-1-1 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> ~/data.sql
+echo "'2020-1-2 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> ~/data.sql
+echo "'2020-1-3 1:1:1','abc','device',123,'9876', 'abc', 'net', 'mno', 'province', 'city', 'al'" >> ~/data.sql
diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim
index e9f0f1ed08..cf11194ba7 100644
--- a/tests/script/general/parser/import_file.sim
+++ b/tests/script/general/parser/import_file.sim
@@ -15,6 +15,8 @@ $inFileName = '~/data.csv'
 $numOfRows = 10000
 system general/parser/gendata.sh
 
+sql create table stbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16),  imei BINARY(16),  mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2)) tags(a int, b binary(12));
+
 sql create table tbx (ts TIMESTAMP, collect_area NCHAR(12), device_id BINARY(16), imsi BINARY(16),  imei BINARY(16),  mdn BINARY(10), net_type BINARY(4), mno NCHAR(4), province NCHAR(10), city NCHAR(16), alarm BINARY(2))
 print ====== create tables success, starting import data
 
@@ -23,13 +25,48 @@ sql import into tbx file '~/data.sql'
 
 sql select count(*) from tbx
 if $rows != 1 then
+  print expect 1, actual: $rows
   return -1
 endi
 
-#if $data00 != $numOfRows then
-#  print "expect: $numOfRows, act: $data00"
-#  return -1
-#endi
+if $data00 != 3 then
+  return -1
+endi
+
+sql drop table tbx;
+
+sql insert into tbx using stbx tags(1,'abc') file '~/data.sql';
+sql insert into tbx using stbx tags(1,'abc') file '~/data.sql';
+
+sql select count(*) from tbx
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 3 then
+  return -1
+endi
+
+sql drop table tbx;
+sql insert into tbx using stbx(b) tags('abcf') file '~/data.sql';
+
+sql select ts,a,b from tbx;
+if $rows != 3 then
+  return -1
+endi
+
+if $data00 != @20-01-01 01:01:01.000@ then
+  print expect 20-01-01 01:01:01.000 , actual: $data00
+  return -1
+endi
+
+if $data01 != NULL then
+  return -1
+endi
+
+if $data02 != @abcf@ then
+  return -1
+endi
 
 system rm -f ~/data.sql
 

From 1e592fb52bdb607f3c592457b06e386dbd707e6b Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Mon, 28 Jun 2021 12:23:26 +0800
Subject: [PATCH 36/71] [TD-4950]<fix>: fix undefined left bit shift

---
 src/mnode/src/mnodeTable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 20edb02c38..6c96f1f0d2 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1068,7 +1068,7 @@ static int32_t mnodeProcessCreateSuperTableMsg(SMnodeMsg *pMsg) {
   pStable->info.tableId = strdup(pCreate->tableName);
   pStable->info.type    = TSDB_SUPER_TABLE;
   pStable->createdTime  = taosGetTimestampMs();
-  int64_t x = (us&0x000000FFFFFFFFFF);
+  uint64_t x = (us&0x000000FFFFFFFFFF);
   x = x<<24;
   pStable->uid          = x + ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
   pStable->sversion     = 0;

From 6719d41b15b6d97295539d6d7a8fe680dc15c49d Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Mon, 28 Jun 2021 14:35:57 +0800
Subject: [PATCH 37/71] [TD-4821] <docs>: add new operator 'IN'.

---
 documentation20/cn/12.taos-sql/docs.md | 28 ++++++++++++++------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index 844865f6db..19fd92d8f6 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -703,22 +703,24 @@ Query OK, 1 row(s) in set (0.001091s)
 
 ### 支持的条件过滤操作
 
-| **Operation**   | **Note**                      | **Applicable Data Types**             |
-| --------------- | ----------------------------- | ------------------------------------- |
-| >               | larger than                   | **`timestamp`** and all numeric types |
-| <               | smaller than                  | **`timestamp`** and all numeric types |
-| >=              | larger than or equal to       | **`timestamp`** and all numeric types |
-| <=              | smaller than or equal to      | **`timestamp`** and all numeric types |
-| =               | equal to                      | all types                             |
-| <>              | not equal to                  | all types                             |
-| between and     | within a certain range        | **`timestamp`** and all numeric types |
-| %               | match with any char sequences | **`binary`** **`nchar`**              |
-| _               | match with a single char      | **`binary`** **`nchar`**              |
+| **Operation**   | **Note**                      | **Applicable Data Types**                 |
+| --------------- | ----------------------------- | ----------------------------------------- |
+| >               | larger than                   | **`timestamp`** and all numeric types     |
+| <               | smaller than                  | **`timestamp`** and all numeric types     |
+| >=              | larger than or equal to       | **`timestamp`** and all numeric types     |
+| <=              | smaller than or equal to      | **`timestamp`** and all numeric types     |
+| =               | equal to                      | all types                                 |
+| <>              | not equal to                  | all types                                 |
+| between and     | within a certain range        | **`timestamp`** and all numeric types     |
+| in              | matches any value in a set    | all types except first column `timestamp` |
+| %               | match with any char sequences | **`binary`** **`nchar`**                  |
+| _               | match with a single char      | **`binary`** **`nchar`**                  |
 
 1. <> 算子也可以写为 != ，请注意，这个算子不能用于数据表第一列的 timestamp 字段。
 2. 同时进行多个字段的范围过滤，需要使用关键词 AND 来连接不同的查询条件，暂不支持 OR 连接的不同列之间的查询过滤条件。
-3. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用 `OR` 关键字进行组合条件的查询过滤。例如：((value > 20 AND value < 30) OR (value < 12)) 。
-4. 从 2.0.17 版本开始，条件过滤开始支持 BETWEEN AND 语法，例如 `WHERE col2 BETWEEN 1.5 AND 3.25` 表示查询条件为“1.5 ≤ col2 ≤ 3.25”。
+3. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用 `OR` 关键字进行组合条件的查询过滤。例如： `((value > 20 AND value < 30) OR (value < 12))`。
+4. 从 2.0.17.0 版本开始，条件过滤开始支持 BETWEEN AND 语法，例如 `WHERE col2 BETWEEN 1.5 AND 3.25` 表示查询条件为“1.5 ≤ col2 ≤ 3.25”。
+5. 从 2.1.4.0 版本开始，条件过滤开始支持 IN 算子，例如 `WHERE city IN ('Beijing', 'Shanghai')`。需注意：BOOL 类型必须写作 `{true, false}` 的形式，而不能写成 0 或 1；FLOAT 和 DOUBLE 类型会受到浮点数精度影响，集合内的值在精度范围内认为和数据行的值相等既能匹配成功。<!-- REPLACE_OPEN_TO_ENTERPRISE__IN_OPERATOR_AND_UNSIGNED_INTEGER -->
 
 <!-- 
 <a class="anchor" id="having"></a>

From b33916be9f568ea7f9267d6da7ec3d8d8e331b73 Mon Sep 17 00:00:00 2001
From: yihaoDeng <yhdeng@taosdata.com>
Date: Mon, 28 Jun 2021 14:57:04 +0800
Subject: [PATCH 38/71] [TD-4825]<feature> order by col after group-by

---
 src/client/src/tscSQLParser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 5884d18ee7..f4eb5a3c2e 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5179,7 +5179,7 @@ int32_t validateOrderbyNode(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, SSqlNode* pSq
     SArray *columnInfo = pQueryInfo->groupbyExpr.columnInfo;
     if (columnInfo != NULL && taosArrayGetSize(columnInfo) > 0) {
       SColIndex* pColIndex = taosArrayGet(columnInfo, 0);
-      if (pColIndex->colIndex == index.columnIndex) {
+      if (PRIMARYKEY_TIMESTAMP_COL_INDEX != index.columnIndex && pColIndex->colIndex == index.columnIndex) {
         orderByGroupbyCol = true; 
       }
     } 

From bcbfd1a33fbd6200b035e96eeb5d1fde9cfaea59 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Mon, 28 Jun 2021 15:28:38 +0800
Subject: [PATCH 39/71] [TD-4821] <docs>: clarify 'IN' operator on BOOL, FLOAT,
 and DOUBLE.

---
 documentation20/cn/12.taos-sql/docs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index 19fd92d8f6..429b2e7d73 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -720,7 +720,7 @@ Query OK, 1 row(s) in set (0.001091s)
 2. 同时进行多个字段的范围过滤，需要使用关键词 AND 来连接不同的查询条件，暂不支持 OR 连接的不同列之间的查询过滤条件。
 3. 针对单一字段的过滤，如果是时间过滤条件，则一条语句中只支持设定一个；但针对其他的（普通）列或标签列，则可以使用 `OR` 关键字进行组合条件的查询过滤。例如： `((value > 20 AND value < 30) OR (value < 12))`。
 4. 从 2.0.17.0 版本开始，条件过滤开始支持 BETWEEN AND 语法，例如 `WHERE col2 BETWEEN 1.5 AND 3.25` 表示查询条件为“1.5 ≤ col2 ≤ 3.25”。
-5. 从 2.1.4.0 版本开始，条件过滤开始支持 IN 算子，例如 `WHERE city IN ('Beijing', 'Shanghai')`。需注意：BOOL 类型必须写作 `{true, false}` 的形式，而不能写成 0 或 1；FLOAT 和 DOUBLE 类型会受到浮点数精度影响，集合内的值在精度范围内认为和数据行的值相等既能匹配成功。<!-- REPLACE_OPEN_TO_ENTERPRISE__IN_OPERATOR_AND_UNSIGNED_INTEGER -->
+5. 从 2.1.4.0 版本开始，条件过滤开始支持 IN 算子，例如 `WHERE city IN ('Beijing', 'Shanghai')`。说明：BOOL 类型写作 `{true, false}` 或 `{0, 1}` 均可，但不能写作 0、1 之外的整数；FLOAT 和 DOUBLE 类型会受到浮点数精度影响，集合内的值在精度范围内认为和数据行的值完全相等才能匹配成功。<!-- REPLACE_OPEN_TO_ENTERPRISE__IN_OPERATOR_AND_UNSIGNED_INTEGER -->
 
 <!-- 
 <a class="anchor" id="having"></a>

From ea1777d551f4d291a01738d26f7dd1058a904f96 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Mon, 28 Jun 2021 20:39:32 +0800
Subject: [PATCH 40/71] [TD-4918]<fix>: taosdemo subscribe endAfterResume.
 (#6654)

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 src/kit/taosdemo/taosdemo.c | 273 +++++++++++++++++++-----------------
 1 file changed, 141 insertions(+), 132 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index b2ac11b2ca..ec4c6d8773 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -4408,14 +4408,12 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
 
         cJSON* resubAfterConsume =
             cJSON_GetObjectItem(specifiedQuery, "resubAfterConsume");
+        g_queryInfo.specifiedQueryInfo.resubAfterConsume[j] = -1;
         if ((resubAfterConsume)
                 && (resubAfterConsume->type == cJSON_Number)
                 && (resubAfterConsume->valueint >= 0)) {
             g_queryInfo.specifiedQueryInfo.resubAfterConsume[j]
                 = resubAfterConsume->valueint;
-        } else if (!resubAfterConsume) {
-            // default value is -1, which mean do not resub
-            g_queryInfo.specifiedQueryInfo.resubAfterConsume[j] = -1;
         }
 
         cJSON *result = cJSON_GetObjectItem(sql, "result");
@@ -4572,14 +4570,12 @@ static bool getMetaFromQueryJsonFile(cJSON* root) {
 
     cJSON* superResubAfterConsume =
             cJSON_GetObjectItem(superQuery, "resubAfterConsume");
+    g_queryInfo.superQueryInfo.resubAfterConsume = -1;
     if ((superResubAfterConsume)
             && (superResubAfterConsume->type == cJSON_Number)
             && (superResubAfterConsume->valueint >= 0)) {
         g_queryInfo.superQueryInfo.resubAfterConsume =
             superResubAfterConsume->valueint;
-    } else if (!superResubAfterConsume) {
-        // default value is -1, which mean do not resub
-        g_queryInfo.superQueryInfo.resubAfterConsume = -1;
     }
 
     // supert table sqls
@@ -7222,151 +7218,159 @@ static TAOS_SUB* subscribeImpl(
   }
 
   if (tsub == NULL) {
-    printf("failed to create subscription. topic:%s, sql:%s\n", topic, sql);
-    return NULL;
+      errorPrint("failed to create subscription. topic:%s, sql:%s\n", topic, sql);
+      return NULL;
   }
 
   return tsub;
 }
 
 static void *superSubscribe(void *sarg) {
-  threadInfo *pThreadInfo = (threadInfo *)sarg;
-  char subSqlstr[MAX_QUERY_SQL_LENGTH];
-  TAOS_SUB*    tsub[MAX_QUERY_SQL_COUNT] = {0};
-  uint64_t tsubSeq;
+    threadInfo *pThreadInfo = (threadInfo *)sarg;
+    char subSqlstr[MAX_QUERY_SQL_LENGTH];
+    TAOS_SUB*    tsub[MAX_QUERY_SQL_COUNT] = {0};
+    uint64_t tsubSeq;
 
-  if (pThreadInfo->ntables > MAX_QUERY_SQL_COUNT) {
-      errorPrint("The table number(%"PRId64") of the thread is more than max query sql count: %d\n",
-              pThreadInfo->ntables,
-              MAX_QUERY_SQL_COUNT);
-      exit(-1);
-  }
-
-  if (pThreadInfo->taos == NULL) {
-    pThreadInfo->taos = taos_connect(g_queryInfo.host,
-          g_queryInfo.user,
-          g_queryInfo.password,
-          g_queryInfo.dbName,
-          g_queryInfo.port);
-    if (pThreadInfo->taos == NULL) {
-      errorPrint("[%d] Failed to connect to TDengine, reason:%s\n",
-            pThreadInfo->threadID, taos_errstr(NULL));
-      return NULL;
+    if (pThreadInfo->ntables > MAX_QUERY_SQL_COUNT) {
+        errorPrint("The table number(%"PRId64") of the thread is more than max query sql count: %d\n",
+                pThreadInfo->ntables, MAX_QUERY_SQL_COUNT);
+        exit(-1);
     }
-  }
 
-  char sqlStr[MAX_TB_NAME_SIZE*2];
-  sprintf(sqlStr, "use %s", g_queryInfo.dbName);
-  if (0 != queryDbExec(pThreadInfo->taos, sqlStr, NO_INSERT_TYPE, false)) {
-    taos_close(pThreadInfo->taos);
-    errorPrint( "use database %s failed!\n\n",
-                g_queryInfo.dbName);
-    return NULL;
-  }
+    if (pThreadInfo->taos == NULL) {
+        pThreadInfo->taos = taos_connect(g_queryInfo.host,
+                g_queryInfo.user,
+                g_queryInfo.password,
+                g_queryInfo.dbName,
+                g_queryInfo.port);
+        if (pThreadInfo->taos == NULL) {
+            errorPrint("[%d] Failed to connect to TDengine, reason:%s\n",
+                    pThreadInfo->threadID, taos_errstr(NULL));
+            return NULL;
+        }
+    }
 
-  char topic[32] = {0};
-  for (uint64_t i = pThreadInfo->start_table_from;
-          i <= pThreadInfo->end_table_to; i++) {
-
-      tsubSeq = i - pThreadInfo->start_table_from;
-      verbosePrint("%s() LN%d, [%d], start=%"PRId64" end=%"PRId64" i=%"PRIu64"\n",
-              __func__, __LINE__,
-              pThreadInfo->threadID,
-              pThreadInfo->start_table_from,
-              pThreadInfo->end_table_to, i);
-      sprintf(topic, "taosdemo-subscribe-%"PRIu64"-%"PRIu64"",
-              i, pThreadInfo->querySeq);
-      memset(subSqlstr, 0, sizeof(subSqlstr));
-      replaceChildTblName(
-              g_queryInfo.superQueryInfo.sql[pThreadInfo->querySeq],
-              subSqlstr, i);
-      if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-        sprintf(pThreadInfo->filePath, "%s-%d",
-                g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
-                pThreadInfo->threadID);
-      }
-
-      debugPrint("%s() LN%d, [%d] subSqlstr: %s\n",
-              __func__, __LINE__, pThreadInfo->threadID, subSqlstr);
-      tsub[tsubSeq] = subscribeImpl(
-              STABLE_CLASS,
-              pThreadInfo, subSqlstr, topic,
-              g_queryInfo.superQueryInfo.subscribeRestart,
-              g_queryInfo.superQueryInfo.subscribeInterval);
-      if (NULL == tsub[tsubSeq]) {
+    char sqlStr[MAX_TB_NAME_SIZE*2];
+    sprintf(sqlStr, "use %s", g_queryInfo.dbName);
+    if (0 != queryDbExec(pThreadInfo->taos, sqlStr, NO_INSERT_TYPE, false)) {
         taos_close(pThreadInfo->taos);
+        errorPrint( "use database %s failed!\n\n",
+                g_queryInfo.dbName);
         return NULL;
-      }
-  }
+    }
 
-  // start loop to consume result
-  int consumed[MAX_QUERY_SQL_COUNT];
-  for (int i = 0; i < MAX_QUERY_SQL_COUNT; i++) {
-    consumed[i] = 0;
-  }
-  TAOS_RES* res = NULL;
+    char topic[32] = {0};
+    for (uint64_t i = pThreadInfo->start_table_from;
+            i <= pThreadInfo->end_table_to; i++) {
+        tsubSeq = i - pThreadInfo->start_table_from;
+        verbosePrint("%s() LN%d, [%d], start=%"PRId64" end=%"PRId64" i=%"PRIu64"\n",
+                __func__, __LINE__,
+                pThreadInfo->threadID,
+                pThreadInfo->start_table_from,
+                pThreadInfo->end_table_to, i);
+        sprintf(topic, "taosdemo-subscribe-%"PRIu64"-%"PRIu64"",
+                i, pThreadInfo->querySeq);
+        memset(subSqlstr, 0, sizeof(subSqlstr));
+        replaceChildTblName(
+                g_queryInfo.superQueryInfo.sql[pThreadInfo->querySeq],
+                subSqlstr, i);
+        if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
+            sprintf(pThreadInfo->filePath, "%s-%d",
+                    g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
+                    pThreadInfo->threadID);
+        }
 
-  uint64_t st = 0, et = 0;
+        debugPrint("%s() LN%d, [%d] subSqlstr: %s\n",
+                __func__, __LINE__, pThreadInfo->threadID, subSqlstr);
+        tsub[tsubSeq] = subscribeImpl(
+                STABLE_CLASS,
+                pThreadInfo, subSqlstr, topic,
+                g_queryInfo.superQueryInfo.subscribeRestart,
+                g_queryInfo.superQueryInfo.subscribeInterval);
+        if (NULL == tsub[tsubSeq]) {
+            taos_close(pThreadInfo->taos);
+            return NULL;
+        }
+    }
 
-  while ((g_queryInfo.superQueryInfo.endAfterConsume == -1)
-          || (g_queryInfo.superQueryInfo.endAfterConsume <
-              consumed[pThreadInfo->end_table_to - pThreadInfo->start_table_from])) {
+    // start loop to consume result
+    int consumed[MAX_QUERY_SQL_COUNT];
+    for (int i = 0; i < MAX_QUERY_SQL_COUNT; i++) {
+        consumed[i] = 0;
+    }
+    TAOS_RES* res = NULL;
+
+    uint64_t st = 0, et = 0;
+
+    while ((g_queryInfo.superQueryInfo.endAfterConsume == -1)
+            || (g_queryInfo.superQueryInfo.endAfterConsume >
+                consumed[pThreadInfo->end_table_to
+                - pThreadInfo->start_table_from])) {
+
+        verbosePrint("super endAfterConsume: %d, consumed: %d\n",
+                g_queryInfo.superQueryInfo.endAfterConsume,
+                consumed[pThreadInfo->end_table_to
+                - pThreadInfo->start_table_from]);
+        for (uint64_t i = pThreadInfo->start_table_from;
+                i <= pThreadInfo->end_table_to; i++) {
+            tsubSeq = i - pThreadInfo->start_table_from;
+            if (ASYNC_MODE == g_queryInfo.superQueryInfo.asyncMode) {
+                continue;
+            }
+
+            st = taosGetTimestampMs();
+            performancePrint("st: %"PRIu64" et: %"PRIu64" st-et: %"PRIu64"\n", st, et, (st - et));
+            res = taos_consume(tsub[tsubSeq]);
+            et = taosGetTimestampMs();
+            performancePrint("st: %"PRIu64" et: %"PRIu64" delta: %"PRIu64"\n", st, et, (et - st));
+
+            if (res) {
+                if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
+                    sprintf(pThreadInfo->filePath, "%s-%d",
+                            g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
+                            pThreadInfo->threadID);
+                    fetchResult(res, pThreadInfo);
+                }
+                consumed[tsubSeq] ++;
+
+                if ((g_queryInfo.superQueryInfo.resubAfterConsume != -1)
+                        && (consumed[tsubSeq] >=
+                            g_queryInfo.superQueryInfo.resubAfterConsume)) {
+                    verbosePrint("%s() LN%d, keepProgress:%d, resub super table query: %"PRIu64"\n",
+                            __func__, __LINE__,
+                            g_queryInfo.superQueryInfo.subscribeKeepProgress,
+                            pThreadInfo->querySeq);
+                    taos_unsubscribe(tsub[tsubSeq],
+                            g_queryInfo.superQueryInfo.subscribeKeepProgress);
+                    consumed[tsubSeq]= 0;
+                    tsub[tsubSeq] = subscribeImpl(
+                            STABLE_CLASS,
+                            pThreadInfo, subSqlstr, topic,
+                            g_queryInfo.superQueryInfo.subscribeRestart,
+                            g_queryInfo.superQueryInfo.subscribeInterval
+                            );
+                    if (NULL == tsub[tsubSeq]) {
+                        taos_close(pThreadInfo->taos);
+                        return NULL;
+                    }
+                }
+            }
+        }
+    }
+    verbosePrint("%s() LN%d, super endAfterConsume: %d, consumed: %d\n",
+            __func__, __LINE__,
+            g_queryInfo.superQueryInfo.endAfterConsume,
+            consumed[pThreadInfo->end_table_to - pThreadInfo->start_table_from]);
+    taos_free_result(res);
 
     for (uint64_t i = pThreadInfo->start_table_from;
             i <= pThreadInfo->end_table_to; i++) {
-      tsubSeq = i - pThreadInfo->start_table_from;
-      if (ASYNC_MODE == g_queryInfo.superQueryInfo.asyncMode) {
-          continue;
-      }
-
-      st = taosGetTimestampMs();
-      performancePrint("st: %"PRIu64" et: %"PRIu64" st-et: %"PRIu64"\n", st, et, (st - et));
-      res = taos_consume(tsub[tsubSeq]);
-      et = taosGetTimestampMs();
-      performancePrint("st: %"PRIu64" et: %"PRIu64" delta: %"PRIu64"\n", st, et, (et - st));
-
-      if (res) {
-          if (g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq][0] != 0) {
-              sprintf(pThreadInfo->filePath, "%s-%d",
-                      g_queryInfo.superQueryInfo.result[pThreadInfo->querySeq],
-                      pThreadInfo->threadID);
-              fetchResult(res, pThreadInfo);
-          }
-          consumed[tsubSeq] ++;
-
-          if ((g_queryInfo.superQueryInfo.resubAfterConsume != -1)
-                  && (consumed[tsubSeq] >=
-                      g_queryInfo.superQueryInfo.resubAfterConsume)) {
-              printf("keepProgress:%d, resub super table query: %"PRIu64"\n",
-                      g_queryInfo.superQueryInfo.subscribeKeepProgress,
-                      pThreadInfo->querySeq);
-              taos_unsubscribe(tsub[tsubSeq],
-                    g_queryInfo.superQueryInfo.subscribeKeepProgress);
-              consumed[tsubSeq]= 0;
-              tsub[tsubSeq] = subscribeImpl(
-                      STABLE_CLASS,
-                      pThreadInfo, subSqlstr, topic,
-                      g_queryInfo.superQueryInfo.subscribeRestart,
-                      g_queryInfo.superQueryInfo.subscribeInterval
-                      );
-              if (NULL == tsub[tsubSeq]) {
-                  taos_close(pThreadInfo->taos);
-                  return NULL;
-              }
-          }
-      }
+        tsubSeq = i - pThreadInfo->start_table_from;
+        taos_unsubscribe(tsub[tsubSeq], 0);
     }
-  }
-  taos_free_result(res);
 
-  for (uint64_t i = pThreadInfo->start_table_from;
-          i <= pThreadInfo->end_table_to; i++) {
-    tsubSeq = i - pThreadInfo->start_table_from;
-    taos_unsubscribe(tsub[tsubSeq], 0);
-  }
-
-  taos_close(pThreadInfo->taos);
-  return NULL;
+    taos_close(pThreadInfo->taos);
+    return NULL;
 }
 
 static void *specifiedSubscribe(void *sarg) {
@@ -7420,8 +7424,13 @@ static void *specifiedSubscribe(void *sarg) {
           || (g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID] <
               g_queryInfo.specifiedQueryInfo.endAfterConsume[pThreadInfo->querySeq])) {
 
+      printf("consumed[%d]: %d, endAfterConsum[%"PRId64"]: %d\n",
+              pThreadInfo->threadID,
+              g_queryInfo.specifiedQueryInfo.consumed[pThreadInfo->threadID],
+              pThreadInfo->querySeq,
+              g_queryInfo.specifiedQueryInfo.endAfterConsume[pThreadInfo->querySeq]);
       if (ASYNC_MODE == g_queryInfo.specifiedQueryInfo.asyncMode) {
-        continue;
+          continue;
       }
 
       g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID] = taos_consume(

From bc2185771cb3bfd21ca324c52204b509c5f7abba Mon Sep 17 00:00:00 2001
From: Zhiyu Yang <69311263+zyyang-taosdata@users.noreply.github.com>
Date: Tue, 29 Jun 2021 09:39:25 +0800
Subject: [PATCH 41/71] Hotfix/td 4876 (#6656)

* fix warn mesage in jdbc

* change

* [TD-4876]<fix>: fix getNetworkTimeout and setNetworkTimeout in jdbc driver

* [TD-4117]<test>: remove System.out.println in all jdbc test cases

* change
---
 cmake/install.inc                             |   2 +-
 src/connector/jdbc/CMakeLists.txt             |   2 +-
 src/connector/jdbc/deploy-pom.xml             |   2 +-
 src/connector/jdbc/pom.xml                    |  12 +-
 .../com/taosdata/jdbc/AbstractConnection.java |  29 +-
 .../jdbc/AbstractDatabaseMetaData.java        |   4 +-
 .../com/taosdata/jdbc/AbstractDriver.java     |   4 +-
 .../jdbc/AbstractParameterMetaData.java       |   2 -
 .../jdbc/DatabaseMetaDataResultSet.java       |  12 +-
 .../com/taosdata/jdbc/EmptyResultSet.java     |   2 +-
 .../com/taosdata/jdbc/TSDBConnection.java     |   2 +-
 .../java/com/taosdata/jdbc/TSDBConstants.java |   7 +-
 .../taosdata/jdbc/TSDBDatabaseMetaData.java   |   4 +-
 .../java/com/taosdata/jdbc/TSDBDriver.java    |   6 +-
 .../java/com/taosdata/jdbc/TSDBError.java     |   5 +-
 .../com/taosdata/jdbc/TSDBErrorNumbers.java   |   5 +-
 .../com/taosdata/jdbc/TSDBJNIConnector.java   |  30 +-
 .../taosdata/jdbc/TSDBPreparedStatement.java  |  27 +-
 .../java/com/taosdata/jdbc/TSDBResultSet.java |   4 +-
 .../taosdata/jdbc/TSDBResultSetBlockData.java |  20 +-
 .../taosdata/jdbc/TSDBResultSetMetaData.java  |   5 +-
 .../taosdata/jdbc/TSDBResultSetRowData.java   |  44 +--
 .../java/com/taosdata/jdbc/TSDBSubscribe.java |   3 -
 .../jdbc/{rs => }/enums/TimestampFormat.java  |   2 +-
 .../taosdata/jdbc/rs/RestfulConnection.java   |   2 +-
 .../jdbc/rs/RestfulPreparedStatement.java     |   2 +-
 .../taosdata/jdbc/rs/RestfulResultSet.java    | 100 ++---
 .../jdbc/rs/RestfulResultSetMetaData.java     |  11 +-
 .../taosdata/jdbc/rs/RestfulStatement.java    |   7 -
 .../jdbc/utils/HttpClientPoolUtil.java        |   5 +-
 .../jdbc/utils/SqlSyntaxValidator.java        |  10 -
 .../java/com/taosdata/jdbc/utils/Utils.java   |   3 +-
 .../java/com/taosdata/jdbc/StatementTest.java | 108 ------
 .../com/taosdata/jdbc/TSDBConnectionTest.java |   7 +-
 .../com/taosdata/jdbc/TSDBStatementTest.java  |  22 --
 .../jdbc/cases/AppMemoryLeakTest.java         |   7 +-
 .../{rs => cases}/AuthenticationTest.java     |   2 +-
 .../taosdata/jdbc/cases/BatchInsertTest.java  |   3 -
 ...iTaosdByRestfulWithDifferentTokenTest.java |   3 -
 .../jdbc/cases/DatetimeBefore1970Test.java    |  66 ++--
 .../com/taosdata/jdbc/cases/ImportTest.java   |   5 -
 .../cases/MicroSecondPrecisionJNITest.java    |   1 -
 ...=> MultiThreadsWithSameStatementTest.java} |   9 +-
 .../cases/NullValueInResultSetJNITest.java    |   5 -
 .../NullValueInResultSetRestfulTest.java      |   2 -
 .../taosdata/jdbc/cases/QueryDataTest.java    |   5 +-
 ...sultSetMetaShouldNotBeNullRestfulTest.java |   4 +-
 .../com/taosdata/jdbc/cases/SelectTest.java   |   4 -
 .../com/taosdata/jdbc/cases/StableTest.java   |   9 -
 .../taosdata/jdbc/rs/RestfulDriverTest.java   |   9 +-
 .../com/taosdata/jdbc/rs/RestfulJDBCTest.java | 207 +++++-----
 .../jdbc/rs/RestfulPreparedStatementTest.java |  28 +-
 .../jdbc/rs/RestfulStatementTest.java         |  20 +-
 .../java/com/taosdata/jdbc/rs/SQLTest.java    | 366 +++++++++++++++---
 .../com/taosdata/jdbc/utils/SQLExecutor.java  |  74 ----
 55 files changed, 625 insertions(+), 716 deletions(-)
 rename src/connector/jdbc/src/main/java/com/taosdata/jdbc/{rs => }/enums/TimestampFormat.java (65%)
 delete mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
 rename src/connector/jdbc/src/test/java/com/taosdata/jdbc/{rs => cases}/AuthenticationTest.java (98%)
 rename src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/{MultiThreadsWithSameStatmentTest.java => MultiThreadsWithSameStatementTest.java} (84%)
 delete mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/SQLExecutor.java

diff --git a/cmake/install.inc b/cmake/install.inc
index b37cf751fb..30aa801122 100755
--- a/cmake/install.inc
+++ b/cmake/install.inc
@@ -32,7 +32,7 @@ ELSEIF (TD_WINDOWS)
   #INSTALL(TARGETS taos RUNTIME DESTINATION driver)
   #INSTALL(TARGETS shell RUNTIME DESTINATION .)
   IF (TD_MVN_INSTALLED)
-    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.31.jar DESTINATION connector/jdbc)
+    INSTALL(FILES ${LIBRARY_OUTPUT_PATH}/taos-jdbcdriver-2.0.32-dist.jar DESTINATION connector/jdbc)
   ENDIF ()
 ELSEIF (TD_DARWIN)
   SET(TD_MAKE_INSTALL_SH "${TD_COMMUNITY_DIR}/packaging/tools/make_install.sh")
diff --git a/src/connector/jdbc/CMakeLists.txt b/src/connector/jdbc/CMakeLists.txt
index 1db8361faf..9642b0490f 100644
--- a/src/connector/jdbc/CMakeLists.txt
+++ b/src/connector/jdbc/CMakeLists.txt
@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.31.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.32-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})
diff --git a/src/connector/jdbc/deploy-pom.xml b/src/connector/jdbc/deploy-pom.xml
index 8f77582d30..06122372f0 100755
--- a/src/connector/jdbc/deploy-pom.xml
+++ b/src/connector/jdbc/deploy-pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>2.0.31</version>
+  <version>2.0.32</version>
   <packaging>jar</packaging>
 
   <name>JDBCDriver</name>
diff --git a/src/connector/jdbc/pom.xml b/src/connector/jdbc/pom.xml
index a3a36d54cf..61d7fb85ef 100644
--- a/src/connector/jdbc/pom.xml
+++ b/src/connector/jdbc/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.taosdata.jdbc</groupId>
     <artifactId>taos-jdbcdriver</artifactId>
-    <version>2.0.31</version>
+    <version>2.0.32</version>
     <packaging>jar</packaging>
     <name>JDBCDriver</name>
     <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>
@@ -113,16 +113,16 @@
                         <include>**/*Test.java</include>
                     </includes>
                     <excludes>
-                        <exclude>**/TSDBJNIConnectorTest.java</exclude>
-                        <exclude>**/UnsignedNumberJniTest.java</exclude>
-                        <exclude>**/DatetimeBefore1970Test.java</exclude>
                         <exclude>**/AppMemoryLeakTest.java</exclude>
                         <exclude>**/AuthenticationTest.java</exclude>
-                        <exclude>**/TaosInfoMonitorTest.java</exclude>
+                        <exclude>**/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java</exclude>
+                        <exclude>**/DatetimeBefore1970Test.java</exclude>
                         <exclude>**/FailOverTest.java</exclude>
                         <exclude>**/InvalidResultSetPointerTest.java</exclude>
                         <exclude>**/RestfulConnectionTest.java</exclude>
-                        <exclude>**/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java</exclude>
+                        <exclude>**/TSDBJNIConnectorTest.java</exclude>
+                        <exclude>**/TaosInfoMonitorTest.java</exclude>
+                        <exclude>**/UnsignedNumberJniTest.java</exclude>
                     </excludes>
                     <testFailureIgnore>true</testFailureIgnore>
                 </configuration>
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
index 686ef36262..b3887d436b 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractConnection.java
@@ -1,6 +1,6 @@
 package com.taosdata.jdbc;
 
-import com.taosdata.jdbc.rs.enums.TimestampFormat;
+import com.taosdata.jdbc.enums.TimestampFormat;
 
 import java.sql.*;
 import java.util.Enumeration;
@@ -306,9 +306,6 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
 
     @Override
     public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        if (isClosed())
-            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
-
         switch (resultSetHoldability) {
             case ResultSet.HOLD_CURSORS_OVER_COMMIT:
                 break;
@@ -322,11 +319,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
     }
 
     @Override
-    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
-            throws SQLException {
-        if (isClosed())
-            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
-
+    public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
         switch (resultSetHoldability) {
             case ResultSet.HOLD_CURSORS_OVER_COMMIT:
                 break;
@@ -425,7 +418,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
                 status = resultSet.getInt("server_status()");
                 resultSet.close();
             }
-            return status == 1 ? true : false;
+            return status == 1;
         });
 
         boolean status = false;
@@ -434,9 +427,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
                 status = future.get();
             else
                 status = future.get(timeout, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        } catch (ExecutionException e) {
+        } catch (InterruptedException | ExecutionException e) {
             e.printStackTrace();
         } catch (TimeoutException e) {
             future.cancel(true);
@@ -452,8 +443,7 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         if (isClosed)
             throw (SQLClientInfoException) TSDBError.createSQLException(TSDBErrorNumbers.ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED);
 
-        if (clientInfoProps != null)
-            clientInfoProps.setProperty(name, value);
+        clientInfoProps.setProperty(name, value);
     }
 
     @Override
@@ -461,8 +451,8 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         if (isClosed)
             throw (SQLClientInfoException) TSDBError.createSQLException(TSDBErrorNumbers.ERROR_SQLCLIENT_EXCEPTION_ON_CONNECTION_CLOSED);
 
-        for (Enumeration<Object> enumer = properties.keys(); enumer.hasMoreElements(); ) {
-            String name = (String) enumer.nextElement();
+        for (Enumeration<Object> enumeration = properties.keys(); enumeration.hasMoreElements(); ) {
+            String name = (String) enumeration.nextElement();
             clientInfoProps.put(name, properties.getProperty(name));
         }
     }
@@ -528,14 +518,13 @@ public abstract class AbstractConnection extends WrapperImpl implements Connecti
         if (milliseconds < 0)
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_VARIABLE);
 
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
+        // do nothing
     }
 
     @Override
     public int getNetworkTimeout() throws SQLException {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED);
-
-        throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
+        return 0;
     }
 }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java
index 48811d30a6..3c9c784f59 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDatabaseMetaData.java
@@ -12,8 +12,7 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
     private final static int DRIVER_MAJAR_VERSION = 2;
     private final static int DRIVER_MINOR_VERSION = 0;
 
-    private String precision = "ms";
-    private String database;
+    private String precision = TSDBConstants.DEFAULT_PRECISION;
 
     public boolean allProceduresAreCallable() throws SQLException {
         return false;
@@ -1223,7 +1222,6 @@ public abstract class AbstractDatabaseMetaData extends WrapperImpl implements Da
             ResultSet databases = stmt.executeQuery("show databases");
             while (databases.next()) {
                 String dbname = databases.getString("name");
-                this.database = dbname;
                 this.precision = databases.getString("precision");
                 if (dbname.equalsIgnoreCase(catalog))
                     return true;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
index 5eaac1cd3b..7d4a268391 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractDriver.java
@@ -58,7 +58,7 @@ public abstract class AbstractDriver implements Driver {
                         value = parameterValuePair.substring(indexOfEqual + 1);
                     }
                 }
-                if ((value != null && value.length() > 0) && (parameter != null && parameter.length() > 0)) {
+                if (value != null && value.length() > 0 && parameter.length() > 0) {
                     urlProps.setProperty(parameter, value);
                 }
             }
@@ -87,7 +87,7 @@ public abstract class AbstractDriver implements Driver {
             url = url.substring(0, indexOfColon);
         }
         // parse host
-        if (url != null && url.length() > 0 && url.trim().length() > 0) {
+        if (url.length() > 0 && url.trim().length() > 0) {
             urlProps.setProperty(TSDBDriver.PROPERTY_KEY_HOST, url);
         }
         return urlProps;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
index cb6c7d40ad..7d9d8ee515 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/AbstractParameterMetaData.java
@@ -1,7 +1,5 @@
 package com.taosdata.jdbc;
 
-import com.sun.org.apache.xpath.internal.operations.Bool;
-
 import java.sql.ParameterMetaData;
 import java.sql.SQLException;
 import java.sql.Timestamp;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
index cd266529f3..bda3d52212 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
@@ -15,10 +15,12 @@
 package com.taosdata.jdbc;
 
 import java.math.BigDecimal;
-import java.sql.*;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Iterator;
 import java.util.List;
 
 /*
@@ -130,7 +132,7 @@ public class DatabaseMetaDataResultSet extends AbstractResultSet {
     public Timestamp getTimestamp(int columnIndex) throws SQLException {
         int colType = columnMetaDataList.get(columnIndex - 1).getColType();
         int nativeType = TSDBConstants.jdbcType2TaosType(colType);
-        return rowCursor.getTimestamp(columnIndex,nativeType);
+        return rowCursor.getTimestamp(columnIndex, nativeType);
     }
 
     @Override
@@ -145,9 +147,7 @@ public class DatabaseMetaDataResultSet extends AbstractResultSet {
 
     @Override
     public int findColumn(String columnLabel) throws SQLException {
-        Iterator<ColumnMetaData> colMetaDataIt = this.columnMetaDataList.iterator();
-        while (colMetaDataIt.hasNext()) {
-            ColumnMetaData colMetaData = colMetaDataIt.next();
+        for (ColumnMetaData colMetaData : this.columnMetaDataList) {
             if (colMetaData.getColName() != null && colMetaData.getColName().equals(columnLabel)) {
                 return colMetaData.getColIndex();
             }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java
index b6587b942d..64b4276e93 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/EmptyResultSet.java
@@ -23,7 +23,7 @@ import java.util.Calendar;
 import java.util.Map;
 
 /*
- * TDengine only supports a subset of the standard SQL, thus this implemetation of the
+ * TDengine only supports a subset of the standard SQL, thus this implementation of the
  * standard JDBC API contains more or less some adjustments customized for certain
  * compatibility needs.
  */
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
index 02fee74eb5..8cd8da6de4 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConnection.java
@@ -20,7 +20,7 @@ import java.util.Properties;
 public class TSDBConnection extends AbstractConnection {
 
     private TSDBJNIConnector connector;
-    private TSDBDatabaseMetaData databaseMetaData;
+    private final TSDBDatabaseMetaData databaseMetaData;
     private boolean batchFetch;
 
     public Boolean getBatchFetch() {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
index e6406d2c6d..5b5128e720 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBConstants.java
@@ -54,10 +54,11 @@ public abstract class TSDBConstants {
     public static final int TSDB_DATA_TYPE_USMALLINT = 12;      //unsigned smallint
     public static final int TSDB_DATA_TYPE_UINT = 13;           //unsigned int
     public static final int TSDB_DATA_TYPE_UBIGINT = 14;        //unsigned bigint
+
     // nchar column max length
     public static final int maxFieldSize = 16 * 1024;
 
-    // precision for data types
+    // precision for data types, this is used for metadata
     public static final int BOOLEAN_PRECISION = 1;
     public static final int TINYINT_PRECISION = 4;
     public static final int SMALLINT_PRECISION = 6;
@@ -67,10 +68,12 @@ public abstract class TSDBConstants {
     public static final int DOUBLE_PRECISION = 22;
     public static final int TIMESTAMP_MS_PRECISION = 23;
     public static final int TIMESTAMP_US_PRECISION = 26;
-    // scale for data types
+    // scale for data types, this is used for metadata
     public static final int FLOAT_SCALE = 31;
     public static final int DOUBLE_SCALE = 31;
 
+    public static final String DEFAULT_PRECISION = "ms";
+
     public static int typeName2JdbcType(String type) {
         switch (type.toUpperCase()) {
             case "TIMESTAMP":
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
index 8b7ede148e..9a5eda4cd8 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDatabaseMetaData.java
@@ -20,8 +20,8 @@ import java.sql.SQLException;
 
 public class TSDBDatabaseMetaData extends AbstractDatabaseMetaData {
 
-    private String url;
-    private String userName;
+    private final String url;
+    private final String userName;
     private Connection conn;
 
     public TSDBDatabaseMetaData(String url, String userName) {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
index 55533bd28c..98a7d1929b 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBDriver.java
@@ -176,7 +176,7 @@ public class TSDBDriver extends AbstractDriver {
         int beginningOfSlashes = url.indexOf("//");
         int index = url.indexOf("?");
         if (index != -1) {
-            String paramString = url.substring(index + 1, url.length());
+            String paramString = url.substring(index + 1);
             url = url.substring(0, index);
             StringTokenizer queryParams = new StringTokenizer(paramString, "&");
             while (queryParams.hasMoreElements()) {
@@ -213,7 +213,7 @@ public class TSDBDriver extends AbstractDriver {
             url = url.substring(0, indexOfColon);
         }
 
-        if (url != null && url.length() > 0 && url.trim().length() > 0) {
+        if (url.length() > 0 && url.trim().length() > 0) {
             urlProps.setProperty(TSDBDriver.PROPERTY_KEY_HOST, url);
         }
 
@@ -233,7 +233,7 @@ public class TSDBDriver extends AbstractDriver {
         return false;
     }
 
-    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+    public Logger getParentLogger() {
         return null;
     }
 
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
index 411a61eb86..da89081428 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBError.java
@@ -8,7 +8,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class TSDBError {
-    private static Map<Integer, String> TSDBErrorMap = new HashMap<>();
+    private static final Map<Integer, String> TSDBErrorMap = new HashMap<>();
 
     static {
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_CONNECTION_CLOSED, "connection already closed");
@@ -34,9 +34,8 @@ public class TSDBError {
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE, "unknown taos type in tdengine");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN_TIMESTAMP_PERCISION, "unknown timestamp precision");
 
-        /**************************************************/
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNKNOWN, "unknown error");
-        /**************************************************/
+
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_SUBSCRIBE_FAILED, "failed to create subscription");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_UNSUPPORTED_ENCODING, "Unsupported encoding");
         TSDBErrorMap.put(TSDBErrorNumbers.ERROR_JNI_TDENGINE_ERROR, "internal error of database");
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
index 9f0ba5afab..714162b563 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBErrorNumbers.java
@@ -1,6 +1,7 @@
 package com.taosdata.jdbc;
 
 import java.util.HashSet;
+import java.util.Set;
 
 public class TSDBErrorNumbers {
 
@@ -39,10 +40,9 @@ public class TSDBErrorNumbers {
     public static final int ERROR_JNI_FETCH_END = 0x2358;       // fetch to the end of resultSet
     public static final int ERROR_JNI_OUT_OF_MEMORY = 0x2359;   // JNI alloc memory failed
 
-    private static final HashSet<Integer> errorNumbers;
+    private static final Set<Integer> errorNumbers = new HashSet();
 
     static {
-        errorNumbers = new HashSet();
         errorNumbers.add(ERROR_CONNECTION_CLOSED);
         errorNumbers.add(ERROR_UNSUPPORTED_METHOD);
         errorNumbers.add(ERROR_INVALID_VARIABLE);
@@ -65,7 +65,6 @@ public class TSDBErrorNumbers {
         errorNumbers.add(ERROR_UNKNOWN_TAOS_TYPE_IN_TDENGINE);
         errorNumbers.add(ERROR_UNKNOWN_TIMESTAMP_PERCISION);
 
-        /*****************************************************/
         errorNumbers.add(ERROR_SUBSCRIBE_FAILED);
         errorNumbers.add(ERROR_UNSUPPORTED_ENCODING);
         errorNumbers.add(ERROR_JNI_TDENGINE_ERROR);
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index bc4d58785a..7f400fc1ee 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -29,14 +29,9 @@ import java.util.List;
 public class TSDBJNIConnector {
     private static volatile Boolean isInitialized = false;
 
-    private TaosInfo taosInfo = TaosInfo.getInstance();
-
-    // Connection pointer used in C
-    private long taos = TSDBConstants.JNI_NULL_POINTER;
-
-    // result set status in current connection
-    private boolean isResultsetClosed;
-
+    private final TaosInfo taosInfo = TaosInfo.getInstance();
+    private long taos = TSDBConstants.JNI_NULL_POINTER;     // Connection pointer used in C
+    private boolean isResultsetClosed;      // result set status in current connection
     private int affectedRows = -1;
 
     static {
@@ -96,11 +91,9 @@ public class TSDBJNIConnector {
 
     /**
      * Execute DML/DDL operation
-     *
-     * @throws SQLException
      */
     public long executeQuery(String sql) throws SQLException {
-        Long pSql = 0l;
+        long pSql = 0L;
         try {
             pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
             taosInfo.stmt_count_increment();
@@ -161,7 +154,7 @@ public class TSDBJNIConnector {
     private native long getResultSetImp(long connection, long pSql);
 
     public boolean isUpdateQuery(long pSql) {
-        return isUpdateQueryImp(this.taos, pSql) == 1 ? true : false;
+        return isUpdateQueryImp(this.taos, pSql) == 1;
     }
 
     private native long isUpdateQueryImp(long connection, long pSql);
@@ -195,7 +188,7 @@ public class TSDBJNIConnector {
      */
     public int getSchemaMetaData(long resultSet, List<ColumnMetaData> columnMetaData) {
         int ret = this.getSchemaMetaDataImp(this.taos, resultSet, columnMetaData);
-        columnMetaData.stream().forEach(column -> column.setColIndex(column.getColIndex() + 1));
+        columnMetaData.forEach(column -> column.setColIndex(column.getColIndex() + 1));
         return ret;
     }
 
@@ -218,8 +211,9 @@ public class TSDBJNIConnector {
 
     /**
      * Get Result Time Precision.
+     *
      * @return 0: ms, 1: us, 2: ns
-    */
+     */
     public int getResultTimePrecision(long sqlObj) {
         return this.getResultTimePrecisionImp(this.taos, sqlObj);
     }
@@ -228,8 +222,6 @@ public class TSDBJNIConnector {
 
     /**
      * Execute close operation from C to release connection pointer by JNI
-     *
-     * @throws SQLException
      */
     public void closeConnection() throws SQLException {
         int code = this.closeConnectionImp(this.taos);
@@ -268,8 +260,6 @@ public class TSDBJNIConnector {
 
     /**
      * Unsubscribe, close a subscription
-     *
-     * @param subscription
      */
     void unsubscribe(long subscription, boolean isKeep) {
         unsubscribeImp(subscription, isKeep);
@@ -282,13 +272,13 @@ public class TSDBJNIConnector {
      */
     public boolean validateCreateTableSql(String sql) {
         int res = validateCreateTableSqlImp(taos, sql.getBytes());
-        return res != 0 ? false : true;
+        return res == 0;
     }
 
     private native int validateCreateTableSqlImp(long connection, byte[] sqlBytes);
 
     public long prepareStmt(String sql) throws SQLException {
-        Long stmt;
+        long stmt;
         try {
             stmt = prepareStmtImp(sql.getBytes(), this.taos);
         } catch (Exception e) {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
index 1a007156e9..d9042fb729 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBPreparedStatement.java
@@ -62,8 +62,8 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
 
         if (parameterCnt > 1) {
             // the table name is also a parameter, so ignore it.
-            this.colData = new ArrayList<ColumnInfo>();
-            this.tableTags = new ArrayList<TableTagInfo>();
+            this.colData = new ArrayList<>();
+            this.tableTags = new ArrayList<>();
         }
     }
 
@@ -73,12 +73,16 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
     }
 
     /*
+     *
+     */
+
+    /**
      * Some of the SQLs sent by other popular frameworks or tools like Spark, contains syntax that cannot be parsed by
      * the TDengine client. Thus, some simple parsers/filters are intentionally added in this JDBC implementation in
      * order to process those supported SQLs.
      */
     private void preprocessSql() {
-        /***** For processing some of Spark SQLs*****/
+        /***For processing some of Spark SQLs*/
         // should replace it first
         this.rawSql = this.rawSql.replaceAll("or (.*) is null", "");
         this.rawSql = this.rawSql.replaceAll(" where ", " WHERE ");
@@ -125,7 +129,6 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
             }
             rawSql = rawSql.replace(matcher.group(1), tableFullName);
         }
-        /***** for inner queries *****/
     }
 
     @Override
@@ -519,12 +522,10 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
         }
     }
 
-    ;
-
     private static class TableTagInfo {
         private boolean isNull;
-        private Object value;
-        private int type;
+        private final Object value;
+        private final int type;
 
         public TableTagInfo(Object value, int type) {
             this.value = value;
@@ -538,8 +539,6 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
         }
     }
 
-    ;
-
     public void setTableName(String name) {
         this.tableName = name;
     }
@@ -627,7 +626,7 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
             this.colData.addAll(Collections.nCopies(this.parameters.length - 1 - this.tableTags.size(), null));
         }
 
-        ColumnInfo col = (ColumnInfo) this.colData.get(columnIndex);
+        ColumnInfo col = this.colData.get(columnIndex);
         if (col == null) {
             ColumnInfo p = new ColumnInfo();
             p.setType(type);
@@ -718,8 +717,7 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
             ByteBuffer isNullList = ByteBuffer.allocate(num * Integer.BYTES);
             isNullList.order(ByteOrder.LITTLE_ENDIAN);
 
-            for (int i = 0; i < num; ++i) {
-                TableTagInfo tag = this.tableTags.get(i);
+            for (TableTagInfo tag : this.tableTags) {
                 if (tag.isNull) {
                     typeList.put((byte) tag.type);
                     isNullList.putInt(1);
@@ -818,7 +816,7 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
                     typeList, lengthList, isNullList);
         }
 
-        ColumnInfo colInfo = (ColumnInfo) this.colData.get(0);
+        ColumnInfo colInfo = this.colData.get(0);
         if (colInfo == null) {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN, "column data not bind");
         }
@@ -954,7 +952,6 @@ public class TSDBPreparedStatement extends TSDBStatement implements PreparedStat
                     throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNKNOWN, "not support data types");
                 }
             }
-            ;
 
             connector.bindColumnDataArray(this.nativeStmtHandle, colDataList, lengthList, isNullList, col1.type, col1.bytes, rows, i);
         }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
index 59a64ad520..00a62206fc 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSet.java
@@ -339,11 +339,11 @@ public class TSDBResultSet extends AbstractResultSet implements ResultSet {
                 case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
                 case TSDBConstants.TSDB_DATA_TYPE_INT:
                 case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-                    res = new BigDecimal(Long.valueOf(this.rowData.getObject(columnIndex).toString()));
+                    res = new BigDecimal(Long.parseLong(this.rowData.getObject(columnIndex).toString()));
                     break;
                 case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
                 case TSDBConstants.TSDB_DATA_TYPE_DOUBLE:
-                    res = new BigDecimal(Double.valueOf(this.rowData.getObject(columnIndex).toString()));
+                    res = BigDecimal.valueOf(Double.parseDouble(this.rowData.getObject(columnIndex).toString()));
                     break;
                 case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
                     return new BigDecimal(((Timestamp) this.rowData.getObject(columnIndex)).getTime());
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
index 7b3be5d263..6211f61dc5 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
@@ -36,23 +36,20 @@ public class TSDBResultSetBlockData {
     private int rowIndex = 0;
 
     private List<ColumnMetaData> columnMetaDataList;
-    private ArrayList<Object> colData = null;
+    private ArrayList<Object> colData;
 
     public TSDBResultSetBlockData(List<ColumnMetaData> colMeta, int numOfCols) {
         this.columnMetaDataList = colMeta;
-        this.colData = new ArrayList<Object>(numOfCols);
+        this.colData = new ArrayList<>(numOfCols);
     }
 
     public TSDBResultSetBlockData() {
-        this.colData = new ArrayList<Object>();
+        this.colData = new ArrayList<>();
     }
 
     public void clear() {
         int size = this.colData.size();
-        if (this.colData != null) {
-            this.colData.clear();
-        }
-
+        this.colData.clear();
         setNumOfCols(size);
     }
 
@@ -69,7 +66,7 @@ public class TSDBResultSetBlockData {
     }
 
     public void setNumOfCols(int numOfCols) {
-        this.colData = new ArrayList<Object>(numOfCols);
+        this.colData = new ArrayList<>(numOfCols);
         this.colData.addAll(Collections.nCopies(numOfCols, null));
     }
 
@@ -166,15 +163,10 @@ public class TSDBResultSetBlockData {
         }
     }
 
-    
 
     /**
      * The original type may not be a string type, but will be converted to by
      * calling this method
-     *
-     * @param col column index
-     * @return
-     * @throws SQLException
      */
     public String getString(int col) throws SQLException {
         Object obj = get(col);
@@ -387,7 +379,7 @@ public class TSDBResultSetBlockData {
                     return null;
                 }
 
-                return (long) val;
+                return val;
             }
 
             case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
index 48d4247392..6292673352 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetMetaData.java
@@ -41,10 +41,7 @@ public class TSDBResultSetMetaData extends WrapperImpl implements ResultSetMetaD
     }
 
     public boolean isSearchable(int column) throws SQLException {
-        if (column == 1) {
-            return true;
-        }
-        return false;
+        return column == 1;
     }
 
     public boolean isCurrency(int column) throws SQLException {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
index e00ec1e758..b91fe88dfa 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetRowData.java
@@ -19,14 +19,13 @@ import com.taosdata.jdbc.utils.NullType;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.sql.Timestamp;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 
 public class TSDBResultSetRowData {
 
     private ArrayList<Object> data;
-    private int colSize;
+    private final int colSize;
 
     public TSDBResultSetRowData(int colSize) {
         this.colSize = colSize;
@@ -390,27 +389,27 @@ public class TSDBResultSetRowData {
 
         switch (nativeType) {
             case TSDBConstants.TSDB_DATA_TYPE_UTINYINT: {
-                Byte value = new Byte(String.valueOf(obj));
+                byte value = new Byte(String.valueOf(obj));
                 if (value >= 0)
-                    return value.toString();
+                    return Byte.toString(value);
                 return Integer.toString(value & 0xff);
             }
             case TSDBConstants.TSDB_DATA_TYPE_USMALLINT: {
-                Short value = new Short(String.valueOf(obj));
+                short value = new Short(String.valueOf(obj));
                 if (value >= 0)
-                    return value.toString();
+                    return Short.toString(value);
                 return Integer.toString(value & 0xffff);
             }
             case TSDBConstants.TSDB_DATA_TYPE_UINT: {
-                Integer value = new Integer(String.valueOf(obj));
+                int value = new Integer(String.valueOf(obj));
                 if (value >= 0)
-                    return value.toString();
-                return Long.toString(value & 0xffffffffl);
+                    return Integer.toString(value);
+                return Long.toString(value & 0xffffffffL);
             }
             case TSDBConstants.TSDB_DATA_TYPE_UBIGINT: {
-                Long value = new Long(String.valueOf(obj));
+                long value = new Long(String.valueOf(obj));
                 if (value >= 0)
-                    return value.toString();
+                    return Long.toString(value);
                 long lowValue = value & 0x7fffffffffffffffL;
                 return BigDecimal.valueOf(lowValue).add(BigDecimal.valueOf(Long.MAX_VALUE)).add(BigDecimal.valueOf(1)).toString();
             }
@@ -432,25 +431,26 @@ public class TSDBResultSetRowData {
 
     /**
      * !!! this method is invoked by JNI method and the index start from 0 in C implementations
+     *
      * @param precision 0 : ms, 1 : us, 2 : ns
      */
     public void setTimestamp(int col, long ts, int precision) {
-        long milliseconds = 0;
-        int fracNanoseconds = 0;
+        long milliseconds;
+        int fracNanoseconds;
         switch (precision) {
             case 0: {
                 milliseconds = ts;
-                fracNanoseconds = (int)(ts*1_000_000%1_000_000_000);
+                fracNanoseconds = (int) (ts * 1_000_000 % 1_000_000_000);
                 break;
             }
             case 1: {
-                milliseconds = ts/1_000;
-                fracNanoseconds = (int)(ts*1_000%1_000_000_000);
+                milliseconds = ts / 1_000;
+                fracNanoseconds = (int) (ts * 1_000 % 1_000_000_000);
                 break;
             }
             case 2: {
-                milliseconds = ts/1_000_000;
-                fracNanoseconds = (int)(ts%1_000_000_000);
+                milliseconds = ts / 1_000_000;
+                fracNanoseconds = (int) (ts % 1_000_000_000);
                 break;
             }
             default: {
@@ -467,12 +467,10 @@ public class TSDBResultSetRowData {
         Object obj = data.get(col - 1);
         if (obj == null)
             return null;
-        switch (nativeType) {
-            case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
-                return new Timestamp((Long) obj);
-            default:
-                return (Timestamp) obj;
+        if (nativeType == TSDBConstants.TSDB_DATA_TYPE_BIGINT) {
+            return new Timestamp((Long) obj);
         }
+        return (Timestamp) obj;
     }
 
     public Object getObject(int col) {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
index c5fd497ca3..d74f7755b2 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBSubscribe.java
@@ -47,9 +47,6 @@ public class TSDBSubscribe {
 
     /**
      * close subscription
-     *
-     * @param keepProgress
-     * @throws SQLException
      */
     public void close(boolean keepProgress) throws SQLException {
         if (this.connecter.isClosed())
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/enums/TimestampFormat.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java
similarity index 65%
rename from src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/enums/TimestampFormat.java
rename to src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java
index edc429857e..5ff0774639 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/enums/TimestampFormat.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/enums/TimestampFormat.java
@@ -1,4 +1,4 @@
-package com.taosdata.jdbc.rs.enums;
+package com.taosdata.jdbc.enums;
 
 public enum TimestampFormat {
     STRING,
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
index d6a02b7e3a..12a0ab57e2 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulConnection.java
@@ -16,7 +16,7 @@ public class RestfulConnection extends AbstractConnection {
     private final String host;
     private final int port;
     private final String url;
-    private volatile String database;
+    private final String database;
     private final String token;
     /******************************************************/
     private boolean isClosed;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
index 16272f4289..1eaddce1d6 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulPreparedStatement.java
@@ -13,7 +13,7 @@ import java.util.Calendar;
 
 public class RestfulPreparedStatement extends RestfulStatement implements PreparedStatement {
 
-    private ParameterMetaData parameterMetaData;
+    private final ParameterMetaData parameterMetaData;
     private final String rawSql;
     private Object[] parameters;
     private boolean isPrepared;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
index 13850f0b80..d435062ef6 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSet.java
@@ -7,7 +7,7 @@ import com.google.common.primitives.Longs;
 import com.google.common.primitives.Shorts;
 import com.taosdata.jdbc.*;
 import com.taosdata.jdbc.enums.TimestampPrecision;
-import com.taosdata.jdbc.rs.enums.TimestampFormat;
+import com.taosdata.jdbc.enums.TimestampFormat;
 import com.taosdata.jdbc.utils.Utils;
 
 import java.math.BigDecimal;
@@ -17,19 +17,20 @@ import java.time.ZoneOffset;
 import java.time.format.DateTimeParseException;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.List;
 
 public class RestfulResultSet extends AbstractResultSet implements ResultSet {
-    private volatile boolean isClosed;
-    private int pos = -1;
 
-    private final String database;
     private final Statement statement;
     // data
-    private final ArrayList<ArrayList<Object>> resultSet = new ArrayList<>();
+    private final List<List<Object>> resultSet = new ArrayList<>();
     // meta
-    private ArrayList<String> columnNames = new ArrayList<>();
-    private ArrayList<Field> columns = new ArrayList<>();
-    private RestfulResultSetMetaData metaData;
+    private final List<String> columnNames = new ArrayList<>();
+    private final List<Field> columns = new ArrayList<>();
+    private final RestfulResultSetMetaData metaData;
+
+    private volatile boolean isClosed;
+    private int pos = -1;
 
     /**
      * 由一个result的Json构造结果集，对应执行show databases, show tables等这些语句，返回结果集，但无法获取结果集对应的meta，统一当成String处理
@@ -37,35 +38,30 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
      * @param resultJson: 包含data信息的结果集，有sql返回的结果集
      ***/
     public RestfulResultSet(String database, Statement statement, JSONObject resultJson) throws SQLException {
-        this.database = database;
         this.statement = statement;
 
+        // get head
+        JSONArray head = resultJson.getJSONArray("head");
         // get column metadata
         JSONArray columnMeta = resultJson.getJSONArray("column_meta");
         // get row data
         JSONArray data = resultJson.getJSONArray("data");
-        if (data == null || data.isEmpty()) {
-            columnNames.clear();
-            columns.clear();
-            this.resultSet.clear();
-            this.metaData = new RestfulResultSetMetaData(this.database, null, this);
-            return;
-        }
-        // get head
-        JSONArray head = resultJson.getJSONArray("head");
         // get rows
         Integer rows = resultJson.getInteger("rows");
+
         // parse column_meta
         if (columnMeta != null) {
             parseColumnMeta_new(columnMeta);
         } else {
             parseColumnMeta_old(head, data, rows);
         }
-        this.metaData = new RestfulResultSetMetaData(this.database, columns, this);
+        this.metaData = new RestfulResultSetMetaData(database, columns, this);
+
+        if (data == null || data.isEmpty())
+            return;
         // parse row data
-        resultSet.clear();
         for (int rowIndex = 0; rowIndex < data.size(); rowIndex++) {
-            ArrayList row = new ArrayList();
+            List<Object> row = new ArrayList();
             JSONArray jsonRow = data.getJSONArray(rowIndex);
             for (int colIndex = 0; colIndex < this.metaData.getColumnCount(); colIndex++) {
                 row.add(parseColumnData(jsonRow, colIndex, columns.get(colIndex).taos_type));
@@ -174,8 +170,8 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
                 //TODO: this implementation has bug if the timestamp bigger than 9999_9999_9999_9
                 if (value < 1_0000_0000_0000_0L)
                     return new Timestamp(value);
-                long epochSec = value / 1000_000l;
-                long nanoAdjustment = value % 1000_000l * 1000l;
+                long epochSec = value / 1000_000L;
+                long nanoAdjustment = value % 1000_000L * 1000L;
                 return Timestamp.from(Instant.ofEpochSecond(epochSec, nanoAdjustment));
             }
             case UTC: {
@@ -244,10 +240,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
         pos++;
-        if (pos <= resultSet.size() - 1) {
-            return true;
-        }
-        return false;
+        return pos <= resultSet.size() - 1;
     }
 
     @Override
@@ -257,13 +250,6 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         }
     }
 
-//    @Override
-//    public boolean wasNull() throws SQLException {
-//        if (isClosed())
-//            throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
-//        return resultSet.isEmpty();
-//    }
-
     @Override
     public String getString(int columnIndex) throws SQLException {
         checkAvailability(columnIndex, resultSet.get(pos).size());
@@ -288,7 +274,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         wasNull = false;
         if (value instanceof Boolean)
             return (boolean) value;
-        return Boolean.valueOf(value.toString());
+        return Boolean.parseBoolean(value.toString());
     }
 
     @Override
@@ -443,9 +429,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return null;
         if (value instanceof Timestamp)
             return new Date(((Timestamp) value).getTime());
-        Date date = null;
-        date = Utils.parseDate(value.toString());
-        return date;
+        return Utils.parseDate(value.toString());
     }
 
     @Override
@@ -460,8 +444,7 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         Time time = null;
         try {
             time = Utils.parseTime(value.toString());
-        } catch (DateTimeParseException e) {
-            time = null;
+        } catch (DateTimeParseException ignored) {
         }
         return time;
     }
@@ -525,9 +508,9 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
             return null;
 
         if (value instanceof Long || value instanceof Integer || value instanceof Short || value instanceof Byte)
-            return new BigDecimal(Long.valueOf(value.toString()));
+            return new BigDecimal(Long.parseLong(value.toString()));
         if (value instanceof Double || value instanceof Float)
-            return new BigDecimal(Double.valueOf(value.toString()));
+            return BigDecimal.valueOf(Double.parseDouble(value.toString()));
         if (value instanceof Timestamp)
             return new BigDecimal(((Timestamp) value).getTime());
         BigDecimal ret;
@@ -637,36 +620,6 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         if (isClosed())
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_RESULTSET_CLOSED);
 
-//        if (this.resultSet.size() == 0)
-//            return false;
-//
-//        if (row == 0) {
-//            beforeFirst();
-//            return false;
-//        } else if (row == 1) {
-//            return first();
-//        } else if (row == -1) {
-//            return last();
-//        } else if (row > this.resultSet.size()) {
-//            afterLast();
-//            return false;
-//        } else {
-//            if (row < 0) {
-//                // adjust to reflect after end of result set
-//                int newRowPosition = this.resultSet.size() + row + 1;
-//                if (newRowPosition <= 0) {
-//                    beforeFirst();
-//                    return false;
-//                } else {
-//                    return absolute(newRowPosition);
-//                }
-//            } else {
-//                row--; // adjust for index difference
-//                this.pos = row;
-//                return true;
-//            }
-//        }
-
         throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_UNSUPPORTED_METHOD);
     }
 
@@ -710,5 +663,4 @@ public class RestfulResultSet extends AbstractResultSet implements ResultSet {
         return isClosed;
     }
 
-
-}
+}
\ No newline at end of file
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
index a185abb709..148f77974f 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulResultSetMetaData.java
@@ -7,20 +7,17 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.sql.Types;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class RestfulResultSetMetaData extends WrapperImpl implements ResultSetMetaData {
 
     private final String database;
-    private List<RestfulResultSet.Field> fields;
-    private final RestfulResultSet resultSet;
+    private final List<RestfulResultSet.Field> fields;
 
-    public RestfulResultSetMetaData(String database, ArrayList<RestfulResultSet.Field> fields, RestfulResultSet resultSet) {
+    public RestfulResultSetMetaData(String database, List<RestfulResultSet.Field> fields, RestfulResultSet resultSet) {
         this.database = database;
         this.fields = fields == null ? Collections.emptyList() : fields;
-        this.resultSet = resultSet;
     }
 
     public List<RestfulResultSet.Field> getFields() {
@@ -141,8 +138,8 @@ public class RestfulResultSetMetaData extends WrapperImpl implements ResultSetMe
 
     @Override
     public String getColumnTypeName(int column) throws SQLException {
-        int taos_type = fields.get(column - 1).taos_type;
-        return TSDBConstants.taosType2JdbcTypeName(taos_type);
+        int taosType = fields.get(column - 1).taos_type;
+        return TSDBConstants.taosType2JdbcTypeName(taosType);
     }
 
     @Override
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
index e9d193f6b4..f8acd8f061 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/rs/RestfulStatement.java
@@ -35,10 +35,6 @@ public class RestfulStatement extends AbstractStatement {
         if (!SqlSyntaxValidator.isValidForExecuteQuery(sql))
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE_QUERY, "not a valid sql for executeQuery: " + sql);
 
-        if (SqlSyntaxValidator.isDatabaseUnspecifiedQuery(sql)) {
-            return executeOneQuery(sql);
-        }
-
         return executeOneQuery(sql);
     }
 
@@ -50,9 +46,6 @@ public class RestfulStatement extends AbstractStatement {
             throw TSDBError.createSQLException(TSDBErrorNumbers.ERROR_INVALID_FOR_EXECUTE_UPDATE, "not a valid sql for executeUpdate: " + sql);
 
         final String url = "http://" + conn.getHost() + ":" + conn.getPort() + "/rest/sql";
-        if (SqlSyntaxValidator.isDatabaseUnspecifiedUpdate(sql)) {
-            return executeOneUpdate(url, sql);
-        }
 
         return executeOneUpdate(url, sql);
     }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java
index ff27bdbdad..715b051b74 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/HttpClientPoolUtil.java
@@ -27,19 +27,18 @@ public class HttpClientPoolUtil {
     private static final int DEFAULT_MAX_TOTAL = 1000;
     private static final int DEFAULT_HTTP_KEEP_TIME = 15000;
 
-    private static PoolingHttpClientConnectionManager connectionManager;
     private static CloseableHttpClient httpClient;
 
     private static synchronized void initPools() {
         if (httpClient == null) {
-            connectionManager = new PoolingHttpClientConnectionManager();
+            PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager();
             connectionManager.setDefaultMaxPerRoute(DEFAULT_MAX_PER_ROUTE);
             connectionManager.setMaxTotal(DEFAULT_MAX_TOTAL);
             httpClient = HttpClients.custom().setKeepAliveStrategy(DEFAULT_KEEP_ALIVE_STRATEGY).setConnectionManager(connectionManager).build();
         }
     }
 
-    private static ConnectionKeepAliveStrategy DEFAULT_KEEP_ALIVE_STRATEGY = (response, context) -> {
+    private static final ConnectionKeepAliveStrategy DEFAULT_KEEP_ALIVE_STRATEGY = (response, context) -> {
         HeaderElementIterator it = new BasicHeaderElementIterator(response.headerIterator(HTTP.CONN_KEEP_ALIVE));
         int keepTime = DEFAULT_HTTP_KEEP_TIME * 1000;
         while (it.hasNext()) {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
index 251ca2af01..15faa41a27 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/SqlSyntaxValidator.java
@@ -14,10 +14,6 @@
  *****************************************************************************/
 package com.taosdata.jdbc.utils;
 
-import com.taosdata.jdbc.TSDBConnection;
-
-import java.sql.Connection;
-
 public class SqlSyntaxValidator {
 
     private static final String[] SQL = {"select", "insert", "import", "create", "use", "alter", "drop", "set", "show", "describe"};
@@ -26,12 +22,6 @@ public class SqlSyntaxValidator {
 
     private static final String[] databaseUnspecifiedShow = {"databases", "dnodes", "mnodes", "variables"};
 
-    private TSDBConnection tsdbConnection;
-
-    public SqlSyntaxValidator(Connection connection) {
-        this.tsdbConnection = (TSDBConnection) connection;
-    }
-
     public static boolean isValidForExecuteUpdate(String sql) {
         for (String prefix : updateSQL) {
             if (sql.trim().toLowerCase().startsWith(prefix))
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
index 4c92d27a28..e3179bd317 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/utils/Utils.java
@@ -6,6 +6,7 @@ import com.google.common.collect.TreeRangeSet;
 import com.taosdata.jdbc.enums.TimestampPrecision;
 
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -160,7 +161,7 @@ public class Utils {
             String paraStr;
             if (para != null) {
                 if (para instanceof byte[]) {
-                    paraStr = new String((byte[]) para, Charset.forName("UTF-8"));
+                    paraStr = new String((byte[]) para, StandardCharsets.UTF_8);
                 } else {
                     paraStr = para.toString();
                 }
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
deleted file mode 100644
index 73ceafa729..0000000000
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.taosdata.jdbc;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.sql.*;
-import java.util.Properties;
-
-public class StatementTest {
-    static Connection connection = null;
-    static Statement statement = null;
-    static String dbName = "test";
-    static String tName = "t0";
-    static String host = "localhost";
-
-    @BeforeClass
-    public static void createConnection() throws SQLException {
-        try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
-            Properties properties = new Properties();
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
-            properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-            connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/?user=root&password=taosdata", properties);
-            statement = connection.createStatement();
-            statement.executeUpdate("drop database if exists " + dbName);
-
-        } catch (ClassNotFoundException e) {
-            return;
-        }
-    }
-
-    @Test
-    public void testCase() {
-        try {
-            ResultSet rs = statement.executeQuery("show databases");
-            ResultSetMetaData metaData = rs.getMetaData();
-            while (rs.next()) {
-                for (int i = 1; i <= metaData.getColumnCount(); i++) {
-                    System.out.print(metaData.getColumnLabel(i) + ":" + rs.getString(i) + "\t");
-                }
-                System.out.println();
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    public void createTableAndQuery() throws SQLException {
-        long ts = System.currentTimeMillis();
-
-        statement.executeUpdate("create database if not exists " + dbName);
-        statement.executeUpdate("create table if not exists " + dbName + "." + tName + "(ts timestamp, k1 int)");
-        statement.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", 1)");
-        statement.execute("select * from " + dbName + "." + tName);
-        ResultSet resultSet = statement.getResultSet();
-        Assert.assertNotNull(resultSet);
-
-        boolean isClosed = statement.isClosed();
-        Assert.assertEquals(false, isClosed);
-    }
-
-    @Test(expected = SQLException.class)
-    public void testUnsupport() throws SQLException {
-        Assert.assertNotNull(statement.unwrap(TSDBStatement.class));
-        Assert.assertTrue(statement.isWrapperFor(TSDBStatement.class));
-
-        statement.getMaxFieldSize();
-        statement.setMaxFieldSize(0);
-        statement.setEscapeProcessing(true);
-        statement.cancel();
-        statement.getWarnings();
-        statement.clearWarnings();
-        statement.setCursorName(null);
-        statement.getMoreResults();
-        statement.setFetchDirection(0);
-        statement.getFetchDirection();
-        statement.getResultSetConcurrency();
-        statement.getResultSetType();
-        statement.getConnection();
-        statement.getMoreResults();
-        statement.getGeneratedKeys();
-        statement.executeUpdate(null, 0);
-        statement.executeUpdate(null, new int[]{0});
-        statement.executeUpdate(null, new String[]{"str1", "str2"});
-        statement.getResultSetHoldability();
-        statement.setPoolable(true);
-        statement.isPoolable();
-        statement.closeOnCompletion();
-        statement.isCloseOnCompletion();
-    }
-
-    @AfterClass
-    public static void close() {
-        try {
-            statement.execute("drop database if exists " + dbName);
-            if (statement != null)
-                statement.close();
-            if (connection != null)
-                connection.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
index dc6d0d322a..30c6d99a40 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBConnectionTest.java
@@ -380,14 +380,15 @@ public class TSDBConnectionTest {
         conn.abort(null);
     }
 
-    @Test(expected = SQLFeatureNotSupportedException.class)
+    @Test
     public void setNetworkTimeout() throws SQLException {
         conn.setNetworkTimeout(null, 1000);
     }
 
-    @Test(expected = SQLFeatureNotSupportedException.class)
+    @Test
     public void getNetworkTimeout() throws SQLException {
-        conn.getNetworkTimeout();
+        int networkTimeout = conn.getNetworkTimeout();
+        Assert.assertEquals(0, networkTimeout);
     }
 
     @Test
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java
index 51535bc886..c1dfa42511 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBStatementTest.java
@@ -14,24 +14,6 @@ public class TSDBStatementTest {
     private static Connection conn;
     private static Statement stmt;
 
-    @Test
-    public void executeQuery() {
-        try {
-            ResultSet rs = stmt.executeQuery("show databases");
-            Assert.assertNotNull(rs);
-            ResultSetMetaData meta = rs.getMetaData();
-            while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
-            }
-            rs.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
     @Test
     public void executeUpdate() {
         final String dbName = ("test_" + UUID.randomUUID()).replace("-", "_").substring(0, 32);
@@ -173,10 +155,6 @@ public class TSDBStatementTest {
             Assert.assertEquals(3, meta.getColumnCount());
             int count = 0;
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
                 count++;
             }
             Assert.assertEquals(1, count);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java
index 19bc5f713f..4f37183e71 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AppMemoryLeakTest.java
@@ -1,5 +1,6 @@
 package com.taosdata.jdbc.cases;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.sql.Connection;
@@ -12,21 +13,19 @@ public class AppMemoryLeakTest {
     @Test(expected = SQLException.class)
     public void testCreateTooManyConnection() throws ClassNotFoundException, SQLException {
         Class.forName("com.taosdata.jdbc.TSDBDriver");
-        int conCnt = 0;
         while (true) {
             Connection conn = DriverManager.getConnection("jdbc:TAOS://localhost:6030/?user=root&password=taosdata");
-            System.out.println(conCnt++ + " : " + conn);
+            Assert.assertNotNull(conn);
         }
     }
 
     @Test(expected = Exception.class)
     public void testCreateTooManyStatement() throws ClassNotFoundException, SQLException {
         Class.forName("com.taosdata.jdbc.TSDBDriver");
-        int stmtCnt = 0;
         Connection conn = DriverManager.getConnection("jdbc:TAOS://localhost:6030/?user=root&password=taosdata");
         while (true) {
             Statement stmt = conn.createStatement();
-            System.out.println(++stmtCnt + " : " + stmt);
+            Assert.assertNotNull(stmt);
         }
     }
 
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java
similarity index 98%
rename from src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
rename to src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java
index a6fb6cfda0..6702de9bdb 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/AuthenticationTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/AuthenticationTest.java
@@ -1,4 +1,4 @@
-package com.taosdata.jdbc.rs;
+package com.taosdata.jdbc.cases;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
index e2541e8109..e175d6d114 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/BatchInsertTest.java
@@ -60,7 +60,6 @@ public class BatchInsertTest {
             final int index = i;
             executorService.execute(() -> {
                 try {
-                    long startTime = System.currentTimeMillis();
                     Statement statement = connection.createStatement(); // get statement
                     StringBuilder sb = new StringBuilder();
                     sb.append("INSERT INTO " + tablePrefix + index + " VALUES");
@@ -73,8 +72,6 @@ public class BatchInsertTest {
                     }
                     statement.addBatch(sb.toString());
                     statement.executeBatch();
-                    long endTime = System.currentTimeMillis();
-                    System.out.println("Thread " + index + " takes " + (endTime - startTime) + " microseconds");
                     connection.commit();
                     statement.close();
                 } catch (Exception e) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java
index 7f2d367dce..31893527af 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ConnectMultiTaosdByRestfulWithDifferentTokenTest.java
@@ -31,9 +31,6 @@ public class ConnectMultiTaosdByRestfulWithDifferentTokenTest {
             ResultSet rs = stmt.executeQuery("select server_status()");
             ResultSetMetaData meta = rs.getMetaData();
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.println(meta.getColumnLabel(i) + ": " + rs.getString(i));
-                }
             }
         } catch (SQLException e) {
             e.printStackTrace();
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
index f97e555ad1..14c7698548 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/DatetimeBefore1970Test.java
@@ -1,64 +1,76 @@
 package com.taosdata.jdbc.cases;
 
 import com.taosdata.jdbc.utils.TimestampUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 import java.sql.*;
 
 public class DatetimeBefore1970Test {
 
-    private static Connection conn;
+    private static final String host = "127.0.0.1";
+    private Connection conn;
 
     @Test
     public void test() {
         try (Statement stmt = conn.createStatement()) {
+            // given
             stmt.executeUpdate("insert into weather(ts) values('1969-12-31 23:59:59.999')");
             stmt.executeUpdate("insert into weather(ts) values('1970-01-01 00:00:00.000')");
             stmt.executeUpdate("insert into weather(ts) values('1970-01-01 08:00:00.000')");
             stmt.executeUpdate("insert into weather(ts) values('1970-01-01 07:59:59.999')");
+            ResultSet rs = stmt.executeQuery("select * from weather order by ts asc");
+            ResultSetMetaData metaData = rs.getMetaData();
+            Assert.assertEquals(2, metaData.getColumnCount());
+
+            // when
+            rs.next();
+            // then
+            Timestamp ts = rs.getTimestamp("ts");
+            Assert.assertEquals("1969-12-31 23:59:59.999", TimestampUtil.longToDatetime(ts.getTime()));
+
+            // when
+            rs.next();
+            // then
+            ts = rs.getTimestamp("ts");
+            Assert.assertEquals("1970-01-01 00:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+
+            // when
+            rs.next();
+            // then
+            ts = rs.getTimestamp("ts");
+            Assert.assertEquals("1970-01-01 08:00:00.000", TimestampUtil.longToDatetime(ts.getTime()));
+
+            // when
+            rs.next();
+            // then
+            ts = rs.getTimestamp("ts");
+            Assert.assertEquals("1970-01-01 07:59:59.999", TimestampUtil.longToDatetime(ts.getTime()));
 
-            ResultSet rs = stmt.executeQuery("select * from weather");
-            while (rs.next()) {
-                Timestamp ts = rs.getTimestamp("ts");
-                System.out.println("long: " + ts.getTime() + ", string: " + TimestampUtil.longToDatetime(ts.getTime()));
-            }
         } catch (SQLException e) {
             e.printStackTrace();
         }
     }
 
-    public static void main(String[] args) {
-        System.out.println("timestamp: " + Long.MAX_VALUE + ", string: " + TimestampUtil.longToDatetime(Long.MAX_VALUE));
-        System.out.println("timestamp: " + Long.MIN_VALUE + ", string: " + TimestampUtil.longToDatetime(Long.MIN_VALUE));
-        System.out.println("timestamp: " + 0 + ", string: " + TimestampUtil.longToDatetime(0));
-        System.out.println("timestamp: " + -1 + ", string: " + TimestampUtil.longToDatetime(-1));
-        String datetime = "1970-01-01 00:00:00.000";
-        System.out.println("timestamp: " + TimestampUtil.datetimeToLong(datetime) + ", string: " + datetime);
-        datetime = "1969-12-31 23:59:59.999";
-        System.out.println("timestamp: " + TimestampUtil.datetimeToLong(datetime) + ", string: " + datetime);
-    }
-
-    @BeforeClass
-    public static void beforeClass() {
+    @Before
+    public void before() {
         try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
-            conn = DriverManager.getConnection("jdbc:TAOS://127.0.0.1:6030/?user=root&password=taosdata");
+            conn = DriverManager.getConnection("jdbc:TAOS://" + host + ":6030/?user=root&password=taosdata");
             Statement stmt = conn.createStatement();
             stmt.execute("drop database if exists test_timestamp");
             stmt.execute("create database if not exists test_timestamp keep 36500");
             stmt.execute("use test_timestamp");
             stmt.execute("create table weather(ts timestamp,f1 float)");
             stmt.close();
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (SQLException e) {
             e.printStackTrace();
         }
     }
 
-    @AfterClass
-    public static void afterClass() {
+    @After
+    public void after() {
         try {
+            Statement stmt = conn.createStatement();
+            stmt.execute("drop database if exists test_timestamp");
             if (conn != null)
                 conn.close();
         } catch (SQLException e) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ImportTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ImportTest.java
index d7603312a0..bc11c7f34e 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ImportTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ImportTest.java
@@ -20,7 +20,6 @@ public class ImportTest {
     @BeforeClass
     public static void before() {
         try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
@@ -33,8 +32,6 @@ public class ImportTest {
             stmt.close();
 
             ts = System.currentTimeMillis();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -47,7 +44,6 @@ public class ImportTest {
             for (int i = 0; i < 50; i++) {
                 ts++;
                 int row = stmt.executeUpdate("import into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
-                System.out.println("import into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
                 assertEquals(1, row);
             }
         }
@@ -84,7 +80,6 @@ public class ImportTest {
                 long t = (++ts) + a;
                 sqlBuilder.append("(").append(t).append(",").append((100 + i)).append(",").append(i).append(") ");
             }
-            System.out.println(sqlBuilder.toString());
             int rows = stmt.executeUpdate(sqlBuilder.toString());
             assertEquals(50, rows);
         } catch (SQLException e) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MicroSecondPrecisionJNITest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MicroSecondPrecisionJNITest.java
index 54e4273ea3..eb8f134227 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MicroSecondPrecisionJNITest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MicroSecondPrecisionJNITest.java
@@ -41,7 +41,6 @@ public class MicroSecondPrecisionJNITest {
             rs.next();
 
             Timestamp timestamp = rs.getTimestamp(1);
-            System.out.println(timestamp);
             long ts = timestamp.getTime();
             Assert.assertEquals(timestamp1, ts);
             int nanos = timestamp.getNanos();
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MultiThreadsWithSameStatmentTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MultiThreadsWithSameStatementTest.java
similarity index 84%
rename from src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MultiThreadsWithSameStatmentTest.java
rename to src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MultiThreadsWithSameStatementTest.java
index 5cb76cc0cb..da6853d2fa 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MultiThreadsWithSameStatmentTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/MultiThreadsWithSameStatementTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
 import java.sql.*;
 import java.util.concurrent.TimeUnit;
 
-public class MultiThreadsWithSameStatmentTest {
+public class MultiThreadsWithSameStatementTest {
 
 
     private class Service {
@@ -16,12 +16,11 @@ public class MultiThreadsWithSameStatmentTest {
 
         public Service() {
             try {
-                Class.forName("com.taosdata.jdbc.TSDBDriver");
                 conn = DriverManager.getConnection("jdbc:TAOS://localhost:6030/?user=root&password=taosdata");
                 stmt = conn.createStatement();
                 stmt.execute("create database if not exists jdbctest");
                 stmt.executeUpdate("create table if not exists jdbctest.weather (ts timestamp, f1 int)");
-            } catch (ClassNotFoundException | SQLException e) {
+            } catch (SQLException e) {
                 e.printStackTrace();
             }
         }
@@ -48,10 +47,6 @@ public class MultiThreadsWithSameStatmentTest {
                 ResultSet resultSet = service.stmt.executeQuery("select * from jdbctest.weather");
                 while (resultSet.next()) {
                     ResultSetMetaData metaData = resultSet.getMetaData();
-                    for (int i = 1; i <= metaData.getColumnCount(); i++) {
-                        System.out.print(metaData.getColumnLabel(i) + ": " + resultSet.getString(i));
-                    }
-                    System.out.println();
                 }
                 resultSet.close();
                 service.release();
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetJNITest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetJNITest.java
index 076125a752..ae0241bf31 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetJNITest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetJNITest.java
@@ -17,11 +17,6 @@ public class NullValueInResultSetJNITest {
             ResultSet rs = stmt.executeQuery("select * from weather");
             ResultSetMetaData meta = rs.getMetaData();
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    Object value = rs.getObject(i);
-                    System.out.print(meta.getColumnLabel(i) + ": " + value + "\t");
-                }
-                System.out.println();
             }
 
         } catch (SQLException e) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetRestfulTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetRestfulTest.java
index ea6e36ec1d..7fbb30a524 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetRestfulTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/NullValueInResultSetRestfulTest.java
@@ -19,9 +19,7 @@ public class NullValueInResultSetRestfulTest {
             while (rs.next()) {
                 for (int i = 1; i <= meta.getColumnCount(); i++) {
                     Object value = rs.getObject(i);
-                    System.out.print(meta.getColumnLabel(i) + ": " + value + "\t");
                 }
-                System.out.println();
             }
 
         } catch (SQLException e) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/QueryDataTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/QueryDataTest.java
index d0ba113b7a..535e56f7d7 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/QueryDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/QueryDataTest.java
@@ -21,7 +21,6 @@ public class QueryDataTest {
     @Before
     public void createDatabase() {
         try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
@@ -36,7 +35,7 @@ public class QueryDataTest {
             String createTableSql = "create table " + stbName + "(ts timestamp, name binary(64))";
             statement.executeUpdate(createTableSql);
 
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (SQLException e) {
             return;
         }
     }
@@ -44,7 +43,6 @@ public class QueryDataTest {
     @Test
     public void testQueryBinaryData() throws SQLException {
         String insertSql = "insert into " + stbName + " values(now, 'taosdata')";
-        System.out.println(insertSql);
         statement.executeUpdate(insertSql);
 
         String querySql = "select * from " + stbName;
@@ -52,7 +50,6 @@ public class QueryDataTest {
 
         while (rs.next()) {
             String name = rs.getString(2);
-            System.out.println("name = " + name);
             assertEquals("taosdata", name);
         }
         rs.close();
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResultSetMetaShouldNotBeNullRestfulTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResultSetMetaShouldNotBeNullRestfulTest.java
index f6d6bb2556..be27b13507 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResultSetMetaShouldNotBeNullRestfulTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/ResultSetMetaShouldNotBeNullRestfulTest.java
@@ -31,7 +31,7 @@ public class ResultSetMetaShouldNotBeNullRestfulTest {
 
         // then
         Assert.assertNotNull(metaData);
-        Assert.assertEquals(0, columnCount);
+        Assert.assertEquals(2, columnCount);
     }
 
     @Test
@@ -53,7 +53,7 @@ public class ResultSetMetaShouldNotBeNullRestfulTest {
         // then
         Assert.assertEquals(true, execute);
         Assert.assertNotNull(metaData);
-        Assert.assertEquals(0, columnCount);
+        Assert.assertEquals(2, columnCount);
     }
 
     @Before
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/SelectTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/SelectTest.java
index 38c8cbb98c..0022ceaf21 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/SelectTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/SelectTest.java
@@ -19,7 +19,6 @@ public class SelectTest {
     @Before
     public void createDatabaseAndTable() {
         try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
@@ -31,8 +30,6 @@ public class SelectTest {
             stmt.execute("create database if not exists " + dbName);
             stmt.execute("create table if not exists " + dbName + "." + tName + " (ts timestamp, k int, v int)");
             stmt.close();
-        } catch (ClassNotFoundException e) {
-            return;
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -47,7 +44,6 @@ public class SelectTest {
             for (int i = 0; i < 50; i++) {
                 ts++;
                 int row = stmt.executeUpdate("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")");
-                System.out.println("insert into " + dbName + "." + tName + " values (" + ts + ", " + (100 + i) + ", " + i + ")\t" + row);
                 assertEquals(1, row);
             }
 
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/StableTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/StableTest.java
index 4575cb73a0..332c171c38 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/StableTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/StableTest.java
@@ -23,7 +23,6 @@ public class StableTest {
     @BeforeClass
     public static void createDatabase() {
         try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
@@ -34,8 +33,6 @@ public class StableTest {
             statement.execute("create database if not exists " + dbName);
             statement.execute("use " + dbName);
             statement.close();
-        } catch (ClassNotFoundException e) {
-            return;
         } catch (SQLException e) {
             e.printStackTrace();
         }
@@ -68,9 +65,6 @@ public class StableTest {
             String sql = "describe " + stbName;
             ResultSet rs = stmt.executeQuery(sql);
             while (rs.next()) {
-                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-                    System.out.println(i + ":" + rs.getString(i));
-                }
                 num++;
             }
             rs.close();
@@ -86,9 +80,6 @@ public class StableTest {
         try (Statement stmt = connection.createStatement()) {
             ResultSet rs = stmt.executeQuery("describe t1");
             while (rs.next()) {
-                for (int i = 1; i <= rs.getMetaData().getColumnCount(); i++) {
-                    System.out.printf("%d: %s\n", i, rs.getString(i));
-                }
                 num++;
             }
             rs.close();
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDriverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDriverTest.java
index e239aa068b..c2f732c869 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDriverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulDriverTest.java
@@ -8,11 +8,6 @@ import java.sql.*;
 public class RestfulDriverTest {
     private static final String host = "127.0.0.1";
 
-    @Test
-    public void connect() {
-
-    }
-
     @Test
     public void acceptsURL() throws SQLException {
         Driver driver = new RestfulDriver();
@@ -27,9 +22,7 @@ public class RestfulDriverTest {
         Driver driver = new RestfulDriver();
         final String url = "";
         DriverPropertyInfo[] propertyInfo = driver.getPropertyInfo(url, null);
-        for (DriverPropertyInfo prop : propertyInfo) {
-            System.out.println(prop);
-        }
+        Assert.assertNotNull(propertyInfo);
     }
 
     @Test
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
index c8bb69d827..b07dae8003 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulJDBCTest.java
@@ -10,132 +10,151 @@ import java.util.Random;
 public class RestfulJDBCTest {
 
     private static final String host = "127.0.0.1";
-    private static Connection connection;
-    private Random random = new Random(System.currentTimeMillis());
+    private final Random random = new Random(System.currentTimeMillis());
+    private Connection connection;
 
-    /**
-     * select * from log.log
-     **/
     @Test
     public void testCase001() {
-        try {
-            Statement statement = connection.createStatement();
-            ResultSet resultSet = statement.executeQuery("select * from log.log");
-            ResultSetMetaData metaData = resultSet.getMetaData();
-            while (resultSet.next()) {
-                for (int i = 1; i <= metaData.getColumnCount(); i++) {
-                    String column = metaData.getColumnLabel(i);
-                    String value = resultSet.getString(i);
-                    System.out.print(column + ":" + value + "\t");
-                }
-                System.out.println();
-            }
-            statement.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+        // given
+        String sql = "drop database if exists restful_test";
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertFalse(execute);
+
+        // given
+        sql = "create database if not exists restful_test";
+        // when
+        execute = execute(connection, sql);
+        // then
+        Assert.assertFalse(execute);
+
+        // given
+        sql = "use restful_test";
+        // when
+        execute = execute(connection, sql);
+        // then
+        Assert.assertFalse(execute);
     }
 
-    /**
-     * create database
-     */
     @Test
     public void testCase002() {
-        try (Statement stmt = connection.createStatement()) {
-            stmt.execute("drop database if exists restful_test");
-            stmt.execute("create database if not exists restful_test");
-            stmt.execute("use restful_test");
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * create super table
-     ***/
-    @Test
-    public void testCase003() {
-        try (Statement stmt = connection.createStatement()) {
-            stmt.execute("create table weather(ts timestamp, temperature float, humidity int) tags(location nchar(64), groupId int)");
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
+        // given
+        String sql = "create table weather(ts timestamp, temperature float, humidity int) tags(location nchar(64), groupId int)";
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase004() {
-        try (Statement stmt = connection.createStatement()) {
-            for (int i = 1; i <= 100; i++) {
-                stmt.execute("create table t" + i + " using weather tags('beijing', '" + i + "')");
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
+        for (int i = 1; i <= 100; i++) {
+            // given
+            String sql = "create table t" + i + " using weather tags('beijing', '" + i + "')";
+            // when
+            boolean execute = execute(connection, sql);
+            // then
+            Assert.assertFalse(execute);
         }
     }
 
-
     @Test
     public void testCase005() {
-        try (Statement stmt = connection.createStatement()) {
-            int rows = 0;
-            for (int i = 0; i < 10; i++) {
-                for (int j = 1; j <= 100; j++) {
-                    long currentTimeMillis = System.currentTimeMillis();
-                    int affectRows = stmt.executeUpdate("insert into t" + j + " values(" + currentTimeMillis + "," + (random.nextFloat() * 50) + "," + random.nextInt(100) + ")");
-                    Assert.assertEquals(1, affectRows);
-                    rows += affectRows;
-                }
+        int rows = 0;
+        for (int i = 0; i < 10; i++) {
+            for (int j = 1; j <= 100; j++) {
+
+                // given
+                long currentTimeMillis = System.currentTimeMillis();
+                String sql = "insert into t" + j + " values(" + currentTimeMillis + "," + (random.nextFloat() * 50) + "," + random.nextInt(100) + ")";
+                // when
+                int affectRows = executeUpdate(connection, sql);
+                // then
+                Assert.assertEquals(1, affectRows);
+
+                rows += affectRows;
             }
-            Assert.assertEquals(1000, rows);
-        } catch (SQLException e) {
-            e.printStackTrace();
         }
+        Assert.assertEquals(1000, rows);
     }
 
     @Test
-    public void testCase006() {
-        try (Statement stmt = connection.createStatement()) {
-            ResultSet rs = stmt.executeQuery("select * from weather");
-            while (rs.next()) {
-                System.out.print("ts: " + rs.getTimestamp("ts"));
-                System.out.print(", temperature: " + rs.getString("temperature"));
-                System.out.print(", humidity: " + rs.getString("humidity"));
-                System.out.println(", location: " + rs.getString("location"));
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
+    public void testCase006() throws SQLException {
+        // given
+        String sql = "select * from weather";
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        ResultSetMetaData meta = rs.getMetaData();
+
+        // then
+        Assert.assertEquals(5, meta.getColumnCount());
+
+        while (rs.next()) {
+            Assert.assertNotNull(rs.getTimestamp("ts"));
+            Assert.assertNotNull(rs.getFloat("temperature"));
+            Assert.assertNotNull(rs.getInt("humidity"));
+            Assert.assertNotNull(rs.getString("location"));
         }
     }
 
     @Test
     public void testCase007() {
+        // given
+        String sql = "drop database restful_test";
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
+    }
+
+    private int executeUpdate(Connection connection, String sql) {
         try (Statement stmt = connection.createStatement()) {
-            ResultSet rs = stmt.executeQuery("select * from weather");
-            ResultSetMetaData meta = rs.getMetaData();
-            while (rs.next()) {
-                int columnCount = meta.getColumnCount();
-                for (int i = 1; i <= columnCount; i++) {
-                    String columnLabel = meta.getColumnLabel(i);
-                    String value = rs.getString(i);
-                    System.out.print(columnLabel + ": " + value + "\t");
-                }
-                System.out.println();
-            }
+            return stmt.executeUpdate(sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    private boolean execute(Connection connection, String sql) {
+        try (Statement stmt = connection.createStatement()) {
+            return stmt.execute(sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+
+    private ResultSet executeQuery(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            return statement.executeQuery(sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    @Before
+    public void before() {
+        try {
+            connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
         } catch (SQLException e) {
             e.printStackTrace();
         }
     }
 
-    @BeforeClass
-    public static void before() throws ClassNotFoundException, SQLException {
-        Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
-        connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
-    }
-
-    @AfterClass
-    public static void after() throws SQLException {
-        if (connection != null)
-            connection.close();
+    @After
+    public void after() {
+        try {
+            if (connection != null)
+                connection.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
     }
 
 }
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java
index ee457ff412..244e8afd11 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulPreparedStatementTest.java
@@ -27,12 +27,9 @@ public class RestfulPreparedStatementTest {
         ResultSet rs = pstmt_select.executeQuery();
         Assert.assertNotNull(rs);
         ResultSetMetaData meta = rs.getMetaData();
-        while (rs.next()) {
-            for (int i = 1; i <= meta.getColumnCount(); i++) {
-                System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-            }
-            System.out.println();
-        }
+        int columnCount = meta.getColumnCount();
+        Assert.assertEquals(10, columnCount);
+        Assert.assertNotNull(rs);
     }
 
     @Test
@@ -373,18 +370,19 @@ public class RestfulPreparedStatementTest {
     @BeforeClass
     public static void beforeClass() {
         try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
             conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata");
-            try (Statement stmt = conn.createStatement()) {
-                stmt.execute("drop database if exists test_pstmt");
-                stmt.execute("create database if not exists test_pstmt");
-                stmt.execute("use test_pstmt");
-                stmt.execute("create table weather(ts timestamp, f1 int, f2 bigint, f3 float, f4 double, f5 smallint, f6 tinyint, f7 bool, f8 binary(64), f9 nchar(64)) tags(loc nchar(64))");
-                stmt.execute("create table t1 using weather tags('beijing')");
-            }
+
+            Statement stmt = conn.createStatement();
+            stmt.execute("drop database if exists test_pstmt");
+            stmt.execute("create database if not exists test_pstmt");
+            stmt.execute("use test_pstmt");
+            stmt.execute("create table weather(ts timestamp, f1 int, f2 bigint, f3 float, f4 double, f5 smallint, f6 tinyint, f7 bool, f8 binary(64), f9 nchar(64)) tags(loc nchar(64))");
+            stmt.execute("create table t1 using weather tags('beijing')");
+            stmt.close();
+
             pstmt_insert = conn.prepareStatement(sql_insert);
             pstmt_select = conn.prepareStatement(sql_select);
-        } catch (ClassNotFoundException | SQLException e) {
+        } catch (SQLException e) {
             e.printStackTrace();
         }
     }
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulStatementTest.java
index 1be32b502d..a7b3ceb9d3 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/RestfulStatementTest.java
@@ -12,6 +12,7 @@ import java.util.UUID;
 
 public class RestfulStatementTest {
     private static final String host = "127.0.0.1";
+
     private static Connection conn;
     private static Statement stmt;
 
@@ -21,11 +22,11 @@ public class RestfulStatementTest {
             ResultSet rs = stmt.executeQuery("show databases");
             Assert.assertNotNull(rs);
             ResultSetMetaData meta = rs.getMetaData();
+            int columnCount = meta.getColumnCount();
+            Assert.assertTrue(columnCount > 1);
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
+                Assert.assertEquals("name", meta.getColumnLabel(1));
+                Assert.assertNotNull(rs.getString("name"));
             }
             rs.close();
         } catch (SQLException e) {
@@ -174,10 +175,10 @@ public class RestfulStatementTest {
             Assert.assertEquals(3, meta.getColumnCount());
             int count = 0;
             while (rs.next()) {
-                for (int i = 1; i <= meta.getColumnCount(); i++) {
-                    System.out.print(meta.getColumnLabel(i) + ": " + rs.getString(i) + "\t");
-                }
-                System.out.println();
+                Assert.assertEquals("ts", meta.getColumnLabel(1));
+                Assert.assertNotNull(rs.getTimestamp(1));
+                Assert.assertEquals("temperature", meta.getColumnLabel(2));
+                Assert.assertEquals(22.33, rs.getFloat(2), 0.001f);
                 count++;
             }
             Assert.assertEquals(1, count);
@@ -388,15 +389,12 @@ public class RestfulStatementTest {
     @BeforeClass
     public static void beforeClass() {
         try {
-            Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
             properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
             conn = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/?user=root&password=taosdata", properties);
             stmt = conn.createStatement();
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
         } catch (SQLException e) {
             e.printStackTrace();
         }
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
index 4ad9826384..6b88de258d 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/rs/SQLTest.java
@@ -1,342 +1,586 @@
 package com.taosdata.jdbc.rs;
 
-import com.taosdata.jdbc.utils.SQLExecutor;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.runners.MethodSorters;
 
 import java.sql.*;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class SQLTest {
+
     private static final String host = "127.0.0.1";
     private static Connection connection;
 
     @Test
     public void testCase001() {
+        // given
         String sql = "create database if not exists restful_test";
-        SQLExecutor.execute(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase002() {
+        // given
         String sql = "use restful_test";
-        SQLExecutor.execute(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase003() {
+        // given
         String sql = "show databases";
-        SQLExecutor.executeWithResult(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase004() {
+        // given
         String sql = "show tables";
-        SQLExecutor.executeWithResult(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase005() {
+        // given
         String sql = "show stables";
-        SQLExecutor.executeWithResult(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase006() {
+        // given
         String sql = "show dnodes";
-        SQLExecutor.executeWithResult(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase007() {
+        // given
         String sql = "show vgroups";
-        SQLExecutor.executeWithResult(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase008() {
+        // given
         String sql = "drop table if exists restful_test.weather";
-        SQLExecutor.execute(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase009() {
+        // given
         String sql = "create table if not exists restful_test.weather(ts timestamp, temperature float) tags(location nchar(64))";
-        SQLExecutor.execute(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase010() {
+        // given
         String sql = "create table t1 using restful_test.weather tags('北京')";
-        SQLExecutor.execute(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase011() {
+        // given
         String sql = "insert into restful_test.t1 values(now, 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase012() {
+        // given
         String sql = "insert into restful_test.t1 values('2020-01-01 00:00:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase013() {
+        // given
         String sql = "insert into restful_test.t1 values('2020-01-01 00:01:00.000', 22.22),('2020-01-01 00:02:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase014() {
+        // given
         String sql = "insert into restful_test.t2 using weather tags('上海') values('2020-01-01 00:03:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase015() {
+        // given
         String sql = "insert into restful_test.t2 using weather tags('上海') values('2020-01-01 00:01:00.000', 22.22),('2020-01-01 00:02:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase016() {
+        // given
         String sql = "insert into t1 values('2020-01-01 01:0:00.000', 22.22),('2020-01-01 02:00:00.000', 22.22) t2 values('2020-01-01 01:0:00.000', 33.33),('2020-01-01 02:00:00.000', 33.33)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase017() {
+        // given
         String sql = "Insert into t3 using weather tags('广东') values('2020-01-01 01:0:00.000', 22.22),('2020-01-01 02:00:00.000', 22.22) t4 using weather tags('天津') values('2020-01-01 01:0:00.000', 33.33),('2020-01-01 02:00:00.000', 33.33)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        boolean execute = execute(connection, sql);
+
+        // then
+        Assert.assertFalse(execute);
     }
 
     @Test
     public void testCase018() {
+        // given
         String sql = "select * from restful_test.t1";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase019() {
+        // given
         String sql = "select * from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase020() {
+        // given
         String sql = "select ts, temperature from restful_test.t1";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase021() {
+        // given
         String sql = "select ts, temperature from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase022() {
+        // given
         String sql = "select temperature, ts from restful_test.t1";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase023() {
+        // given
         String sql = "select temperature, ts from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        boolean execute = execute(connection, sql);
+        // then
+        Assert.assertTrue(execute);
     }
 
     @Test
     public void testCase024() {
+        // given
         String sql = "import into restful_test.t5 using weather tags('石家庄') values('2020-01-01 00:01:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+        // when
+        int affectedRows = executeUpdate(connection, sql);
+        // then
+        Assert.assertEquals(1, affectedRows);
     }
 
     @Test
     public void testCase025() {
+        // given
         String sql = "import into restful_test.t6 using weather tags('沈阳') values('2020-01-01 00:01:00.000', 22.22),('2020-01-01 00:02:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+        // when
+        int affectedRows = executeUpdate(connection, sql);
+        // then
+        Assert.assertEquals(2, affectedRows);
     }
 
     @Test
     public void testCase026() {
+        // given
         String sql = "import into restful_test.t7 using weather tags('长沙') values('2020-01-01 00:01:00.000', 22.22) restful_test.t8 using weather tags('吉林') values('2020-01-01 00:01:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+
+        // when
+        int affectedRows = executeUpdate(connection, sql);
+        // then
+        Assert.assertEquals(2, affectedRows);
     }
 
     @Test
     public void testCase027() {
+        // given
         String sql = "import into restful_test.t9 using weather tags('武汉') values('2020-01-01 00:01:00.000', 22.22) ,('2020-01-02 00:01:00.000', 22.22) restful_test.t10 using weather tags('哈尔滨') values('2020-01-01 00:01:00.000', 22.22),('2020-01-02 00:01:00.000', 22.22)";
-        SQLExecutor.executeUpdate(connection, sql);
+        // when
+        int affectedRows = executeUpdate(connection, sql);
+        // then
+        Assert.assertEquals(4, affectedRows);
     }
 
     @Test
     public void testCase028() {
+        // given
         String sql = "select location, temperature, ts from restful_test.weather where temperature > 1";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase029() {
         String sql = "select location, temperature, ts from restful_test.weather where temperature < 1";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase030() {
         String sql = "select location, temperature, ts from restful_test.weather where ts  > now";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase031() {
         String sql = "select location, temperature, ts from restful_test.weather where ts  < now";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase032() {
         String sql = "select count(*) from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase033() {
         String sql = "select first(*) from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase034() {
         String sql = "select last(*) from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase035() {
         String sql = "select last_row(*) from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase036() {
         String sql = "select ts, ts as primary_key from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
 
     @Test
     public void testCase037() {
         String sql = "select database()";
-        SQLExecutor.execute(connection, "use restful_test");
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase038() {
         String sql = "select client_version()";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase039() {
         String sql = "select server_status()";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase040() {
         String sql = "select server_status() as status";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase041() {
         String sql = "select tbname, location from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase042() {
         String sql = "select count(tbname) from restful_test.weather";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase043() {
         String sql = "select * from restful_test.weather where ts < now - 1h";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase044() {
         String sql = "select * from restful_test.weather where ts < now - 1h and location like '%'";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase045() {
         String sql = "select * from restful_test.weather where ts < now - 1h order by ts";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase046() {
         String sql = "select last(*) from restful_test.weather where ts < now - 1h group by tbname order by tbname";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase047() {
         String sql = "select * from restful_test.weather limit 2";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase048() {
         String sql = "select * from restful_test.weather limit 2 offset 5";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase049() {
         String sql = "select * from restful_test.t1, restful_test.t3 where t1.ts = t3.ts ";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase050() {
         String sql = "select * from restful_test.t1, restful_test.t3 where t1.ts = t3.ts and t1.location = t3.location";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase051() {
         String sql = "select * from restful_test.t1 tt, restful_test.t3 yy where tt.ts = yy.ts";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase052() {
         String sql = "select server_status()";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
     }
 
     @Test
     public void testCase053() {
         String sql = "select avg(cpu_taosd), avg(cpu_system), max(cpu_cores), avg(mem_taosd), avg(mem_system), max(mem_total), avg(disk_used), max(disk_total), avg(band_speed), avg(io_read), avg(io_write), sum(req_http), sum(req_select), sum(req_insert) from log.dn1 where ts> now - 60m and ts<= now interval(1m) fill(value, 0)";
-        SQLExecutor.executeQuery(connection, sql);
+        // when
+        ResultSet rs = executeQuery(connection, sql);
+        // then
+        Assert.assertNotNull(rs);
+    }
+
+    private boolean execute(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            return statement.execute(sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    private ResultSet executeQuery(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            return statement.executeQuery(sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private int executeUpdate(Connection connection, String sql) {
+        try (Statement statement = connection.createStatement()) {
+            return statement.executeUpdate(sql);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return 0;
     }
 
     @BeforeClass
-    public static void before() throws ClassNotFoundException, SQLException {
-        Class.forName("com.taosdata.jdbc.rs.RestfulDriver");
+    public static void before() throws SQLException {
         connection = DriverManager.getConnection("jdbc:TAOS-RS://" + host + ":6041/restful_test?user=root&password=taosdata");
     }
 
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/SQLExecutor.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/SQLExecutor.java
deleted file mode 100644
index bf034bf458..0000000000
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/utils/SQLExecutor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.taosdata.jdbc.utils;
-
-import java.sql.*;
-
-public class SQLExecutor {
-
-    // insert, import
-    public static void executeUpdate(Connection connection, String sql) {
-        try (Statement statement = connection.createStatement()) {
-            long start = System.currentTimeMillis();
-            int affectedRows = statement.executeUpdate(sql);
-            long end = System.currentTimeMillis();
-            System.out.println("[ affected rows : " + affectedRows + " ] time cost: " + (end - start) + " ms, execute statement ====> " + sql);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    // show databases, show tables, show stables
-    public static void executeWithResult(Connection connection, String sql) {
-        try (Statement statement = connection.createStatement()) {
-            statement.execute(sql);
-            ResultSet resultSet = statement.getResultSet();
-            printResult(resultSet);
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
-
-    // use database, create database, create table, drop table...
-    public static void execute(Connection connection, String sql) {
-        try (Statement statement = connection.createStatement()) {
-            long start = System.currentTimeMillis();
-            boolean execute = statement.execute(sql);
-            long end = System.currentTimeMillis();
-            printSql(sql, execute, (end - start));
-        } catch (SQLException e) {
-            System.out.println("ERROR execute SQL ===> " + sql);
-            e.printStackTrace();
-        }
-    }
-
-    // select
-    public static void executeQuery(Connection connection, String sql) {
-        try (Statement statement = connection.createStatement()) {
-            long start = System.currentTimeMillis();
-            ResultSet resultSet = statement.executeQuery(sql);
-            long end = System.currentTimeMillis();
-            printSql(sql, true, (end - start));
-            printResult(resultSet);
-        } catch (SQLException e) {
-            System.out.println("ERROR execute SQL ===> " + sql);
-            e.printStackTrace();
-        }
-    }
-
-    private static void printSql(String sql, boolean succeed, long cost) {
-        System.out.println("[ " + (succeed ? "OK" : "ERROR!") + " ] time cost: " + cost + " ms, execute statement ====> " + sql);
-    }
-
-    private static void printResult(ResultSet resultSet) throws SQLException {
-        ResultSetMetaData metaData = resultSet.getMetaData();
-        while (resultSet.next()) {
-            StringBuilder sb = new StringBuilder();
-            for (int i = 1; i <= metaData.getColumnCount(); i++) {
-                String columnLabel = metaData.getColumnLabel(i);
-                String value = resultSet.getString(i);
-                sb.append(columnLabel + ": " + value + "\t");
-            }
-            System.out.println(sb.toString());
-        }
-    }
-
-}

From 6a288d80fb0ab2dcb127ba5f2e00b4e19a381e62 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 29 Jun 2021 16:55:06 +0800
Subject: [PATCH 42/71] [td-4927]<enhance>:ignore the rows of expired timestamp
 that are not dropped yet during query according to the TTL settings.

---
 src/common/inc/tglobal.h    |  2 +-
 src/common/src/tglobal.c    |  2 +-
 src/tsdb/inc/tsdbFile.h     |  4 +-
 src/tsdb/src/tsdbCommit.c   | 10 ++---
 src/tsdb/src/tsdbMemTable.c |  4 +-
 src/tsdb/src/tsdbRead.c     | 82 ++++++++++++++++++++++++++-----------
 6 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index 47460a5fab..e35e805efe 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -155,7 +155,7 @@ extern char    tsMnodeTmpDir[];
 extern char    tsDataDir[];
 extern char    tsLogDir[];
 extern char    tsScriptDir[];
-extern int64_t tsMsPerDay[3];
+extern int64_t tsTickPerDay[3];
 
 // system info
 extern char    tsOsName[];
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index af21ef6d82..51d44add4c 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -204,7 +204,7 @@ SDiskCfg tsDiskCfg[TSDB_MAX_DISKS];
  *     TSDB_TIME_PRECISION_MICRO: 86400000000L
  *     TSDB_TIME_PRECISION_NANO:  86400000000000L
  */
-int64_t tsMsPerDay[] = {86400000L, 86400000000L, 86400000000000L};
+int64_t tsTickPerDay[] = {86400000L, 86400000000L, 86400000000000L};
 
 // system info
 char    tsOsName[10] = "Linux";
diff --git a/src/tsdb/inc/tsdbFile.h b/src/tsdb/inc/tsdbFile.h
index dcb5eadfab..b9d5431de6 100644
--- a/src/tsdb/inc/tsdbFile.h
+++ b/src/tsdb/inc/tsdbFile.h
@@ -350,8 +350,8 @@ static FORCE_INLINE int tsdbCopyDFileSet(SDFileSet* pSrc, SDFileSet* pDest) {
 }
 
 static FORCE_INLINE void tsdbGetFidKeyRange(int days, int8_t precision, int fid, TSKEY* minKey, TSKEY* maxKey) {
-  *minKey = fid * days * tsMsPerDay[precision];
-  *maxKey = *minKey + days * tsMsPerDay[precision] - 1;
+  *minKey = fid * days * tsTickPerDay[precision];
+  *maxKey = *minKey + days * tsTickPerDay[precision] - 1;
 }
 
 static FORCE_INLINE bool tsdbFSetIsOk(SDFileSet* pSet) {
diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c
index 82cc6f07f7..75b072b063 100644
--- a/src/tsdb/src/tsdbCommit.c
+++ b/src/tsdb/src/tsdbCommit.c
@@ -17,9 +17,9 @@
 #define TSDB_MAX_SUBBLOCKS 8
 static FORCE_INLINE int TSDB_KEY_FID(TSKEY key, int32_t days, int8_t precision) {
   if (key < 0) {
-    return (int)((key + 1) / tsMsPerDay[precision] / days - 1);
+    return (int)((key + 1) / tsTickPerDay[precision] / days - 1);
   } else {
-    return (int)((key / tsMsPerDay[precision] / days));
+    return (int)((key / tsTickPerDay[precision] / days));
   }
 }
 
@@ -363,9 +363,9 @@ void tsdbGetRtnSnap(STsdbRepo *pRepo, SRtn *pRtn) {
   TSKEY     minKey, midKey, maxKey, now;
 
   now = taosGetTimestamp(pCfg->precision);
-  minKey = now - pCfg->keep * tsMsPerDay[pCfg->precision];
-  midKey = now - pCfg->keep2 * tsMsPerDay[pCfg->precision];
-  maxKey = now - pCfg->keep1 * tsMsPerDay[pCfg->precision];
+  minKey = now - pCfg->keep * tsTickPerDay[pCfg->precision];
+  midKey = now - pCfg->keep2 * tsTickPerDay[pCfg->precision];
+  maxKey = now - pCfg->keep1 * tsTickPerDay[pCfg->precision];
 
   pRtn->minKey = minKey;
   pRtn->minFid = (int)(TSDB_KEY_FID(minKey, pCfg->daysPerFile, pCfg->precision));
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index 9d8b1ca7f2..50b5d32177 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -632,8 +632,8 @@ static int tsdbScanAndConvertSubmitMsg(STsdbRepo *pRepo, SSubmitMsg *pMsg) {
   SSubmitBlkIter blkIter = {0};
   SDataRow       row = NULL;
   TSKEY          now = taosGetTimestamp(pRepo->config.precision);
-  TSKEY          minKey = now - tsMsPerDay[pRepo->config.precision] * pRepo->config.keep;
-  TSKEY          maxKey = now + tsMsPerDay[pRepo->config.precision] * pRepo->config.daysPerFile;
+  TSKEY          minKey = now - tsTickPerDay[pRepo->config.precision] * pRepo->config.keep;
+  TSKEY          maxKey = now + tsTickPerDay[pRepo->config.precision] * pRepo->config.daysPerFile;
 
   terrno = TSDB_CODE_SUCCESS;
   pMsg->length = htonl(pMsg->length);
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 92a0d489b3..cb50eaf896 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -280,9 +280,17 @@ static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STa
       info.tableId.uid = info.pTableObj->tableId.uid;
 
       if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
-        assert(info.lastKey >= pQueryHandle->window.skey);
+        if (info.lastKey == INT64_MIN) {
+          info.lastKey = pQueryHandle->window.skey;
+        }
+
+        assert(info.lastKey >= pQueryHandle->window.skey && info.lastKey <= pQueryHandle->window.ekey);
       } else {
-        assert(info.lastKey <= pQueryHandle->window.skey);
+        if (info.lastKey == INT64_MIN) {
+          info.lastKey = pQueryHandle->window.ekey;
+        }
+
+        assert(info.lastKey >= pQueryHandle->window.ekey && info.lastKey <= pQueryHandle->window.skey);
       }
 
       taosArrayPush(pTableCheckInfo, &info);
@@ -339,14 +347,44 @@ static SArray* createCheckInfoFromCheckInfo(STableCheckInfo* pCheckInfo, TSKEY s
   return pNew;
 }
 
+// Update the query time window according to the data time to live(TTL) information, in order to avoid to return
+// the expired data to client, even it is queried already.
+static int64_t getEarliestValidTimestamp(STsdbRepo* pTsdb) {
+  STsdbCfg* pCfg = &pTsdb->config;
+
+  int64_t now = taosGetTimestamp(pCfg->precision);
+  return now - (tsTickPerDay[pCfg->precision] * pCfg->keep);
+}
+
+static void setQueryTimewindow(STsdbQueryHandle* pQueryHandle, STsdbQueryCond* pCond) {
+  pQueryHandle->window = pCond->twindow;
+
+  int64_t startTs = getEarliestValidTimestamp(pQueryHandle->pTsdb);
+  if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+    if (startTs > pQueryHandle->window.skey) {
+      pQueryHandle->window.skey = startTs;
+    }
+
+    assert(pQueryHandle->window.skey <= pQueryHandle->window.ekey);
+  } else {
+    if (startTs > pQueryHandle->window.ekey) {
+      pQueryHandle->window.ekey = startTs;
+    }
+
+    assert(pQueryHandle->window.skey >= pQueryHandle->window.ekey);
+  }
+
+  tsdbDebug("%p update the query time window, old:%"PRId64" - %"PRId64", new:%"PRId64" - %"PRId64 ", 0x%"PRIx64,
+      pQueryHandle, pCond->twindow.skey, pCond->twindow.ekey, pQueryHandle->window.skey, pQueryHandle->window.ekey, pQueryHandle->qId);
+}
+
 static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pCond, uint64_t qId, SMemRef* pMemRef) {
   STsdbQueryHandle* pQueryHandle = calloc(1, sizeof(STsdbQueryHandle));
   if (pQueryHandle == NULL) {
-    goto out_of_memory;
+    goto _end;
   }
 
   pQueryHandle->order       = pCond->order;
-  pQueryHandle->window      = pCond->twindow;
   pQueryHandle->pTsdb       = tsdb;
   pQueryHandle->type        = TSDB_QUERY_TYPE_ALL;
   pQueryHandle->cur.fid     = INT32_MIN;
@@ -354,36 +392,33 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
   pQueryHandle->checkFiles  = true;
   pQueryHandle->activeIndex = 0;   // current active table index
   pQueryHandle->qId         = qId;
-  pQueryHandle->outputCapacity = ((STsdbRepo*)tsdb)->config.maxRowsPerFileBlock;
   pQueryHandle->allocSize   = 0;
   pQueryHandle->locateStart = false;
   pQueryHandle->pMemRef     = pMemRef;
+  pQueryHandle->loadType    = pCond->type;
+
+  pQueryHandle->outputCapacity  = ((STsdbRepo*)tsdb)->config.maxRowsPerFileBlock;
   pQueryHandle->loadExternalRow = pCond->loadExternalRows;
   pQueryHandle->currentLoadExternalRows = pCond->loadExternalRows;
 
-  pQueryHandle->loadType    = pCond->type;
-
   if (tsdbInitReadH(&pQueryHandle->rhelper, (STsdbRepo*)tsdb) != 0) {
-    goto out_of_memory;
+    goto _end;
   }
 
   assert(pCond != NULL && pMemRef != NULL);
-  if (ASCENDING_TRAVERSE(pCond->order)) {
-    assert(pQueryHandle->window.skey <= pQueryHandle->window.ekey);
-  } else {
-    assert(pQueryHandle->window.skey >= pQueryHandle->window.ekey);
-  }
+  setQueryTimewindow(pQueryHandle, pCond);
+
   if (pCond->numOfCols > 0) {
     // allocate buffer in order to load data blocks from file
     pQueryHandle->statis = calloc(pCond->numOfCols, sizeof(SDataStatis));
     if (pQueryHandle->statis == NULL) {
-      goto out_of_memory;
+      goto _end;
     }
 
-    pQueryHandle->pColumns =
-        taosArrayInit(pCond->numOfCols, sizeof(SColumnInfoData));  // todo: use list instead of array?
+    // todo: use list instead of array?
+    pQueryHandle->pColumns = taosArrayInit(pCond->numOfCols, sizeof(SColumnInfoData));
     if (pQueryHandle->pColumns == NULL) {
-      goto out_of_memory;
+      goto _end;
     }
 
     for (int32_t i = 0; i < pCond->numOfCols; ++i) {
@@ -392,14 +427,16 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
       colInfo.info = pCond->colList[i];
       colInfo.pData = calloc(1, EXTRA_BYTES + pQueryHandle->outputCapacity * pCond->colList[i].bytes);
       if (colInfo.pData == NULL) {
-        goto out_of_memory;
+        goto _end;
       }
+
       taosArrayPush(pQueryHandle->pColumns, &colInfo);
       pQueryHandle->statis[i].colId = colInfo.info.colId;
     }
 
     pQueryHandle->defaultLoadColumn = getDefaultLoadColumns(pQueryHandle, true);
   }
+
   STsdbMeta* pMeta = tsdbGetMeta(tsdb);
   assert(pMeta != NULL);
 
@@ -407,7 +444,7 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
   if (pQueryHandle->pDataCols == NULL) {
     tsdbError("%p failed to malloc buf for pDataCols, %"PRIu64, pQueryHandle, pQueryHandle->qId);
     terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
-    goto out_of_memory;
+    goto _end;
   }
 
   tsdbInitDataBlockLoadInfo(&pQueryHandle->dataBlockLoadInfo);
@@ -415,7 +452,7 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
 
   return (TsdbQueryHandleT) pQueryHandle;
 
-  out_of_memory:
+  _end:
   tsdbCleanupQueryHandle(pQueryHandle);
   terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
   return NULL;
@@ -864,10 +901,10 @@ static int32_t getFileIdFromKey(TSKEY key, int32_t daysPerFile, int32_t precisio
   }
 
   if (key < 0) {
-    key -= (daysPerFile * tsMsPerDay[precision]);
+    key -= (daysPerFile * tsTickPerDay[precision]);
   }
   
-  int64_t fid = (int64_t)(key / (daysPerFile * tsMsPerDay[precision]));  // set the starting fileId
+  int64_t fid = (int64_t)(key / (daysPerFile * tsTickPerDay[precision]));  // set the starting fileId
   if (fid < 0L && llabs(fid) > INT32_MAX) { // data value overflow for INT32
     fid = INT32_MIN;
   }
@@ -3548,7 +3585,6 @@ int32_t tsdbGetOneTableGroup(STsdbRepo* tsdb, uint64_t uid, TSKEY startKey, STab
   taosArrayPush(group, &info);
 
   taosArrayPush(pGroupInfo->pGroupList, &group);
-
   return TSDB_CODE_SUCCESS;
 
   _error:

From 8a79e00e4dfed767ee9b0f4eb9dcac8e41ed1e22 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 29 Jun 2021 16:55:59 +0800
Subject: [PATCH 43/71] [td-4791]<fix>:fix bug in nest query.

---
 src/client/src/tscSQLParser.c             | 40 +++++-----
 tests/script/general/parser/nestquery.sim | 89 +++++++++++++++++++++--
 2 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index cf72b7abd9..e24c063b2e 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -7810,18 +7810,19 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     pQueryInfo->numOfTables = 0;
 
     // parse the subquery in the first place
-    int32_t numOfSub = (int32_t) taosArrayGetSize(pSqlNode->from->list);
-    for(int32_t i = 0; i < numOfSub; ++i) {
+    int32_t numOfSub = (int32_t)taosArrayGetSize(pSqlNode->from->list);
+    for (int32_t i = 0; i < numOfSub; ++i) {
       code = doValidateSubquery(pSqlNode, i, pSql, pQueryInfo, tscGetErrorMsgPayload(pCmd));
       if (code != TSDB_CODE_SUCCESS) {
         return code;
       }
     }
-    
+
     int32_t timeWindowQuery =
         (TPARSER_HAS_TOKEN(pSqlNode->interval.interval) || TPARSER_HAS_TOKEN(pSqlNode->sessionVal.gap));
 
-    if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, timeWindowQuery) != TSDB_CODE_SUCCESS) {
+    if (validateSelectNodeList(pCmd, pQueryInfo, pSqlNode->pSelNodeList, false, false, timeWindowQuery) !=
+        TSDB_CODE_SUCCESS) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
 
@@ -7831,12 +7832,12 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
     }
 
     // todo NOT support yet
-    for(int32_t i = 0; i < tscNumOfExprs(pQueryInfo); ++i) {
+    for (int32_t i = 0; i < tscNumOfExprs(pQueryInfo); ++i) {
       SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
-      int32_t f = pExpr->base.functionId;
+      int32_t    f = pExpr->base.functionId;
       if (f == TSDB_FUNC_STDDEV || f == TSDB_FUNC_PERCT || f == TSDB_FUNC_INTERP) {
         return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
-      } 
+      }
 
       if ((timeWindowQuery || pQueryInfo->stateWindow) && f == TSDB_FUNC_LAST) {
         pExpr->base.numOfParams = 1;
@@ -7845,22 +7846,19 @@ int32_t validateSqlNode(SSqlObj* pSql, SSqlNode* pSqlNode, SQueryInfo* pQueryInf
       }
     }
 
-    // todo derivative function requires ts column exists in subquery
     STableMeta* pTableMeta = tscGetMetaInfo(pQueryInfo, 0)->pTableMeta;
-    SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, 0);
+    SSchema*    pSchema = tscGetTableColumnSchema(pTableMeta, 0);
 
-    int32_t numOfExprs = (int32_t) tscNumOfExprs(pQueryInfo);
-    if (numOfExprs == 1) {
-      SExprInfo* pExpr = tscExprGet(pQueryInfo, 0);
-      int32_t f = pExpr->base.functionId;
-      if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE) {
-        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
-      }
-    } else {
-      SExprInfo* pExpr = tscExprGet(pQueryInfo, 1);
-      int32_t f = pExpr->base.functionId;
-      if ((f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE) && pSchema->type != TSDB_DATA_TYPE_TIMESTAMP) {
-        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
+    if (pSchema->type != TSDB_DATA_TYPE_TIMESTAMP) {
+      int32_t numOfExprs = (int32_t)tscNumOfExprs(pQueryInfo);
+
+      for (int32_t i = 0; i < numOfExprs; ++i) {
+        SExprInfo* pExpr = tscExprGet(pQueryInfo, i);
+
+        int32_t f = pExpr->base.functionId;
+        if (f == TSDB_FUNC_DERIVATIVE || f == TSDB_FUNC_TWA || f == TSDB_FUNC_IRATE) {
+          return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
+        }
       }
     }
 
diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/general/parser/nestquery.sim
index fd56a91dd6..b26d163ab5 100644
--- a/tests/script/general/parser/nestquery.sim
+++ b/tests/script/general/parser/nestquery.sim
@@ -179,14 +179,6 @@ if $data21 != 49.500000000 then
   return -1
 endi
 
-#define TSDB_FUNC_APERCT       7
-#define TSDB_FUNC_TWA          14
-#define TSDB_FUNC_LEASTSQR     15
-#define TSDB_FUNC_DIFF         24
-#define TSDB_FUNC_INTERP       28
-#define TSDB_FUNC_IRATE        30
-#define TSDB_FUNC_DERIVATIVE   32
-
 sql_error select stddev(c1) from (select c1 from nest_tb0);
 sql_error select percentile(c1, 20) from (select * from nest_tb0);
 sql_error select interp(c1) from (select * from nest_tb0);
@@ -197,9 +189,90 @@ sql_error select diff(c1), twa(c1) from (select * from nest_tb0);
 sql_error select irate(c1), interp(c1), twa(c1) from (select * from nest_tb0);
 
 sql select apercentile(c1, 50) from (select * from nest_tb0) interval(1d)
+if $rows != 7 then
+  return -1
+endi
+
+if $data00 != @20-09-15 00:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 47.571428571 then
+  return -1
+endi
+
+if $data10 != @20-09-16 00:00:00.000@ then
+  return -1
+endi
+
+if $data11 != 49.666666667 then
+  return -1
+endi
+
+if $data20 != @20-09-17 00:00:00.000@ then
+  return -1
+endi
+
+if $data21 != 49.000000000 then
+  return -1
+endi
+
+if $data30 != @20-09-18 00:00:00.000@ then
+  return -1
+endi
+
+if $data31 != 48.333333333 then
+  return -1
+endi
+
 sql select twa(c1) from (select * from nest_tb0);
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 49.500000000 then
+  return -1
+endi
+
 sql select leastsquares(c1, 1, 1) from (select * from nest_tb0);
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != @{slop:0.000100, intercept:49.000000}@ then
+  return -1
+endi
+
 sql select irate(c1) from (select * from nest_tb0);
+if $data00 != 0.016666667 then
+  return -1
+endi
+
+sql select derivative(c1, 1s, 0) from (select * from nest_tb0);
+if $rows != 9999 then
+  return -1
+endi
+
+if $data00 != @20-09-15 00:01:00.000@ then
+  return -1
+endi
+
+if $data01 != 0.016666667 then
+  return -1
+endi
+
+if $data10 != @20-09-15 00:02:00.000@ then
+  return -1
+endi
+
+if $data11 != 0.016666667 then
+  return -1
+endi
+
+sql select diff(c1) from (select * from nest_tb0);
+if $rows != 9999 then
+  return -1
+endi
 
 sql select avg(c1),sum(c2), max(c3), min(c4), count(*), first(c7), last(c7),spread(c6) from (select * from nest_tb0) interval(1d);
 if $rows != 7 then

From 51dc9fa425b19584c8724837879111624387fb6e Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 30 Jun 2021 19:34:48 +0800
Subject: [PATCH 44/71] [td-225]fix bug by regression test.

---
 src/tsdb/src/tsdbRead.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index cb50eaf896..7d366ec814 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -280,16 +280,12 @@ static SArray* createCheckInfoFromTableGroup(STsdbQueryHandle* pQueryHandle, STa
       info.tableId.uid = info.pTableObj->tableId.uid;
 
       if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
-        if (info.lastKey == INT64_MIN) {
+        if (info.lastKey == INT64_MIN || info.lastKey < pQueryHandle->window.skey) {
           info.lastKey = pQueryHandle->window.skey;
         }
 
         assert(info.lastKey >= pQueryHandle->window.skey && info.lastKey <= pQueryHandle->window.ekey);
       } else {
-        if (info.lastKey == INT64_MIN) {
-          info.lastKey = pQueryHandle->window.ekey;
-        }
-
         assert(info.lastKey >= pQueryHandle->window.ekey && info.lastKey <= pQueryHandle->window.skey);
       }
 

From 25d2821d78d09d050a36447ed8962772cf4aaec2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 29 Jun 2021 10:41:19 +0800
Subject: [PATCH 45/71] [td-225]fix bug found by regression test.

---
 src/query/src/qExecutor.c                     |  4 +-
 src/tsdb/src/tsdbRead.c                       | 61 +++++++++++++++----
 .../general/parser/single_row_in_tb_query.sim |  4 ++
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index e7f63a027d..6138d9deb3 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -4145,8 +4145,8 @@ static SFillColInfo* createFillColInfo(SExprInfo* pExpr, int32_t numOfOutput, in
   return pFillCol;
 }
 
-int32_t doInitQInfo(SQInfo* pQInfo, STSBuf* pTsBuf, void* tsdb, void* sourceOptr, int32_t tbScanner,
-                    SArray* pOperator, void* param) {
+int32_t doInitQInfo(SQInfo* pQInfo, STSBuf* pTsBuf, void* tsdb, void* sourceOptr, int32_t tbScanner, SArray* pOperator,
+    void* param) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
 
   SQueryAttr *pQueryAttr = pQInfo->runtimeEnv.pQueryAttr;
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 7d366ec814..b1c8633c02 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -343,6 +343,15 @@ static SArray* createCheckInfoFromCheckInfo(STableCheckInfo* pCheckInfo, TSKEY s
   return pNew;
 }
 
+static bool emptyQueryTimewindow(STsdbQueryHandle* pQueryHandle) {
+  assert(pQueryHandle != NULL);
+
+  STimeWindow* w = &pQueryHandle->window;
+  bool asc = ASCENDING_TRAVERSE(pQueryHandle->order);
+
+  return ((asc && w->skey > w->ekey) || (!asc && w->ekey > w->skey));
+}
+
 // Update the query time window according to the data time to live(TTL) information, in order to avoid to return
 // the expired data to client, even it is queried already.
 static int64_t getEarliestValidTimestamp(STsdbRepo* pTsdb) {
@@ -355,23 +364,27 @@ static int64_t getEarliestValidTimestamp(STsdbRepo* pTsdb) {
 static void setQueryTimewindow(STsdbQueryHandle* pQueryHandle, STsdbQueryCond* pCond) {
   pQueryHandle->window = pCond->twindow;
 
+  bool    updateTs = false;
   int64_t startTs = getEarliestValidTimestamp(pQueryHandle->pTsdb);
   if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
     if (startTs > pQueryHandle->window.skey) {
       pQueryHandle->window.skey = startTs;
+      pCond->twindow.skey = startTs;
+      updateTs = true;
     }
-
-    assert(pQueryHandle->window.skey <= pQueryHandle->window.ekey);
   } else {
     if (startTs > pQueryHandle->window.ekey) {
       pQueryHandle->window.ekey = startTs;
+      pCond->twindow.ekey = startTs;
+      updateTs = true;
     }
-
-    assert(pQueryHandle->window.skey >= pQueryHandle->window.ekey);
   }
 
-  tsdbDebug("%p update the query time window, old:%"PRId64" - %"PRId64", new:%"PRId64" - %"PRId64 ", 0x%"PRIx64,
-      pQueryHandle, pCond->twindow.skey, pCond->twindow.ekey, pQueryHandle->window.skey, pQueryHandle->window.ekey, pQueryHandle->qId);
+  if (updateTs) {
+    tsdbDebug("%p update the query time window, old:%" PRId64 " - %" PRId64 ", new:%" PRId64 " - %" PRId64
+              ", 0x%" PRIx64, pQueryHandle, pCond->twindow.skey, pCond->twindow.ekey, pQueryHandle->window.skey,
+              pQueryHandle->window.ekey, pQueryHandle->qId);
+  }
 }
 
 static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pCond, uint64_t qId, SMemRef* pMemRef) {
@@ -456,6 +469,9 @@ static STsdbQueryHandle* tsdbQueryTablesImpl(STsdbRepo* tsdb, STsdbQueryCond* pC
 
 TsdbQueryHandleT* tsdbQueryTables(STsdbRepo* tsdb, STsdbQueryCond* pCond, STableGroupInfo* groupList, uint64_t qId, SMemRef* pRef) {
   STsdbQueryHandle* pQueryHandle = tsdbQueryTablesImpl(tsdb, pCond, qId, pRef);
+  if (emptyQueryTimewindow(pQueryHandle)) {
+    return (TsdbQueryHandleT*) pQueryHandle;
+  }
 
   STsdbMeta* pMeta = tsdbGetMeta(tsdb);
   assert(pMeta != NULL);
@@ -479,6 +495,15 @@ TsdbQueryHandleT* tsdbQueryTables(STsdbRepo* tsdb, STsdbQueryCond* pCond, STable
 void tsdbResetQueryHandle(TsdbQueryHandleT queryHandle, STsdbQueryCond *pCond) {
   STsdbQueryHandle* pQueryHandle = queryHandle;
 
+  if (emptyQueryTimewindow(pQueryHandle)) {
+    if (pCond->order != pQueryHandle->order) {
+      pQueryHandle->order = pCond->order;
+      SWAP(pQueryHandle->window.skey, pQueryHandle->window.ekey, int64_t);
+    }
+
+    return;
+  }
+
   pQueryHandle->order       = pCond->order;
   pQueryHandle->window      = pCond->twindow;
   pQueryHandle->type        = TSDB_QUERY_TYPE_ALL;
@@ -1204,8 +1229,9 @@ static int32_t handleDataMergeIfNeeded(STsdbQueryHandle* pQueryHandle, SBlock* p
 static int32_t loadFileDataBlock(STsdbQueryHandle* pQueryHandle, SBlock* pBlock, STableCheckInfo* pCheckInfo, bool* exists) {
   SQueryFilePos* cur = &pQueryHandle->cur;
   int32_t code = TSDB_CODE_SUCCESS;
+  bool asc = ASCENDING_TRAVERSE(pQueryHandle->order);
 
-  if (ASCENDING_TRAVERSE(pQueryHandle->order)) {
+  if (asc) {
     // query ended in/started from current block
     if (pQueryHandle->window.ekey < pBlock->keyLast || pCheckInfo->lastKey > pBlock->keyFirst) {
       if ((code = doLoadFileDataBlock(pQueryHandle, pBlock, pCheckInfo, cur->slot)) != TSDB_CODE_SUCCESS) {
@@ -1226,7 +1252,7 @@ static int32_t loadFileDataBlock(STsdbQueryHandle* pQueryHandle, SBlock* pBlock,
       assert(pCheckInfo->lastKey <= pBlock->keyLast);
       doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
     } else {  // the whole block is loaded in to buffer
-      cur->pos = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:(pBlock->numOfRows - 1);
+      cur->pos = asc? 0:(pBlock->numOfRows - 1);
       code = handleDataMergeIfNeeded(pQueryHandle, pBlock, pCheckInfo);
     }
   } else {  //desc order, query ended in current block
@@ -1246,7 +1272,7 @@ static int32_t loadFileDataBlock(STsdbQueryHandle* pQueryHandle, SBlock* pBlock,
       assert(pCheckInfo->lastKey >= pBlock->keyFirst);
       doMergeTwoLevelData(pQueryHandle, pCheckInfo, pBlock);
     } else {
-      cur->pos = ASCENDING_TRAVERSE(pQueryHandle->order)? 0:(pBlock->numOfRows-1);
+      cur->pos = asc? 0:(pBlock->numOfRows-1);
       code = handleDataMergeIfNeeded(pQueryHandle, pBlock, pCheckInfo);
     }
   }
@@ -2717,6 +2743,11 @@ static bool loadDataBlockFromTableSeq(STsdbQueryHandle* pQueryHandle) {
 bool tsdbNextDataBlock(TsdbQueryHandleT pHandle) {
   STsdbQueryHandle* pQueryHandle = (STsdbQueryHandle*) pHandle;
 
+  if (emptyQueryTimewindow(pQueryHandle)) {
+    tsdbDebug("%p query window not overlaps with the data set, no result returned, 0x%"PRIx64, pQueryHandle, pQueryHandle->qId);
+    return false;
+  }
+
   int64_t stime = taosGetTimestampUs();
   int64_t elapsedTime = stime;
 
@@ -3669,15 +3700,21 @@ void tsdbCleanupQueryHandle(TsdbQueryHandleT queryHandle) {
     return;
   }
 
-  pQueryHandle->pTableCheckInfo = destroyTableCheckInfo(pQueryHandle->pTableCheckInfo);
   pQueryHandle->pColumns = doFreeColumnInfoData(pQueryHandle->pColumns);
 
   taosArrayDestroy(pQueryHandle->defaultLoadColumn);
   tfree(pQueryHandle->pDataBlockInfo);
   tfree(pQueryHandle->statis);
 
-  // todo check error
-  tsdbMayUnTakeMemSnapshot(pQueryHandle);
+  if (!emptyQueryTimewindow(pQueryHandle)) {
+    tsdbMayUnTakeMemSnapshot(pQueryHandle);
+  } else {
+    assert(pQueryHandle->pTableCheckInfo == NULL);
+  }
+
+  if (pQueryHandle->pTableCheckInfo != NULL) {
+    pQueryHandle->pTableCheckInfo = destroyTableCheckInfo(pQueryHandle->pTableCheckInfo);
+  }
 
   tsdbDestroyReadH(&pQueryHandle->rhelper);
 
diff --git a/tests/script/general/parser/single_row_in_tb_query.sim b/tests/script/general/parser/single_row_in_tb_query.sim
index 1f9cb8b558..acf85ea692 100644
--- a/tests/script/general/parser/single_row_in_tb_query.sim
+++ b/tests/script/general/parser/single_row_in_tb_query.sim
@@ -193,3 +193,7 @@ endi
 if $data04 != 1 then
   return -1
 endi
+
+print ===============>safty check TD-4927
+sql select first(ts, c1) from sr_stb where ts<1 group by t1;
+sql select first(ts, c1) from sr_stb where ts>0 and ts<1;
\ No newline at end of file

From 3eccaee176ec8c7843d76c2a11491882949367d2 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Tue, 29 Jun 2021 11:03:28 +0800
Subject: [PATCH 46/71] [TD-4965] <docs>: update latest keywords list.

---
 documentation20/cn/11.administrator/docs.md | 79 +++++++++++----------
 documentation20/cn/12.taos-sql/docs.md      |  4 +-
 2 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/documentation20/cn/11.administrator/docs.md b/documentation20/cn/11.administrator/docs.md
index 10951ed1fb..dce2f50d9e 100644
--- a/documentation20/cn/11.administrator/docs.md
+++ b/documentation20/cn/11.administrator/docs.md
@@ -465,43 +465,44 @@ TDengine的所有可执行文件默认存放在 _/usr/local/taos/bin_ 目录下
 
 目前 TDengine 有将近 200 个内部保留关键字，这些关键字无论大小写均不可以用作库名、表名、STable 名、数据列名及标签列名等。这些关键字列表如下：
 
-| 关键字列表 |             |              |            |           |
-| ---------- | ----------- | ------------ | ---------- | --------- |
-| ABLOCKS    | CONNECTIONS | HAVING       | MODULES    | SMALLINT  |
-| ABORT      | COPY        | ID           | NCHAR      | SPREAD    |
-| ACCOUNT    | COUNT       | IF           | NE         | STABLE    |
-| ACCOUNTS   | CREATE      | IGNORE       | NONE       | STABLES   |
-| ADD        | CTIME       | IMMEDIATE    | NOT        | STAR      |
-| AFTER      | DATABASE    | IMPORT       | NOTNULL    | STATEMENT |
-| ALL        | DATABASES   | IN           | NOW        | STDDEV    |
-| ALTER      | DAYS        | INITIALLY    | OF         | STREAM    |
-| AND        | DEFERRED    | INSERT       | OFFSET     | STREAMS   |
-| AS         | DELIMITERS  | INSTEAD      | OR         | STRING    |
-| ASC        | DESC        | INTEGER      | ORDER      | SUM       |
-| ATTACH     | DESCRIBE    | INTERVAL     | PASS       | TABLE     |
-| AVG        | DETACH      | INTO         | PERCENTILE | TABLES    |
-| BEFORE     | DIFF        | IP           | PLUS       | TAG       |
-| BEGIN      | DISTINCT    | IS           | PRAGMA     | TAGS      |
-| BETWEEN    | DIVIDE      | ISNULL       | PREV       | TBLOCKS   |
-| BIGINT     | DNODE       | JOIN         | PRIVILEGE  | TBNAME    |
-| BINARY     | DNODES      | KEEP         | QUERIES    | TIMES     |
-| BITAND     | DOT         | KEY          | QUERY      | TIMESTAMP |
-| BITNOT     | DOUBLE      | KILL         | RAISE      | TINYINT   |
-| BITOR      | DROP        | LAST         | REM        | TOP       |
-| BOOL       | EACH        | LE           | REPLACE    | TOPIC     |
-| BOTTOM     | END         | LEASTSQUARES | REPLICA    | TRIGGER   |
-| BY         | EQ          | LIKE         | RESET      | UMINUS    |
-| CACHE      | EXISTS      | LIMIT        | RESTRICT   | UNION     |
-| CASCADE    | EXPLAIN     | LINEAR       | ROW        | UPLUS     |
-| CHANGE     | FAIL        | LOCAL        | ROWS       | USE       |
-| CLOG       | FILL        | LP           | RP         | USER      |
-| CLUSTER    | FIRST       | LSHIFT       | RSHIFT     | USERS     |
-| COLON      | FLOAT       | LT           | SCORES     | USING     |
-| COLUMN     | FOR         | MATCH        | SELECT     | VALUES    |
-| COMMA      | FROM        | MAX          | SEMI       | VARIABLE  |
-| COMP       | GE          | METRIC       | SET        | VGROUPS   |
-| CONCAT     | GLOB        | METRICS      | SHOW       | VIEW      |
-| CONFIGS    | GRANTS      | MIN          | SLASH      | WAVG      |
-| CONFLICT   | GROUP       | MINUS        | SLIDING    | WHERE     |
-| CONNECTION | GT          | MNODES       | SLIMIT     |           |
+|  关键字列表  |              |              |              |              |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| ABORT        | CREATE       | IGNORE       | NULL         | STAR         |
+| ACCOUNT      | CTIME        | IMMEDIATE    | OF           | STATE        |
+| ACCOUNTS     | DATABASE     | IMPORT       | OFFSET       | STATEMENT    |
+| ADD          | DATABASES    | IN           | OR           | STATE_WINDOW |
+| AFTER        | DAYS         | INITIALLY    | ORDER        | STORAGE      |
+| ALL          | DBS          | INSERT       | PARTITIONS   | STREAM       |
+| ALTER        | DEFERRED     | INSTEAD      | PASS         | STREAMS      |
+| AND          | DELIMITERS   | INT          | PLUS         | STRING       |
+| AS           | DESC         | INTEGER      | PPS          | SYNCDB       |
+| ASC          | DESCRIBE     | INTERVAL     | PRECISION    | TABLE        |
+| ATTACH       | DETACH       | INTO         | PREV         | TABLES       |
+| BEFORE       | DISTINCT     | IS           | PRIVILEGE    | TAG          |
+| BEGIN        | DIVIDE       | ISNULL       | QTIME        | TAGS         |
+| BETWEEN      | DNODE        | JOIN         | QUERIES      | TBNAME       |
+| BIGINT       | DNODES       | KEEP         | QUERY        | TIMES        |
+| BINARY       | DOT          | KEY          | QUORUM       | TIMESTAMP    |
+| BITAND       | DOUBLE       | KILL         | RAISE        | TINYINT      |
+| BITNOT       | DROP         | LE           | REM          | TOPIC        |
+| BITOR        | EACH         | LIKE         | REPLACE      | TOPICS       |
+| BLOCKS       | END          | LIMIT        | REPLICA      | TRIGGER      |
+| BOOL         | EQ           | LINEAR       | RESET        | TSERIES      |
+| BY           | EXISTS       | LOCAL        | RESTRICT     | UMINUS       |
+| CACHE        | EXPLAIN      | LP           | ROW          | UNION        |
+| CACHELAST    | FAIL         | LSHIFT       | RP           | UNSIGNED     |
+| CASCADE      | FILE         | LT           | RSHIFT       | UPDATE       |
+| CHANGE       | FILL         | MATCH        | SCORES       | UPLUS        |
+| CLUSTER      | FLOAT        | MAXROWS      | SELECT       | USE          |
+| COLON        | FOR          | MINROWS      | SEMI         | USER         |
+| COLUMN       | FROM         | MINUS        | SESSION      | USERS        |
+| COMMA        | FSYNC        | MNODES       | SET          | USING        |
+| COMP         | GE           | MODIFY       | SHOW         | VALUES       |
+| COMPACT      | GLOB         | MODULES      | SLASH        | VARIABLE     |
+| CONCAT       | GRANTS       | NCHAR        | SLIDING      | VARIABLES    |
+| CONFLICT     | GROUP        | NE           | SLIMIT       | VGROUPS      |
+| CONNECTION   | GT           | NONE         | SMALLINT     | VIEW         |
+| CONNECTIONS  | HAVING       | NOT          | SOFFSET      | VNODES       |
+| CONNS        | ID           | NOTNULL      | STABLE       | WAL          |
+| COPY         | IF           | NOW          | STABLES      | WHERE        |
 
diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index 429b2e7d73..2a1112fd16 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -89,13 +89,13 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
     ```mysql
     USE db_name;
     ```
-    使用/切换数据库
+    使用/切换数据库（在 RESTful 连接方式下无效）。
 
 - **删除数据库**
     ```mysql
     DROP DATABASE [IF EXISTS] db_name;
     ```
-    删除数据库。所包含的全部数据表将被删除，谨慎使用
+    删除数据库。指定 Database 所包含的全部数据表将被删除，谨慎使用！
 
 - **修改数据库参数**
     ```mysql

From 00055ce2aad7a4e1da5ac5fbab9a489c082179d2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 29 Jun 2021 13:16:11 +0800
Subject: [PATCH 47/71] [td-225]fix bug found by regression test.

---
 src/tsdb/src/tsdbRead.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index b1c8633c02..2c44df0237 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -39,6 +39,12 @@ enum {
   TSDB_QUERY_TYPE_LAST     = 2,
 };
 
+enum {
+  TSDB_CACHED_TYPE_NONE    = 0,
+  TSDB_CACHED_TYPE_LASTROW = 1,
+  TSDB_CACHED_TYPE_LAST    = 2,
+};
+
 typedef struct SQueryFilePos {
   int32_t fid;
   int32_t slot;
@@ -2751,10 +2757,11 @@ bool tsdbNextDataBlock(TsdbQueryHandleT pHandle) {
   int64_t stime = taosGetTimestampUs();
   int64_t elapsedTime = stime;
 
+  // TODO refactor: remove "type"
   if (pQueryHandle->type == TSDB_QUERY_TYPE_LAST) {
-    if (pQueryHandle->cachelastrow == 1) {
+    if (pQueryHandle->cachelastrow == TSDB_CACHED_TYPE_LASTROW) {
       return loadCachedLastRow(pQueryHandle);
-    } else if (pQueryHandle->cachelastrow == 2) {
+    } else if (pQueryHandle->cachelastrow == TSDB_CACHED_TYPE_LAST) {
       return loadCachedLast(pQueryHandle);
     }
   }
@@ -2960,7 +2967,7 @@ out:
 }
 
 bool isTsdbCacheLastRow(TsdbQueryHandleT* pQueryHandle) {
-  return ((STsdbQueryHandle *)pQueryHandle)->cachelastrow > 0;
+  return ((STsdbQueryHandle *)pQueryHandle)->cachelastrow > TSDB_CACHED_TYPE_NONE;
 }
 
 int32_t checkForCachedLastRow(STsdbQueryHandle* pQueryHandle, STableGroupInfo *groupList) {
@@ -2978,9 +2985,9 @@ int32_t checkForCachedLastRow(STsdbQueryHandle* pQueryHandle, STableGroupInfo *g
   if (((STable*)pInfo->pTable)->lastRow) {
     code = tsdbGetCachedLastRow(pInfo->pTable, NULL, &key);
     if (code != TSDB_CODE_SUCCESS) {
-      pQueryHandle->cachelastrow = 0;
+      pQueryHandle->cachelastrow = TSDB_CACHED_TYPE_NONE;
     } else {
-      pQueryHandle->cachelastrow = 1;
+      pQueryHandle->cachelastrow = TSDB_CACHED_TYPE_LASTROW;
     }
   }
 
@@ -3000,12 +3007,11 @@ int32_t checkForCachedLast(STsdbQueryHandle* pQueryHandle) {
   int32_t code = 0;
   
   if (pQueryHandle->pTsdb && atomic_load_8(&pQueryHandle->pTsdb->hasCachedLastColumn)){
-    pQueryHandle->cachelastrow = 2;
+    pQueryHandle->cachelastrow = TSDB_CACHED_TYPE_LAST;
   }
 
   // update the tsdb query time range
   if (pQueryHandle->cachelastrow) {
-    pQueryHandle->window      = TSWINDOW_INITIALIZER;
     pQueryHandle->checkFiles  = false;
     pQueryHandle->activeIndex = -1;  // start from -1
   }

From ccb66fca0cc4d15ee9d8db654220f5ba23909105 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 29 Jun 2021 13:18:30 +0800
Subject: [PATCH 48/71] [td-4969]<enhance>:enable the interval value to be 1us.

---
 src/client/src/tscSQLParser.c              | 6 +++---
 src/common/src/tglobal.c                   | 4 ++--
 src/os/src/detail/osTime.c                 | 1 +
 tests/script/general/parser/fill_us.sim    | 4 ++--
 tests/script/general/parser/last_cache.sim | 2 +-
 tests/script/general/parser/testSuite.sim  | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index e24c063b2e..50c8aa0376 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -914,8 +914,8 @@ static int32_t checkInvalidExprForTimeWindow(SSqlCmd* pCmd, SQueryInfo* pQueryIn
 }
 
 int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pSqlNode) {
+  const char* msg1 = "sliding cannot be used without interval";
   const char* msg2 = "interval cannot be less than 10 ms";
-  const char* msg3 = "sliding cannot be used without interval";
 
   SSqlCmd* pCmd = &pSql->cmd;
 
@@ -924,7 +924,7 @@ int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pS
   
   if (!TPARSER_HAS_TOKEN(pSqlNode->interval.interval)) {
     if (TPARSER_HAS_TOKEN(pSqlNode->sliding)) {
-      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg3);
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
     return TSDB_CODE_SUCCESS;
@@ -945,7 +945,7 @@ int32_t validateIntervalNode(SSqlObj* pSql, SQueryInfo* pQueryInfo, SSqlNode* pS
   if (pQueryInfo->interval.intervalUnit != 'n' && pQueryInfo->interval.intervalUnit != 'y') {
 
     // interval cannot be less than 10 milliseconds
-    if (convertTimePrecision(pQueryInfo->interval.interval, tinfo.precision, TSDB_TIME_PRECISION_MILLI) < tsMinIntervalTime) {
+    if (convertTimePrecision(pQueryInfo->interval.interval, tinfo.precision, TSDB_TIME_PRECISION_MICRO) < tsMinIntervalTime) {
       return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
     }
   }
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 51d44add4c..ec98915227 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -84,8 +84,8 @@ int32_t tsMaxNumOfOrderedResults = 100000;
 // 10 ms for sliding time, the value will changed in case of time precision changed
 int32_t tsMinSlidingTime = 10;
 
-// 10 ms for interval time range, changed accordingly
-int32_t tsMinIntervalTime = 10;
+// 1 us for interval time range, changed accordingly
+int32_t tsMinIntervalTime = 1;
 
 // 20sec, the maximum value of stream computing delay, changed accordingly
 int32_t tsMaxStreamComputDelay = 20000;
diff --git a/src/os/src/detail/osTime.c b/src/os/src/detail/osTime.c
index 4d64e14d94..847d484d9e 100644
--- a/src/os/src/detail/osTime.c
+++ b/src/os/src/detail/osTime.c
@@ -348,6 +348,7 @@ int64_t convertTimePrecision(int64_t time, int32_t fromPrecision, int32_t toPrec
                                   {1.0 / 1000000, 1.0 / 1000,       1.} };
   return (int64_t)((double)time * factors[fromPrecision][toPrecision]);
 }
+
 static int32_t getDuration(int64_t val, char unit, int64_t* result, int32_t timePrecision) {
 
   switch (unit) {
diff --git a/tests/script/general/parser/fill_us.sim b/tests/script/general/parser/fill_us.sim
index 8cd2c33347..762413d0a1 100644
--- a/tests/script/general/parser/fill_us.sim
+++ b/tests/script/general/parser/fill_us.sim
@@ -959,14 +959,14 @@ endi
 if $data31 != 9.000000000 then
   return -1
 endi
-if $data41 != null then
+if $data41 != NULL then
   print ===== $data41
   return -1
 endi
 if $data51 != 16.000000000 then
   return -1
 endi
-if $data61 != null then
+if $data61 != NULL then
    print ===== $data61
   return -1
 endi
diff --git a/tests/script/general/parser/last_cache.sim b/tests/script/general/parser/last_cache.sim
index 4b3285871b..9c414263ec 100644
--- a/tests/script/general/parser/last_cache.sim
+++ b/tests/script/general/parser/last_cache.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
-system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index 5f71138966..d7f06769a8 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -12,7 +12,7 @@ run general/parser/create_tb.sim
 run general/parser/dbtbnameValidate.sim
 run general/parser/fill.sim
 run general/parser/fill_stb.sim
-#run general/parser/fill_us.sim               #
+run general/parser/fill_us.sim
 run general/parser/first_last.sim
 run general/parser/import_commit1.sim
 run general/parser/import_commit2.sim

From 0af16a88d9fffbbae13755904d57b336dcb8db57 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Tue, 29 Jun 2021 13:33:55 +0800
Subject: [PATCH 49/71] [TD-4752]<doc>: python connector supports nanoseconds.
 (#6660)

---
 documentation20/cn/08.connector/docs.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index aa5fa50b66..454d896fc2 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -557,6 +557,13 @@ c1.close()
 conn.close()
 ```
 
+#### 关于纳秒 (nanosecon) 在 Python 连接器中的说明
+
+由于目前 Python 对 nanosecond 支持的不完善(参见链接 1. 2. )，目前的实现方式是在 nanosecond 精度时返回整数，而不是 ms 和 us 返回的 datetime 类型，应用开发者需要自行处理，建议使用 pandas 的 to_datetime()。未来如果 Python 正式完整支持了纳秒，涛思数据可能会修改相关接口。
+
+1. https://stackoverflow.com/questions/10611328/parsing-datetime-strings-containing-nanoseconds
+2. https://www.python.org/dev/peps/pep-0564/
+
 #### 帮助信息
 
 用户可通过python的帮助信息直接查看模块的使用信息，或者参考tests/examples/python中的示例程序。以下为部分常用类和方法：

From 2237648e8333c801c9cb0513bcaff23d711a3d42 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Tue, 29 Jun 2021 14:20:45 +0800
Subject: [PATCH 50/71] [TD-3178] <docs>: describe command "COMPACT".

---
 documentation20/cn/00.index/docs.md         |  1 +
 documentation20/cn/11.administrator/docs.md | 13 +++++++++++++
 documentation20/cn/13.faq/docs.md           |  1 +
 3 files changed, 15 insertions(+)

diff --git a/documentation20/cn/00.index/docs.md b/documentation20/cn/00.index/docs.md
index ed7156be17..18bdc15d30 100644
--- a/documentation20/cn/00.index/docs.md
+++ b/documentation20/cn/00.index/docs.md
@@ -106,6 +106,7 @@ TDengine是一个高效的存储、查询、分析时序大数据的平台，专
 * [数据导入](/administrator#import)：可按脚本文件导入，也可按数据文件导入
 * [数据导出](/administrator#export)：从shell按表导出，也可用taosdump工具做各种导出
 * [系统监控](/administrator#status)：检查系统现有的连接、查询、流式计算，日志和事件等
+* [性能优化](/administrator#optimize)：对长期运行的系统进行维护优化，保障性能表现
 * [文件目录结构](/administrator#directories)：TDengine数据文件、配置文件等所在目录
 * [参数限制与保留关键字](/administrator#keywords)：TDengine的参数限制与保留关键字列表
 
diff --git a/documentation20/cn/11.administrator/docs.md b/documentation20/cn/11.administrator/docs.md
index dce2f50d9e..753f91f589 100644
--- a/documentation20/cn/11.administrator/docs.md
+++ b/documentation20/cn/11.administrator/docs.md
@@ -418,6 +418,19 @@ TDengine启动后，会自动创建一个监测数据库log，并自动将服务
 
 这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项enableMonitor将其关闭或打开。
 
+<a class="anchor" id="optimize"></a>
+## 性能优化
+
+因数据行 [update](https://www.taosdata.com/cn/documentation/faq#update)、表删除、数据过期等原因，TDengine 的磁盘存储文件有可能出现数据碎片，影响查询操作的性能表现。从 2.1.3.0 版本开始，新增 SQL 指令 COMPACT 来启动碎片重整过程：
+
+```mysql
+COMPACT VNODES IN (vg_id1, vg_id2, ...)
+```
+
+COMPACT 命令对指定的一个或多个 VGroup 启动碎片重整，系统会通过任务队列尽快安排重整操作的具体执行。COMPACT 指令所需的 VGroup id，可以通过 `SHOW VGROUPS;` 指令的输出结果获取；而且在 `SHOW VGROUPS;` 中会有一个 compacting 列，值为 1 时表示对应的 VGroup 正在进行碎片重整，为 0 时则表示并没有处于重整状态。
+
+需要注意的是，碎片重整操作会大幅消耗磁盘 I/O。因此在重整进行期间，有可能会影响节点的写入和查询性能，甚至在极端情况下导致短时间的阻写。
+
 ## <a class="anchor" id="directories"></a>文件目录结构
 
 安装TDengine后，默认会在操作系统中生成下列目录或文件：
diff --git a/documentation20/cn/13.faq/docs.md b/documentation20/cn/13.faq/docs.md
index 8d18ae269d..300ff27fe4 100644
--- a/documentation20/cn/13.faq/docs.md
+++ b/documentation20/cn/13.faq/docs.md
@@ -87,6 +87,7 @@
 
 TDengine还没有一组专用的validation queries。然而建议你使用系统监测的数据库”log"来做。
 
+<a class="anchor" id="update"></a>
 ## 9. 我可以删除或更新一条记录吗？
 
 TDengine 目前尚不支持删除功能，未来根据用户需求可能会支持。

From 80047afd7e7e2adca213284a5e59764bda5d3e6a Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Tue, 29 Jun 2021 15:55:06 +0800
Subject: [PATCH 51/71] [TD-3086] <docs>: tags columns can use timestamp type
 now.

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

diff --git a/documentation20/cn/12.taos-sql/docs.md b/documentation20/cn/12.taos-sql/docs.md
index 2a1112fd16..764560dbeb 100644
--- a/documentation20/cn/12.taos-sql/docs.md
+++ b/documentation20/cn/12.taos-sql/docs.md
@@ -279,11 +279,11 @@ TDengine 缺省的时间戳是毫秒精度，但通过在 CREATE DATABASE 时传
 
     说明：
 
-    1) TAGS 列的数据类型不能是 timestamp 类型；
+    1) TAGS 列的数据类型不能是 timestamp 类型；（从 2.1.3.0 版本开始，TAGS 列中支持使用 timestamp 类型，但需注意在 TAGS 中的 timestamp 列写入数据时需要提供给定值，而暂不支持四则运算，例如 `NOW + 10s` 这类表达式）
 
     2) TAGS 列名不能与其他列名相同；
 
-    3) TAGS 列名不能为预留关键字；
+    3) TAGS 列名不能为预留关键字（参见：[参数限制与保留关键字](https://www.taosdata.com/cn/documentation/administrator#keywords) 章节）；
 
     4) TAGS 最多允许 128 个，至少 1 个，总长度不超过 16 KB。
 

From 44758e1b51238e62f01babb730260a99a720055b Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Tue, 29 Jun 2021 16:17:15 +0800
Subject: [PATCH 52/71] [TD-4906]<fix>: fix grafana dashboard import error in
 Grafana v6.2.x (#6661)

---
 src/connector/grafanaplugin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/connector/grafanaplugin b/src/connector/grafanaplugin
index 3530c6df09..dbc5f04ebd 160000
--- a/src/connector/grafanaplugin
+++ b/src/connector/grafanaplugin
@@ -1 +1 @@
-Subproject commit 3530c6df097134a410bacec6b3cd013ef38a61aa
+Subproject commit dbc5f04ebd29522d2acd0636f6fc350060d15a6b

From 46b3927e07f31a6aedb47753df3ea21ad184aff6 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Tue, 29 Jun 2021 16:23:45 +0800
Subject: [PATCH 53/71] Docs/sangshuduo/td 4752 python nanosecond (#6664)

* [TD-4752]<doc>: python connector supports nanoseconds.

* update english document too.
---
 documentation20/cn/08.connector/docs.md | 2 +-
 documentation20/en/08.connector/docs.md | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index 454d896fc2..762d1ad480 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -557,7 +557,7 @@ c1.close()
 conn.close()
 ```
 
-#### 关于纳秒 (nanosecon) 在 Python 连接器中的说明
+#### 关于纳秒 (nanosecond) 在 Python 连接器中的说明
 
 由于目前 Python 对 nanosecond 支持的不完善(参见链接 1. 2. )，目前的实现方式是在 nanosecond 精度时返回整数，而不是 ms 和 us 返回的 datetime 类型，应用开发者需要自行处理，建议使用 pandas 的 to_datetime()。未来如果 Python 正式完整支持了纳秒，涛思数据可能会修改相关接口。
 
diff --git a/documentation20/en/08.connector/docs.md b/documentation20/en/08.connector/docs.md
index 3da9937f98..9b3940a2e8 100644
--- a/documentation20/en/08.connector/docs.md
+++ b/documentation20/en/08.connector/docs.md
@@ -515,6 +515,13 @@ c1.close()
 conn.close()
 ```
 
+#### Using nanosecond in Python connector
+
+So far Python still does not completely support nanosecond type. Please refer to the link 1 and 2. The implementation of the python connector is to return an integer number for nanosecond value rather than datatime type as what ms and us do. The developer needs to handle it themselves. We recommend using pandas to_datetime() function. If Python officially support nanosecond in the future, TAOS Data might be possible to change the interface accordingly, which mean the application need change too.
+
+1. https://stackoverflow.com/questions/10611328/parsing-datetime-strings-containing-nanoseconds
+2. https://www.python.org/dev/peps/pep-0564/
+
 #### Helper
 
 Users can directly view the usage information of the module through Python's helper, or refer to the sample program in tests/examples/Python. The following are some common classes and methods:

From bf14dba3566a0df4f4d96fa746604a9e59379ea2 Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Tue, 29 Jun 2021 17:39:55 +0800
Subject: [PATCH 54/71] [TD-4528] <docs>: add Go example about reading from
 Kafka and writing to TDengine.

---
 documentation20/cn/08.connector/docs.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index aa5fa50b66..ca28a25fdf 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -900,6 +900,10 @@ go env -w GOPROXY=https://goproxy.io,direct
 
   sql.Open内置的方法，Close closes the statement.	
 
+### 其他代码示例
+
+[Consume Messages from Kafka](https://github.com/taosdata/go-demo-kafka) 是一个通过 Go 语言实现消费 Kafka 队列写入 TDengine 的示例程序，也可以作为通过 Go 连接 TDengine 的写法参考。
+
 ## <a class="anchor" id="nodejs"></a>Node.js Connector
 
 Node.js连接器支持的系统有：

From 0a45ee6812f3d93f1442d651e4bb23b98df83b96 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Tue, 10 Aug 2021 14:30:37 +0800
Subject: [PATCH 55/71] [TD-4967]<test>update retention policy testcase

---
 tests/pytest/insert/retentionpolicy.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tests/pytest/insert/retentionpolicy.py b/tests/pytest/insert/retentionpolicy.py
index e0446113d6..067fe3e5c3 100644
--- a/tests/pytest/insert/retentionpolicy.py
+++ b/tests/pytest/insert/retentionpolicy.py
@@ -71,13 +71,10 @@ class TDTestRetetion:
         tdDnodes.start(1)
         
         tdLog.info(cmd)
+        ttime = datetime.datetime.now()
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        if self.queryRows==4:
-            self.checkRows(4,cmd)
-            return 0
-        else:
-            self.checkRows(5,cmd)
+        self.checkRows(3,cmd)
         tdLog.info("=============== step3")
         tdDnodes.stop(1)
         os.system("date -s '%s'"%(datetime.datetime.now()+datetime.timedelta(hours=48)))
@@ -92,7 +89,7 @@ class TDTestRetetion:
         tdLog.info(cmd)
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        self.checkRows(6,cmd)
+        self.checkRows(3,cmd)
         tdLog.info("=============== step4")
         tdDnodes.stop(1)
         tdDnodes.start(1)
@@ -100,7 +97,7 @@ class TDTestRetetion:
         tdLog.info(cmd)
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        self.checkRows(5,cmd)
+        self.checkRows(4,cmd)
 
         tdLog.info("=============== step5")
         tdDnodes.stop(1)
@@ -109,6 +106,21 @@ class TDTestRetetion:
         self.queryRows=tdSql.query('select * from test where ts > now-1d')
         self.checkRows(2,cmd)
 
+        tdLog.info("=============== step6")
+        tdDnodes.stop(1)
+        os.system("date -s '%s'"%(ttime + datetime.timedelta(seconds=(72*60*60-7))))
+        tdDnodes.start(1)
+        while datetime.datetime.now() < (ttime + datetime.timedelta(seconds=(72*60*60-1))):
+            time.sleep(0.001)
+        cmd = 'select * from test'
+        self.queryRows=tdSql.query(cmd)
+        self.checkRows(4,cmd)
+        while datetime.datetime.now() < (ttime + datetime.timedelta(hours=72)):
+            time.sleep(0.001)
+        cmd = 'select * from test'
+        self.queryRows=tdSql.query(cmd)
+        self.checkRows(3,cmd)
+
     def stop(self):
         os.system("sudo timedatectl set-ntp true")
         os.system("date -s '%s'"%(datetime.datetime.now()+datetime.timedelta(hours=1)))

From d654a5c762b114e17ee37a77a8b4656b8e73ab0c Mon Sep 17 00:00:00 2001
From: bryanchang0603 <changb9@mcamster.ca>
Date: Tue, 29 Jun 2021 18:22:10 +0800
Subject: [PATCH 56/71] [TD-4927] update test case

---
 tests/pytest/alter/alter_keep.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py
index 72ca635ac3..b23f364fc6 100644
--- a/tests/pytest/alter/alter_keep.py
+++ b/tests/pytest/alter/alter_keep.py
@@ -173,8 +173,9 @@ class TDTestCase:
         tdSql.checkData(0,7,'10,10,10')
         tdSql.error('insert into tb values (now-15d, 10)')
         tdSql.query('select * from tb')
-        tdSql.checkRows(rowNum)
+        tdSql.checkRows(2)
         
+        rowNum = 2
         tdLog.notice('testing keep will be altered if sudden change from small to big')
         for i in range(30):
             tdSql.execute('alter database db keep 14,14,14')
@@ -182,14 +183,19 @@ class TDTestCase:
             tdSql.execute('insert into tb values (now-15d, 10)')
             tdSql.query('select * from tb')
             rowNum += 1
-            tdSql.checkRows(rowNum )
+            tdSql.checkRows(rowNum)
 
         tdLog.notice('testing keep will be altered if sudden change from big to small')
         tdSql.execute('alter database db keep 16,16,16')
         tdSql.execute('alter database db keep 14,14,14')
         tdSql.error('insert into tb values (now-15d, 10)')
         tdSql.query('select * from tb')
-        tdSql.checkRows(rowNum)
+        tdSql.checkRows(2)
+
+        tdLog.notice('testing data will show up again when keep is being changed to large value')
+        tdSql.execute('alter database db keep 40,40,40')
+        tdSql.query('select * from tb')
+        tdSql.checkRows(63)
 
 
 

From 4233a5a5d4879c22ccf51d0919e2e1e80429da79 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Tue, 29 Jun 2021 21:48:15 +0800
Subject: [PATCH 57/71] Hotfix/sangshuduo/td 4892 taosdemo sub fetch for
 develop (#6668)

* fix crash if no result file.

* make taosdemo same as master branch.

* decrease few debug print level.
---
 src/kit/taosdemo/taosdemo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index ec4c6d8773..f6dc6d9c79 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -1221,7 +1221,7 @@ static void fetchResult(TAOS_RES *res, threadInfo* pThreadInfo) {
     //printf("query result:%s\n", temp);
     memcpy(databuf + totalLen, temp, len);
     totalLen += len;
-    debugPrint("totalLen: %"PRId64"\n", totalLen);
+    verbosePrint("%s() LN%d, totalLen: %"PRId64"\n", __func__, __LINE__, totalLen);
   }
 
   verbosePrint("%s() LN%d, databuf=%s resultFile=%s\n",
@@ -7280,7 +7280,7 @@ static void *superSubscribe(void *sarg) {
                     pThreadInfo->threadID);
         }
 
-        debugPrint("%s() LN%d, [%d] subSqlstr: %s\n",
+        verbosePrint("%s() LN%d, [%d] subSqlstr: %s\n",
                 __func__, __LINE__, pThreadInfo->threadID, subSqlstr);
         tsub[tsubSeq] = subscribeImpl(
                 STABLE_CLASS,

From 9fd6d0593f45745df4eab56a0b592198fb3b0d6a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 29 Jun 2021 22:58:00 +0800
Subject: [PATCH 58/71] [td-4954]<fix>:update some error message strings.

---
 src/client/src/tscSQLParser.c | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 50c8aa0376..3ceb10520b 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -1309,15 +1309,8 @@ static bool validateTagParams(SArray* pTagsList, SArray* pFieldList, SSqlCmd* pC
     return false;
   }
 
-  /* timestamp in tag is not allowed */
   for (int32_t i = 0; i < numOfTags; ++i) {
     TAOS_FIELD* p = taosArrayGet(pTagsList, i);
-
-    //if (p->type == TSDB_DATA_TYPE_TIMESTAMP) {
-    //  invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
-    //  return false;
-    //}
-
     if (!isValidDataType(p->type)) {
       invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
       return false;
@@ -2174,7 +2167,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
   const char* msg3 = "illegal column name";
   const char* msg4 = "invalid table name";
   const char* msg5 = "parameter is out of range [0, 100]";
-  const char* msg6 = "function applied to tags not allowed";
+  const char* msg6 = "functions applied to tags are not allowed";
   const char* msg7 = "normal table can not apply this function";
   const char* msg8 = "multi-columns selection does not support alias column name";
   const char* msg9 = "diff/derivative can no be applied to unsigned numeric type";
@@ -3087,9 +3080,9 @@ void tscRestoreFuncForSTableQuery(SQueryInfo* pQueryInfo) {
 }
 
 bool hasUnsupportFunctionsForSTableQuery(SSqlCmd* pCmd, SQueryInfo* pQueryInfo) {
-  const char* msg1 = "TWA/Diff/Derivative/Irate not allowed to apply to super table directly";
+  const char* msg1 = "TWA/Diff/Derivative/Irate are not allowed to apply to super table directly";
   const char* msg2 = "TWA/Diff/Derivative/Irate only support group by tbname for super table query";
-  const char* msg3 = "function not support for super table query";
+  const char* msg3 = "functions not support for super table query";
 
   // filter sql function not supported by metric query yet.
   size_t size = tscNumOfExprs(pQueryInfo);

From e55053fc451995827950209bfa03266d9d136a68 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 30 Jun 2021 10:31:40 +0800
Subject: [PATCH 59/71] [td-4966]<fix>:add more check in group by clause.

---
 src/client/src/tscSQLParser.c | 72 ++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 3ceb10520b..3c0c9ae6c3 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -3187,34 +3187,42 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
   const char* msg2 = "invalid column name in group by clause";
   const char* msg3 = "columns from one table allowed as group by columns";
   const char* msg4 = "join query does not support group by";
+  const char* msg5 = "not allowed column type for group by";
+  const char* msg6 = "tags not allowed for table query";
   const char* msg7 = "not support group by expression";
-  const char* msg8 = "not allowed column type for group by";
-  const char* msg9 = "tags not allowed for table query";
+  const char* msg8 = "normal column can only locate at the end of group by clause";
 
   // todo : handle two tables situation
   STableMetaInfo* pTableMetaInfo = NULL;
-
   if (pList == NULL) {
     return TSDB_CODE_SUCCESS;
   }
 
-  if (pQueryInfo->colList == NULL) {
-    pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
-  }
-  
-  pQueryInfo->groupbyExpr.numOfGroupCols = (int16_t)taosArrayGetSize(pList);
-  if (pQueryInfo->groupbyExpr.numOfGroupCols > TSDB_MAX_TAGS) {
-    return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
-  }
-
   if (pQueryInfo->numOfTables > 1) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg4);
   }
 
-  STableMeta* pTableMeta = NULL;
-  SSchema*    pSchema = NULL;
+  SGroupbyExpr* pGroupExpr = &pQueryInfo->groupbyExpr;
+  if (pGroupExpr->columnInfo == NULL) {
+    pGroupExpr->columnInfo = taosArrayInit(4, sizeof(SColIndex));
+  }
 
-  int32_t tableIndex = COLUMN_INDEX_INITIAL_VAL;
+  if (pQueryInfo->colList == NULL) {
+    pQueryInfo->colList = taosArrayInit(4, POINTER_BYTES);
+  }
+
+  if (pGroupExpr->columnInfo == NULL || pQueryInfo->colList == NULL) {
+    return TSDB_CODE_TSC_OUT_OF_MEMORY;
+  }
+
+  pGroupExpr->numOfGroupCols = (int16_t)taosArrayGetSize(pList);
+  if (pGroupExpr->numOfGroupCols > TSDB_MAX_TAGS) {
+    return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg1);
+  }
+
+  SSchema *pSchema       = NULL;
+  int32_t tableIndex     = COLUMN_INDEX_INITIAL_VAL;
+  int32_t numOfGroupCols = 0;
 
   size_t num = taosArrayGetSize(pList);
   for (int32_t i = 0; i < num; ++i) {
@@ -3235,28 +3243,20 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
     }
 
     pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
-    pTableMeta = pTableMetaInfo->pTableMeta;
+    STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
   
-    int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
     if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
       pSchema = tGetTbnameColumnSchema();
     } else {
       pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
     }
 
-    bool groupTag = false;
-    if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX || index.columnIndex >= numOfCols) {
-      groupTag = true;
-    }
+    int32_t numOfCols = tscGetNumOfColumns(pTableMeta);
+    bool groupTag = (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX || index.columnIndex >= numOfCols);
   
-    SGroupbyExpr* pGroupExpr = &pQueryInfo->groupbyExpr;
-    if (pGroupExpr->columnInfo == NULL) {
-      pGroupExpr->columnInfo = taosArrayInit(4, sizeof(SColIndex));
-    }
-    
     if (groupTag) {
       if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
-        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg9);
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg6);
       }
 
       int32_t relIndex = index.columnIndex;
@@ -3273,7 +3273,7 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
     } else {
       // check if the column type is valid, here only support the bool/tinyint/smallint/bigint group by
       if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP || pSchema->type == TSDB_DATA_TYPE_FLOAT || pSchema->type == TSDB_DATA_TYPE_DOUBLE) {
-        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg8);
+        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg5);
       }
 
       tscColumnListInsert(pQueryInfo->colList, index.columnIndex, pTableMeta->id.uid, pSchema);
@@ -3283,10 +3283,20 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
 
       taosArrayPush(pGroupExpr->columnInfo, &colIndex);
       pQueryInfo->groupbyExpr.orderType = TSDB_ORDER_ASC;
+      numOfGroupCols++;
+    }
+  }
 
-      if (i == 0 && num > 1) {
-        return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
-      }
+  // 1. only one normal column allowed in the group by clause
+  // 2. the normal column in the group by clause can only located in the end position
+  if (numOfGroupCols) {
+    return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
+  }
+
+  for(int32_t i = 0; i < num; ++i) {
+    SColIndex* pIndex = taosArrayGet(pGroupExpr->columnInfo, i);
+    if (TSDB_COL_IS_NORMAL_COL(pIndex->flag) && i != num - 1) {
+     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg8);
     }
   }
 

From 1f670fc95a637512bf91872517cc352659689853 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 30 Jun 2021 11:27:17 +0800
Subject: [PATCH 60/71] [td-225]update the sim.

---
 tests/script/general/parser/groupby.sim | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 6ae5d420d8..e47af5588e 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -781,4 +781,14 @@ if $data11 != 2 then
   return -1
 endi
 
+sql_error select count(*) from m1 group by tbname,k,f1;
+sql_error select count(*) from m1 group by tbname,k,a;
+sql_error select count(*) from m1 group by k, tbname;
+sql_error select count(*) from m1 group by k,f1;
+sql_error select count(*) from tm0 group by tbname;
+sql_error select count(*) from tm0 group by a;
+sql_error select count(*) from tm0 group by k,f1;
+
+sql_error select count(*),f1 from m1 group by tbname,k;
+
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

From 201f6c465e56846dfcf87e880e7b06d895394af8 Mon Sep 17 00:00:00 2001
From: Jun Li <jun.li@convoy.com>
Date: Tue, 29 Jun 2021 20:42:16 -0700
Subject: [PATCH 61/71] Fix some printf typing issue (#6659)

---
 src/client/tests/cliTest.cpp       |  3 ++-
 src/client/tests/timeParseTest.cpp | 28 +++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/client/tests/cliTest.cpp b/src/client/tests/cliTest.cpp
index 30f248b541..c2799c7ff6 100644
--- a/src/client/tests/cliTest.cpp
+++ b/src/client/tests/cliTest.cpp
@@ -1,5 +1,6 @@
 #include <gtest/gtest.h>
 #include <iostream>
+#include <inttypes.h>
 
 #include "taos.h"
 #include "tglobal.h"
@@ -132,7 +133,7 @@ void validateResultFields() {
   taos_free_result(res);
 
   char sql[512] = {0};
-  sprintf(sql, "insert into t1 values(%ld, 99, 'abc', 'test')", start_ts);
+  sprintf(sql, "insert into t1 values(%" PRId64 ", 99, 'abc', 'test')", start_ts);
 
   res = taos_query(conn, sql);
   ASSERT_EQ(taos_errno(res), 0);
diff --git a/src/client/tests/timeParseTest.cpp b/src/client/tests/timeParseTest.cpp
index 3cc6d541e0..f6de5d46a7 100644
--- a/src/client/tests/timeParseTest.cpp
+++ b/src/client/tests/timeParseTest.cpp
@@ -1,8 +1,10 @@
-#include "os.h"
+
 #include <gtest/gtest.h>
 #include <cassert>
 #include <iostream>
+#include <inttypes.h>
 
+#include "os.h"
 #include "taos.h"
 #include "ttoken.h"
 #include "tutil.h"
@@ -15,10 +17,10 @@ int main(int argc, char** argv) {
 extern void deltaToUtcInitOnce();
 /* test parse time function */
 TEST(testCase, parse_time) {
-  
+
   taos_options(TSDB_OPTION_TIMEZONE, "GMT-8");
   deltaToUtcInitOnce();
-  
+
   char t1[] = "2018-1-1 1:1:1.952798";
   char t13[] = "1970-1-1 0:0:0";
 
@@ -77,15 +79,15 @@ TEST(testCase, parse_time) {
   taosParseTime(t12, &time1, strlen(t12), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, time1);
 
-  taos_options(TSDB_OPTION_TIMEZONE, "UTC");  
+  taos_options(TSDB_OPTION_TIMEZONE, "UTC");
   deltaToUtcInitOnce();
-  
+
   taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, 0);
 
   taos_options(TSDB_OPTION_TIMEZONE, "Asia/Shanghai");
   deltaToUtcInitOnce();
-  
+
   char t14[] = "1970-1-1T0:0:0Z";
   taosParseTime(t14, &time, strlen(t14), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, 0);
@@ -135,7 +137,7 @@ TEST(testCase, parse_time) {
 
 
   //======================== add some case ============================//
-  
+
   char b1[] = "9999-12-31 23:59:59.999";
   taosParseTime(b1, &time, strlen(b1), TSDB_TIME_PRECISION_MILLI,0);
   EXPECT_EQ(time, 253402271999999);
@@ -145,27 +147,27 @@ TEST(testCase, parse_time) {
   taosParseTime(b2, &time, strlen(b2), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, 1577811661321);
 
-  taos_options(TSDB_OPTION_TIMEZONE, "America/New_York");  
+  taos_options(TSDB_OPTION_TIMEZONE, "America/New_York");
   deltaToUtcInitOnce();
-  
+
   taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, 18000 * MILLISECOND_PER_SECOND);
 
-  taos_options(TSDB_OPTION_TIMEZONE, "Asia/Tokyo");  
+  taos_options(TSDB_OPTION_TIMEZONE, "Asia/Tokyo");
   deltaToUtcInitOnce();
-  
+
   taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, -32400 * MILLISECOND_PER_SECOND);
 
   taos_options(TSDB_OPTION_TIMEZONE, "Asia/Shanghai");
   deltaToUtcInitOnce();
-  
+
   taosParseTime(t13, &time, strlen(t13), TSDB_TIME_PRECISION_MILLI, 0);
   EXPECT_EQ(time, -28800 * MILLISECOND_PER_SECOND);
 
   char t[] = "2021-01-08T02:11:40.000+00:00";
   taosParseTime(t, &time, strlen(t), TSDB_TIME_PRECISION_MILLI, 0);
-  printf("%ld\n", time);
+  printf("%" PRId64 "\n", time);
 }
 
 

From d9ba8b1662788d9a93bca79e9d7fb5caac3b2a54 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 30 Jun 2021 13:06:51 +0800
Subject: [PATCH 62/71] [td-225]

---
 src/client/src/tscSQLParser.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 3c0c9ae6c3..ac4a0bc9d8 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -3289,7 +3289,7 @@ int32_t validateGroupbyNode(SQueryInfo* pQueryInfo, SArray* pList, SSqlCmd* pCmd
 
   // 1. only one normal column allowed in the group by clause
   // 2. the normal column in the group by clause can only located in the end position
-  if (numOfGroupCols) {
+  if (numOfGroupCols > 1) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
   }
 
@@ -6283,7 +6283,7 @@ static void updateTagPrjFunction(SQueryInfo* pQueryInfo) {
  */
 static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) {
   const char* msg1 = "only one selectivity function allowed in presence of tags function";
-  const char* msg3 = "aggregation function should not be mixed up with projection";
+  const char* msg2 = "aggregation function should not be mixed up with projection";
 
   bool    tagTsColExists = false;
   int16_t numOfSelectivity = 0;
@@ -6362,7 +6362,7 @@ static int32_t checkUpdateTagPrjFunctions(SQueryInfo* pQueryInfo, char* msg) {
   } else {
     if ((pQueryInfo->type & TSDB_QUERY_TYPE_PROJECTION_QUERY) != 0) {
       if (numOfAggregation > 0 && pQueryInfo->groupbyExpr.numOfGroupCols == 0) {
-        return invalidOperationMsg(msg, msg3);
+        return invalidOperationMsg(msg, msg2);
       }
 
       if (numOfAggregation > 0 || numOfSelectivity > 0) {

From d5f914857ab66755839e1c2833e3c87c45d1e049 Mon Sep 17 00:00:00 2001
From: xywang <xywang@taosdata.com>
Date: Wed, 30 Jun 2021 13:54:32 +0800
Subject: [PATCH 63/71] [TD-4953]<fix>: fixed a crash bug when run taos on
 Windows.

---
 src/client/src/tscUtil.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 6219fe23c7..175ad04cdb 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -3526,6 +3526,7 @@ void executeQuery(SSqlObj* pSql, SQueryInfo* pQueryInfo) {
 
     pSql->pSubs = calloc(pSql->subState.numOfSub, POINTER_BYTES);
     pSql->subState.states = calloc(pSql->subState.numOfSub, sizeof(int8_t));
+    pthread_mutex_init(&pSql->subState.mutex, NULL);
 
     for(int32_t i = 0; i < pSql->subState.numOfSub; ++i) {
       SQueryInfo* pSub = taosArrayGetP(pQueryInfo->pUpstream, i);

From 3f5f0261f231c63df92fd1a36f8a21c2d2630096 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Wed, 30 Jun 2021 12:47:12 +0800
Subject: [PATCH 64/71] [TD-4951]<test>: add test case

---
 tests/pytest/fulltest.sh                      |  1 +
 ...tFromCSVOurofOrder.py => insertFromCSV.py} | 39 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)
 rename tests/pytest/insert/{insertFromCSVOurofOrder.py => insertFromCSV.py} (59%)

diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 88c5909863..17d0bbe190 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -334,6 +334,7 @@ python3 ./test.py -f insert/unsignedInt.py
 python3 ./test.py -f insert/unsignedBigint.py
 python3 ./test.py -f insert/unsignedSmallint.py
 python3 ./test.py -f insert/unsignedTinyint.py
+python3 ./test.py -f insert/insertFromCSV.py
 python3 ./test.py -f query/filterAllUnsignedIntTypes.py
 
 python3 ./test.py -f tag_lite/unsignedInt.py
diff --git a/tests/pytest/insert/insertFromCSVOurofOrder.py b/tests/pytest/insert/insertFromCSV.py
similarity index 59%
rename from tests/pytest/insert/insertFromCSVOurofOrder.py
rename to tests/pytest/insert/insertFromCSV.py
index d4de85b7e9..c5d3648569 100644
--- a/tests/pytest/insert/insertFromCSVOurofOrder.py
+++ b/tests/pytest/insert/insertFromCSV.py
@@ -28,16 +28,15 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
-        self.ts = 1500074556514                  
+        self.ts = 1500074556514
+        self.csvfile = "/tmp/csvfile.csv"
+        self.rows = 100000
     
     def writeCSV(self):
-        with open('test3.csv','w', encoding='utf-8', newline='') as csvFile:
+        with open(self.csvfile, 'w', encoding='utf-8', newline='') as csvFile:
             writer = csv.writer(csvFile, dialect='excel')
-            for i in range(1000000):
-                newTimestamp = self.ts + random.randint(10000000, 10000000000) + random.randint(1000, 10000000) + random.randint(1, 1000)
-                d = datetime.datetime.fromtimestamp(newTimestamp / 1000)
-                dt = str(d.strftime("%Y-%m-%d %H:%M:%S.%f"))
-                writer.writerow(["'%s'" % dt, random.randint(1, 100), random.uniform(1, 100), random.randint(1, 100), random.randint(1, 100)])
+            for i in range(self.rows):                
+                writer.writerow([self.ts + i, random.randint(1, 100), random.uniform(1, 100), random.randint(1, 100), random.randint(1, 100)])
     
     def removCSVHeader(self):
         data = pd.read_csv("ordered.csv")
@@ -45,23 +44,25 @@ class TDTestCase:
         data.to_csv("ordered.csv", header = False, index = False)
 
     def run(self):
+        self.writeCSV()
+
         tdSql.prepare()
-        
         tdSql.execute("create table t1(ts timestamp, c1 int, c2 float, c3 int, c4 int)")
         startTime = time.time()
-        tdSql.execute("insert into t1 file 'outoforder.csv'")
+        tdSql.execute("insert into t1 file '%s'" % self.csvfile) 
         duration = time.time() - startTime
-        print("Out of Order - Insert time: %d" % duration)
-        tdSql.query("select count(*) from t1")
-        rows = tdSql.getData(0, 0)
+        print("Insert time: %d" % duration)
+        tdSql.query("select * from t1")
+        tdSql.checkRows(self.rows)
         
-        tdSql.execute("create table t2(ts timestamp, c1 int, c2 float, c3 int, c4 int)")
-        startTime = time.time()
-        tdSql.execute("insert into t2 file 'ordered.csv'")
-        duration = time.time() - startTime
-        print("Ordered - Insert time: %d" % duration)
-        tdSql.query("select count(*) from t2")
-        tdSql.checkData(0,0, rows)
+        tdSql.execute("create table stb(ts timestamp, c1 int, c2 float, c3 int, c4 int) tags(t1 int, t2 binary(20))")
+        tdSql.execute("insert into t2 using stb(t1) tags(1) file '%s'" % self.csvfile)
+        tdSql.query("select * from stb")
+        tdSql.checkRows(self.rows)
+
+        tdSql.execute("insert into t3 using stb tags(1, 'test') file '%s'" % self.csvfile)
+        tdSql.query("select * from stb")
+        tdSql.checkRows(self.rows * 2)
 
     def stop(self):
         tdSql.close()

From e7cc15a86132b055ba8dbbce29376d5802eb693d Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 30 Jun 2021 16:30:46 +0800
Subject: [PATCH 65/71] fix retention case error

---
 tests/pytest/insert/retentionpolicy.py | 2 +-
 tests/pytest/util/dnodes.py            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/pytest/insert/retentionpolicy.py b/tests/pytest/insert/retentionpolicy.py
index 067fe3e5c3..e43321cd6e 100644
--- a/tests/pytest/insert/retentionpolicy.py
+++ b/tests/pytest/insert/retentionpolicy.py
@@ -115,7 +115,7 @@ class TDTestRetetion:
         cmd = 'select * from test'
         self.queryRows=tdSql.query(cmd)
         self.checkRows(4,cmd)
-        while datetime.datetime.now() < (ttime + datetime.timedelta(hours=72)):
+        while datetime.datetime.now() <= (ttime + datetime.timedelta(hours=72)):
             time.sleep(0.001)
         cmd = 'select * from test'
         self.queryRows=tdSql.query(cmd)
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 0f71ffd0a3..ae4ba97eb3 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -127,6 +127,7 @@ class TDDnode:
             "anyIp":"0",
             "tsEnableTelemetryReporting":"0",
             "dDebugFlag":"135",
+            "tsdbDebugFlag":"135",
             "mDebugFlag":"135",
             "sdbDebugFlag":"135",
             "rpcDebugFlag":"135",

From 72d8302f9dc3c3c5f2169732103cf0f43a5fb5f0 Mon Sep 17 00:00:00 2001
From: Shenglian Zhou <shenglian_zhou@163.com>
Date: Wed, 30 Jun 2021 12:07:37 +0800
Subject: [PATCH 66/71] [TD-4972]<fix>:fix error about double precision
 conversion on timestamp expr value

---
 src/client/src/tscSQLParser.c         |  2 ++
 tests/script/general/parser/where.sim | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 658fdf06bb..ade2b846e2 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -3341,6 +3341,7 @@ static int32_t doExtractColumnFilterInfo(SSqlCmd* pCmd, SQueryInfo* pQueryInfo,
     if (pRight->flags & (1 << EXPR_FLAG_NS_TIMESTAMP)) {
       pRight->value.i64 =
           convertTimePrecision(pRight->value.i64, TSDB_TIME_PRECISION_NANO, timePrecision);
+      pRight->flags &= ~(1 << EXPR_FLAG_NS_TIMESTAMP);
     }
   }
 
@@ -4905,6 +4906,7 @@ int32_t getTimeRange(STimeWindow* win, tSqlExpr* pRight, int32_t optr, int16_t t
      */
     if (pRight->flags & (1 << EXPR_FLAG_NS_TIMESTAMP)) {
       pRight->value.i64 = convertTimePrecision(pRight->value.i64, TSDB_TIME_PRECISION_NANO, timePrecision);
+      pRight->flags &= ~(1 << EXPR_FLAG_NS_TIMESTAMP);
     }
 
     tVariantDump(&pRight->value, (char*)&val, TSDB_DATA_TYPE_BIGINT, true);
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index d20f013a8e..781b2725b5 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -352,18 +352,24 @@ if $rows != 0 then
  return -1
 endi
 
-print ==========================> td-4783
+print ==========================> td-4783,td-4792
 sql create table where_ts(ts timestamp, f int)
 sql insert into where_ts values('2021-06-19 16:22:00', 1);
 sql insert into where_ts values('2021-06-19 16:23:00', 2);
 sql insert into where_ts values('2021-06-19 16:24:00', 3);
 sql insert into where_ts values('2021-06-19 16:25:00', 1);
 sql select * from (select * from where_ts) where ts<'2021-06-19 16:25:00' and ts>'2021-06-19 16:22:00'
-if $row != 2 then
+if $rows != 2 then
   return -1
 endi
 print $data00, $data01
 if $data01 != 2 then
   return -1
 endi
+sql insert into where_ts values(now, 5);
+sleep 10
+sql select * from (select * from where_ts) where ts<now;
+if $rows != 5 then
+  return -1
+endi
 system sh/exec.sh -n dnode1 -s stop -x SIGINT

From 8eedc5c9732d7fda69f62e3f052f0f9e26a431dd Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Wed, 30 Jun 2021 18:06:13 +0800
Subject: [PATCH 67/71] [TD-2639] <docs>: fix return type of "taos_errno".

---
 documentation20/cn/08.connector/docs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation20/cn/08.connector/docs.md b/documentation20/cn/08.connector/docs.md
index ca28a25fdf..218356b0fa 100644
--- a/documentation20/cn/08.connector/docs.md
+++ b/documentation20/cn/08.connector/docs.md
@@ -259,7 +259,7 @@ typedef struct taosField {
 
   获取最近一次API调用失败的原因,返回值为字符串。
 
-- `char *taos_errno(TAOS_RES *res)`
+- `int taos_errno(TAOS_RES *res)`
 
   获取最近一次API调用失败的原因，返回值为错误代码。
 

From adc6cbc887b08b157a42f787a806a5afb5fb592e Mon Sep 17 00:00:00 2001
From: Elias Soong <elias.soong@gmail.com>
Date: Wed, 30 Jun 2021 18:17:52 +0800
Subject: [PATCH 68/71] [TD-4928] <docs>: fix typo.

---
 documentation20/cn/08.connector/01.java/docs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation20/cn/08.connector/01.java/docs.md b/documentation20/cn/08.connector/01.java/docs.md
index 546e2dbcd3..511bab8a60 100644
--- a/documentation20/cn/08.connector/01.java/docs.md
+++ b/documentation20/cn/08.connector/01.java/docs.md
@@ -533,7 +533,7 @@ Query OK, 1 row(s) in set (0.000141s)
 | taos-jdbcdriver 版本 | TDengine 版本     | JDK 版本 |
 | -------------------- | ----------------- | -------- |
 | 2.0.31              | 2.1.3.0 及以上      | 1.8.x    |
-| 2.0.22 - 20.0.30    | 2.0.18.0 - 2.1.2.x | 1.8.x    |
+| 2.0.22 - 2.0.30    | 2.0.18.0 - 2.1.2.x | 1.8.x    |
 | 2.0.12 - 2.0.21     | 2.0.8.0 - 2.0.17.x | 1.8.x    |
 | 2.0.4 - 2.0.11       | 2.0.0.0 - 2.0.7.x | 1.8.x    |
 | 1.0.3                | 1.6.1.x 及以上    | 1.8.x    |

From 067219376ce78080fd1446453329029694dc8d28 Mon Sep 17 00:00:00 2001
From: Linhe Huo <linhehuo@gmail.com>
Date: Wed, 30 Jun 2021 20:16:22 +0800
Subject: [PATCH 69/71] [TD-4641]<fix>: fix nodejs query result error (#6448)

Update Node.js connector version to v2.0.8
---
 src/connector/nodejs/nodetaos/cinterface.js | 30 +++++++--------------
 src/connector/nodejs/package.json           |  2 +-
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/connector/nodejs/nodetaos/cinterface.js b/src/connector/nodejs/nodetaos/cinterface.js
index f3961e3787..1c2685b8cb 100644
--- a/src/connector/nodejs/nodetaos/cinterface.js
+++ b/src/connector/nodejs/nodetaos/cinterface.js
@@ -126,28 +126,18 @@ function convertDouble(data, num_of_rows, nbytes = 0, offset = 0, micro = false)
   }
   return res;
 }
-function convertBinary(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
-  data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
-  let res = [];
-  let currOffset = 0;
-  while (currOffset < data.length) {
-    let dataEntry = data.slice(currOffset, currOffset + nbytes);
-    if (dataEntry[0] == FieldTypes.C_BINARY_NULL) {
-      res.push(null);
-    }
-    else {
-      res.push(ref.readCString(dataEntry));
-    }
-    currOffset += nbytes;
-  }
-  return res;
-}
+
 function convertNchar(data, num_of_rows, nbytes = 0, offset = 0, micro = false) {
   data = ref.reinterpret(data.deref(), nbytes * num_of_rows, offset);
   let res = [];
-  let dataEntry = data.slice(0, nbytes); //one entry in a row under a column;
-  //TODO: should use the correct character encoding 
-  res.push(dataEntry.toString("utf-8"));
+
+  let currOffset = 0;
+  while (currOffset < data.length) {
+    let len = data.readIntLE(currOffset, 2);
+    let dataEntry = data.slice(currOffset + 2, currOffset + len + 2); //one entry in a row under a column;
+    res.push(dataEntry.toString("utf-8"));
+    currOffset += nbytes;
+  }
   return res;
 }
 
@@ -160,7 +150,7 @@ let convertFunctions = {
   [FieldTypes.C_BIGINT]: convertBigint,
   [FieldTypes.C_FLOAT]: convertFloat,
   [FieldTypes.C_DOUBLE]: convertDouble,
-  [FieldTypes.C_BINARY]: convertBinary,
+  [FieldTypes.C_BINARY]: convertNchar,
   [FieldTypes.C_TIMESTAMP]: convertTimestamp,
   [FieldTypes.C_NCHAR]: convertNchar
 }
diff --git a/src/connector/nodejs/package.json b/src/connector/nodejs/package.json
index d21b62108b..b57d4c635c 100644
--- a/src/connector/nodejs/package.json
+++ b/src/connector/nodejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "td2.0-connector",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "A Node.js connector for TDengine.",
   "main": "tdengine.js",
   "directories": {

From f7c6347c50e95133ce621db0039feede2adfaade Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Wed, 30 Jun 2021 21:35:26 +0800
Subject: [PATCH 70/71] Hotfix/sangshuduo/td 4918 taosdemo sub afterconsume for
 develop (#6689)

* [TD-4918]<fix>: taosdemo subscribe endAfterResume.

* fix heap use-after-free issue.

Co-authored-by: Shuduo Sang <sdsang@taosdata.com>
---
 src/client/src/tscServer.c  | 2 +-
 src/kit/taosdemo/taosdemo.c | 8 +++++---
 src/mnode/src/mnodeTable.c  | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 7fc47947c8..8181898ec7 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -484,8 +484,8 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcEpSet *pEpSet) {
   }
 
   if (shouldFree) { // in case of table-meta/vgrouplist query, automatically free it
-    taosRemoveRef(tscObjRef, handle);
     tscDebug("0x%"PRIx64" sqlObj is automatically freed", pSql->self);
+    taosRemoveRef(tscObjRef, handle);
   }
 
   taosReleaseRef(tscObjRef, handle);
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index f6dc6d9c79..93fac54233 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -636,6 +636,9 @@ static FILE *          g_fpOfInsertResult = NULL;
 #define errorPrint(fmt, ...) \
     do { fprintf(stderr, "ERROR: "fmt, __VA_ARGS__); } while(0)
 
+// for strncpy buffer overflow
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+
 
 ///////////////////////////////////////////////////
 
@@ -2574,7 +2577,7 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName,
               fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
       tstrncpy(superTbls->tags[tagIndex].dataType,
               (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
-              fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
+              min(15, fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes));
       superTbls->tags[tagIndex].dataLen =
           *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
       tstrncpy(superTbls->tags[tagIndex].note,
@@ -2587,7 +2590,7 @@ static int getSuperTableFromServer(TAOS * taos, char* dbName,
               fields[TSDB_DESCRIBE_METRIC_FIELD_INDEX].bytes);
       tstrncpy(superTbls->columns[columnIndex].dataType,
               (char *)row[TSDB_DESCRIBE_METRIC_TYPE_INDEX],
-              fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes);
+              min(15, fields[TSDB_DESCRIBE_METRIC_TYPE_INDEX].bytes));
       superTbls->columns[columnIndex].dataLen =
           *((int *)row[TSDB_DESCRIBE_METRIC_LENGTH_INDEX]);
       tstrncpy(superTbls->columns[columnIndex].note,
@@ -7472,7 +7475,6 @@ static void *specifiedSubscribe(void *sarg) {
       }
   }
   taos_free_result(g_queryInfo.specifiedQueryInfo.res[pThreadInfo->threadID]);
-  taos_unsubscribe(g_queryInfo.specifiedQueryInfo.tsub[pThreadInfo->querySeq], 0);
   taos_close(pThreadInfo->taos);
 
   return NULL;
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 6c96f1f0d2..189c4b6005 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -2075,7 +2075,9 @@ static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, int32_t tid) {
   } else {
     if (pTable->info.type == TSDB_SUPER_TABLE) {
       int64_t us = taosGetTimestampUs();
-      pTable->uid = (us << 24) + ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
+      uint64_t x = (us&0x000000FFFFFFFFFF);
+      x = x<<24;
+      pTable->uid = x + ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));
     } else {
       pTable->uid = (((uint64_t)pTable->vgId) << 48) + ((((uint64_t)pTable->tid) & ((1ul << 24) - 1ul)) << 24) +
                     ((sdbGetVersion() & ((1ul << 16) - 1ul)) << 8) + (taosRand() & ((1ul << 8) - 1ul));

From d80c0c2804df32dab44bbf6c30d36bae528312f4 Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <36554565+glzhao89@users.noreply.github.com>
Date: Thu, 1 Jul 2021 09:43:03 +0800
Subject: [PATCH 71/71] [TD-4991]<fix>: fix build failure on MacOS with apple
 m1 chip (#6688)

* Fix build failure on MacOS with apple m1 chip

* Fix build failure on MacOS with apple m1 chip
---
 cmake/define.inc   | 6 +++++-
 cmake/platform.inc | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cmake/define.inc b/cmake/define.inc
index d6a3f2b915..468489c1cc 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -147,7 +147,11 @@ IF (TD_DARWIN_64)
   ADD_DEFINITIONS(-D_REENTRANT -D__USE_POSIX -D_LIBC_REENTRANT)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   MESSAGE(STATUS "darwin64 is defined")
-  SET(COMMON_FLAGS "-Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  IF ("${CPUTYPE}" STREQUAL "apple_m1")
+    SET(COMMON_FLAGS "-Wall -Werror -Wno-missing-braces -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  ELSE ()
+    SET(COMMON_FLAGS "-Wall -Werror -Wno-missing-braces -fPIC -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
+  ENDIF ()
   IF (TD_MEMORY_SANITIZER)
     SET(DEBUG_FLAGS "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -O0 -g3 -DDEBUG")
   ELSE ()
diff --git a/cmake/platform.inc b/cmake/platform.inc
index 5f7391c996..236732e452 100755
--- a/cmake/platform.inc
+++ b/cmake/platform.inc
@@ -108,6 +108,10 @@ IF ("${CPUTYPE}" STREQUAL "")
     SET(TD_LINUX TRUE)
     SET(TD_LINUX_64 FALSE)
     SET(TD_MIPS_64 TRUE)
+  ELSEIF (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+    SET(CPUTYPE "apple_m1")
+    MESSAGE(STATUS "Set CPUTYPE to apple silicon m1")
+    SET(TD_ARM_64 TRUE)
   ENDIF ()
 
 ELSE ()