From e774e8b3a04d83f62481b5a1f333008c24e795db Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 17 Nov 2020 16:03:45 +0800
Subject: [PATCH 01/41] [TD-2070]<enhance>: improve project query performance.

---
 src/client/inc/tscSubquery.h  |  2 +-
 src/client/inc/tsclient.h     |  5 +-
 src/client/src/tscLocal.c     |  2 +-
 src/client/src/tscSQLParser.c |  2 +-
 src/client/src/tscServer.c    | 32 +++++-------
 src/client/src/tscSql.c       | 96 ++++++++++++++++-------------------
 src/client/src/tscSubquery.c  | 24 ++++-----
 src/client/src/tscUtil.c      | 82 +++++++++++++++++++++++++++---
 8 files changed, 152 insertions(+), 93 deletions(-)

diff --git a/src/client/inc/tscSubquery.h b/src/client/inc/tscSubquery.h
index 3226f70528..aa9bda23de 100644
--- a/src/client/inc/tscSubquery.h
+++ b/src/client/inc/tscSubquery.h
@@ -39,7 +39,7 @@ int32_t tscHandleMultivnodeInsert(SSqlObj *pSql);
 int32_t tscHandleInsertRetry(SSqlObj* pSql);
 
 void tscBuildResFromSubqueries(SSqlObj *pSql);
-TAOS_ROW doSetResultRowData(SSqlObj *pSql, bool finalResult);
+TAOS_ROW doSetResultRowData(SSqlObj *pSql);
 
 char *getArithemicInputSrc(void *param, const char *name, int32_t colId);
 
diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 6b3d97d6f9..6c6ceb92bb 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -313,6 +313,7 @@ typedef struct {
   SResRec *             pGroupRec;
   char *                data;
   TAOS_ROW              tsrow;
+  TAOS_ROW              urow;
   int32_t*              length;  // length for each field for current row
   char **               buffer;  // Buffer used to put multibytes encoded using unicode (wchar_t)
   SColumnIndex *        pColumnIndex;
@@ -425,6 +426,7 @@ int32_t tscTansformSQLFuncForSTableQuery(SQueryInfo *pQueryInfo);
 void    tscRestoreSQLFuncForSTableQuery(SQueryInfo *pQueryInfo);
 
 int32_t tscCreateResPointerInfo(SSqlRes *pRes, SQueryInfo *pQueryInfo);
+void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo);
 
 void tscResetSqlCmdObj(SSqlCmd *pCmd, bool removeFromCache);
 
@@ -471,8 +473,9 @@ static FORCE_INLINE void tscGetResultColumnChr(SSqlRes* pRes, SFieldInfo* pField
   int32_t bytes = pInfo->field.bytes;
 
   char* pData = pRes->data + (int32_t)(offset * pRes->numOfRows + bytes * pRes->row);
+  UNUSED(pData);
 
-  // user defined constant value output columns
+//   user defined constant value output columns
   if (pInfo->pSqlExpr != NULL && TSDB_COL_IS_UD_COL(pInfo->pSqlExpr->colInfo.flag)) {
     if (type == TSDB_DATA_TYPE_NCHAR || type == TSDB_DATA_TYPE_BINARY) {
       pData = pInfo->pSqlExpr->param[1].pz;
diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c
index fc49047f98..1e4360d052 100644
--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -341,7 +341,7 @@ TAOS_ROW tscFetchRow(void *param) {
     return NULL;
   }
 
-  void* data = doSetResultRowData(pSql, true);
+  void* data = doSetResultRowData(pSql);
 
   tscClearSqlOwner(pSql);
   return data;
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index b55326bbd3..069f7303d6 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -6412,7 +6412,7 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
       return code;
     }
 
-    tVariantListItem* p1 = taosArrayGet(pQuerySql->from, i);
+    tVariantListItem* p1 = taosArrayGet(pQuerySql->from, i + 1);
     if (p1->pVar.nType != TSDB_DATA_TYPE_BINARY) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg11);
     }
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index e8b6cb284e..a367d14604 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1437,19 +1437,6 @@ int tscBuildRetrieveFromMgmtMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int tscSetResultPointer(SQueryInfo *pQueryInfo, SSqlRes *pRes) {
-  if (tscCreateResPointerInfo(pRes, pQueryInfo) != TSDB_CODE_SUCCESS) {
-    return pRes->code;
-  }
-
-  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
-    int16_t offset = tscFieldInfoGetOffset(pQueryInfo, i);
-    pRes->tsrow[i] = (unsigned char*)((char*) pRes->data + offset * pRes->numOfRows);
-  }
-
-  return 0;
-}
-
 /*
  * this function can only be called once.
  * by using pRes->rspType to denote its status
@@ -1460,15 +1447,18 @@ static int tscLocalResultCommonBuilder(SSqlObj *pSql, int32_t numOfRes) {
   SSqlRes *pRes = &pSql->res;
   SSqlCmd *pCmd = &pSql->cmd;
 
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-
   pRes->code = TSDB_CODE_SUCCESS;
   if (pRes->rspType == 0) {
     pRes->numOfRows = numOfRes;
     pRes->row = 0;
     pRes->rspType = 1;
 
-    tscSetResultPointer(pQueryInfo, pRes);
+    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
+    if (tscCreateResPointerInfo(pRes, pQueryInfo) != TSDB_CODE_SUCCESS) {
+      return pRes->code;
+    }
+
+    tscSetResRawPtr(pRes, pQueryInfo);
   } else {
     tscResetForNextRetrieve(pRes);
   }
@@ -1512,10 +1502,11 @@ int tscProcessRetrieveLocalMergeRsp(SSqlObj *pSql) {
   }
 
   pRes->code = tscDoLocalMerge(pSql);
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   if (pRes->code == TSDB_CODE_SUCCESS && pRes->numOfRows > 0) {
+    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
     tscCreateResPointerInfo(pRes, pQueryInfo);
+    tscSetResRawPtr(pRes, pQueryInfo);
   }
 
   pRes->row = 0;
@@ -2195,7 +2186,12 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
   if (tscCreateResPointerInfo(pRes, pQueryInfo) != TSDB_CODE_SUCCESS) {
     return pRes->code;
   }
-  
+
+  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) || tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) || pCmd->command == TSDB_SQL_RETRIEVE) {
+    tscSetResRawPtr(pRes, pQueryInfo);
+  }
+
   if (pSql->pSubscription != NULL) {
     int32_t numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
     
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index a7b859b294..bb02472e58 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -489,6 +489,27 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
   return (int)((pQueryInfo->order.order == TSDB_ORDER_DESC) ? pRes->numOfRows : -pRes->numOfRows);
 }
 
+static bool needToFetchNewBlock(SSqlObj* pSql) {
+  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
+
+  return (pRes->completed != true || hasMoreVnodesToTry(pSql) || hasMoreClauseToTry(pSql)) &&
+         (pCmd->command == TSDB_SQL_RETRIEVE ||
+          pCmd->command == TSDB_SQL_RETRIEVE_LOCALMERGE ||
+          pCmd->command == TSDB_SQL_TABLE_JOIN_RETRIEVE ||
+          pCmd->command == TSDB_SQL_FETCH ||
+          pCmd->command == TSDB_SQL_SHOW ||
+          pCmd->command == TSDB_SQL_SHOW_CREATE_TABLE ||
+          pCmd->command == TSDB_SQL_SHOW_CREATE_DATABASE ||
+          pCmd->command == TSDB_SQL_SELECT ||
+          pCmd->command == TSDB_SQL_DESCRIBE_TABLE ||
+          pCmd->command == TSDB_SQL_SERV_STATUS ||
+          pCmd->command == TSDB_SQL_CURRENT_DB ||
+          pCmd->command == TSDB_SQL_SERV_VERSION ||
+          pCmd->command == TSDB_SQL_CLI_VERSION ||
+          pCmd->command == TSDB_SQL_CURRENT_USER);
+}
+
 TAOS_ROW taos_fetch_row(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
   if (pSql == NULL || pSql->signature != pSql) {
@@ -509,77 +530,48 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
   // set the sql object owner
   tscSetSqlOwner(pSql);
 
-  // current data set are exhausted, fetch more data from node
-  if (pRes->row >= pRes->numOfRows && (pRes->completed != true || hasMoreVnodesToTry(pSql) || hasMoreClauseToTry(pSql)) &&
-      (pCmd->command == TSDB_SQL_RETRIEVE ||
-       pCmd->command == TSDB_SQL_RETRIEVE_LOCALMERGE ||
-       pCmd->command == TSDB_SQL_TABLE_JOIN_RETRIEVE ||
-       pCmd->command == TSDB_SQL_FETCH ||
-       pCmd->command == TSDB_SQL_SHOW ||
-       pCmd->command == TSDB_SQL_SHOW_CREATE_TABLE ||
-       pCmd->command == TSDB_SQL_SHOW_CREATE_DATABASE ||
-       pCmd->command == TSDB_SQL_SELECT ||
-       pCmd->command == TSDB_SQL_DESCRIBE_TABLE ||
-       pCmd->command == TSDB_SQL_SERV_STATUS ||
-       pCmd->command == TSDB_SQL_CURRENT_DB ||
-       pCmd->command == TSDB_SQL_SERV_VERSION ||
-       pCmd->command == TSDB_SQL_CLI_VERSION ||
-       pCmd->command == TSDB_SQL_CURRENT_USER )) {
+  // current data set are exhausted, fetch more result from node
+  if (pRes->row >= pRes->numOfRows && needToFetchNewBlock(pSql)) {
     taos_fetch_rows_a(res, waitForRetrieveRsp, pSql->pTscObj);
     tsem_wait(&pSql->rspSem);
   }
 
-  void* data = doSetResultRowData(pSql, true);
+  void* data = doSetResultRowData(pSql);
 
   tscClearSqlOwner(pSql);
   return data;
 }
 
 int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
-#if 0
   SSqlObj *pSql = (SSqlObj *)res;
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  int nRows = 0;
-
   if (pSql == NULL || pSql->signature != pSql) {
     terrno = TSDB_CODE_TSC_DISCONNECTED;
-    *rows = NULL;
     return 0;
   }
 
-  // projection query on metric, pipeline retrieve data from vnode list,
-  // instead of two-stage mergednodeProcessMsgFromShell free qhandle
-  nRows = taos_fetch_block_impl(res, rows);
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
 
-  // current subclause is completed, try the next subclause
-  while (rows == NULL && pCmd->clauseIndex < pCmd->numOfClause - 1) {
-    SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-
-    pSql->cmd.command = pQueryInfo->command;
-    pCmd->clauseIndex++;
-
-    pRes->numOfTotal += pRes->numOfClauseTotal;
-    pRes->numOfClauseTotal = 0;
-    pRes->rspType = 0;
-
-    pSql->subState.numOfSub = 0;
-    tfree(pSql->pSubs);
-
-    assert(pSql->fp == NULL);
-
-    tscDebug("%p try data in the next subclause:%d, total subclause:%d", pSql, pCmd->clauseIndex, pCmd->numOfClause);
-    tscProcessSql(pSql);
-
-    nRows = taos_fetch_block_impl(res, rows);
+  if (pRes->qhandle == 0 ||
+      pRes->code == TSDB_CODE_TSC_QUERY_CANCELLED ||
+      pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT ||
+      pCmd->command == TSDB_SQL_INSERT) {
+    return 0;
   }
 
-  return nRows;
-#endif
+  // set the sql object owner
+  tscSetSqlOwner(pSql);
 
-  (*rows) = taos_fetch_row(res);
-  return ((*rows) != NULL)? 1:0;
+  // current data set are exhausted, fetch more data from node
+  if (needToFetchNewBlock(pSql)) {
+    taos_fetch_rows_a(res, waitForRetrieveRsp, pSql->pTscObj);
+    tsem_wait(&pSql->rspSem);
+  }
+
+  *rows = pRes->urow;
+
+  tscClearSqlOwner(pSql);
+  return pRes->numOfRows;
 }
 
 int taos_select_db(TAOS *taos, const char *db) {
@@ -600,7 +592,7 @@ int taos_select_db(TAOS *taos, const char *db) {
 }
 
 // send free message to vnode to free qhandle and corresponding resources in vnode
-static UNUSED_FUNC bool tscKillQueryInDnode(SSqlObj* pSql) {
+static bool tscKillQueryInDnode(SSqlObj* pSql) {
   SSqlCmd* pCmd = &pSql->cmd;
   SSqlRes* pRes = &pSql->res;
 
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index bc522d4007..a532a5ead7 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2390,7 +2390,7 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
   }
 }
 
-static void transferNcharData(SSqlObj *pSql, int32_t columnIndex, TAOS_FIELD *pField) {
+static UNUSED_FUNC void transferNcharData(SSqlObj *pSql, int32_t columnIndex, TAOS_FIELD *pField) {
   SSqlRes *pRes = &pSql->res;
   
   if (pRes->tsrow[columnIndex] != NULL && pField->type == TSDB_DATA_TYPE_NCHAR) {
@@ -2432,7 +2432,7 @@ char *getArithemicInputSrc(void *param, const char *name, int32_t colId) {
   return pSupport->data[index] + pSupport->offset * pExpr->resBytes;
 }
 
-TAOS_ROW doSetResultRowData(SSqlObj *pSql, bool finalResult) {
+TAOS_ROW doSetResultRowData(SSqlObj *pSql) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
 
@@ -2445,22 +2445,20 @@ TAOS_ROW doSetResultRowData(SSqlObj *pSql, bool finalResult) {
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
 
   size_t size = tscNumOfFields(pQueryInfo);
-  int32_t offset = 0;
-
   for (int i = 0; i < size; ++i) {
-    tscGetResultColumnChr(pRes, &pQueryInfo->fieldsInfo, i, offset);
-    TAOS_FIELD *pField = TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, i);
+    SInternalField* pInfo = (SInternalField*)TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, i);
 
-    offset += pField->bytes;
+    int32_t type = pInfo->field.type;
+    int32_t bytes = pInfo->field.bytes;
 
-    // primary key column cannot be null in interval query, no need to check
-    if (i == 0 && pQueryInfo->interval.interval > 0) {
-      continue;
+    if (type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_NCHAR) {
+      pRes->tsrow[i] = isNull(pRes->urow[i], type) ? NULL : pRes->urow[i];
+    } else {
+      pRes->tsrow[i] = isNull(pRes->urow[i], type) ? NULL : varDataVal(pRes->urow[i]);
+      pRes->length[i] = varDataLen(pRes->urow[i]);
     }
 
-    if (pRes->tsrow[i] != NULL && pField->type == TSDB_DATA_TYPE_NCHAR) {
-      transferNcharData(pSql, i, pField);
-    }
+    pRes->urow[i] += bytes;
   }
 
   pRes->row++;  // index increase one-step
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 27824fc1ff..d4bdcd6ed9 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -265,16 +265,20 @@ void tscClearInterpInfo(SQueryInfo* pQueryInfo) {
 
 int32_t tscCreateResPointerInfo(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
   if (pRes->tsrow == NULL) {
-    int32_t numOfOutput = pQueryInfo->fieldsInfo.numOfOutput;
-    pRes->numOfCols = numOfOutput;
+    pRes->numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
 
-    pRes->tsrow  = calloc(numOfOutput, POINTER_BYTES);
-    pRes->length = calloc(numOfOutput, sizeof(int32_t));
-    pRes->buffer = calloc(numOfOutput, POINTER_BYTES);
+    pRes->tsrow  = calloc(pRes->numOfCols, POINTER_BYTES);
+    pRes->urow   = calloc(pRes->numOfCols, POINTER_BYTES);
+    pRes->length = calloc(pRes->numOfCols, sizeof(int32_t));
+    pRes->buffer = calloc(pRes->numOfCols, POINTER_BYTES);
 
     // not enough memory
-    if (pRes->tsrow == NULL || (pRes->buffer == NULL && pRes->numOfCols > 0)) {
+    if (pRes->tsrow == NULL  || pRes->urow == NULL || pRes->length == NULL || (pRes->buffer == NULL && pRes->numOfCols > 0)) {
       tfree(pRes->tsrow);
+      tfree(pRes->urow);
+      tfree(pRes->length);
+      tfree(pRes->buffer);
+
       pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
       return pRes->code;
     }
@@ -283,6 +287,71 @@ int32_t tscCreateResPointerInfo(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
+void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
+  assert(pRes->numOfCols > 0);
+
+  int32_t offset = 0;
+
+  for (int32_t i = 0; i < pRes->numOfCols; ++i) {
+    SInternalField* pInfo = (SInternalField*)TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, i);
+
+    pRes->urow[i] = pRes->data + offset * pRes->numOfRows;
+    pRes->length[i] = pInfo->field.bytes;
+
+    offset += pInfo->field.bytes;
+
+    // generated the user-defined column result
+    if (pInfo->pSqlExpr != NULL && TSDB_COL_IS_UD_COL(pInfo->pSqlExpr->colInfo.flag)) {
+      if (pInfo->pSqlExpr->param[1].nType == TSDB_DATA_TYPE_NULL) {
+        setNullN(pRes->urow[i], pInfo->field.type, pInfo->field.bytes, pRes->numOfRows);
+      } else {
+        if (pInfo->field.type == TSDB_DATA_TYPE_NCHAR || pInfo->field.type == TSDB_DATA_TYPE_BINARY) {
+          assert(pInfo->pSqlExpr->param[1].nLen <= pInfo->field.bytes);
+
+          for (int32_t k = 0; k < pRes->numOfRows; ++k) {
+            char* p = pRes->urow[i] + k * pInfo->field.bytes;
+
+            memcpy(varDataVal(p), pInfo->pSqlExpr->param[1].pz, pInfo->pSqlExpr->param[1].nLen);
+            varDataSetLen(p, pInfo->pSqlExpr->param[1].nLen);
+          }
+        } else {
+          for (int32_t k = 0; k < pRes->numOfRows; ++k) {
+            char* p = pRes->urow[i] + k * pInfo->field.bytes;
+            memcpy(p, &pInfo->pSqlExpr->param[1].i64Key, pInfo->field.bytes);
+          }
+        }
+      }
+
+    } else if (pInfo->field.type == TSDB_DATA_TYPE_NCHAR) {
+      // convert unicode to native code in a temporary buffer extra one byte for terminated symbol
+      pRes->buffer[i] = realloc(pRes->buffer[i], pInfo->field.bytes * pRes->numOfRows);
+
+      // string terminated char for binary data
+      memset(pRes->buffer[i], 0, pInfo->field.bytes * pRes->numOfRows);
+
+      char* p = pRes->urow[i];
+      for (int32_t k = 0; k < pRes->numOfRows; ++k) {
+        char* dst = pRes->buffer[i] + k * pInfo->field.bytes;
+
+        if (isNull(p, TSDB_DATA_TYPE_NCHAR)) {
+          memcpy(dst, p, varDataTLen(p));
+        } else {
+          int32_t length = taosUcs4ToMbs(varDataVal(p), varDataLen(p), varDataVal(dst));
+          varDataSetLen(dst, length);
+
+          if (length == 0) {
+            tscError("charset:%s to %s. val:%s convert failed.", DEFAULT_UNICODE_ENCODEC, tsCharset, (char*)p);
+          }
+        }
+
+        p += pInfo->field.bytes;
+      }
+
+      memcpy(pRes->urow[i], pRes->buffer[i], pInfo->field.bytes * pRes->numOfRows);
+    }
+  }
+}
+
 static void tscDestroyResPointerInfo(SSqlRes* pRes) {
   if (pRes->buffer != NULL) { // free all buffers containing the multibyte string
     for (int i = 0; i < pRes->numOfCols; i++) {
@@ -297,6 +366,7 @@ static void tscDestroyResPointerInfo(SSqlRes* pRes) {
   tfree(pRes->tsrow);
   tfree(pRes->length);
   tfree(pRes->buffer);
+  tfree(pRes->urow);
 
   tfree(pRes->pGroupRec);
   tfree(pRes->pColumnIndex);

From c73422d872c1f2857829363d9b6309942cf3a377 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 17 Nov 2020 16:05:53 +0800
Subject: [PATCH 02/41] [TD-225] update script.

---
 tests/script/general/parser/alter.sim         |   9 +-
 tests/script/general/parser/alter1.sim        |   4 +-
 tests/script/general/parser/alter_stable.sim  |   2 +-
 .../script/general/parser/auto_create_tb.sim  |   4 +-
 .../general/parser/auto_create_tb_drop_tb.sim |   2 +-
 .../general/parser/binary_escapeCharacter.sim |   2 +-
 .../parser/col_arithmetic_operation.sim       |   2 +-
 tests/script/general/parser/columnValue.sim   |   2 +-
 .../general/parser/columnValue_bigint.sim     |   2 +-
 .../general/parser/columnValue_bool.sim       |   2 +-
 .../general/parser/columnValue_double.sim     |   2 +-
 .../general/parser/columnValue_float.sim      |   2 +-
 .../script/general/parser/columnValue_int.sim |   2 +-
 .../general/parser/columnValue_smallint.sim   |   2 +-
 .../general/parser/columnValue_tinyint.sim    |   2 +-
 tests/script/general/parser/commit.sim        |   6 +-
 tests/script/general/parser/create_db.sim     |   2 +-
 tests/script/general/parser/create_mt.sim     |   2 +-
 tests/script/general/parser/create_tb.sim     |   2 +-
 tests/script/general/parser/fill.sim          |   2 +-
 tests/script/general/parser/fill_stb.sim      |   2 +-
 tests/script/general/parser/fill_us.sim       |   2 +-
 tests/script/general/parser/first_last.sim    |   4 +-
 .../general/parser/first_last_query.sim       |   2 +-
 tests/script/general/parser/import.sim        |   4 +-
 .../script/general/parser/import_commit1.sim  |   2 +-
 .../script/general/parser/import_commit2.sim  |   2 +-
 .../script/general/parser/import_commit3.sim  |   2 +-
 .../script/general/parser/insert_multiTbl.sim |   2 +-
 tests/script/general/parser/insert_tb.sim     |   2 +-
 tests/script/general/parser/interp.sim        |   2 +-
 tests/script/general/parser/interp_test.sim   |  12 +-
 tests/script/general/parser/lastrow.sim       |   4 +-
 tests/script/general/parser/lastrow_query.sim |   2 +-
 tests/script/general/parser/limit.sim         |   4 +-
 tests/script/general/parser/limit1.sim        |   2 +-
 tests/script/general/parser/limit1_stb.sim    |   2 +-
 tests/script/general/parser/limit1_tb.sim     |   2 +-
 .../general/parser/limit1_tblocks100.sim      |   2 +-
 tests/script/general/parser/limit2.sim        |   2 +-
 tests/script/general/parser/limit2_query.sim  |   2 +-
 .../general/parser/limit2_tblocks100.sim      |   4 +-
 tests/script/general/parser/limit_stb.sim     |   2 +-
 tests/script/general/parser/limit_tb.sim      |   2 +-
 tests/script/general/parser/mixed_blocks.sim  |   2 +-
 tests/script/general/parser/nchar.sim         |   2 +-
 tests/script/general/parser/null_char.sim     |   2 +-
 .../parser/projection_limit_offset.sim        |   2 +-
 tests/script/general/parser/selectResNum.sim  |   6 +-
 .../general/parser/select_across_vnodes.sim   |   2 +-
 .../general/parser/select_from_cache_disk.sim |   4 +-
 tests/script/general/parser/set_tag_vals.sim  |   2 +-
 .../general/parser/single_row_in_tb.sim       |   2 +-
 .../general/parser/single_row_in_tb_query.sim |   2 +-
 tests/script/general/parser/slimit.sim        |   4 +-
 tests/script/general/parser/slimit1.sim       |   4 +-
 tests/script/general/parser/slimit1_query.sim |   2 +-
 .../general/parser/slimit_alter_tags.sim      |   4 +-
 tests/script/general/parser/slimit_query.sim  |   2 +-
 tests/script/general/parser/stream_on_sys.sim |   2 +-
 .../parser/tags_dynamically_specifiy.sim      |   4 +-
 tests/script/general/parser/tags_filter.sim   |   2 +-
 tests/script/general/parser/tbnameIn.sim      |   2 +-
 .../script/general/parser/tbnameIn_query.sim  |   2 +-
 tests/script/general/parser/testSuite.sim     | 168 +++++++++---------
 tests/script/general/parser/timestamp.sim     |   6 +-
 .../script/general/parser/timestamp_query.sim |   2 +-
 tests/script/general/parser/where.sim         |   2 +-
 68 files changed, 183 insertions(+), 172 deletions(-)

diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index 6b28b20fb8..2a9e3a8873 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = m_alt_db
@@ -56,6 +56,7 @@ if $rows != 2 then
 endi
 print data03 = $data03
 if $data03 != taos then
+  print expect taos, actual: $data03
   return -1
 endi
 sql drop table tb
@@ -113,7 +114,7 @@ endi
 sql drop table tb
 sql drop table mt
 
-sleep 3000
+sleep 1000
 ### ALTER TABLE WHILE STREAMING [TBASE271]
 #sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
 #sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
@@ -146,7 +147,7 @@ sleep 3000
 #sql alter table tb1 add column c3 int
 #sleep 6000
 #sql insert into tb1 values (now, 3, 'taos', 3);
-#sleep 3000
+#sleep 1000
 #sql select * from strm
 #if $rows != 3 then
 #   return -1
@@ -185,7 +186,7 @@ sql create database $db
 sql use $db
 sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
 sql create table tb using mt tags(1)
-sleep 3000
+sleep 1000
 sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
 sql alter table mt drop column c3
 
diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim
index 24cf79eae1..0326f9b23f 100644
--- a/tests/script/general/parser/alter1.sim
+++ b/tests/script/general/parser/alter1.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 sql reset query cache
 
@@ -87,7 +87,7 @@ if $data13 != NULL then
   return -1
 endi
 
-sleep 3000
+sleep 1000
 print ================== insert values into table
 sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)
 
diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim
index b64c919042..b0d94ef68c 100644
--- a/tests/script/general/parser/alter_stable.sim
+++ b/tests/script/general/parser/alter_stable.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 print ========== alter_stable.sim
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index 64fec4b56d..c72147be95 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 print ======================== dnode1 start
 
@@ -212,7 +212,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 sql use $db
 
 #### auto create multiple tables
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index be334bca4a..2a809fa9db 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = db
diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim
index c3c867795a..780916258b 100644
--- a/tests/script/general/parser/binary_escapeCharacter.sim
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 sql drop database if exists ecdb
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
index 3208df95e4..f5e91b933a 100644
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ca_db
diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim
index e905f61215..c7aac1a8fa 100644
--- a/tests/script/general/parser/columnValue.sim
+++ b/tests/script/general/parser/columnValue.sim
@@ -5,7 +5,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 print ========== columnValues.sim
diff --git a/tests/script/general/parser/columnValue_bigint.sim b/tests/script/general/parser/columnValue_bigint.sim
index e6839b2fb6..002240fa25 100644
--- a/tests/script/general/parser/columnValue_bigint.sim
+++ b/tests/script/general/parser/columnValue_bigint.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_bool.sim b/tests/script/general/parser/columnValue_bool.sim
index 7f3a6c3d6a..e43f2289e7 100644
--- a/tests/script/general/parser/columnValue_bool.sim
+++ b/tests/script/general/parser/columnValue_bool.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_double.sim b/tests/script/general/parser/columnValue_double.sim
index 733fc52285..009ef971c9 100644
--- a/tests/script/general/parser/columnValue_double.sim
+++ b/tests/script/general/parser/columnValue_double.sim
@@ -1,5 +1,5 @@
 ####
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_float.sim b/tests/script/general/parser/columnValue_float.sim
index c71b4b40ee..f7b77cdc0a 100644
--- a/tests/script/general/parser/columnValue_float.sim
+++ b/tests/script/general/parser/columnValue_float.sim
@@ -1,5 +1,5 @@
 ####
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_int.sim b/tests/script/general/parser/columnValue_int.sim
index 2a909ebf3c..46e466c417 100644
--- a/tests/script/general/parser/columnValue_int.sim
+++ b/tests/script/general/parser/columnValue_int.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_smallint.sim b/tests/script/general/parser/columnValue_smallint.sim
index cf34a85a2a..cdaceaa05f 100644
--- a/tests/script/general/parser/columnValue_smallint.sim
+++ b/tests/script/general/parser/columnValue_smallint.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_tinyint.sim b/tests/script/general/parser/columnValue_tinyint.sim
index 707242a23e..31eff422d4 100644
--- a/tests/script/general/parser/columnValue_tinyint.sim
+++ b/tests/script/general/parser/columnValue_tinyint.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
index 4d85806b69..5aa5b8f40c 100644
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
@@ -4,7 +4,7 @@ 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 maxTablesperVnode -v 100
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = sc_db
@@ -85,10 +85,10 @@ print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 5000
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 print ====== select from table and check num of rows returned
 sql use $db
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index ed6e427fe7..c8337ea81d 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim
index f21a830671..d940853984 100644
--- a/tests/script/general/parser/create_mt.sim
+++ b/tests/script/general/parser/create_mt.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim
index 9d1672fdbe..1027e2b25f 100644
--- a/tests/script/general/parser/create_tb.sim
+++ b/tests/script/general/parser/create_tb.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim
index 0547db7749..0b535272bd 100644
--- a/tests/script/general/parser/fill.sim
+++ b/tests/script/general/parser/fill.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim
index f0cd058352..a84aa0c557 100644
--- a/tests/script/general/parser/fill_stb.sim
+++ b/tests/script/general/parser/fill_stb.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = fl1_db
diff --git a/tests/script/general/parser/fill_us.sim b/tests/script/general/parser/fill_us.sim
index b597d378a2..b6de72464f 100644
--- a/tests/script/general/parser/fill_us.sim
+++ b/tests/script/general/parser/fill_us.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index 46431b0848..e4f50ea365 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -4,7 +4,7 @@ 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 maxTablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = first_db
@@ -80,7 +80,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 run general/parser/first_last_query.sim
 
diff --git a/tests/script/general/parser/first_last_query.sim b/tests/script/general/parser/first_last_query.sim
index d43cd52878..512fc70245 100644
--- a/tests/script/general/parser/first_last_query.sim
+++ b/tests/script/general/parser/first_last_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = first_db
diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim
index 7ab0437685..9ef83fa35b 100644
--- a/tests/script/general/parser/import.sim
+++ b/tests/script/general/parser/import.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = impt_db
@@ -64,7 +64,7 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 sql use $db
 sql select * from tb
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
index 197ae58453..9af1acfe77 100644
--- a/tests/script/general/parser/import_commit1.sim
+++ b/tests/script/general/parser/import_commit1.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ic_db
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
index e400d0c3cb..3c8635f3fd 100644
--- a/tests/script/general/parser/import_commit2.sim
+++ b/tests/script/general/parser/import_commit2.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ic_db
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
index 7e7451e689..3ceb025f32 100644
--- a/tests/script/general/parser/import_commit3.sim
+++ b/tests/script/general/parser/import_commit3.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ic_db
diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim
index b24c1b629f..f3b9c4a390 100644
--- a/tests/script/general/parser/insert_multiTbl.sim
+++ b/tests/script/general/parser/insert_multiTbl.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 2000
 sql connect
-sleep 3000
+sleep 1000
 print ======================== dnode1 start
 
 sql create database mul_db
diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim
index 4ba455c244..5eb973520a 100644
--- a/tests/script/general/parser/insert_tb.sim
+++ b/tests/script/general/parser/insert_tb.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index 1cd857162d..c83d3ab5c4 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = intp_db
diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim
index 8bffae4af6..6de8de0b7a 100644
--- a/tests/script/general/parser/interp_test.sim
+++ b/tests/script/general/parser/interp_test.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = intp_db
@@ -303,6 +303,8 @@ $tb = $tbPrefix . 0
     return -1
   endi
 
+  print select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(linear)
+
   sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $ts0 fill(linear)
   if $rows != 1 then
     return -1
@@ -338,6 +340,8 @@ $tb = $tbPrefix . 0
     return -1
   endi
   # columns contain NULL values
+
+  print select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(linear)
   sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(linear)
   if $rows != 1 then
     return -1
@@ -380,6 +384,7 @@ $tb = $tbPrefix . 0
   endi
 
   $t = $tsu + 1000
+  print select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
   sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(linear)
   if $rows != 0 then
     return -1
@@ -387,6 +392,7 @@ $tb = $tbPrefix . 0
 
 ## fill(value)
   $t = $ts0 + 1000
+  print 91
   sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from $tb where ts = $t fill(value, -1, -2)
   if $rows != 1 then
     return -1
@@ -456,6 +462,7 @@ $tb = $tbPrefix . 0
   if $data09 != nchar0 then
     return -1
   endi
+
   # table has NULL columns
   sql select interp(ts), interp(c1), interp(c2), interp(c3), interp(c4), interp(c5), interp(c6), interp(c7), interp(c8), interp(c9) from intp_tb3 where ts = $ts0 fill(value, -1, -2, -3)
   if $rows != 1 then
@@ -491,11 +498,14 @@ $tb = $tbPrefix . 0
 
 ##### select interp from stable
   ## interp(*) from stb
+  print select interp(*) from $stb where ts = $ts0
   sql select interp(*) from $stb where ts = $ts0
   if $rows != 1 then
     return -1
   endi
   $t = $ts0 + 1000
+  print 92
+
   sql select interp(*) from $stb where ts = $t
   if $rows != 0 then
     return -1
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 6321823fe2..7db233ee9d 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lr_db
@@ -66,7 +66,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 run general/parser/lastrow_query.sim
 
diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/general/parser/lastrow_query.sim
index f81a48d5b2..1a9b1a74a9 100644
--- a/tests/script/general/parser/lastrow_query.sim
+++ b/tests/script/general/parser/lastrow_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lr_db
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index d8c72349db..909ac71cbf 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm_db
@@ -66,7 +66,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 run general/parser/limit_tb.sim
 run general/parser/limit_stb.sim
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index 8b927b2a7f..59ecdb92b0 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_stb.sim b/tests/script/general/parser/limit1_stb.sim
index fbcd8d0965..3eee6132a4 100644
--- a/tests/script/general/parser/limit1_stb.sim
+++ b/tests/script/general/parser/limit1_stb.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_tb.sim b/tests/script/general/parser/limit1_tb.sim
index a9484d10db..52c4615c9f 100644
--- a/tests/script/general/parser/limit1_tb.sim
+++ b/tests/script/general/parser/limit1_tb.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index f1702924aa..2860305b3d 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index d22c786aa3..8ffa157945 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -4,7 +4,7 @@ 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 rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm2_db
diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
index 8294247a86..327c867be4 100644
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm2_db
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
index 64f86edd28..2f3e30de60 100644
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -4,7 +4,7 @@ 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 rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm2_db
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 1000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit_stb.sim b/tests/script/general/parser/limit_stb.sim
index c9df03ab2e..e43a78bc31 100644
--- a/tests/script/general/parser/limit_stb.sim
+++ b/tests/script/general/parser/limit_stb.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm_db
diff --git a/tests/script/general/parser/limit_tb.sim b/tests/script/general/parser/limit_tb.sim
index 970c7b75c5..eed78a37ec 100644
--- a/tests/script/general/parser/limit_tb.sim
+++ b/tests/script/general/parser/limit_tb.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = lm_db
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 41082bb144..f6744f22ab 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = mb_db
diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim
index bdac5ace55..082a6331a6 100644
--- a/tests/script/general/parser/nchar.sim
+++ b/tests/script/general/parser/nchar.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim
index 2e39fc7db2..9ac83eb779 100644
--- a/tests/script/general/parser/null_char.sim
+++ b/tests/script/general/parser/null_char.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 
 print ========== NULL_char.sim
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 7c83ca0c2f..4cadc706d9 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = group_db
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
index 42cedc034b..b80cfa9ce4 100644
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 200
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = sc_db
@@ -122,9 +122,9 @@ system sh/exec.sh -n dnode1 -s stop -x SIGINT
 sleep 6000
 system sh/exec.sh -n dnode1 -s start
 print ====== server restart completed
-sleep 3000
+sleep 1000
 sql connect
-sleep 3000
+sleep 1000
 sql use $db
 
 ##### repeat test after server restart
diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim
index ac3a8f2b2b..ed8c3a51eb 100644
--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 5
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = sav_db
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index 4fdfa7b55b..d778f20de0 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = scd_db
@@ -39,7 +39,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 sql use $db
 
 # generate some data in cache
diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim
index 38af57c73d..95ec4a77ec 100644
--- a/tests/script/general/parser/set_tag_vals.sim
+++ b/tests/script/general/parser/set_tag_vals.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = db
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index 4305ae1b5d..d5b61944ef 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = sr_db
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 a1ae70ec81..2292e6d0a1 100644
--- a/tests/script/general/parser/single_row_in_tb_query.sim
+++ b/tests/script/general/parser/single_row_in_tb_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = sr_db
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index edbf0c8cc0..4b5f013d31 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = slm_db
@@ -101,7 +101,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 run general/parser/slimit_query.sim
 
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 9e26a2882a..9c69dd6c8b 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -60,7 +60,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 run general/parser/slimit1_query.sim
 
diff --git a/tests/script/general/parser/slimit1_query.sim b/tests/script/general/parser/slimit1_query.sim
index 617ccb3fd9..ad892fbf86 100644
--- a/tests/script/general/parser/slimit1_query.sim
+++ b/tests/script/general/parser/slimit1_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = slm_alt_tg_db
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index eccd4a6815..178f151475 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -175,7 +175,7 @@ sleep 5000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 sql use $db
 ### repeat above queries
diff --git a/tests/script/general/parser/slimit_query.sim b/tests/script/general/parser/slimit_query.sim
index 655bc5f8be..dc1116405f 100644
--- a/tests/script/general/parser/slimit_query.sim
+++ b/tests/script/general/parser/slimit_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = slm_db
diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim
index 845a484488..4032871591 100644
--- a/tests/script/general/parser/stream_on_sys.sim
+++ b/tests/script/general/parser/stream_on_sys.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c monitor       -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 print ======================== stream_on_sys.sim
 
diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim
index 07bf4d8dd1..6c79f30bd2 100644
--- a/tests/script/general/parser/tags_dynamically_specifiy.sim
+++ b/tests/script/general/parser/tags_dynamically_specifiy.sim
@@ -3,9 +3,9 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
-sleep 3000
+sleep 1000
 
 $db = dytag_db
 $tbNum = 10
diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim
index 9842b4fda6..1ba7b60cfe 100644
--- a/tests/script/general/parser/tags_filter.sim
+++ b/tests/script/general/parser/tags_filter.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $db = tf_db
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index fd5f32972a..f1962d968f 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ti_db
diff --git a/tests/script/general/parser/tbnameIn_query.sim b/tests/script/general/parser/tbnameIn_query.sim
index 37cc1aa824..3f87d20327 100644
--- a/tests/script/general/parser/tbnameIn_query.sim
+++ b/tests/script/general/parser/tbnameIn_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ti_db
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index 3dd80b8e38..d16cec9619 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -1,113 +1,113 @@
-sleep 2000
-run general/parser/alter.sim
-sleep 2000
-run general/parser/alter1.sim
-sleep 2000
-run general/parser/alter_stable.sim
-sleep 2000
-run general/parser/auto_create_tb.sim
-sleep 2000
-run general/parser/auto_create_tb_drop_tb.sim
-sleep 2000
-run general/parser/col_arithmetic_operation.sim
-sleep 2000
-run general/parser/columnValue.sim
-sleep 2000
-run general/parser/commit.sim
-sleep 2000
-run general/parser/create_db.sim
-sleep 2000
-run general/parser/create_mt.sim
-sleep 2000
-run general/parser/create_tb.sim
-sleep 2000
-run general/parser/dbtbnameValidate.sim
-sleep 2000
-run general/parser/fill.sim
-sleep 2000
-run general/parser/fill_stb.sim
-sleep 2000
-#run general/parser/fill_us.sim               #
-sleep 2000
-run general/parser/first_last.sim
-sleep 2000
-run general/parser/import_commit1.sim
-sleep 2000
-run general/parser/import_commit2.sim
-sleep 2000
-run general/parser/import_commit3.sim
-sleep 2000
-#run general/parser/import_file.sim
-sleep 2000
-run general/parser/insert_tb.sim
-sleep 2000
-run general/parser/tags_dynamically_specifiy.sim
-sleep 2000
-run general/parser/interp.sim
-sleep 2000
-run general/parser/lastrow.sim
-sleep 2000
-run general/parser/limit.sim
-sleep 2000
-run general/parser/limit1.sim
-sleep 2000
-run general/parser/limit1_tblocks100.sim
-sleep 2000
-run general/parser/limit2.sim
-sleep 2000
+#sleep 1000
+#run general/parser/alter.sim
+#sleep 1000
+#run general/parser/alter1.sim
+#sleep 1000
+#run general/parser/alter_stable.sim
+#sleep 1000
+#run general/parser/auto_create_tb.sim
+#sleep 1000
+#run general/parser/auto_create_tb_drop_tb.sim
+#sleep 1000
+#run general/parser/col_arithmetic_operation.sim
+#sleep 1000
+#run general/parser/columnValue.sim
+#sleep 1000
+#run general/parser/commit.sim
+#sleep 1000
+#run general/parser/create_db.sim
+#sleep 1000
+#run general/parser/create_mt.sim
+#sleep 1000
+#run general/parser/create_tb.sim
+#sleep 1000
+#run general/parser/dbtbnameValidate.sim
+#sleep 1000
+#run general/parser/fill.sim
+#sleep 1000
+#run general/parser/fill_stb.sim
+#sleep 1000
+##run general/parser/fill_us.sim               #
+#sleep 1000
+#run general/parser/first_last.sim
+#sleep 1000
+#run general/parser/import_commit1.sim
+#sleep 1000
+#run general/parser/import_commit2.sim
+#sleep 1000
+#run general/parser/import_commit3.sim
+#sleep 1000
+##run general/parser/import_file.sim
+#sleep 1000
+#run general/parser/insert_tb.sim
+#sleep 1000
+#run general/parser/tags_dynamically_specifiy.sim
+#sleep 1000
+#run general/parser/interp.sim
+#sleep 1000
+#run general/parser/lastrow.sim
+#sleep 1000
+#run general/parser/limit.sim
+#sleep 1000
+#run general/parser/limit1.sim
+#sleep 1000
+#run general/parser/limit1_tblocks100.sim
+#sleep 1000
+#run general/parser/limit2.sim
+sleep 1000
 run general/parser/mixed_blocks.sim
-sleep 2000
+sleep 1000
 run general/parser/nchar.sim
-sleep 2000
+sleep 1000
 run general/parser/null_char.sim
-sleep 2000
+sleep 1000
 run general/parser/selectResNum.sim
-sleep 2000
+sleep 1000
 run general/parser/select_across_vnodes.sim
-sleep 2000
+sleep 1000
 run general/parser/select_from_cache_disk.sim
-sleep 2000
+sleep 1000
 run general/parser/set_tag_vals.sim
-sleep 2000
+sleep 1000
 run general/parser/single_row_in_tb.sim
-sleep 2000
+sleep 1000
 run general/parser/slimit.sim
-sleep 2000
+sleep 1000
 run general/parser/slimit1.sim
-sleep 2000
+sleep 1000
 run general/parser/slimit_alter_tags.sim
-sleep 2000
+sleep 1000
 run general/parser/tbnameIn.sim
-sleep 2000
+sleep 1000
 run general/parser/slimit_alter_tags.sim  # persistent failed
-sleep 2000
+sleep 1000
 run general/parser/join.sim
-sleep 2000
+sleep 1000
 run general/parser/join_multivnode.sim
-sleep 2000
+sleep 1000
 run general/parser/projection_limit_offset.sim
-sleep 2000
+sleep 1000
 run general/parser/select_with_tags.sim
-sleep 2000
+sleep 1000
 run general/parser/groupby.sim
-sleep 2000
+sleep 1000
 run general/parser/tags_filter.sim
-sleep 2000
+sleep 1000
 run general/parser/topbot.sim
-sleep 2000
+sleep 1000
 run general/parser/union.sim
-sleep 2000
+sleep 1000
 run general/parser/constCol.sim
-sleep 2000
+sleep 1000
 run general/parser/where.sim
-sleep 2000
+sleep 1000
 run general/parser/timestamp.sim
-sleep 2000
+sleep 1000
 run general/parser/sliding.sim
 
-#sleep 2000
+#sleep 1000
 #run general/parser/repeatStream.sim
-#sleep 2000
+#sleep 1000
 #run general/parser/stream_on_sys.sim
-#sleep 2000
+#sleep 1000
 #run general/parser/stream.sim
\ No newline at end of file
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 67da0f0869..4603e23813 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ts_db
@@ -59,10 +59,10 @@ run general/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 3000
+sleep 1000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 3000
+sleep 1000
 
 run general/parser/timestamp_query.sim
diff --git a/tests/script/general/parser/timestamp_query.sim b/tests/script/general/parser/timestamp_query.sim
index 783c03602b..ab892c0287 100644
--- a/tests/script/general/parser/timestamp_query.sim
+++ b/tests/script/general/parser/timestamp_query.sim
@@ -1,4 +1,4 @@
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = ts_db
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 066fac43ad..3ea354f4da 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 3000
+sleep 1000
 sql connect
 
 $dbPrefix = wh_db

From 922497b3c2dc1a2be33132813f4f883346ba19ee Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 17 Nov 2020 16:06:15 +0800
Subject: [PATCH 03/41] [TD-225] fix memory leaks.

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

diff --git a/src/query/src/qFill.c b/src/query/src/qFill.c
index 1764289219..ca1203cb17 100644
--- a/src/query/src/qFill.c
+++ b/src/query/src/qFill.c
@@ -332,7 +332,7 @@ static void doFillOneRowResult(SFillInfo* pFillInfo, tFilePage** data, char** sr
 
         point1 = (SPoint){.key = *(TSKEY*)(prev), .val = prev + pCol->col.offset};
         point2 = (SPoint){.key = ts, .val = srcData[i] + pFillInfo->index * bytes};
-        point  = (SPoint){.key = pFillInfo->start, .val = val1};
+        point  = (SPoint){.key = pFillInfo->currentKey, .val = val1};
         taosGetLinearInterpolationVal(type, &point1, &point2, &point);
       }
     } else {

From 80323814b7f959b9cf7d4a0b2f15f0fef9920527 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 17 Nov 2020 17:39:10 +0800
Subject: [PATCH 04/41] [TD-225] fix bugs.

---
 src/client/inc/tscSubquery.h                  |   3 +-
 src/client/src/tscLocalMerge.c                |   4 +-
 src/client/src/tscServer.c                    |  18 ++-
 src/client/src/tscSql.c                       |  19 +++
 src/client/src/tscSubquery.c                  |  35 ++++--
 src/inc/taos.h                                |   3 +-
 tests/script/general/parser/join.sim          |   4 +-
 .../script/general/parser/join_multivnode.sim |  11 +-
 tests/script/general/parser/testSuite.sim     | 112 +++++++++---------
 9 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/src/client/inc/tscSubquery.h b/src/client/inc/tscSubquery.h
index aa9bda23de..598ff94835 100644
--- a/src/client/inc/tscSubquery.h
+++ b/src/client/inc/tscSubquery.h
@@ -41,7 +41,8 @@ int32_t tscHandleInsertRetry(SSqlObj* pSql);
 void tscBuildResFromSubqueries(SSqlObj *pSql);
 TAOS_ROW doSetResultRowData(SSqlObj *pSql);
 
-char *getArithemicInputSrc(void *param, const char *name, int32_t colId);
+char *getArithmeticInputSrc(void *param, const char *name, int32_t colId);
+void doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t rowSize, int32_t finalRowSize);
 
 #ifdef __cplusplus
 }
diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index b07c7ca66d..5cdcd6d8c1 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -30,8 +30,6 @@ typedef struct SCompareParam {
   int32_t            groupOrderType;
 } SCompareParam;
 
-static void doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t rowSize, int32_t finalRowSize);
-
 int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
   int32_t pLeftIdx = *(int32_t *)pLeft;
   int32_t pRightIdx = *(int32_t *)pRight;
@@ -1637,7 +1635,7 @@ void doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t r
     // calculate the result from several other columns
     if (pSup->pArithExprInfo != NULL) {
       arithSup.pArithExpr = pSup->pArithExprInfo;
-      tExprTreeCalcTraverse(arithSup.pArithExpr->pExpr, (int32_t) pOutput->num, pbuf + pOutput->num*offset, &arithSup, TSDB_ORDER_ASC, getArithemicInputSrc);
+      tExprTreeCalcTraverse(arithSup.pArithExpr->pExpr, (int32_t) pOutput->num, pbuf + pOutput->num*offset, &arithSup, TSDB_ORDER_ASC, getArithmeticInputSrc);
     } else {
       SSqlExpr* pExpr = pSup->pSqlExpr;
       memcpy(pbuf + pOutput->num * offset, pExpr->offset * pOutput->num + pOutput->data, pExpr->resBytes * pOutput->num);
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index a367d14604..63c68e1209 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2187,11 +2187,25 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
     return pRes->code;
   }
 
-  STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-  if (!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) || tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) || pCmd->command == TSDB_SQL_RETRIEVE) {
+  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
+  if (pCmd->command == TSDB_SQL_RETRIEVE) {
+    tscSetResRawPtr(pRes, pQueryInfo);
+  } else if ((UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo) || UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo)) && !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_SUBQUERY)) {
+    tscSetResRawPtr(pRes, pQueryInfo);
+  } else if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_QUERY) && !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_JOIN_SEC_STAGE)) {
     tscSetResRawPtr(pRes, pQueryInfo);
   }
 
+//  if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY)) {
+//
+//  }
+//
+//  if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY) ||
+//     ((!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) || pCmd->command == TSDB_SQL_RETRIEVE) &&
+//      !(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_SUBQUERY)))) {
+//    tscSetResRawPtr(pRes, pQueryInfo);
+//  }
+
   if (pSql->pSubscription != NULL) {
     int32_t numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
     
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index bb02472e58..9e32892814 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -787,6 +787,25 @@ void taos_stop_query(TAOS_RES *res) {
   tscDebug("%p query is cancelled", res);
 }
 
+bool taos_is_null(TAOS_RES *res, int32_t row, int32_t col) {
+  SSqlObj *pSql = (SSqlObj *)res;
+  if (pSql == NULL || pSql->signature != pSql) {
+    return true;
+  }
+
+  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
+  if (pQueryInfo == NULL) {
+    return true;
+  }
+
+  SInternalField* pInfo = (SInternalField*)TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, col);
+  if (col < 0 || col >= tscNumOfFields(pQueryInfo) || row < 0 || row > pSql->res.numOfRows) {
+    return true;
+  }
+
+  return isNull(pSql->res.urow[col] + row * pInfo->field.bytes, pInfo->field.type);
+}
+
 int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields) {
   int len = 0;
   for (int i = 0; i < num_fields; ++i) {
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index a532a5ead7..52db86f0ad 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2312,10 +2312,10 @@ static void doBuildResFromSubqueries(SSqlObj* pSql) {
     return;
   }
 
-  int32_t totalSize = tscGetResRowLength(pQueryInfo->exprList);
+  int32_t rowSize = tscGetResRowLength(pQueryInfo->exprList);
 
-  assert(numOfRes * totalSize > 0);
-  char* tmp = realloc(pRes->pRsp, numOfRes * totalSize);
+  assert(numOfRes * rowSize > 0);
+  char* tmp = realloc(pRes->pRsp, numOfRes * rowSize + sizeof(tFilePage));
   if (tmp == NULL) {
     pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
     return;
@@ -2323,9 +2323,12 @@ static void doBuildResFromSubqueries(SSqlObj* pSql) {
     pRes->pRsp = tmp;
   }
 
-  pRes->data = pRes->pRsp;
+  tFilePage* pFilePage = (tFilePage*) pRes->pRsp;
+  pFilePage->num = numOfRes;
 
+  pRes->data = pFilePage->data;
   char* data = pRes->data;
+
   int16_t bytes = 0;
 
   size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
@@ -2352,6 +2355,17 @@ static void doBuildResFromSubqueries(SSqlObj* pSql) {
 
   pRes->numOfRows = numOfRes;
   pRes->numOfClauseTotal += numOfRes;
+
+  int32_t finalRowSize = 0;
+  for(int32_t i = 0; i < tscNumOfFields(pQueryInfo); ++i) {
+    TAOS_FIELD* pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
+    finalRowSize += pField->bytes;
+  }
+
+  doArithmeticCalculate(pQueryInfo, pFilePage, rowSize, finalRowSize);
+
+  pRes->data = pFilePage->data;
+  tscSetResRawPtr(pRes, pQueryInfo);
 }
 
 void tscBuildResFromSubqueries(SSqlObj *pSql) {
@@ -2364,13 +2378,12 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
 
   if (pRes->tsrow == NULL) {
     SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, pSql->cmd.clauseIndex);
+    pRes->numOfCols = (int16_t) tscSqlExprNumOfExprs(pQueryInfo);
 
-    size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
-    pRes->numOfCols =  (int16_t)numOfExprs;
-
-    pRes->tsrow  = calloc(numOfExprs, POINTER_BYTES);
-    pRes->buffer = calloc(numOfExprs, POINTER_BYTES);
-    pRes->length = calloc(numOfExprs, sizeof(int32_t));
+    pRes->tsrow  = calloc(pRes->numOfCols, POINTER_BYTES);
+    pRes->urow   = calloc(pRes->numOfCols, POINTER_BYTES);
+    pRes->buffer = calloc(pRes->numOfCols, POINTER_BYTES);
+    pRes->length = calloc(pRes->numOfCols, sizeof(int32_t));
 
     if (pRes->tsrow == NULL || pRes->buffer == NULL || pRes->length == NULL) {
       pRes->code = TSDB_CODE_TSC_OUT_OF_MEMORY;
@@ -2414,7 +2427,7 @@ static UNUSED_FUNC void transferNcharData(SSqlObj *pSql, int32_t columnIndex, TA
   }
 }
 
-char *getArithemicInputSrc(void *param, const char *name, int32_t colId) {
+char *getArithmeticInputSrc(void *param, const char *name, int32_t colId) {
   SArithmeticSupport *pSupport = (SArithmeticSupport *) param;
 
   int32_t index = -1;
diff --git a/src/inc/taos.h b/src/inc/taos.h
index 2c6454ced1..e517d22b2b 100644
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
@@ -109,13 +109,14 @@ DLL_EXPORT TAOS_RES *taos_query(TAOS *taos, const char *sql);
 DLL_EXPORT TAOS_ROW taos_fetch_row(TAOS_RES *res);
 DLL_EXPORT int taos_result_precision(TAOS_RES *res);  // get the time precision of result
 DLL_EXPORT void taos_free_result(TAOS_RES *res);
-DLL_EXPORT int taos_field_count(TAOS_RES *tres);
+DLL_EXPORT int taos_field_count(TAOS_RES *res);
 DLL_EXPORT int taos_num_fields(TAOS_RES *res);
 DLL_EXPORT int taos_affected_rows(TAOS_RES *res);
 DLL_EXPORT TAOS_FIELD *taos_fetch_fields(TAOS_RES *res);
 DLL_EXPORT int taos_select_db(TAOS *taos, const char *db);
 DLL_EXPORT int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields);
 DLL_EXPORT void taos_stop_query(TAOS_RES *res);
+DLL_EXPORT bool taos_is_null(TAOS_RES *res, int32_t row, int32_t col);
 
 int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows);
 int taos_validate_sql(TAOS *taos, const char *sql);
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index 624c2e72c4..d6e4a6a5a7 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -360,9 +360,7 @@ endi
 sql select join_mt1.* from join_mt1
 
 print $rows
-
-$val = 2000
-if $rows != $val then
+if $rows != 2000 then
   return -1
 endi
 
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index a5e71260b4..6bca0e75c4 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -136,9 +136,8 @@ sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbna
 #1970-01-01 08:01:40.790 |                    10 |             945.000000000 |        90 |     true |      true |           0 |
 sql_error select count(join_mt0.c1), sum(join_mt1.c2), first(join_mt0.c5), last(join_mt1.c7), first(join_mt1.c7) from join_mt0, join_mt1 where join_mt0.t1=join_mt1.t1 and join_mt0.ts=join_mt1.ts interval(10a) group by join_mt0.t1 order by join_mt0.ts desc limit 20 offset 19;
 
-
 sql select count(join_mt0.c1), sum(join_mt0.c2)/count(*), avg(c2), first(join_mt0.c5), last(c7) from join_mt0  interval(10a) group by join_mt0.t1 order by join_mt0.ts desc;
-if $rows != 100 then
+if $rows != 300 then
   return -1
 endi
 
@@ -147,7 +146,7 @@ if $data00 != @70-01-01 08:01:40.990@ then
   return -1
 endi
 
-if $data01 != 30 then
+if $data01 != 10 then
   return -1
 endi
 
@@ -168,7 +167,7 @@ if $data05 != 1 then
   return -1
 endi
 
-if $data06 != 2 then
+if $data06 != 0 then
   return -1
 endi
 
@@ -177,7 +176,7 @@ if $data10 != @70-01-01 08:01:40.980@ then
   return -1
 endi
 
-if $data11 != 30 then
+if $data11 != 10 then
   return -1
 endi
 
@@ -198,7 +197,7 @@ if $data15 != 1 then
   return -1
 endi
 
-if $data16 != 2 then
+if $data16 != 0 then
   return -1
 endi
 
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index d16cec9619..1374199548 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -1,59 +1,59 @@
-#sleep 1000
-#run general/parser/alter.sim
-#sleep 1000
-#run general/parser/alter1.sim
-#sleep 1000
-#run general/parser/alter_stable.sim
-#sleep 1000
-#run general/parser/auto_create_tb.sim
-#sleep 1000
-#run general/parser/auto_create_tb_drop_tb.sim
-#sleep 1000
-#run general/parser/col_arithmetic_operation.sim
-#sleep 1000
-#run general/parser/columnValue.sim
-#sleep 1000
-#run general/parser/commit.sim
-#sleep 1000
-#run general/parser/create_db.sim
-#sleep 1000
-#run general/parser/create_mt.sim
-#sleep 1000
-#run general/parser/create_tb.sim
-#sleep 1000
-#run general/parser/dbtbnameValidate.sim
-#sleep 1000
-#run general/parser/fill.sim
-#sleep 1000
-#run general/parser/fill_stb.sim
-#sleep 1000
-##run general/parser/fill_us.sim               #
-#sleep 1000
-#run general/parser/first_last.sim
-#sleep 1000
-#run general/parser/import_commit1.sim
-#sleep 1000
-#run general/parser/import_commit2.sim
-#sleep 1000
-#run general/parser/import_commit3.sim
-#sleep 1000
-##run general/parser/import_file.sim
-#sleep 1000
-#run general/parser/insert_tb.sim
-#sleep 1000
-#run general/parser/tags_dynamically_specifiy.sim
-#sleep 1000
-#run general/parser/interp.sim
-#sleep 1000
-#run general/parser/lastrow.sim
-#sleep 1000
-#run general/parser/limit.sim
-#sleep 1000
-#run general/parser/limit1.sim
-#sleep 1000
-#run general/parser/limit1_tblocks100.sim
-#sleep 1000
-#run general/parser/limit2.sim
+sleep 1000
+run general/parser/alter.sim
+sleep 1000
+run general/parser/alter1.sim
+sleep 1000
+run general/parser/alter_stable.sim
+sleep 1000
+run general/parser/auto_create_tb.sim
+sleep 1000
+run general/parser/auto_create_tb_drop_tb.sim
+sleep 1000
+run general/parser/col_arithmetic_operation.sim
+sleep 1000
+run general/parser/columnValue.sim
+sleep 1000
+run general/parser/commit.sim
+sleep 1000
+run general/parser/create_db.sim
+sleep 1000
+run general/parser/create_mt.sim
+sleep 1000
+run general/parser/create_tb.sim
+sleep 1000
+run general/parser/dbtbnameValidate.sim
+sleep 1000
+run general/parser/fill.sim
+sleep 1000
+run general/parser/fill_stb.sim
+sleep 1000
+#run general/parser/fill_us.sim               #
+sleep 1000
+run general/parser/first_last.sim
+sleep 1000
+run general/parser/import_commit1.sim
+sleep 1000
+run general/parser/import_commit2.sim
+sleep 1000
+run general/parser/import_commit3.sim
+sleep 1000
+#run general/parser/import_file.sim
+sleep 1000
+run general/parser/insert_tb.sim
+sleep 1000
+run general/parser/tags_dynamically_specifiy.sim
+sleep 1000
+run general/parser/interp.sim
+sleep 1000
+run general/parser/lastrow.sim
+sleep 1000
+run general/parser/limit.sim
+sleep 1000
+run general/parser/limit1.sim
+sleep 1000
+run general/parser/limit1_tblocks100.sim
+sleep 1000
+run general/parser/limit2.sim
 sleep 1000
 run general/parser/mixed_blocks.sim
 sleep 1000

From 6852339a0da74bee2037f959865fb8fde81dba07 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 17 Nov 2020 17:41:09 +0800
Subject: [PATCH 05/41] [TD-225]

---
 src/client/src/tscSql.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 9e32892814..261467ad29 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -559,6 +559,8 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
     return 0;
   }
 
+  tscResetForNextRetrieve(pRes);
+
   // set the sql object owner
   tscSetSqlOwner(pSql);
 

From 91dcb46d73b46970216d9d75a762654fb0171bd2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 17 Nov 2020 17:45:11 +0800
Subject: [PATCH 06/41] [TD-225] fix memory leaks.

---
 src/inc/taos.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/inc/taos.h b/src/inc/taos.h
index e517d22b2b..cd863587a6 100644
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
@@ -17,6 +17,7 @@
 #define TDENGINE_TAOS_H
 
 #include <stdint.h>
+#include <stdbool.h>
 
 #ifdef __cplusplus
 extern "C" {

From 87ab74823dcf53532d1496a5041ab85df11dcf5e Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 18 Nov 2020 16:37:04 +0800
Subject: [PATCH 07/41] [TD-2070]<enhance>: optimize the load data performance.

---
 .../jni/com_taosdata_jdbc_TSDBJNIConnector.h  |   8 +
 src/client/src/TSDBJNIConnector.c             | 250 ++++++++++--------
 src/client/src/tscServer.c                    |  10 -
 .../com/taosdata/jdbc/TSDBJNIConnector.java   |   5 +
 .../java/com/taosdata/jdbc/TSDBResultSet.java | 198 +++++++++-----
 .../taosdata/jdbc/TSDBResultSetRowData.java   |   1 -
 .../java/com/taosdata/jdbc/TSDBStatement.java |   6 +-
 7 files changed, 287 insertions(+), 191 deletions(-)

diff --git a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
index eaea91d1bf..582bd6bac0 100644
--- a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
@@ -129,6 +129,14 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp
   (JNIEnv *, jobject, jlong, jlong, jobject);
 
+/*
+ * Class:     com_taosdata_jdbc_TSDBJNIConnector
+ * Method:    fetchBlockImp
+ * Signature: (JJLcom/taosdata/jdbc/TSDBResultSetBlockData;)I
+ */
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchBlockImp
+  (JNIEnv *, jobject, jlong, jlong, jobject);
+
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
  * Method:    closeConnectionImp
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 4e2272eb05..a8829499a3 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -17,7 +17,6 @@
 #include "taos.h"
 #include "tlog.h"
 #include "tscUtil.h"
-#include "tsclient.h"
 
 #include "com_taosdata_jdbc_TSDBJNIConnector.h"
 
@@ -57,6 +56,10 @@ jmethodID g_rowdataSetStringFp;
 jmethodID g_rowdataSetTimestampFp;
 jmethodID g_rowdataSetByteArrayFp;
 
+jmethodID g_blockdataSetByteArrayFp;
+jmethodID g_blockdataSetNumOfRowsFp;
+jmethodID g_blockdataSetNumOfColsFp;
+
 #define JNI_SUCCESS          0
 #define JNI_TDENGINE_ERROR  -1
 #define JNI_CONNECTION_NULL -2
@@ -66,7 +69,7 @@ jmethodID g_rowdataSetByteArrayFp;
 #define JNI_FETCH_END       -6
 #define JNI_OUT_OF_MEMORY   -7
 
-void jniGetGlobalMethod(JNIEnv *env) {
+static void jniGetGlobalMethod(JNIEnv *env) {
   // make sure init function executed once
   switch (atomic_val_compare_exchange_32(&__init, 0, 1)) {
     case 0:
@@ -114,10 +117,31 @@ void jniGetGlobalMethod(JNIEnv *env) {
   g_rowdataSetByteArrayFp = (*env)->GetMethodID(env, g_rowdataClass, "setByteArray", "(I[B)V");
   (*env)->DeleteLocalRef(env, rowdataClass);
 
+  jclass blockdataClass = (*env)->FindClass(env, "com/taosdata/jdbc/TSDBResultSetBlockData");
+  jclass g_blockdataClass = (*env)->NewGlobalRef(env, blockdataClass);
+  g_blockdataSetByteArrayFp = (*env)->GetMethodID(env, g_blockdataClass, "setByteArray", "(II[B)V");
+  g_blockdataSetNumOfRowsFp = (*env)->GetMethodID(env, g_blockdataClass, "setNumOfRows", "(I)V");
+  g_blockdataSetNumOfColsFp = (*env)->GetMethodID(env, g_blockdataClass, "setNumOfCols", "(I)V");
+  (*env)->DeleteLocalRef(env, blockdataClass);
+
   atomic_store_32(&__init, 2);
   jniDebug("native method register finished");
 }
 
+static int32_t check_for_params(jobject jobj, jlong conn, jlong res) {
+  if ((TAOS*) conn == NULL) {
+    jniError("jobj:%p, connection is closed", jobj);
+    return JNI_CONNECTION_NULL;
+  }
+
+  if ((TAOS_RES *) res == NULL) {
+    jniError("jobj:%p, conn:%p, res is null", jobj, (TAOS*) conn);
+    return JNI_RESULT_SET_NULL;
+  }
+
+  return JNI_SUCCESS;
+}
+
 JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setAllocModeImp(JNIEnv *env, jobject jobj, jint jMode,
                                                                                jstring jPath, jboolean jAutoDump) {
   if (jPath != NULL) {
@@ -192,39 +216,37 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions(JNIEnv
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEnv *env, jobject jobj, jstring jhost,
                                                                            jint jport, jstring jdbName, jstring juser,
                                                                            jstring jpass) {
-  jlong       ret = 0;
+  jlong       ret  = 0;
   const char *host = NULL;
-  const char *dbname = NULL;
   const char *user = NULL;
   const char *pass = NULL;
+  const char *dbname = NULL;
 
   if (jhost != NULL) {
     host = (*env)->GetStringUTFChars(env, jhost, NULL);
   }
+
   if (jdbName != NULL) {
     dbname = (*env)->GetStringUTFChars(env, jdbName, NULL);
   }
+
   if (juser != NULL) {
     user = (*env)->GetStringUTFChars(env, juser, NULL);
   }
+
   if (jpass != NULL) {
     pass = (*env)->GetStringUTFChars(env, jpass, NULL);
   }
 
   if (user == NULL) {
-    jniDebug("jobj:%p, user is null, use default user %s", jobj, TSDB_DEFAULT_USER);
+    jniDebug("jobj:%p, user not specified, use default user %s", jobj, TSDB_DEFAULT_USER);
   }
+
   if (pass == NULL) {
-    jniDebug("jobj:%p, pass is null, use default password", jobj);
+    jniDebug("jobj:%p, pass not specified, use default password", jobj);
   }
 
-  /*
-   * set numOfThreadsPerCore = 0
-   * means only one thread for client side scheduler
-   */
-  tsNumOfThreadsPerCore = 0.0;
-
-  ret = (jlong)taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, (uint16_t)jport);
+  ret = (jlong) taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, (uint16_t)jport);
   if (ret == 0) {
     jniError("jobj:%p, conn:%p, connect to database failed, host=%s, user=%s, dbname=%s, port=%d", jobj, (void *)ret,
              (char *)host, (char *)user, (char *)dbname, (int32_t)jport);
@@ -233,10 +255,21 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
              (char *)host, (char *)user, (char *)dbname, (int32_t)jport);
   }
 
-  if (host != NULL) (*env)->ReleaseStringUTFChars(env, jhost, host);
-  if (dbname != NULL) (*env)->ReleaseStringUTFChars(env, jdbName, dbname);
-  if (user != NULL) (*env)->ReleaseStringUTFChars(env, juser, user);
-  if (pass != NULL) (*env)->ReleaseStringUTFChars(env, jpass, pass);
+  if (host != NULL) {
+    (*env)->ReleaseStringUTFChars(env, jhost, host);
+  }
+
+  if (dbname != NULL) {
+    (*env)->ReleaseStringUTFChars(env, jdbName, dbname);
+  }
+
+  if (user != NULL) {
+    (*env)->ReleaseStringUTFChars(env, juser, user);
+  }
+
+  if (pass != NULL) {
+    (*env)->ReleaseStringUTFChars(env, jpass, pass);
+  }
 
   return ret;
 }
@@ -245,64 +278,53 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(
                                                                                 jbyteArray jsql, jlong con) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
-    jniError("jobj:%p, connection is already closed", jobj);
+    jniError("jobj:%p, connection already closed", jobj);
     return JNI_CONNECTION_NULL;
   }
 
   if (jsql == NULL) {
-    jniError("jobj:%p, conn:%p, sql is null", jobj, tscon);
+    jniError("jobj:%p, conn:%p, empty sql string", jobj, tscon);
     return JNI_SQL_NULL;
   }
 
   jsize len = (*env)->GetArrayLength(env, jsql);
 
-  char *dst = (char *)calloc(1, sizeof(char) * (len + 1));
-  if (dst == NULL) {
-    jniError("jobj:%p, conn:%p, can not alloc memory", jobj, tscon);
+  char *str = (char *) calloc(1, sizeof(char) * (len + 1));
+  if (str == NULL) {
+    jniError("jobj:%p, conn:%p, alloc memory failed", jobj, tscon);
     return JNI_OUT_OF_MEMORY;
   }
 
-  (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)dst);
+  (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)str);
   if ((*env)->ExceptionCheck(env)) {
     // todo handle error
   }
 
-  jniDebug("jobj:%p, conn:%p, sql:%s", jobj, tscon, dst);
-
-  SSqlObj *pSql = taos_query(tscon, dst);
+  SSqlObj *pSql = taos_query(tscon, str);
   int32_t  code = taos_errno(pSql);
 
   if (code != TSDB_CODE_SUCCESS) {
     jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(code), taos_errstr(pSql));
   } else {
-    int32_t affectRows = 0;
     if (pSql->cmd.command == TSDB_SQL_INSERT) {
-      affectRows = taos_affected_rows(pSql);
+      int32_t affectRows = taos_affected_rows(pSql);
       jniDebug("jobj:%p, conn:%p, code:%s, affect rows:%d", jobj, tscon, tstrerror(code), affectRows);
     } else {
       jniDebug("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
     }
   }
 
-  free(dst);
-  return (jlong)pSql;
+  free(str);
+  return (jlong) pSql;
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con, jlong tres) {
-  TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
-    jniError("jobj:%p, connection is closed", jobj);
-    return (jint)TSDB_CODE_TSC_INVALID_CONNECTION;
+  int32_t code = check_for_params(jobj, con, tres);
+  if (code != JNI_SUCCESS) {
+    return code;
   }
 
-  if ((void *)tres == NULL) {
-    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
-    return JNI_RESULT_SET_NULL;
-  }
-
-  TAOS_RES *pSql = (TAOS_RES *)tres;
-
-  return (jint)taos_errno(pSql);
+  return (jint)taos_errno((TAOS_RES*) tres);
 }
 
 JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong tres) {
@@ -313,23 +335,16 @@ JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(J
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con,
                                                                                 jlong tres) {
   TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
-    jniError("jobj:%p, connection is closed", jobj);
-    return JNI_CONNECTION_NULL;
-  }
-
-  if ((void *)tres == NULL) {
-    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
-    return JNI_RESULT_SET_NULL;
+  int32_t code = check_for_params(jobj, con, tres);
+  if (code != JNI_SUCCESS) {
+    return code;
   }
 
   SSqlObj *pSql = (TAOS_RES *)tres;
-  STscObj *pObj = pSql->pTscObj;
-
   if (tscIsUpdateQuery(pSql)) {
-    jniDebug("jobj:%p, conn:%p, update query, no resultset, %p", jobj, pObj, (void *)tres);
+    jniDebug("jobj:%p, conn:%p, update query, no resultset, %p", jobj, tscon, (void *)tres);
   } else {
-    jniDebug("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *)tres);
+    jniDebug("jobj:%p, conn:%p, get resultset, %p", jobj, tscon, (void *)tres);
   }
 
   return tres;
@@ -337,15 +352,9 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp(JNIEnv *env, jobject jobj, jlong con,
                                                                                 jlong tres) {
-  TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
-    jniError("jobj:%p, connection is closed", jobj);
-    return JNI_CONNECTION_NULL;
-  }
-
-  if ((void *)tres == NULL) {
-    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
-    return JNI_RESULT_SET_NULL;
+  int32_t code = check_for_params(jobj, con, tres);
+  if (code != JNI_SUCCESS) {
+    return code;
   }
 
   SSqlObj *pSql = (TAOS_RES *)tres;
@@ -355,37 +364,27 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_isUpdateQueryImp(
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
                                                                                 jlong res) {
-  TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
-    jniError("jobj:%p, connection is closed", jobj);
-    return JNI_CONNECTION_NULL;
-  }
-
-  if ((void *)res == NULL) {
-    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
-    return JNI_RESULT_SET_NULL;
+  int32_t code = check_for_params(jobj, con, res);
+  if (code != JNI_SUCCESS) {
+    return code;
   }
 
   taos_free_result((void *)res);
-  jniDebug("jobj:%p, conn:%p, free resultset:%p", jobj, tscon, (void *)res);
+  jniDebug("jobj:%p, conn:%p, free resultset:%p", jobj, (TAOS*) con, (void *)res);
+
   return JNI_SUCCESS;
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp(JNIEnv *env, jobject jobj, jlong con,
                                                                                   jlong res) {
   TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
-    jniError("jobj:%p, connection is closed", jobj);
-    return JNI_CONNECTION_NULL;
-  }
-
-  if ((void *)res == NULL) {
-    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
-    return JNI_RESULT_SET_NULL;
+  int32_t code = check_for_params(jobj, con, res);
+  if (code != JNI_SUCCESS) {
+    return code;
   }
 
   jint ret = taos_affected_rows((SSqlObj *)res);
-  jniDebug("jobj:%p, conn:%p, sql:%p, res: %p, affect rows:%d", jobj, tscon, (void *)con, (void *)res, (int32_t)ret);
+  jniDebug("jobj:%p, conn:%p, sql:%p, res: %p, affect rows:%d", jobj, tscon, (TAOS *)con, (TAOS_RES *)res, (int32_t)ret);
 
   return ret;
 }
@@ -394,27 +393,20 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
                                                                                     jlong con, jlong res,
                                                                                     jobject arrayListObj) {
   TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
-    jniError("jobj:%p, connection is closed", jobj);
-    return JNI_CONNECTION_NULL;
+  int32_t code = check_for_params(jobj, con, res);
+  if (code != JNI_SUCCESS) {
+    return code;
   }
 
-  TAOS_RES *result = (TAOS_RES *)res;
-  if (result == NULL) {
-    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
-    return JNI_RESULT_SET_NULL;
-  }
-
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  int         num_fields = taos_num_fields(result);
-
-  // jobject arrayListObj = (*env)->NewObject(env, g_arrayListClass, g_arrayListConstructFp, "");
+  TAOS_RES* tres = (TAOS_RES*) res;
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
 
+  int32_t num_fields = taos_num_fields(tres);
   if (num_fields == 0) {
-    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, (void *)res, num_fields);
+    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, tres, num_fields);
     return JNI_NUM_OF_FIELDS_0;
   } else {
-    jniDebug("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, (void *)res, num_fields);
+    jniDebug("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, tres, num_fields);
     for (int i = 0; i < num_fields; ++i) {
       jobject metadataObj = (*env)->NewObject(env, g_metadataClass, g_metadataConstructFp);
       (*env)->SetIntField(env, metadataObj, g_metadataColtypeField, fields[i].type);
@@ -457,21 +449,21 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   }
 
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  int         num_fields = taos_num_fields(result);
 
-  if (num_fields == 0) {
-    jniError("jobj:%p, conn:%p, resultset:%p, fields size is %d", jobj, tscon, (void*)res, num_fields);
+  int32_t numOfFields = taos_num_fields(result);
+  if (numOfFields == 0) {
+    jniError("jobj:%p, conn:%p, resultset:%p, fields size %d", jobj, tscon, (void*)res, numOfFields);
     return JNI_NUM_OF_FIELDS_0;
   }
 
   TAOS_ROW row = taos_fetch_row(result);
   if (row == NULL) {
-    int tserrno = taos_errno(result);
-    if (tserrno == 0) {
-      jniDebug("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, (void*)res, num_fields);
+    int code = taos_errno(result);
+    if (code == TSDB_CODE_SUCCESS) {
+      jniDebug("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, (void*)res, numOfFields);
       return JNI_FETCH_END;
     } else {
-      jniDebug("jobj:%p, conn:%p, interruptted query", jobj, tscon);
+      jniDebug("jobj:%p, conn:%p, interrupted query", jobj, tscon);
       return JNI_RESULT_SET_NULL;
     }
   }
@@ -480,7 +472,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
 
   char tmp[TSDB_MAX_BYTES_PER_ROW] = {0};
 
-  for (int i = 0; i < num_fields; i++) {
+  for (int i = 0; i < numOfFields; i++) {
     if (row[i] == NULL) {
       continue;
     }
@@ -534,6 +526,45 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
   return JNI_SUCCESS;
 }
 
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchBlockImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                           jlong res, jobject rowobj) {
+  TAOS *  tscon = (TAOS *)con;
+  int32_t code = check_for_params(jobj, con, res);
+  if (code != JNI_SUCCESS) {
+    return code;
+  }
+
+  TAOS_RES *  tres = (TAOS_RES *)res;
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
+
+  int32_t numOfFields = taos_num_fields(tres);
+  assert(numOfFields > 0);
+
+  TAOS_ROW row = NULL;
+  int32_t  numOfRows = taos_fetch_block(tres, &row);
+  if (numOfRows == 0) {
+    code = taos_errno(tres);
+    if (code == JNI_SUCCESS) {
+      jniDebug("jobj:%p, conn:%p, resultset:%p, numOfFields:%d, no data to retrieve", jobj, tscon, (void *)res,
+               numOfFields);
+      return JNI_FETCH_END;
+    } else {
+      jniDebug("jobj:%p, conn:%p, query interrupted", jobj, tscon);
+      return JNI_RESULT_SET_NULL;
+    }
+  }
+
+  (*env)->CallVoidMethod(env, rowobj, g_blockdataSetNumOfRowsFp, (jint)numOfRows);
+  (*env)->CallVoidMethod(env, rowobj, g_blockdataSetNumOfColsFp, (jint)numOfFields);
+
+  for (int i = 0; i < numOfFields; i++) {
+    (*env)->CallVoidMethod(env, rowobj, g_blockdataSetByteArrayFp, i, fields[i].bytes * numOfRows,
+                           jniFromNCharToByteArray(env, (char *)row[i], fields[i].bytes * numOfRows));
+  }
+
+  return JNI_SUCCESS;
+}
+
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeConnectionImp(JNIEnv *env, jobject jobj,
                                                                                   jlong con) {
   TAOS *tscon = (TAOS *)con;
@@ -589,7 +620,6 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNIEn
   jniGetGlobalMethod(env);
 
   TAOS_SUB *tsub = (TAOS_SUB *)sub;
-
   TAOS_RES *res = taos_consume(tsub);
 
   if (res == NULL) {
@@ -621,16 +651,16 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
 
   jsize len = (*env)->GetArrayLength(env, jsql);
 
-  char *dst = (char *)calloc(1, sizeof(char) * (len + 1));
-  (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)dst);
+  char *str = (char *)calloc(1, sizeof(char) * (len + 1));
+  (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)str);
   if ((*env)->ExceptionCheck(env)) {
     // todo handle error
   }
 
-  int code = taos_validate_sql(tscon, dst);
+  int code = taos_validate_sql(tscon, str);
   jniDebug("jobj:%p, conn:%p, code is %d", jobj, tscon, code);
 
-  free(dst);
+  free(str);
   return code;
 }
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 63c68e1209..7465e25895 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -2196,16 +2196,6 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
     tscSetResRawPtr(pRes, pQueryInfo);
   }
 
-//  if (TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY)) {
-//
-//  }
-//
-//  if (tscNonOrderedProjectionQueryOnSTable(pQueryInfo, 0) && !TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_TAG_FILTER_QUERY) ||
-//     ((!UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo) || pCmd->command == TSDB_SQL_RETRIEVE) &&
-//      !(TSDB_QUERY_HAS_TYPE(pQueryInfo->type, TSDB_QUERY_TYPE_SUBQUERY)))) {
-//    tscSetResRawPtr(pRes, pQueryInfo);
-//  }
-
   if (pSql->pSubscription != NULL) {
     int32_t numOfCols = pQueryInfo->fieldsInfo.numOfOutput;
     
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 edc160e323..f918463439 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
@@ -243,6 +243,11 @@ public class TSDBJNIConnector {
 
     private native int fetchRowImp(long connection, long resultSet, TSDBResultSetRowData rowData);
 
+    public int fetchBlock(long resultSet, TSDBResultSetBlockData blockData) {
+		return this.fetchBlockImp(this.taos, resultSet, blockData);
+    }
+    
+    private native int fetchBlockImp(long connection, long resultSet, TSDBResultSetBlockData blockData);
     /**
      * Execute close operation from C to release connection pointer by JNI
      *
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 961633b8ae..56c1719ddb 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
@@ -47,10 +47,14 @@ public class TSDBResultSet implements ResultSet {
 	private List<ColumnMetaData> columnMetaDataList = new ArrayList<ColumnMetaData>();
 
 	private TSDBResultSetRowData rowData;
+	private TSDBResultSetBlockData blockData;
 
+	private boolean blockwiseFetch = false;
 	private boolean lastWasNull = false;
 	private final int COLUMN_INDEX_START_VALUE = 1;
 
+	private int rowIndex = 0;
+
 	public TSDBJNIConnector getJniConnector() {
 		return jniConnector;
 	}
@@ -67,6 +71,10 @@ public class TSDBResultSet implements ResultSet {
 		this.resultSetPointer = resultSetPointer;
 	}
 
+	public void setBlockWiseFetch(boolean fetchBlock) {
+		this.blockwiseFetch = fetchBlock;
+	}
+
 	public List<ColumnMetaData> getColumnMetaDataList() {
 		return columnMetaDataList;
 	}
@@ -107,6 +115,7 @@ public class TSDBResultSet implements ResultSet {
 		}
 
 		this.rowData = new TSDBResultSetRowData(this.columnMetaDataList.size());
+		this.blockData = new TSDBResultSetBlockData(this.columnMetaDataList, this.columnMetaDataList.size());
 	}
 
 	public <T> T unwrap(Class<T> iface) throws SQLException {
@@ -118,21 +127,42 @@ public class TSDBResultSet implements ResultSet {
 	}
 
 	public boolean next() throws SQLException {
-		if (rowData != null) {
-			this.rowData.clear();
-		}
+		if (this.blockwiseFetch) {
+			if (this.blockData.forward()) {
+				return true;
+			}
+
+			int code = this.jniConnector.fetchBlock(this.resultSetPointer, this.blockData);
+			this.blockData.resetCursor();
+
+			if (code == TSDBConstants.JNI_CONNECTION_NULL) {
+				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+			} else if (code == TSDBConstants.JNI_RESULT_SET_NULL) {
+				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_RESULT_SET_NULL));
+			} else if (code == TSDBConstants.JNI_NUM_OF_FIELDS_0) {
+				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_NUM_OF_FIELDS_0));
+			} else if (code == TSDBConstants.JNI_FETCH_END) {
+				return false;
+			}
 
-		int code = this.jniConnector.fetchRow(this.resultSetPointer, this.rowData);
-		if (code == TSDBConstants.JNI_CONNECTION_NULL) {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
-		} else if (code == TSDBConstants.JNI_RESULT_SET_NULL) {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_RESULT_SET_NULL));
-		} else if (code == TSDBConstants.JNI_NUM_OF_FIELDS_0) {
-			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_NUM_OF_FIELDS_0));
-		} else if (code == TSDBConstants.JNI_FETCH_END) {
-			return false;
-		} else {
 			return true;
+		} else {
+			if (rowData != null) {
+				this.rowData.clear();
+			}
+
+			int code = this.jniConnector.fetchRow(this.resultSetPointer, this.rowData);
+			if (code == TSDBConstants.JNI_CONNECTION_NULL) {
+				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
+			} else if (code == TSDBConstants.JNI_RESULT_SET_NULL) {
+				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_RESULT_SET_NULL));
+			} else if (code == TSDBConstants.JNI_NUM_OF_FIELDS_0) {
+				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_NUM_OF_FIELDS_0));
+			} else if (code == TSDBConstants.JNI_FETCH_END) {
+				return false;
+			} else {
+				return true;
+			}
 		}
 	}
 
@@ -155,21 +185,30 @@ public class TSDBResultSet implements ResultSet {
 		String res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return this.blockData.getString(colIndex);
 		}
-		return res;
 	}
 
 	public boolean getBoolean(int columnIndex) throws SQLException {
 		boolean res = false;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+		} else {
+			return this.blockData.getBoolean(colIndex);
 		}
+
 		return res;
 	}
 
@@ -177,66 +216,91 @@ public class TSDBResultSet implements ResultSet {
 		byte res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return (byte) this.blockData.getInt(colIndex);
 		}
-		return res;
 	}
 
 	public short getShort(int columnIndex) throws SQLException {
 		short res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return (short) this.blockData.getInt(colIndex);
 		}
-		return res;
 	}
 
 	public int getInt(int columnIndex) throws SQLException {
 		int res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return this.blockData.getInt(colIndex);
 		}
-		return res;
+
 	}
 
 	public long getLong(int columnIndex) throws SQLException {
 		long res = 0l;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return this.blockData.getLong(colIndex);
 		}
-		return res;
 	}
 
 	public float getFloat(int columnIndex) throws SQLException {
 		float res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return (float) this.blockData.getDouble(colIndex);
 		}
-		return res;
 	}
 
 	public double getDouble(int columnIndex) throws SQLException {
 		double res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
+			}
+			return res;
+		} else {
+			return this.blockData.getDouble(colIndex);
 		}
-		return res;
 	}
 
 	/*
@@ -249,25 +313,11 @@ public class TSDBResultSet implements ResultSet {
 	 */
 	@Deprecated
 	public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
-		BigDecimal res = null;
-		int colIndex = getTrueColumnIndex(columnIndex);
-
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = new BigDecimal(this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType()));
-		}
-		return res;
+		return new BigDecimal(getLong(columnIndex));
 	}
 
 	public byte[] getBytes(int columnIndex) throws SQLException {
-		byte[] res = null;
-		int colIndex = getTrueColumnIndex(columnIndex);
-
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType()).getBytes();
-		}
-		return res;
+		return getString(columnIndex).getBytes();
 	}
 
 	public Date getDate(int columnIndex) throws SQLException {
@@ -284,11 +334,15 @@ public class TSDBResultSet implements ResultSet {
 		Timestamp res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		if (!lastWasNull) {
-			res = this.rowData.getTimestamp(colIndex);
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			if (!lastWasNull) {
+				res = this.rowData.getTimestamp(colIndex);
+			}
+			return res;
+		} else {
+			return this.blockData.getTimestamp(columnIndex);
 		}
-		return res;
 	}
 
 	public InputStream getAsciiStream(int columnIndex) throws SQLException {
@@ -400,8 +454,12 @@ public class TSDBResultSet implements ResultSet {
 	public Object getObject(int columnIndex) throws SQLException {
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		return this.rowData.get(colIndex);
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			return this.rowData.get(colIndex);
+		} else {
+			return this.blockData.get(colIndex);
+		}
 	}
 
 	public Object getObject(String columnLabel) throws SQLException {
@@ -433,8 +491,12 @@ public class TSDBResultSet implements ResultSet {
 	public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		this.lastWasNull = this.rowData.wasNull(colIndex);
-		return new BigDecimal(this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType()));
+		if (!this.blockwiseFetch) {
+			this.lastWasNull = this.rowData.wasNull(colIndex);
+			return new BigDecimal(this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType()));
+		} else {
+			return new BigDecimal(this.blockData.getLong(colIndex));
+		}
 	}
 
 	public BigDecimal getBigDecimal(String columnLabel) 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 8efcac9000..c57f19550d 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
@@ -218,5 +218,4 @@ public class TSDBResultSetRowData {
 	public void setData(ArrayList<Object> data) {
 		this.data = (ArrayList<Object>) data.clone();
 	}
-
 }
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
index 5c6b0545e9..15a978a2fd 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
@@ -81,7 +81,9 @@ public class TSDBStatement implements Statement {
         }
 
         if (!this.connecter.isUpdateQuery(pSql)) {
-            return new TSDBResultSet(this.connecter, resultSetPointer);
+        	TSDBResultSet res = new TSDBResultSet(this.connecter, resultSetPointer);
+            res.setBlockWiseFetch(true);
+            return res;
         } else {
             this.connecter.freeResultSet(pSql);
             return null;
@@ -136,7 +138,7 @@ public class TSDBStatement implements Statement {
     }
 
     public void setMaxRows(int max) throws SQLException {
-        // always set maxRows to zero, meaning unlimitted rows in a resultSet
+        // always set maxRows to zero, meaning unlimited rows in a resultSet
     }
 
     public void setEscapeProcessing(boolean enable) throws SQLException {

From 75d4d18c74f549bd869ffe0d11c88a8606e42b16 Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 18 Nov 2020 18:04:26 +0800
Subject: [PATCH 08/41] [TD-1590]<test>: a test case for JDBC failover

---
 .../com/taosdata/jdbc/cases/FailOverTest.java | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
new file mode 100644
index 0000000000..aa0f3946fd
--- /dev/null
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
@@ -0,0 +1,53 @@
+package com.taosdata.jdbc.cases;
+
+import com.taosdata.jdbc.lib.TSDBCommon;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+public class FailOverTest {
+
+    private Connection conn;
+    private static final String host = "localhost";
+
+    @Before
+    public void before() {
+        try {
+            Class.forName("com.taosdata.jdbc.TSDBDriver");
+            conn = TSDBCommon.getConn(host);
+            TSDBCommon.createDatabase(conn, "failover_test");
+        } catch (ClassNotFoundException | SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testFailOver() {
+        try (Statement stmt = conn.createStatement()) {
+            ResultSet resultSet = stmt.executeQuery("select server_status()");
+            while (true) {
+                resultSet.next();
+                int status = resultSet.getInt("server_status()");
+                System.out.println(">>>>>>>>> status : " + status);
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @After
+    public void after() {
+        try {
+            if (conn != null)
+                conn.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+}

From 88232e2e35a25ee9d9a61d71cbeb9294ae2c4d0b Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 18 Nov 2020 18:05:50 +0800
Subject: [PATCH 09/41] change

---
 .../test/java/com/taosdata/jdbc/cases/FailOverTest.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
index aa0f3946fd..eab7ba3ea7 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
@@ -5,21 +5,18 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 
 public class FailOverTest {
 
     private Connection conn;
-    private static final String host = "localhost";
 
     @Before
     public void before() {
         try {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
-            conn = TSDBCommon.getConn(host);
+            final String url = "jdbc:TAOS://:/?user=root&password=taosdata";
+            conn = DriverManager.getConnection(url);
             TSDBCommon.createDatabase(conn, "failover_test");
         } catch (ClassNotFoundException | SQLException e) {
             e.printStackTrace();

From 7be93e19085a0c42376d59ad86d2961d8741e15a Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Wed, 18 Nov 2020 18:16:48 +0800
Subject: [PATCH 10/41] change

---
 .../com/taosdata/jdbc/cases/FailOverTest.java | 47 +++++++------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
index eab7ba3ea7..dd223777d9 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
@@ -1,50 +1,37 @@
 package com.taosdata.jdbc.cases;
 
-import com.taosdata.jdbc.lib.TSDBCommon;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
 
 public class FailOverTest {
 
-    private Connection conn;
-
-    @Before
-    public void before() {
-        try {
-            Class.forName("com.taosdata.jdbc.TSDBDriver");
-            final String url = "jdbc:TAOS://:/?user=root&password=taosdata";
-            conn = DriverManager.getConnection(url);
-            TSDBCommon.createDatabase(conn, "failover_test");
-        } catch (ClassNotFoundException | SQLException e) {
-            e.printStackTrace();
-        }
-    }
+    private static final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
 
     @Test
-    public void testFailOver() {
-        try (Statement stmt = conn.createStatement()) {
-            ResultSet resultSet = stmt.executeQuery("select server_status()");
-            while (true) {
+    public void testFailOver() throws ClassNotFoundException {
+        Class.forName("com.taosdata.jdbc.TSDBDriver");
+        final String url = "jdbc:TAOS://:/?user=root&password=taosdata";
+
+        while (true) {
+            try (Connection conn = DriverManager.getConnection(url)) {
+                Statement stmt = conn.createStatement();
+                ResultSet resultSet = stmt.executeQuery("select server_status()");
                 resultSet.next();
                 int status = resultSet.getInt("server_status()");
-                System.out.println(">>>>>>>>> status : " + status);
+                System.out.println(">>>>>>>>>" + sdf.format(new Date()) + " status : " + status);
+                stmt.close();
+                TimeUnit.SECONDS.sleep(5);
+            } catch (SQLException | InterruptedException e) {
+                e.printStackTrace();
             }
-        } catch (SQLException e) {
-            e.printStackTrace();
         }
 
     }
 
-    @After
-    public void after() {
-        try {
-            if (conn != null)
-                conn.close();
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }
-    }
 }

From 07bd21e6c6f099729ac8dc39de832600a2f1e532 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 18 Nov 2020 18:33:22 +0800
Subject: [PATCH 11/41] [TD-2070]

---
 .../taosdata/jdbc/TSDBResultSetBlockData.java | 650 ++++++++++++++++++
 1 file changed, 650 insertions(+)
 create mode 100644 src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java

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
new file mode 100644
index 0000000000..77e53f5731
--- /dev/null
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBResultSetBlockData.java
@@ -0,0 +1,650 @@
+/***************************************************************************
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *****************************************************************************/
+package com.taosdata.jdbc;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+import java.nio.ShortBuffer;
+import java.sql.SQLDataException;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class TSDBResultSetBlockData {
+	private int numOfRows = 0;
+	private int numOfCols = 0;
+
+	private int rowIndex = 0;
+
+	private List<ColumnMetaData> columnMetaDataList;
+	private ArrayList<Object> colData = null;
+
+	public TSDBResultSetBlockData(List<ColumnMetaData> colMeta, int numOfCols) {
+		this.columnMetaDataList = colMeta;
+		this.setNumOfCols(numOfCols);
+	}
+
+	public TSDBResultSetBlockData() {
+		this.colData = new ArrayList<Object>();
+		this.setNumOfCols(0);
+	}
+
+	public void clear() {
+		if (this.colData != null) {
+			this.colData.clear();
+		}
+
+		if (this.numOfCols == 0) {
+			return;
+		}
+
+		this.colData = new ArrayList<Object>(numOfCols);
+		this.colData.addAll(Collections.nCopies(this.numOfCols, null));
+	}
+
+	public boolean wasNull(int col) {
+		return colData.get(col) == null;
+	}
+
+	public int getNumOfRows() {
+		return this.numOfRows;
+	}
+
+	public void setNumOfRows(int numOfRows) {
+		this.numOfRows = numOfRows;
+	}
+
+	public int getNumOfCols() {
+		return numOfCols;
+	}
+
+	public void setNumOfCols(int numOfCols) {
+		this.numOfCols = numOfCols;
+		this.clear();
+	}
+
+	public void setColumnData(int col, byte val) {
+		this.colData.set(col, val);
+	}
+
+	public boolean hasMore() {
+		return this.rowIndex < this.numOfRows;
+	}
+
+	public boolean forward() {
+		this.rowIndex++;
+		return (this.rowIndex < this.numOfRows);
+	}
+
+	public void resetCursor() {
+		this.rowIndex = 0;
+	}
+
+	public void setBoolean(int col, boolean value) {
+		colData.set(col, value);
+	}
+
+	public void setByteArray(int col, int length, byte[] value) {
+		try {
+			switch (this.columnMetaDataList.get(col).getColType()) {
+			case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				buf.order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
+				this.colData.set(col, buf);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				buf.order(ByteOrder.LITTLE_ENDIAN);
+				this.colData.set(col, buf);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				ShortBuffer sb = buf.order(ByteOrder.LITTLE_ENDIAN).asShortBuffer();
+				this.colData.set(col, sb);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_INT: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				IntBuffer ib = buf.order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
+				this.colData.set(col, ib);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				LongBuffer lb = buf.order(ByteOrder.LITTLE_ENDIAN).asLongBuffer();
+				this.colData.set(col, lb);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				FloatBuffer fb = buf.order(ByteOrder.LITTLE_ENDIAN).asFloatBuffer();
+				this.colData.set(col, fb);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				DoubleBuffer db = buf.order(ByteOrder.LITTLE_ENDIAN).asDoubleBuffer();
+				this.colData.set(col, db);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				buf.order(ByteOrder.LITTLE_ENDIAN);
+				this.colData.set(col, buf);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				LongBuffer lb = buf.order(ByteOrder.LITTLE_ENDIAN).asLongBuffer();
+				this.colData.set(col, lb);
+				break;
+			}
+			case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
+				ByteBuffer buf = ByteBuffer.wrap(value, 0, length);
+				buf.order(ByteOrder.LITTLE_ENDIAN);
+				this.colData.set(col, buf);
+				break;
+			}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	class NullType {
+		public String toString() {
+			return new String("null");
+		}
+	}
+
+	/**
+	 * 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);
+		if (obj == null) {
+			return new NullType().toString();
+		}
+
+		return obj.toString();
+	}
+
+	private boolean isBooleanNull(byte val) {
+		return val == 0x2;
+	}
+
+	private boolean isTinyIntNull(byte val) {
+		return val == 0x80;
+	}
+
+	private boolean isSmallIntNull(short val) {
+		return val == 0x8000;
+	}
+
+	private boolean isIntNull(int val) {
+		return val == 0x80000000L;
+	}
+
+	private boolean isBigIntNull(long val) {
+		return val == 0x8000000000000000L;
+	}
+
+	private boolean isFloatNull(float val) {
+		return Float.isNaN(val);
+	}
+
+	private boolean isDoubleNull(double val) {
+		return Double.isNaN(val);
+	}
+
+	private boolean isBinaryNull(byte[] val, int length) {
+		return val[0] == 0xFF && length == 1;
+	}
+
+	private boolean isNcharNull(byte[] val, int length) {
+		return (val[0] & val[1] & val[2] & val[3]) == 0xFF && length == 4;
+	}
+
+	public int getInt(int col) {
+		Object obj = get(col);
+		if (obj == null) {
+			return 0;
+		}
+
+		int type = this.columnMetaDataList.get(col).getColType();
+		switch (type) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+		case TSDBConstants.TSDB_DATA_TYPE_INT: {
+			return (int) obj;
+		}
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+			return ((Long) obj).intValue();
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+			return ((Double) obj).intValue();
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+			return Integer.parseInt((String) obj);
+		}
+		}
+
+		return 0;
+	}
+
+	public boolean getBoolean(int col) throws SQLException {
+		Object obj = get(col);
+		if (obj == null) {
+			return Boolean.FALSE;
+		}
+
+		int type = this.columnMetaDataList.get(col).getColType();
+		switch (type) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
+		case TSDBConstants.TSDB_DATA_TYPE_INT: {
+			return ((int) obj == 0L)? Boolean.FALSE:Boolean.TRUE;
+		}
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+			return (((Long) obj) == 0L)? Boolean.FALSE:Boolean.TRUE;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
+		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+			return (((Double) obj) == 0)? Boolean.FALSE:Boolean.TRUE;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
+		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+			if ("TRUE".compareToIgnoreCase((String) obj) == 0) {
+				return Boolean.TRUE;
+			} else if ("FALSE".compareToIgnoreCase((String) obj) == 0) {
+				return Boolean.TRUE;
+			} else {
+				throw new SQLDataException();
+			}
+		}
+		}
+
+		return Boolean.FALSE;
+	}
+
+	public long getLong(int col) throws SQLException {
+		int fieldSize = this.columnMetaDataList.get(col).getColSize();
+		ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+
+		switch (this.columnMetaDataList.get(col).getColType()) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
+			byte val = bb.get(this.rowIndex);
+			if (isBooleanNull(val)) {
+				return 0;
+			}
+
+			return (val == 0x0) ? 0 : 1;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
+			byte val = bb.get(this.rowIndex);
+			if (isTinyIntNull(val)) {
+				return 0;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
+			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
+			short val = sb.get(this.rowIndex);
+			if (isSmallIntNull(val)) {
+				return 0;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_INT: {
+			IntBuffer ib = (IntBuffer) this.colData.get(col);
+			int val = ib.get(this.rowIndex);
+			if (isIntNull(val)) {
+				return 0;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
+			LongBuffer lb = (LongBuffer) this.colData.get(col);
+			long val = lb.get(this.rowIndex);
+			if (isBigIntNull(val)) {
+				return 0;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
+			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
+			float val = fb.get(this.rowIndex);
+			if (isFloatNull(val)) {
+				return 0;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
+			double val = lb.get(this.rowIndex);
+			if (isDoubleNull(val)) {
+				return 0;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+			bb.position(fieldSize * this.rowIndex);
+
+			int length = bb.getShort();
+
+			byte[] dest = new byte[length];
+			bb.get(dest, 0, length);
+			if (isBinaryNull(dest, length)) {
+				return 0;
+			}
+
+			return Long.parseLong(new String(dest));
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
+			bb.position(fieldSize * this.rowIndex);
+
+			int length = bb.getShort();
+
+			byte[] dest = new byte[length];
+			bb.get(dest, 0, length);
+			if (isNcharNull(dest, length)) {
+				return 0;
+			}
+
+			try {
+				return Long.parseLong(new String(dest, TaosGlobalConfig.getCharset()));
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+		}
+		}
+
+		return 0;
+	}
+
+	public Timestamp getTimestamp(int col) {
+		try {
+			return new Timestamp(getLong(col));
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+
+	public double getDouble(int col) {
+		int fieldSize = this.columnMetaDataList.get(col).getColSize();
+		ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+
+		switch (this.columnMetaDataList.get(col).getColType()) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
+			byte val = bb.get(this.rowIndex);
+			if (isBooleanNull(val)) {
+				return 0;
+			}
+
+			return (val == 0x0) ? 0 : 1;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
+			byte val = bb.get(this.rowIndex);
+			if (isTinyIntNull(val)) {
+				return 0;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
+			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
+			short val = sb.get(this.rowIndex);
+			if (isSmallIntNull(val)) {
+				return 0;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_INT: {
+			IntBuffer ib = (IntBuffer) this.colData.get(col);
+			int val = ib.get(this.rowIndex);
+			if (isIntNull(val)) {
+				return 0;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
+			LongBuffer lb = (LongBuffer) this.colData.get(col);
+			long val = lb.get(this.rowIndex);
+			if (isBigIntNull(val)) {
+				return 0;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
+			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
+			float val = fb.get(this.rowIndex);
+			if (isFloatNull(val)) {
+				return 0;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
+			double val = lb.get(this.rowIndex);
+			if (isDoubleNull(val)) {
+				return 0;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+			bb.position(fieldSize * this.rowIndex);
+
+			int length = bb.getShort();
+
+			byte[] dest = new byte[length];
+			bb.get(dest, 0, length);
+			if (isBinaryNull(dest, length)) {
+				return 0;
+			}
+
+			return Double.parseDouble(new String(dest));
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
+			bb.position(fieldSize * this.rowIndex);
+
+			int length = bb.getShort();
+
+			byte[] dest = new byte[length];
+			bb.get(dest, 0, length);
+			if (isNcharNull(dest, length)) {
+				return 0;
+			}
+
+			try {
+				return Double.parseDouble(new String(dest, TaosGlobalConfig.getCharset()));
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+		}
+		}
+
+		return 0;
+	}
+
+	public Object get(int col) {
+		int fieldSize = this.columnMetaDataList.get(col).getColSize();
+
+		switch (this.columnMetaDataList.get(col).getColType()) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
+			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+
+			byte val = bb.get(this.rowIndex);
+			if (isBooleanNull(val)) {
+				return null;
+			}
+
+			return (val == 0x0) ? Boolean.FALSE : Boolean.TRUE;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
+			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+
+			byte val = bb.get(this.rowIndex);
+			if (isTinyIntNull(val)) {
+				return null;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
+			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
+			short val = sb.get(this.rowIndex);
+			if (isSmallIntNull(val)) {
+				return null;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_INT: {
+			IntBuffer ib = (IntBuffer) this.colData.get(col);
+			int val = ib.get(this.rowIndex);
+			if (isIntNull(val)) {
+				return null;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
+			LongBuffer lb = (LongBuffer) this.colData.get(col);
+			long val = lb.get(this.rowIndex);
+			if (isBigIntNull(val)) {
+				return null;
+			}
+
+			return (long) val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
+			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
+			float val = fb.get(this.rowIndex);
+			if (isFloatNull(val)) {
+				return null;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
+			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
+			double val = lb.get(this.rowIndex);
+			if (isDoubleNull(val)) {
+				return null;
+			}
+
+			return val;
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
+			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+			bb.position(fieldSize * this.rowIndex);
+
+			int length = bb.getShort();
+
+			byte[] dest = new byte[length];
+			bb.get(dest, 0, length);
+			if (isBinaryNull(dest, length)) {
+				return null;
+			}
+
+			return new String(dest);
+		}
+
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
+			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
+			bb.position(fieldSize * this.rowIndex);
+
+			int length = bb.getShort();
+
+			byte[] dest = new byte[length];
+			bb.get(dest, 0, length);
+			if (isNcharNull(dest, length)) {
+				return null;
+			}
+
+			try {
+				return new String(dest, TaosGlobalConfig.getCharset());
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+		}
+		}
+
+		return 0;
+	}
+}

From 65e904b7a760ecb370a9db7cc03c3fc7c2e40cd4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 18 Nov 2020 18:58:50 +0800
Subject: [PATCH 12/41] [TD-225] fix memory leaks.

---
 .../taosdata/jdbc/TSDBResultSetBlockData.java | 237 ++++--------------
 1 file changed, 46 insertions(+), 191 deletions(-)

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 77e53f5731..50ebe283e2 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
@@ -224,11 +224,19 @@ public class TSDBResultSetBlockData {
 	}
 
 	private boolean isBinaryNull(byte[] val, int length) {
-		return val[0] == 0xFF && length == 1;
+		if (length != 1) {
+			return false;
+		}
+		
+		return val[0] == 0xFF;
 	}
 
 	private boolean isNcharNull(byte[] val, int length) {
-		return (val[0] & val[1] & val[2] & val[3]) == 0xFF && length == 4;
+		if (length != 4) {
+			return false;
+		}
+		
+		return (val[0] & val[1] & val[2] & val[3]) == 0xFF ;
 	}
 
 	public int getInt(int col) {
@@ -304,109 +312,32 @@ public class TSDBResultSetBlockData {
 	}
 
 	public long getLong(int col) throws SQLException {
-		int fieldSize = this.columnMetaDataList.get(col).getColSize();
-		ByteBuffer bb = (ByteBuffer) this.colData.get(col);
-
-		switch (this.columnMetaDataList.get(col).getColType()) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
-			byte val = bb.get(this.rowIndex);
-			if (isBooleanNull(val)) {
-				return 0;
-			}
-
-			return (val == 0x0) ? 0 : 1;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
-			byte val = bb.get(this.rowIndex);
-			if (isTinyIntNull(val)) {
-				return 0;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
-			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
-			short val = sb.get(this.rowIndex);
-			if (isSmallIntNull(val)) {
-				return 0;
-			}
-
-			return val;
+		Object obj = get(col);
+		if (obj == null) {
+			return 0;
 		}
 
+		int type = this.columnMetaDataList.get(col).getColType();
+		switch (type) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
 		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			IntBuffer ib = (IntBuffer) this.colData.get(col);
-			int val = ib.get(this.rowIndex);
-			if (isIntNull(val)) {
-				return 0;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
-			LongBuffer lb = (LongBuffer) this.colData.get(col);
-			long val = lb.get(this.rowIndex);
-			if (isBigIntNull(val)) {
-				return 0;
-			}
-
-			return (long) val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
-			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
-			float val = fb.get(this.rowIndex);
-			if (isFloatNull(val)) {
-				return 0;
-			}
-
-			return (long) val;
+			return (int) obj;
+		}
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+			return (long) obj;
 		}
 
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
 		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
-			double val = lb.get(this.rowIndex);
-			if (isDoubleNull(val)) {
-				return 0;
-			}
-
-			return (long) val;
+			return ((Double) obj).longValue();
 		}
 
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
 		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			bb.position(fieldSize * this.rowIndex);
-
-			int length = bb.getShort();
-
-			byte[] dest = new byte[length];
-			bb.get(dest, 0, length);
-			if (isBinaryNull(dest, length)) {
-				return 0;
-			}
-
-			return Long.parseLong(new String(dest));
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
-			bb.position(fieldSize * this.rowIndex);
-
-			int length = bb.getShort();
-
-			byte[] dest = new byte[length];
-			bb.get(dest, 0, length);
-			if (isNcharNull(dest, length)) {
-				return 0;
-			}
-
-			try {
-				return Long.parseLong(new String(dest, TaosGlobalConfig.getCharset()));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+			return Long.parseLong((String) obj);
 		}
 		}
 
@@ -424,109 +355,32 @@ public class TSDBResultSetBlockData {
 	}
 
 	public double getDouble(int col) {
-		int fieldSize = this.columnMetaDataList.get(col).getColSize();
-		ByteBuffer bb = (ByteBuffer) this.colData.get(col);
-
-		switch (this.columnMetaDataList.get(col).getColType()) {
-		case TSDBConstants.TSDB_DATA_TYPE_BOOL: {
-			byte val = bb.get(this.rowIndex);
-			if (isBooleanNull(val)) {
-				return 0;
-			}
-
-			return (val == 0x0) ? 0 : 1;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_TINYINT: {
-			byte val = bb.get(this.rowIndex);
-			if (isTinyIntNull(val)) {
-				return 0;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
-			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
-			short val = sb.get(this.rowIndex);
-			if (isSmallIntNull(val)) {
-				return 0;
-			}
-
-			return val;
+		Object obj = get(col);
+		if (obj == null) {
+			return 0;
 		}
 
+		int type = this.columnMetaDataList.get(col).getColType();
+		switch (type) {
+		case TSDBConstants.TSDB_DATA_TYPE_BOOL:
+		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
+		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
 		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			IntBuffer ib = (IntBuffer) this.colData.get(col);
-			int val = ib.get(this.rowIndex);
-			if (isIntNull(val)) {
-				return 0;
-			}
-
-			return val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP:
-		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
-			LongBuffer lb = (LongBuffer) this.colData.get(col);
-			long val = lb.get(this.rowIndex);
-			if (isBigIntNull(val)) {
-				return 0;
-			}
-
-			return (long) val;
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
-			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
-			float val = fb.get(this.rowIndex);
-			if (isFloatNull(val)) {
-				return 0;
-			}
-
-			return (long) val;
+			return (int) obj;
+		}
+		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
+		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
+			return (long) obj;
 		}
 
+		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
 		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
-			double val = lb.get(this.rowIndex);
-			if (isDoubleNull(val)) {
-				return 0;
-			}
-
-			return (long) val;
+			return (double) obj;
 		}
 
+		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
 		case TSDBConstants.TSDB_DATA_TYPE_BINARY: {
-			bb.position(fieldSize * this.rowIndex);
-
-			int length = bb.getShort();
-
-			byte[] dest = new byte[length];
-			bb.get(dest, 0, length);
-			if (isBinaryNull(dest, length)) {
-				return 0;
-			}
-
-			return Double.parseDouble(new String(dest));
-		}
-
-		case TSDBConstants.TSDB_DATA_TYPE_NCHAR: {
-			bb.position(fieldSize * this.rowIndex);
-
-			int length = bb.getShort();
-
-			byte[] dest = new byte[length];
-			bb.get(dest, 0, length);
-			if (isNcharNull(dest, length)) {
-				return 0;
-			}
-
-			try {
-				return Double.parseDouble(new String(dest, TaosGlobalConfig.getCharset()));
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+			return Double.parseDouble((String) obj);
 		}
 		}
 
@@ -638,7 +492,8 @@ public class TSDBResultSetBlockData {
 			}
 
 			try {
-				return new String(dest, TaosGlobalConfig.getCharset());
+				String ss = TaosGlobalConfig.getCharset();
+				return new String(dest, ss);
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}

From 7b7fc4df86e736068a37f89bcb6ff539cb032fbc Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 18 Nov 2020 21:41:15 +0800
Subject: [PATCH 13/41] [TD-225]

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

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 869f57f117..984061e70f 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5336,8 +5336,11 @@ static char *getArithemicInputSrc(void *param, const char *name, int32_t colId)
 }
 
 static void doSecondaryArithmeticProcess(SQuery* pQuery) {
-  SArithmeticSupport arithSup = {0};
+  if (pQuery->numOfExpr2 == 0) {
+    return;
+  }
 
+  SArithmeticSupport arithSup = {0};
   tFilePage **data = calloc(pQuery->numOfExpr2, POINTER_BYTES);
   for (int32_t i = 0; i < pQuery->numOfExpr2; ++i) {
     int32_t bytes = pQuery->pExpr2[i].bytes;

From 4dff524a5bd9a68f66827f41dbb5ac70cee9c974 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 18 Nov 2020 23:49:44 +0800
Subject: [PATCH 14/41] [TD-225] refactor jdbc driver

---
 .../com/taosdata/jdbc/ColumnMetaData.java     |   8 +-
 .../java/com/taosdata/jdbc/TSDBDriver.java    |  29 ++--
 .../java/com/taosdata/jdbc/TSDBResultSet.java |  40 ++---
 .../taosdata/jdbc/TSDBResultSetBlockData.java | 140 +++++++++---------
 .../java/com/taosdata/jdbc/TSDBStatement.java |  52 +++----
 5 files changed, 136 insertions(+), 133 deletions(-)

diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
index 5c7f80c715..633fdcd5ab 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/ColumnMetaData.java
@@ -16,10 +16,10 @@ package com.taosdata.jdbc;
 
 public class ColumnMetaData {
 
-	int colType = 0;
-	String colName = null;
-	int colSize = -1;
-	int colIndex = 0;
+	private int colType = 0;
+	private String colName = null;
+	private int colSize = -1;
+	private int colIndex = 0;
 
 	public int getColSize() {
 		return colSize;
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 8fb607483b..4dc48c84b3 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
@@ -86,6 +86,11 @@ public class TSDBDriver extends AbstractTaosDriver {
      */
     public static final String PROPERTY_KEY_CHARSET = "charset";
 
+    /**
+     * fetch data from native function in a batch model
+     */
+    public static final String PROPERTY_KEY_BATCH_LOAD = "batch";
+    
     private TSDBDatabaseMetaData dbMetaData = null;
 
     static {
@@ -172,26 +177,21 @@ public class TSDBDriver extends AbstractTaosDriver {
             url = url.substring(0, index);
             StringTokenizer queryParams = new StringTokenizer(paramString, "&");
             while (queryParams.hasMoreElements()) {
-                String parameterValuePair = queryParams.nextToken();
-                int indexOfEqual = parameterValuePair.indexOf("=");
-                String parameter = null;
-                String value = null;
-                if (indexOfEqual != -1) {
-                    parameter = parameterValuePair.substring(0, indexOfEqual);
-                    if (indexOfEqual + 1 < parameterValuePair.length()) {
-                        value = parameterValuePair.substring(indexOfEqual + 1);
-                    }
-                }
-                if ((value != null && value.length() > 0) && (parameter != null && parameter.length() > 0)) {
-                    urlProps.setProperty(parameter, value);
+                String oneToken = queryParams.nextToken();
+                String[] pair = oneToken.split("=");
+                
+                if ((pair[0] != null && pair[0].trim().length() > 0) && (pair[1] != null && pair[1].trim().length() > 0)) {
+                    urlProps.setProperty(pair[0].trim(), pair[1].trim());
                 }
             }
         }
+        
         // parse Product Name
         String dbProductName = url.substring(0, beginningOfSlashes);
         dbProductName = dbProductName.substring(dbProductName.indexOf(":") + 1);
         dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
-        // parse dbname
+        
+        // parse database name
         url = url.substring(beginningOfSlashes + 2);
         int indexOfSlash = url.indexOf("/");
         if (indexOfSlash != -1) {
@@ -200,6 +200,7 @@ public class TSDBDriver extends AbstractTaosDriver {
             }
             url = url.substring(0, indexOfSlash);
         }
+        
         // parse port
         int indexOfColon = url.indexOf(":");
         if (indexOfColon != -1) {
@@ -208,9 +209,11 @@ public class TSDBDriver extends AbstractTaosDriver {
             }
             url = url.substring(0, indexOfColon);
         }
+        
         if (url != null && url.length() > 0 && url.trim().length() > 0) {
             urlProps.setProperty(TSDBDriver.PROPERTY_KEY_HOST, url);
         }
+        
         this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, urlProps.getProperty(TSDBDriver.PROPERTY_KEY_USER));
         return urlProps;
     }
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 56c1719ddb..84a3f58f46 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
@@ -49,7 +49,7 @@ public class TSDBResultSet implements ResultSet {
 	private TSDBResultSetRowData rowData;
 	private TSDBResultSetBlockData blockData;
 
-	private boolean blockwiseFetch = false;
+	private boolean batchFetch = false;
 	private boolean lastWasNull = false;
 	private final int COLUMN_INDEX_START_VALUE = 1;
 
@@ -71,8 +71,12 @@ public class TSDBResultSet implements ResultSet {
 		this.resultSetPointer = resultSetPointer;
 	}
 
-	public void setBlockWiseFetch(boolean fetchBlock) {
-		this.blockwiseFetch = fetchBlock;
+	public void setBatchFetch(boolean batchFetch) {
+		this.batchFetch = batchFetch;
+	}
+	
+	public Boolean getBatchFetch() {
+		return this.batchFetch;
 	}
 
 	public List<ColumnMetaData> getColumnMetaDataList() {
@@ -102,8 +106,8 @@ public class TSDBResultSet implements ResultSet {
 	public TSDBResultSet() {
 	}
 
-	public TSDBResultSet(TSDBJNIConnector connecter, long resultSetPointer) throws SQLException {
-		this.jniConnector = connecter;
+	public TSDBResultSet(TSDBJNIConnector connector, long resultSetPointer) throws SQLException {
+		this.jniConnector = connector;
 		this.resultSetPointer = resultSetPointer;
 		int code = this.jniConnector.getSchemaMetaData(this.resultSetPointer, this.columnMetaDataList);
 		if (code == TSDBConstants.JNI_CONNECTION_NULL) {
@@ -127,13 +131,13 @@ public class TSDBResultSet implements ResultSet {
 	}
 
 	public boolean next() throws SQLException {
-		if (this.blockwiseFetch) {
+		if (this.getBatchFetch()) {
 			if (this.blockData.forward()) {
 				return true;
 			}
 
 			int code = this.jniConnector.fetchBlock(this.resultSetPointer, this.blockData);
-			this.blockData.resetCursor();
+			this.blockData.reset();
 
 			if (code == TSDBConstants.JNI_CONNECTION_NULL) {
 				throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
@@ -185,7 +189,7 @@ public class TSDBResultSet implements ResultSet {
 		String res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getString(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -200,7 +204,7 @@ public class TSDBResultSet implements ResultSet {
 		boolean res = false;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getBoolean(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -216,7 +220,7 @@ public class TSDBResultSet implements ResultSet {
 		byte res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = (byte) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -231,7 +235,7 @@ public class TSDBResultSet implements ResultSet {
 		short res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = (short) this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -246,7 +250,7 @@ public class TSDBResultSet implements ResultSet {
 		int res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getInt(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -262,7 +266,7 @@ public class TSDBResultSet implements ResultSet {
 		long res = 0l;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -277,7 +281,7 @@ public class TSDBResultSet implements ResultSet {
 		float res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getFloat(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -292,7 +296,7 @@ public class TSDBResultSet implements ResultSet {
 		double res = 0;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getDouble(colIndex, this.columnMetaDataList.get(colIndex).getColType());
@@ -334,7 +338,7 @@ public class TSDBResultSet implements ResultSet {
 		Timestamp res = null;
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			if (!lastWasNull) {
 				res = this.rowData.getTimestamp(colIndex);
@@ -454,7 +458,7 @@ public class TSDBResultSet implements ResultSet {
 	public Object getObject(int columnIndex) throws SQLException {
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			return this.rowData.get(colIndex);
 		} else {
@@ -491,7 +495,7 @@ public class TSDBResultSet implements ResultSet {
 	public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
 		int colIndex = getTrueColumnIndex(columnIndex);
 
-		if (!this.blockwiseFetch) {
+		if (!this.getBatchFetch()) {
 			this.lastWasNull = this.rowData.wasNull(colIndex);
 			return new BigDecimal(this.rowData.getLong(colIndex, this.columnMetaDataList.get(colIndex).getColType()));
 		} else {
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 50ebe283e2..7373890428 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
@@ -56,13 +56,6 @@ public class TSDBResultSetBlockData {
 		if (this.numOfCols == 0) {
 			return;
 		}
-
-		this.colData = new ArrayList<Object>(numOfCols);
-		this.colData.addAll(Collections.nCopies(this.numOfCols, null));
-	}
-
-	public boolean wasNull(int col) {
-		return colData.get(col) == null;
 	}
 
 	public int getNumOfRows() {
@@ -82,20 +75,19 @@ public class TSDBResultSetBlockData {
 		this.clear();
 	}
 
-	public void setColumnData(int col, byte val) {
-		this.colData.set(col, val);
-	}
-
 	public boolean hasMore() {
 		return this.rowIndex < this.numOfRows;
 	}
 
 	public boolean forward() {
-		this.rowIndex++;
-		return (this.rowIndex < this.numOfRows);
+		if (this.rowIndex > this.numOfRows) {
+			return false;
+		}
+
+		return ((++this.rowIndex) < this.numOfRows);
 	}
 
-	public void resetCursor() {
+	public void reset() {
 		this.rowIndex = 0;
 	}
 
@@ -172,10 +164,58 @@ public class TSDBResultSetBlockData {
 		}
 	}
 
-	class NullType {
+	private static class NullType {
+		private static final byte NULL_BOOL_VAL = 0x2;
+		private static final String NULL_STR = "null";
+		
 		public String toString() {
-			return new String("null");
+			return NullType.NULL_STR;
 		}
+
+		public static boolean isBooleanNull(byte val) {
+			return val == NullType.NULL_BOOL_VAL;
+		}
+
+		private static boolean isTinyIntNull(byte val) {
+			return val == Byte.MIN_VALUE;
+		}
+
+		private static boolean isSmallIntNull(short val) {
+			return val == Short.MIN_VALUE;
+		}
+
+		private static boolean isIntNull(int val) {
+			return val == Integer.MIN_VALUE;
+		}
+
+		private static boolean isBigIntNull(long val) {
+			return val == Long.MIN_VALUE;
+		}
+
+		private static boolean isFloatNull(float val) {
+			return Float.isNaN(val);
+		}
+
+		private static boolean isDoubleNull(double val) {
+			return Double.isNaN(val);
+		}
+
+		private static boolean isBinaryNull(byte[] val, int length) {
+			if (length != Byte.BYTES) {
+				return false;
+			}
+
+			return val[0] == 0xFF;
+		}
+
+		private static boolean isNcharNull(byte[] val, int length) {
+			if (length != Integer.BYTES) {
+				return false;
+			}
+
+			return (val[0] & val[1] & val[2] & val[3]) == 0xFF;
+		}
+
 	}
 
 	/**
@@ -195,50 +235,6 @@ public class TSDBResultSetBlockData {
 		return obj.toString();
 	}
 
-	private boolean isBooleanNull(byte val) {
-		return val == 0x2;
-	}
-
-	private boolean isTinyIntNull(byte val) {
-		return val == 0x80;
-	}
-
-	private boolean isSmallIntNull(short val) {
-		return val == 0x8000;
-	}
-
-	private boolean isIntNull(int val) {
-		return val == 0x80000000L;
-	}
-
-	private boolean isBigIntNull(long val) {
-		return val == 0x8000000000000000L;
-	}
-
-	private boolean isFloatNull(float val) {
-		return Float.isNaN(val);
-	}
-
-	private boolean isDoubleNull(double val) {
-		return Double.isNaN(val);
-	}
-
-	private boolean isBinaryNull(byte[] val, int length) {
-		if (length != 1) {
-			return false;
-		}
-		
-		return val[0] == 0xFF;
-	}
-
-	private boolean isNcharNull(byte[] val, int length) {
-		if (length != 4) {
-			return false;
-		}
-		
-		return (val[0] & val[1] & val[2] & val[3]) == 0xFF ;
-	}
-
 	public int getInt(int col) {
 		Object obj = get(col);
 		if (obj == null) {
@@ -284,16 +280,16 @@ public class TSDBResultSetBlockData {
 		case TSDBConstants.TSDB_DATA_TYPE_TINYINT:
 		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT:
 		case TSDBConstants.TSDB_DATA_TYPE_INT: {
-			return ((int) obj == 0L)? Boolean.FALSE:Boolean.TRUE;
+			return ((int) obj == 0L) ? Boolean.FALSE : Boolean.TRUE;
 		}
 		case TSDBConstants.TSDB_DATA_TYPE_BIGINT:
 		case TSDBConstants.TSDB_DATA_TYPE_TIMESTAMP: {
-			return (((Long) obj) == 0L)? Boolean.FALSE:Boolean.TRUE;
+			return (((Long) obj) == 0L) ? Boolean.FALSE : Boolean.TRUE;
 		}
 
 		case TSDBConstants.TSDB_DATA_TYPE_FLOAT:
 		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
-			return (((Double) obj) == 0)? Boolean.FALSE:Boolean.TRUE;
+			return (((Double) obj) == 0) ? Boolean.FALSE : Boolean.TRUE;
 		}
 
 		case TSDBConstants.TSDB_DATA_TYPE_NCHAR:
@@ -395,7 +391,7 @@ public class TSDBResultSetBlockData {
 			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
 
 			byte val = bb.get(this.rowIndex);
-			if (isBooleanNull(val)) {
+			if (NullType.isBooleanNull(val)) {
 				return null;
 			}
 
@@ -406,7 +402,7 @@ public class TSDBResultSetBlockData {
 			ByteBuffer bb = (ByteBuffer) this.colData.get(col);
 
 			byte val = bb.get(this.rowIndex);
-			if (isTinyIntNull(val)) {
+			if (NullType.isTinyIntNull(val)) {
 				return null;
 			}
 
@@ -416,7 +412,7 @@ public class TSDBResultSetBlockData {
 		case TSDBConstants.TSDB_DATA_TYPE_SMALLINT: {
 			ShortBuffer sb = (ShortBuffer) this.colData.get(col);
 			short val = sb.get(this.rowIndex);
-			if (isSmallIntNull(val)) {
+			if (NullType.isSmallIntNull(val)) {
 				return null;
 			}
 
@@ -426,7 +422,7 @@ public class TSDBResultSetBlockData {
 		case TSDBConstants.TSDB_DATA_TYPE_INT: {
 			IntBuffer ib = (IntBuffer) this.colData.get(col);
 			int val = ib.get(this.rowIndex);
-			if (isIntNull(val)) {
+			if (NullType.isIntNull(val)) {
 				return null;
 			}
 
@@ -437,7 +433,7 @@ public class TSDBResultSetBlockData {
 		case TSDBConstants.TSDB_DATA_TYPE_BIGINT: {
 			LongBuffer lb = (LongBuffer) this.colData.get(col);
 			long val = lb.get(this.rowIndex);
-			if (isBigIntNull(val)) {
+			if (NullType.isBigIntNull(val)) {
 				return null;
 			}
 
@@ -447,7 +443,7 @@ public class TSDBResultSetBlockData {
 		case TSDBConstants.TSDB_DATA_TYPE_FLOAT: {
 			FloatBuffer fb = (FloatBuffer) this.colData.get(col);
 			float val = fb.get(this.rowIndex);
-			if (isFloatNull(val)) {
+			if (NullType.isFloatNull(val)) {
 				return null;
 			}
 
@@ -457,7 +453,7 @@ public class TSDBResultSetBlockData {
 		case TSDBConstants.TSDB_DATA_TYPE_DOUBLE: {
 			DoubleBuffer lb = (DoubleBuffer) this.colData.get(col);
 			double val = lb.get(this.rowIndex);
-			if (isDoubleNull(val)) {
+			if (NullType.isDoubleNull(val)) {
 				return null;
 			}
 
@@ -472,7 +468,7 @@ public class TSDBResultSetBlockData {
 
 			byte[] dest = new byte[length];
 			bb.get(dest, 0, length);
-			if (isBinaryNull(dest, length)) {
+			if (NullType.isBinaryNull(dest, length)) {
 				return null;
 			}
 
@@ -487,7 +483,7 @@ public class TSDBResultSetBlockData {
 
 			byte[] dest = new byte[length];
 			bb.get(dest, 0, length);
-			if (isNcharNull(dest, length)) {
+			if (NullType.isNcharNull(dest, length)) {
 				return null;
 			}
 
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
index 15a978a2fd..cdd88b825e 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TSDBStatement implements Statement {
-    private TSDBJNIConnector connecter = null;
+    private TSDBJNIConnector connector = null;
 
     /**
      * To store batched commands
@@ -45,9 +45,9 @@ public class TSDBStatement implements Statement {
         this.connection = connection;
     }
 
-    TSDBStatement(TSDBConnection connection, TSDBJNIConnector connecter) {
+    TSDBStatement(TSDBConnection connection, TSDBJNIConnector connector) {
         this.connection = connection;
-        this.connecter = connecter;
+        this.connector = connector;
         this.isClosed = false;
     }
 
@@ -65,27 +65,27 @@ public class TSDBStatement implements Statement {
         }
 
         // TODO make sure it is not a update query
-        pSql = this.connecter.executeQuery(sql);
+        pSql = this.connector.executeQuery(sql);
 
-        long resultSetPointer = this.connecter.getResultSet();
+        long resultSetPointer = this.connector.getResultSet();
 
         if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
-            this.connecter.freeResultSet(pSql);
+            this.connector.freeResultSet(pSql);
             throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
         }
 
         // create/insert/update/delete/alter
         if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
-            this.connecter.freeResultSet(pSql);
+            this.connector.freeResultSet(pSql);
             return null;
         }
 
-        if (!this.connecter.isUpdateQuery(pSql)) {
-        	TSDBResultSet res = new TSDBResultSet(this.connecter, resultSetPointer);
-            res.setBlockWiseFetch(true);
+        if (!this.connector.isUpdateQuery(pSql)) {
+        	TSDBResultSet res = new TSDBResultSet(this.connector, resultSetPointer);
+            res.setBatchFetch(this.connection.getBatchFetch());
             return res;
         } else {
-            this.connecter.freeResultSet(pSql);
+            this.connector.freeResultSet(pSql);
             return null;
         }
 
@@ -97,28 +97,28 @@ public class TSDBStatement implements Statement {
         }
 
         // TODO check if current query is update query
-        pSql = this.connecter.executeQuery(sql);
-        long resultSetPointer = this.connecter.getResultSet();
+        pSql = this.connector.executeQuery(sql);
+        long resultSetPointer = this.connector.getResultSet();
 
         if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
-            this.connecter.freeResultSet(pSql);
+            this.connector.freeResultSet(pSql);
             throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
         }
 
-        this.affectedRows = this.connecter.getAffectedRows(pSql);
-        this.connecter.freeResultSet(pSql);
+        this.affectedRows = this.connector.getAffectedRows(pSql);
+        this.connector.freeResultSet(pSql);
 
         return this.affectedRows;
     }
 
     public String getErrorMsg(long pSql) {
-        return this.connecter.getErrMsg(pSql);
+        return this.connector.getErrMsg(pSql);
     }
 
     public void close() throws SQLException {
         if (!isClosed) {
-            if (!this.connecter.isResultsetClosed()) {
-                this.connecter.freeResultSet();
+            if (!this.connector.isResultsetClosed()) {
+                this.connector.freeResultSet();
             }
             isClosed = true;
         }
@@ -174,15 +174,15 @@ public class TSDBStatement implements Statement {
             throw new SQLException("Invalid method call on a closed statement.");
         }
         boolean res = true;
-        pSql = this.connecter.executeQuery(sql);
-        long resultSetPointer = this.connecter.getResultSet();
+        pSql = this.connector.executeQuery(sql);
+        long resultSetPointer = this.connector.getResultSet();
 
         if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
-            this.connecter.freeResultSet(pSql);
+            this.connector.freeResultSet(pSql);
             throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
         } else if (resultSetPointer == TSDBConstants.JNI_NULL_POINTER) {
             // no result set is retrieved
-            this.connecter.freeResultSet(pSql);
+            this.connector.freeResultSet(pSql);
             res = false;
         }
 
@@ -193,10 +193,10 @@ public class TSDBStatement implements Statement {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-        long resultSetPointer = connecter.getResultSet();
+        long resultSetPointer = connector.getResultSet();
         TSDBResultSet resSet = null;
         if (resultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
-            resSet = new TSDBResultSet(connecter, resultSetPointer);
+            resSet = new TSDBResultSet(connector, resultSetPointer);
         }
         return resSet;
     }
@@ -269,7 +269,7 @@ public class TSDBStatement implements Statement {
     }
 
     public Connection getConnection() throws SQLException {
-        if (this.connecter != null)
+        if (this.connector != null)
             return this.connection;
         throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);
     }

From 835e9da1f86b076c7e01ecf304dedd459dcf848a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 18 Nov 2020 23:58:12 +0800
Subject: [PATCH 15/41] [TD-225] refactor jdbc driver

---
 .../com/taosdata/jdbc/TSDBConnection.java     | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

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 f93412ffec..94abe39655 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
@@ -14,7 +14,6 @@
  *****************************************************************************/
 package com.taosdata.jdbc;
 
-import java.io.*;
 import java.sql.Array;
 import java.sql.Blob;
 import java.sql.CallableStatement;
@@ -35,11 +34,10 @@ import java.util.*;
 import java.util.concurrent.Executor;
 
 public class TSDBConnection implements Connection {
+    protected Properties props = null;
 
     private TSDBJNIConnector connector = null;
 
-    protected Properties props = null;
-
     private String catalog = null;
 
     private TSDBDatabaseMetaData dbMetaData = null;
@@ -47,15 +45,21 @@ public class TSDBConnection implements Connection {
     private Properties clientInfoProps = new Properties();
 
     private int timeoutMilliseconds = 0;
-
-    private String tsCharSet = "";
+    
+    private boolean batchFetch = false;
 
     public TSDBConnection(Properties info, TSDBDatabaseMetaData meta) throws SQLException {
         this.dbMetaData = meta;
         connect(info.getProperty(TSDBDriver.PROPERTY_KEY_HOST),
                 Integer.parseInt(info.getProperty(TSDBDriver.PROPERTY_KEY_PORT, "0")),
-                info.getProperty(TSDBDriver.PROPERTY_KEY_DBNAME), info.getProperty(TSDBDriver.PROPERTY_KEY_USER),
+                info.getProperty(TSDBDriver.PROPERTY_KEY_DBNAME), 
+                info.getProperty(TSDBDriver.PROPERTY_KEY_USER),
                 info.getProperty(TSDBDriver.PROPERTY_KEY_PASSWORD));
+        
+        String batchLoad = info.getProperty(TSDBDriver.PROPERTY_KEY_BATCH_LOAD);
+        if (batchLoad != null) {
+        	this.batchFetch = Boolean.parseBoolean(batchLoad);
+        }
     }
 
     private void connect(String host, int port, String dbName, String user, String password) throws SQLException {
@@ -223,6 +227,14 @@ public class TSDBConnection implements Connection {
 
         return this.prepareStatement(sql);
     }
+    
+    public Boolean getBatchFetch() {
+    	return this.batchFetch;
+    }
+    
+    public void setBatchFetch(Boolean batchFetch) {
+    	this.batchFetch = batchFetch;
+    }
 
     public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
         throw new SQLException(TSDBConstants.UNSUPPORT_METHOD_EXCEPTIONZ_MSG);

From 15d1a1ba9a7e451a69862747c59d53b59670d4d8 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 00:00:56 +0800
Subject: [PATCH 16/41] [TD-225] refactor

---
 src/client/inc/tscSubquery.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/client/inc/tscSubquery.h b/src/client/inc/tscSubquery.h
index 598ff94835..f7832c9818 100644
--- a/src/client/inc/tscSubquery.h
+++ b/src/client/inc/tscSubquery.h
@@ -42,7 +42,6 @@ void tscBuildResFromSubqueries(SSqlObj *pSql);
 TAOS_ROW doSetResultRowData(SSqlObj *pSql);
 
 char *getArithmeticInputSrc(void *param, const char *name, int32_t colId);
-void doArithmeticCalculate(SQueryInfo* pQueryInfo, tFilePage* pOutput, int32_t rowSize, int32_t finalRowSize);
 
 #ifdef __cplusplus
 }

From 38459ed3546624bfcce7ca010da558bd48089b6a Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Thu, 19 Nov 2020 09:46:30 +0800
Subject: [PATCH 17/41] change

---
 .../src/test/java/com/taosdata/jdbc/BaseTest.java    | 12 ++++++------
 .../java/com/taosdata/jdbc/cases/FailOverTest.java   |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java
index b793a47c99..ce3735c128 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BaseTest.java
@@ -5,24 +5,24 @@ import com.taosdata.jdbc.utils.TDNodes;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-public class BaseTest {
+public abstract class BaseTest {
 
-    private static boolean testCluster = false;           
+    private static boolean testCluster = false;
     private static TDNodes nodes = new TDNodes();
-    
+
     @BeforeClass
     public static void setupEnv() {
-        try{                         
+        try {
             if (nodes.getTDNode(1).getTaosdPid() != null) {
                 System.out.println("Kill taosd before running JDBC test");
                 nodes.getTDNode(1).setRunning(1);
                 nodes.stop(1);
             }
-            nodes.setTestCluster(testCluster);  
+            nodes.setTestCluster(testCluster);
             nodes.deploy(1);
             nodes.start(1);
         } catch (Exception e) {
-            e.printStackTrace();            
+            e.printStackTrace();
         }
     }
 
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
index dd223777d9..2a803e0f19 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
@@ -1,7 +1,5 @@
 package com.taosdata.jdbc.cases;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 
 import java.sql.*;

From 521bda2f55796b3438d594121940b64a76230c7e Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 19 Nov 2020 09:52:09 +0800
Subject: [PATCH 18/41] <fix>fix python  connector err

---
 .../python/linux/python3/taos/cinterface.py   | 78 +++++++++++--------
 .../python/linux/python3/taos/cursor.py       |  1 -
 2 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/src/connector/python/linux/python3/taos/cinterface.py b/src/connector/python/linux/python3/taos/cinterface.py
index 609154a3a4..be5b99d8c1 100644
--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
@@ -18,7 +18,7 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
         _timestamp_converter = _convert_microsecond_to_datetime
 
     if num_of_rows > 0:
-        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::-1]))
+        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::1]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
 
@@ -26,7 +26,7 @@ def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bool row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_bool))[:abs(num_of_rows)] ]
 
@@ -34,7 +34,7 @@ def _crow_tinyint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C tinyint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)] ]
     
@@ -42,7 +42,7 @@ def _crow_smallint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C smallint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::-1]]
+        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)] ]
 
@@ -50,7 +50,7 @@ def _crow_int_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C int row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)] ]
 
@@ -58,7 +58,7 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bigint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)] ]
 
@@ -66,7 +66,7 @@ def _crow_float_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C float row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)] ]
 
@@ -74,7 +74,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C double row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)] ]
 
@@ -82,7 +82,7 @@ def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::-1]]
+        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
 
@@ -111,7 +111,7 @@ def _crow_nchar_to_python(data, num_of_rows, nbytes=None, micro=False):
     #         except ValueError:
     #             res.append(None)
     #     return res
-    #         # return [ele.value for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[:abs(num_of_rows)][::-1]]
+    #         # return [ele.value for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[:abs(num_of_rows)][::1]]
     # else:
     #     return [ele.value for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_wchar * (nbytes//4))))[:abs(num_of_rows)]]
 
@@ -308,32 +308,48 @@ class CTaosInterface(object):
 
         return fields
 
+    # @staticmethod
+    # def fetchBlock(result, fields):
+    #     pblock = ctypes.c_void_p(0)
+    #     num_of_rows = CTaosInterface.libtaos.taos_fetch_block(
+    #         result, ctypes.byref(pblock))
+    #     if num_of_rows == 0:
+    #         return None, 0
+
+    #     isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
+    #     blocks = [None] * len(fields)
+    #     fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+    #     fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
+    #     for i in range(len(fields)):
+    #         data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+
+    #         if fields[i]['type'] not in _CONVERT_FUNC:
+    #             raise DatabaseError("Invalid data type returned from database")
+    #         print('====================',fieldLen[i])
+    #         blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
+
+    #     return blocks, abs(num_of_rows)
     @staticmethod
     def fetchBlock(result, fields):
         pblock = ctypes.c_void_p(0)
-        num_of_rows = CTaosInterface.libtaos.taos_fetch_block(
-            result, ctypes.byref(pblock))
-
-        if num_of_rows == 0:
+        pblock = CTaosInterface.libtaos.taos_fetch_row(result)  
+        if pblock : 
+            num_of_rows = 1
+            isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
+            blocks = [None] * len(fields)
+            fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+            fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
+            for i in range(len(fields)):
+                data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+                if fields[i]['type'] not in _CONVERT_FUNC:
+                    raise DatabaseError("Invalid data type returned from database")
+                if data is None:
+                    blocks[i] = [None]
+                else:
+                    blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)         
+        else:
             return None, 0
-
-        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
-        blocks = [None] * len(fields)
-        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
-        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
-        for i in range(len(fields)):
-            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
-            if data == None:
-                blocks[i] = [None] * num_of_rows
-                continue
-
-            if fields[i]['type'] not in _CONVERT_FUNC:
-                raise DatabaseError("Invalid data type returned from database")
-            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
-
         return blocks, abs(num_of_rows)
-
     @staticmethod
     def freeResult(result):
         CTaosInterface.libtaos.taos_free_result(result)
diff --git a/src/connector/python/linux/python3/taos/cursor.py b/src/connector/python/linux/python3/taos/cursor.py
index ec7a85ee1a..eb10bed485 100644
--- a/src/connector/python/linux/python3/taos/cursor.py
+++ b/src/connector/python/linux/python3/taos/cursor.py
@@ -216,7 +216,6 @@ class TDengineCursor(object):
             self._rowcount += num_of_fields
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
-
         return list(map(tuple, zip(*buffer)))
 
     def nextset(self):

From 312f26fda6a1c96a6eee2a81e051ca725aab6aca Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 10:01:58 +0800
Subject: [PATCH 19/41] [TD-1355]

---
 src/query/src/qExecutor.c | 47 ++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 869f57f117..87ec62c021 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -847,35 +847,50 @@ static int32_t getNextQualifiedWindow(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow
   }
 
   int32_t startPos = 0;
+
   // tumbling time window query, a special case of sliding time window query
   if (pQuery->interval.sliding == pQuery->interval.interval && prevPosition != -1) {
     int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
     startPos = prevPosition + factor;
   } else {
-    startPos = searchFn((char *)primaryKeys, pDataBlockInfo->rows, startKey, pQuery->order.order);
+    if (startKey < pDataBlockInfo->window.skey && QUERY_IS_ASC_QUERY(pQuery)) {
+      startPos = 0;
+    } else if (startKey > pDataBlockInfo->window.ekey && !QUERY_IS_ASC_QUERY(pQuery)) {
+      startPos = pDataBlockInfo->rows - 1;
+    } else {
+      startPos = searchFn((char *)primaryKeys, pDataBlockInfo->rows, startKey, pQuery->order.order);
+    }
   }
 
   /*
    * This time window does not cover any data, try next time window,
    * this case may happen when the time window is too small
    */
-  if (QUERY_IS_ASC_QUERY(pQuery) && primaryKeys[startPos] > pNext->ekey) {
-    TSKEY next = primaryKeys[startPos];
-    if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
-      pNext->skey = taosTimeTruncate(next, &pQuery->interval, pQuery->precision);
-      pNext->ekey = taosTimeAdd(pNext->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+  if (primaryKeys == NULL) {
+    if (QUERY_IS_ASC_QUERY(pQuery)) {
+      assert(pDataBlockInfo->window.skey <= pNext->ekey);
     } else {
-      pNext->ekey += ((next - pNext->ekey + pQuery->interval.sliding - 1)/pQuery->interval.sliding) * pQuery->interval.sliding;
-      pNext->skey = pNext->ekey - pQuery->interval.interval + 1;
+      assert(pDataBlockInfo->window.ekey >= pNext->skey);
     }
-  } else if ((!QUERY_IS_ASC_QUERY(pQuery)) && primaryKeys[startPos] < pNext->skey) {
-    TSKEY next = primaryKeys[startPos];
-    if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
-      pNext->skey = taosTimeTruncate(next, &pQuery->interval, pQuery->precision);
-      pNext->ekey = taosTimeAdd(pNext->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
-    } else {
-      pNext->skey -= ((pNext->skey - next + pQuery->interval.sliding - 1) / pQuery->interval.sliding) * pQuery->interval.sliding;
-      pNext->ekey = pNext->skey + pQuery->interval.interval - 1;
+  } else {
+    if (QUERY_IS_ASC_QUERY(pQuery) && primaryKeys[startPos] > pNext->ekey) {
+      TSKEY next = primaryKeys[startPos];
+      if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+        pNext->skey = taosTimeTruncate(next, &pQuery->interval, pQuery->precision);
+        pNext->ekey = taosTimeAdd(pNext->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+      } else {
+        pNext->ekey += ((next - pNext->ekey + pQuery->interval.sliding - 1)/pQuery->interval.sliding) * pQuery->interval.sliding;
+        pNext->skey = pNext->ekey - pQuery->interval.interval + 1;
+      }
+    } else if ((!QUERY_IS_ASC_QUERY(pQuery)) && primaryKeys[startPos] < pNext->skey) {
+      TSKEY next = primaryKeys[startPos];
+      if (pQuery->interval.intervalUnit == 'n' || pQuery->interval.intervalUnit == 'y') {
+        pNext->skey = taosTimeTruncate(next, &pQuery->interval, pQuery->precision);
+        pNext->ekey = taosTimeAdd(pNext->skey, pQuery->interval.interval, pQuery->interval.intervalUnit, pQuery->precision) - 1;
+      } else {
+        pNext->skey -= ((pNext->skey - next + pQuery->interval.sliding - 1) / pQuery->interval.sliding) * pQuery->interval.sliding;
+        pNext->ekey = pNext->skey + pQuery->interval.interval - 1;
+      }
     }
   }
 

From 99c985983b00fad54acd63384e8067e051951bd3 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 10:13:54 +0800
Subject: [PATCH 20/41] [TD-225] fix regression test bugs.

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

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 1b1388238c..7dcb554494 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -790,7 +790,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   size_t output = tscNumOfFields(pQueryInfo);
 
   if ((tscIsSecondStageQuery(pQueryInfo) || UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo) ||
-      UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo)) && (output != tscSqlExprNumOfExprs(pQueryInfo))) {
+      UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo))) {
     pQueryMsg->secondStageOutput = htonl((int32_t) output);
 
     SSqlFuncMsg *pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg;

From 4c8a92c9ef5a64396a5a8ac34bac1aaf77f61438 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Thu, 19 Nov 2020 10:20:34 +0800
Subject: [PATCH 21/41] fix python connector err

---
 .../python/linux/python2/taos/cinterface.py   | 55 +++++++++----------
 .../python/linux/python2/taos/cursor.py       | 13 ++---
 .../python/windows/python2/taos/cinterface.py | 54 +++++++++---------
 .../python/windows/python2/taos/cursor.py     |  8 ++-
 .../python/windows/python3/taos/cinterface.py | 55 +++++++++----------
 .../python/windows/python3/taos/cursor.py     |  7 +++
 6 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/src/connector/python/linux/python2/taos/cinterface.py b/src/connector/python/linux/python2/taos/cinterface.py
index 32859f6b34..269326535c 100644
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
@@ -18,7 +18,7 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
         _timestamp_converter = _convert_microsecond_to_datetime
 
     if num_of_rows > 0:
-        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::-1]))
+        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::1]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)]))
 
@@ -26,7 +26,7 @@ def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bool row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_bool))[:abs(num_of_rows)] ]
 
@@ -34,7 +34,7 @@ def _crow_tinyint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C tinyint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)] ]
     
@@ -42,7 +42,7 @@ def _crow_smallint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C smallint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::-1]]
+        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)] ]
 
@@ -50,7 +50,7 @@ def _crow_int_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C int row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)] ]
 
@@ -58,7 +58,7 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bigint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_long))[:abs(num_of_rows)] ]
 
@@ -66,7 +66,7 @@ def _crow_float_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C float row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)] ]
 
@@ -74,7 +74,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C double row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)] ]
 
@@ -82,7 +82,7 @@ def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::-1]]
+        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
 
@@ -311,29 +311,24 @@ class CTaosInterface(object):
     @staticmethod
     def fetchBlock(result, fields):
         pblock = ctypes.c_void_p(0)
-        num_of_rows = CTaosInterface.libtaos.taos_fetch_block(
-            result, ctypes.byref(pblock))
-
-        if num_of_rows == 0:
+        pblock = CTaosInterface.libtaos.taos_fetch_row(result)  
+        if pblock : 
+            num_of_rows = 1
+            isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
+            blocks = [None] * len(fields)
+            fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+            fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
+            for i in range(len(fields)):
+                data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+                if fields[i]['type'] not in _CONVERT_FUNC:
+                    raise DatabaseError("Invalid data type returned from database")
+                if data is None:
+                    blocks[i] = [None]
+                else:
+                    blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)         
+        else:
             return None, 0
-
-        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
-        blocks = [None] * len(fields)
-        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
-        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
-        for i in range(len(fields)):
-            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
-            if data == None:
-                blocks[i] = [None] * num_of_rows
-                continue
-
-            if fields[i]['type'] not in _CONVERT_FUNC:
-                raise DatabaseError("Invalid data type returned from database")
-            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
-
         return blocks, abs(num_of_rows)
-
     @staticmethod
     def freeResult(result):
         CTaosInterface.libtaos.taos_free_result(result)
diff --git a/src/connector/python/linux/python2/taos/cursor.py b/src/connector/python/linux/python2/taos/cursor.py
index 37c02d330e..bc6670ca77 100644
--- a/src/connector/python/linux/python2/taos/cursor.py
+++ b/src/connector/python/linux/python2/taos/cursor.py
@@ -1,6 +1,7 @@
 from .cinterface import CTaosInterface
 from .error import *
 from .constants import FieldType
+import threading
 
 
 class TDengineCursor(object):
@@ -35,6 +36,7 @@ class TDengineCursor(object):
         self._block_iter = 0
         self._affected_rows = 0
         self._logfile = ""
+        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection
@@ -42,7 +44,7 @@ class TDengineCursor(object):
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         if self._result is None or self._fields is None:
             raise OperationalError("Invalid use of fetch iterator")
 
@@ -137,7 +139,7 @@ class TDengineCursor(object):
         else:
             raise ProgrammingError(
                 CTaosInterface.errStr(
-                    self._result ), errno)
+                    self._result), errno)
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
@@ -148,6 +150,8 @@ class TDengineCursor(object):
         """Fetch the next row of a query result set, returning a single sequence, or None when no more data is available.
         """
         pass
+    def fetchmany(self):
+        pass
 
     def istype(self, col, dataType):
         if (dataType.upper() == "BOOL"):
@@ -180,9 +184,6 @@ class TDengineCursor(object):
 
         return False
 
-    def fetchmany(self):
-        pass
-
     def fetchall(self):
         """Fetch all (remaining) rows of a query result, returning them as a sequence of sequences (e.g. a list of tuples). Note that the cursor's arraysize attribute can affect the performance of this operation.
         """
@@ -201,8 +202,6 @@ class TDengineCursor(object):
             self._rowcount += num_of_fields
             for i in range(len(self._fields)):
                 buffer[i].extend(block[i])
-
-
         return list(map(tuple, zip(*buffer)))
 
     def nextset(self):
diff --git a/src/connector/python/windows/python2/taos/cinterface.py b/src/connector/python/windows/python2/taos/cinterface.py
index 6a9c5bfcef..084d38e41c 100644
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
@@ -18,7 +18,7 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
         _timestamp_converter = _convert_microsecond_to_datetime
 
     if num_of_rows > 0:
-        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::-1]))
+        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::1]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)]))
 
@@ -26,7 +26,7 @@ def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bool row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_bool))[:abs(num_of_rows)] ]
 
@@ -34,7 +34,7 @@ def _crow_tinyint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C tinyint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)] ]
     
@@ -42,7 +42,7 @@ def _crow_smallint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C smallint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::-1]]
+        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)] ]
 
@@ -50,7 +50,7 @@ def _crow_int_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C int row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)] ]
 
@@ -58,7 +58,7 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bigint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)] ]
 
@@ -66,7 +66,7 @@ def _crow_float_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C float row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)] ]
 
@@ -74,7 +74,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C double row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)] ]
 
@@ -82,7 +82,7 @@ def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::-1]]
+        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
 
@@ -310,27 +310,23 @@ class CTaosInterface(object):
     @staticmethod
     def fetchBlock(result, fields):
         pblock = ctypes.c_void_p(0)
-        num_of_rows = CTaosInterface.libtaos.taos_fetch_block(
-            result, ctypes.byref(pblock))
-
-        if num_of_rows == 0:
+        pblock = CTaosInterface.libtaos.taos_fetch_row(result)  
+        if pblock : 
+            num_of_rows = 1
+            isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
+            blocks = [None] * len(fields)
+            fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+            fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
+            for i in range(len(fields)):
+                data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+                if fields[i]['type'] not in _CONVERT_FUNC:
+                    raise DatabaseError("Invalid data type returned from database")
+                if data is None:
+                    blocks[i] = [None]
+                else:
+                    blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)         
+        else:
             return None, 0
-
-        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
-        blocks = [None] * len(fields)
-        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
-        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
-        for i in range(len(fields)):
-            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
-            if data == None:
-                blocks[i] = [None] * num_of_rows
-                continue
-
-            if fields[i]['type'] not in _CONVERT_FUNC:
-                raise DatabaseError("Invalid data type returned from database")
-            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
-
         return blocks, abs(num_of_rows)
 
     @staticmethod
diff --git a/src/connector/python/windows/python2/taos/cursor.py b/src/connector/python/windows/python2/taos/cursor.py
index 8714fe77cb..35846cbe11 100644
--- a/src/connector/python/windows/python2/taos/cursor.py
+++ b/src/connector/python/windows/python2/taos/cursor.py
@@ -1,5 +1,9 @@
 from .cinterface import CTaosInterface
 from .error import *
+from .constants import FieldType
+import threading
+
+# querySeqNum = 0
 
 class TDengineCursor(object):
     """Database cursor which is used to manage the context of a fetch operation.
@@ -32,6 +36,8 @@ class TDengineCursor(object):
         self._block_rows = -1
         self._block_iter = 0
         self._affected_rows = 0
+        self._logfile = ""
+        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection
@@ -39,7 +45,7 @@ class TDengineCursor(object):
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         if self._result is None or self._fields is None:
             raise OperationalError("Invalid use of fetch iterator")
 
diff --git a/src/connector/python/windows/python3/taos/cinterface.py b/src/connector/python/windows/python3/taos/cinterface.py
index fa7124431c..68adf191c9 100644
--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
@@ -18,7 +18,7 @@ def _crow_timestamp_to_python(data, num_of_rows, nbytes=None, micro=False):
         _timestamp_converter = _convert_microsecond_to_datetime
 
     if num_of_rows > 0:
-        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::-1]))
+        return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::1]))
     else:
         return list(map(_timestamp_converter, ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)]))
 
@@ -26,7 +26,7 @@ def _crow_bool_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bool row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BOOL_NULL else bool(ele) for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_bool))[:abs(num_of_rows)] ]
 
@@ -34,7 +34,7 @@ def _crow_tinyint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C tinyint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_TINYINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_byte))[:abs(num_of_rows)] ]
     
@@ -42,7 +42,7 @@ def _crow_smallint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C smallint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::-1]]
+        return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele == FieldType.C_SMALLINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_short))[:abs(num_of_rows)] ]
 
@@ -50,7 +50,7 @@ def _crow_int_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C int row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_INT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_int))[:abs(num_of_rows)] ]
 
@@ -58,7 +58,7 @@ def _crow_bigint_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C bigint row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::-1] ]
+        return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if ele == FieldType.C_BIGINT_NULL else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_longlong))[:abs(num_of_rows)] ]
 
@@ -66,7 +66,7 @@ def _crow_float_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C float row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_float))[:abs(num_of_rows)] ]
 
@@ -74,7 +74,7 @@ def _crow_double_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C double row to python row
     """
     if num_of_rows > 0:
-        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::-1] ]
+        return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)][::1] ]
     else:
         return [ None if math.isnan(ele) else ele for ele in ctypes.cast(data,  ctypes.POINTER(ctypes.c_double))[:abs(num_of_rows)] ]
 
@@ -82,7 +82,7 @@ def _crow_binary_to_python(data, num_of_rows, nbytes=None, micro=False):
     """Function to convert C binary row to python row
     """
     if num_of_rows > 0:
-        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::-1]]
+        return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)][::1]]
     else:
         return [ None if ele.value[0:1] == FieldType.C_BINARY_NULL else ele.value.decode('utf-8') for ele in (ctypes.cast(data,  ctypes.POINTER(ctypes.c_char * nbytes)))[:abs(num_of_rows)]]
 
@@ -225,6 +225,7 @@ class CTaosInterface(object):
 
         if connection.value == None:
             print('connect to TDengine failed')
+            raise ConnectionError("connect to TDengine failed")
             # sys.exit(1)
         else:
             print('connect to TDengine success')
@@ -310,27 +311,23 @@ class CTaosInterface(object):
     @staticmethod
     def fetchBlock(result, fields):
         pblock = ctypes.c_void_p(0)
-        num_of_rows = CTaosInterface.libtaos.taos_fetch_block(
-            result, ctypes.byref(pblock))
-
-        if num_of_rows == 0:
+        pblock = CTaosInterface.libtaos.taos_fetch_row(result)  
+        if pblock : 
+            num_of_rows = 1
+            isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
+            blocks = [None] * len(fields)
+            fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
+            fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
+            for i in range(len(fields)):
+                data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
+                if fields[i]['type'] not in _CONVERT_FUNC:
+                    raise DatabaseError("Invalid data type returned from database")
+                if data is None:
+                    blocks[i] = [None]
+                else:
+                    blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)         
+        else:
             return None, 0
-
-        isMicro = (CTaosInterface.libtaos.taos_result_precision(result) == FieldType.C_TIMESTAMP_MICRO)
-        blocks = [None] * len(fields)
-        fieldL = CTaosInterface.libtaos.taos_fetch_lengths(result)
-        fieldLen = [ele for ele in ctypes.cast(fieldL,  ctypes.POINTER(ctypes.c_int))[:len(fields)]]
-        for i in range(len(fields)):
-            data = ctypes.cast(pblock, ctypes.POINTER(ctypes.c_void_p))[i]
-            if data == None:
-                blocks[i] = [None] * num_of_rows
-                continue
-
-            if fields[i]['type'] not in _CONVERT_FUNC:
-                raise DatabaseError("Invalid data type returned from database")
-            
-            blocks[i] = _CONVERT_FUNC[fields[i]['type']](data, num_of_rows, fieldLen[i], isMicro)
-
         return blocks, abs(num_of_rows)
 
     @staticmethod
diff --git a/src/connector/python/windows/python3/taos/cursor.py b/src/connector/python/windows/python3/taos/cursor.py
index c2c442b06e..b58b494cad 100644
--- a/src/connector/python/windows/python3/taos/cursor.py
+++ b/src/connector/python/windows/python3/taos/cursor.py
@@ -1,5 +1,10 @@
 from .cinterface import CTaosInterface
 from .error import *
+from .constants import FieldType
+import threading
+
+# querySeqNum = 0
+
 
 class TDengineCursor(object):
     """Database cursor which is used to manage the context of a fetch operation.
@@ -32,6 +37,8 @@ class TDengineCursor(object):
         self._block_rows = -1
         self._block_iter = 0
         self._affected_rows = 0
+        self._logfile = ""
+        self._threadId = threading.get_ident()
 
         if connection is not None:
             self._connection = connection

From 4410234af264dc6e8fccb1c67c89c3cb945e6ce5 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 10:44:03 +0800
Subject: [PATCH 22/41] [TD-225]

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

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index 261467ad29..ddff004f82 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -573,7 +573,7 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
   *rows = pRes->urow;
 
   tscClearSqlOwner(pSql);
-  return pRes->numOfRows;
+  return (int32_t) pRes->numOfRows;
 }
 
 int taos_select_db(TAOS *taos, const char *db) {

From ad5474d8aaf84ded6a6d5b23a8a205e1ad2a84bd Mon Sep 17 00:00:00 2001
From: zyyang <zyyang@taosdata.com>
Date: Thu, 19 Nov 2020 10:49:01 +0800
Subject: [PATCH 23/41] change

---
 .../src/test/java/com/taosdata/jdbc/cases/FailOverTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
index 2a803e0f19..83295df527 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/cases/FailOverTest.java
@@ -16,7 +16,8 @@ public class FailOverTest {
         Class.forName("com.taosdata.jdbc.TSDBDriver");
         final String url = "jdbc:TAOS://:/?user=root&password=taosdata";
 
-        while (true) {
+        long end = System.currentTimeMillis() + 1000 * 60 * 5;
+        while (System.currentTimeMillis() < end) {
             try (Connection conn = DriverManager.getConnection(url)) {
                 Statement stmt = conn.createStatement();
                 ResultSet resultSet = stmt.executeQuery("select server_status()");

From a41312d5242f91f1ba80629ff3a317839080df33 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 10:51:39 +0800
Subject: [PATCH 24/41] [TD-225]

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

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index ddff004f82..fa4dcd1a76 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -805,7 +805,7 @@ bool taos_is_null(TAOS_RES *res, int32_t row, int32_t col) {
     return true;
   }
 
-  return isNull(pSql->res.urow[col] + row * pInfo->field.bytes, pInfo->field.type);
+  return isNull(((char*) pSql->res.urow[col]) + row * pInfo->field.bytes, pInfo->field.type);
 }
 
 int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields) {

From 1faef8863d954bde6ca8c4bda71627b390c97912 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 10:56:15 +0800
Subject: [PATCH 25/41] [TD-225]

---
 src/client/src/tscSubquery.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index d5f69fd45a..c2594ddbd8 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -2463,7 +2463,7 @@ TAOS_ROW doSetResultRowData(SSqlObj *pSql) {
   for (int i = 0; i < size; ++i) {
     SInternalField* pInfo = (SInternalField*)TARRAY_GET_ELEM(pQueryInfo->fieldsInfo.internalField, i);
 
-    int32_t type = pInfo->field.type;
+    int32_t type  = pInfo->field.type;
     int32_t bytes = pInfo->field.bytes;
 
     if (type != TSDB_DATA_TYPE_BINARY && type != TSDB_DATA_TYPE_NCHAR) {
@@ -2473,7 +2473,7 @@ TAOS_ROW doSetResultRowData(SSqlObj *pSql) {
       pRes->length[i] = varDataLen(pRes->urow[i]);
     }
 
-    pRes->urow[i] += bytes;
+    ((char**) pRes->urow)[i] += bytes;
   }
 
   pRes->row++;  // index increase one-step

From 0b1abeb5d654cabc79a803fa1d98edb0a36b9c47 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 11:00:48 +0800
Subject: [PATCH 26/41] [TD-225]

---
 src/client/src/tscUtil.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index d4bdcd6ed9..4c2d25601f 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -220,13 +220,16 @@ bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
 }
 
 bool tscIsSecondStageQuery(SQueryInfo* pQueryInfo) {
-  size_t numOfOutput = tscNumOfFields(pQueryInfo);
-  size_t numOfExprs = tscSqlExprNumOfExprs(pQueryInfo);
-
-  if (numOfOutput == numOfExprs) {
+  STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[0];
+  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
     return false;
   }
 
+  if (tscIsProjectionQuery(pQueryInfo)) {
+    return false;
+  }
+
+  size_t numOfOutput = tscNumOfFields(pQueryInfo);
   for(int32_t i = 0; i < numOfOutput; ++i) {
     SExprInfo* pExprInfo = tscFieldInfoGetInternalField(&pQueryInfo->fieldsInfo, i)->pArithExprInfo;
     if (pExprInfo != NULL) {
@@ -309,14 +312,14 @@ void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
           assert(pInfo->pSqlExpr->param[1].nLen <= pInfo->field.bytes);
 
           for (int32_t k = 0; k < pRes->numOfRows; ++k) {
-            char* p = pRes->urow[i] + k * pInfo->field.bytes;
+            char* p = ((char**)pRes->urow)[i] + k * pInfo->field.bytes;
 
             memcpy(varDataVal(p), pInfo->pSqlExpr->param[1].pz, pInfo->pSqlExpr->param[1].nLen);
             varDataSetLen(p, pInfo->pSqlExpr->param[1].nLen);
           }
         } else {
           for (int32_t k = 0; k < pRes->numOfRows; ++k) {
-            char* p = pRes->urow[i] + k * pInfo->field.bytes;
+            char* p = ((char**)pRes->urow)[i] + k * pInfo->field.bytes;
             memcpy(p, &pInfo->pSqlExpr->param[1].i64Key, pInfo->field.bytes);
           }
         }

From d0afbae3ccf1dd94241f06aa5996da5ce771c46f Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 11:03:37 +0800
Subject: [PATCH 27/41] [TD-225]

---
 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 4c2d25601f..7a58e8b372 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -306,7 +306,7 @@ void tscSetResRawPtr(SSqlRes* pRes, SQueryInfo* pQueryInfo) {
     // generated the user-defined column result
     if (pInfo->pSqlExpr != NULL && TSDB_COL_IS_UD_COL(pInfo->pSqlExpr->colInfo.flag)) {
       if (pInfo->pSqlExpr->param[1].nType == TSDB_DATA_TYPE_NULL) {
-        setNullN(pRes->urow[i], pInfo->field.type, pInfo->field.bytes, pRes->numOfRows);
+        setNullN(pRes->urow[i], pInfo->field.type, pInfo->field.bytes, (int32_t) pRes->numOfRows);
       } else {
         if (pInfo->field.type == TSDB_DATA_TYPE_NCHAR || pInfo->field.type == TSDB_DATA_TYPE_BINARY) {
           assert(pInfo->pSqlExpr->param[1].nLen <= pInfo->field.bytes);

From 3cbbc55e464ff0220ee5f51e9a6eb474eb53f70c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 13:26:37 +0800
Subject: [PATCH 28/41] [TD-225]

---
 src/client/inc/tsclient.h    | 51 ++++++++++++++++++------------------
 src/client/src/tscServer.c   |  5 ++--
 src/client/src/tscSubquery.c |  8 +++---
 src/client/src/tscUtil.c     |  5 ----
 src/query/src/qExecutor.c    |  4 +--
 5 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index 6c6ceb92bb..ff36cf0f5a 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -293,33 +293,32 @@ typedef struct SResRec {
 } SResRec;
 
 typedef struct {
-  int64_t               numOfRows;                  // num of results in current retrieved
-  int64_t               numOfRowsGroup;             // num of results of current group
-  int64_t               numOfTotal;                 // num of total results
-  int64_t               numOfClauseTotal;           // num of total result in current subclause
-  char *                pRsp;
-  int32_t               rspType;
-  int32_t               rspLen;
-  uint64_t              qhandle;
-  int64_t               uid;
-  int64_t               useconds;
-  int64_t               offset;  // offset value from vnode during projection query of stable
-  int32_t               row;
-  int16_t               numOfCols;
-  int16_t               precision;
-  bool                  completed;
-  int32_t               code;
-  int32_t               numOfGroups;
-  SResRec *             pGroupRec;
-  char *                data;
-  TAOS_ROW              tsrow;
-  TAOS_ROW              urow;
-  int32_t*              length;  // length for each field for current row
-  char **               buffer;  // Buffer used to put multibytes encoded using unicode (wchar_t)
-  SColumnIndex *        pColumnIndex;
+  int32_t        numOfRows;                  // num of results in current retrieval
+  int64_t        numOfRowsGroup;             // num of results of current group
+  int64_t        numOfTotal;                 // num of total results
+  int64_t        numOfClauseTotal;           // num of total result in current subclause
+  char *         pRsp;
+  int32_t        rspType;
+  int32_t        rspLen;
+  uint64_t       qhandle;
+  int64_t        useconds;
+  int64_t        offset;  // offset value from vnode during projection query of stable
+  int32_t        row;
+  int16_t        numOfCols;
+  int16_t        precision;
+  bool           completed;
+  int32_t        code;
+  int32_t        numOfGroups;
+  SResRec *      pGroupRec;
+  char *         data;
+  TAOS_ROW       tsrow;
+  TAOS_ROW       urow;
+  int32_t*       length;  // length for each field for current row
+  char **        buffer;  // Buffer used to put multibytes encoded using unicode (wchar_t)
+  SColumnIndex*  pColumnIndex;
+
   SArithmeticSupport*   pArithSup;   // support the arithmetic expression calculation on agg functions
-  
-  struct SLocalReducer *pLocalReducer;
+  struct SLocalReducer* pLocalReducer;
 } SSqlRes;
 
 typedef struct STscObj {
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 78c56ac8cc..cbc5604a27 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -789,8 +789,7 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 
   size_t output = tscNumOfFields(pQueryInfo);
 
-  if ((tscIsSecondStageQuery(pQueryInfo) || UTIL_TABLE_IS_NORMAL_TABLE(pTableMetaInfo) ||
-      UTIL_TABLE_IS_CHILD_TABLE(pTableMetaInfo))) {
+  if (tscIsSecondStageQuery(pQueryInfo)) {
     pQueryMsg->secondStageOutput = htonl((int32_t) output);
 
     SSqlFuncMsg *pSqlFuncExpr1 = (SSqlFuncMsg *)pMsg;
@@ -2219,7 +2218,7 @@ int tscProcessRetrieveRspFromNode(SSqlObj *pSql) {
   }
 
   pRes->row = 0;
-  tscDebug("%p numOfRows:%" PRId64 ", offset:%" PRId64 ", complete:%d", pSql, pRes->numOfRows, pRes->offset, pRes->completed);
+  tscDebug("%p numOfRows:%d, offset:%" PRId64 ", complete:%d", pSql, pRes->numOfRows, pRes->offset, pRes->completed);
 
   return 0;
 }
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index c2594ddbd8..4f2d98433b 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1085,7 +1085,7 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
     SSqlRes* pRes1 = &pParentSql->pSubs[i]->res;
 
     if (pRes1->row > 0 && pRes1->numOfRows > 0) {
-      tscDebug("%p sub:%p index:%d numOfRows:%"PRId64" total:%"PRId64 " (not retrieve)", pParentSql, pParentSql->pSubs[i], i,
+      tscDebug("%p sub:%p index:%d numOfRows:%d total:%"PRId64 " (not retrieve)", pParentSql, pParentSql->pSubs[i], i,
                pRes1->numOfRows, pRes1->numOfTotal);
       assert(pRes1->row < pRes1->numOfRows);
     } else {
@@ -1093,7 +1093,7 @@ static void joinRetrieveFinalResCallback(void* param, TAOS_RES* tres, int numOfR
         pRes1->numOfClauseTotal += pRes1->numOfRows;
       }
 
-      tscDebug("%p sub:%p index:%d numOfRows:%"PRId64" total:%"PRId64, pParentSql, pParentSql->pSubs[i], i,
+      tscDebug("%p sub:%p index:%d numOfRows:%d total:%"PRId64, pParentSql, pParentSql->pSubs[i], i,
                pRes1->numOfRows, pRes1->numOfTotal);
     }
   }
@@ -2032,7 +2032,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
     assert(pRes->numOfRows == numOfRows);
     int64_t num = atomic_add_fetch_64(&pState->numOfRetrievedRows, numOfRows);
     
-    tscDebug("%p sub:%p retrieve numOfRows:%" PRId64 " totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d", pParentSql, pSql,
+    tscDebug("%p sub:%p retrieve numOfRows:%d totalNumOfRows:%" PRIu64 " from ep:%s, orderOfSub:%d", pParentSql, pSql,
              pRes->numOfRows, pState->numOfRetrievedRows, pSql->epSet.fqdn[pSql->epSet.inUse], idx);
 
     if (num > tsMaxNumOfOrderedResults && tscIsProjectionQueryOnSTable(pQueryInfo, 0)) {
@@ -2171,7 +2171,7 @@ static void multiVnodeInsertFinalize(void* param, TAOS_RES* tres, int numOfRows)
     return;
   }
   
-  tscDebug("%p Async insertion completed, total inserted:%" PRId64, pParentObj, pParentObj->res.numOfRows);
+  tscDebug("%p Async insertion completed, total inserted:%d", pParentObj, pParentObj->res.numOfRows);
 
   // restore user defined fp
   pParentObj->fp = pParentObj->fetchFp;
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 7a58e8b372..7a82bcaaab 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -220,11 +220,6 @@ bool tscIsPointInterpQuery(SQueryInfo* pQueryInfo) {
 }
 
 bool tscIsSecondStageQuery(SQueryInfo* pQueryInfo) {
-  STableMetaInfo* pTableMetaInfo = pQueryInfo->pTableMetaInfo[0];
-  if (UTIL_TABLE_IS_SUPER_TABLE(pTableMetaInfo)) {
-    return false;
-  }
-
   if (tscIsProjectionQuery(pQueryInfo)) {
     return false;
   }
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index f4ffb0aa85..2096cf4766 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -853,9 +853,9 @@ static int32_t getNextQualifiedWindow(SQueryRuntimeEnv *pRuntimeEnv, STimeWindow
     int32_t factor = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
     startPos = prevPosition + factor;
   } else {
-    if (startKey < pDataBlockInfo->window.skey && QUERY_IS_ASC_QUERY(pQuery)) {
+    if (startKey <= pDataBlockInfo->window.skey && QUERY_IS_ASC_QUERY(pQuery)) {
       startPos = 0;
-    } else if (startKey > pDataBlockInfo->window.ekey && !QUERY_IS_ASC_QUERY(pQuery)) {
+    } else if (startKey >= pDataBlockInfo->window.ekey && !QUERY_IS_ASC_QUERY(pQuery)) {
       startPos = pDataBlockInfo->rows - 1;
     } else {
       startPos = searchFn((char *)primaryKeys, pDataBlockInfo->rows, startKey, pQuery->order.order);

From fa3205dceebe208ea63be3b3ad3316ab68cafdba Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 13:32:08 +0800
Subject: [PATCH 29/41] [TD-225]

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

diff --git a/src/query/src/qParserImpl.c b/src/query/src/qParserImpl.c
index 4481ff5e8f..0853565fc6 100644
--- a/src/query/src/qParserImpl.c
+++ b/src/query/src/qParserImpl.c
@@ -225,7 +225,8 @@ tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optrType) {
       tSQLExprDestroy(pLeft);
       tSQLExprDestroy(pRight);
 
-    } else if ((pLeft->nSQLOptr == TK_FLOAT && pRight->nSQLOptr == TK_INTEGER) || (pLeft->nSQLOptr == TK_INTEGER && pRight->nSQLOptr == TK_FLOAT)) {
+    } else if ((pLeft->nSQLOptr == TK_FLOAT && pRight->nSQLOptr == TK_INTEGER) || (pLeft->nSQLOptr == TK_INTEGER && pRight->nSQLOptr == TK_FLOAT) ||
+        (pLeft->nSQLOptr == TK_FLOAT && pRight->nSQLOptr == TK_FLOAT)) {
       pExpr->val.nType = TSDB_DATA_TYPE_DOUBLE;
       pExpr->nSQLOptr  = TK_FLOAT;
 

From bc8fb310b44e2308267d8273ef3167efe30b62a9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 13:34:07 +0800
Subject: [PATCH 30/41] [TD-225] update sim.

---
 tests/script/general/parser/alter.sim         |  12 +-
 tests/script/general/parser/alter1.sim        |   4 +-
 tests/script/general/parser/alter_stable.sim  |   2 +-
 .../script/general/parser/auto_create_tb.sim  |   8 +-
 .../general/parser/auto_create_tb_drop_tb.sim |   8 +-
 .../general/parser/binary_escapeCharacter.sim |   2 +-
 .../parser/col_arithmetic_operation.sim       |   7 +-
 tests/script/general/parser/columnValue.sim   |   2 +-
 .../general/parser/columnValue_bigint.sim     |   2 +-
 .../general/parser/columnValue_bool.sim       |   2 +-
 .../general/parser/columnValue_double.sim     |   2 +-
 .../general/parser/columnValue_float.sim      |   2 +-
 .../script/general/parser/columnValue_int.sim |   2 +-
 .../general/parser/columnValue_smallint.sim   |   2 +-
 .../general/parser/columnValue_tinyint.sim    |   2 +-
 tests/script/general/parser/commit.sim        |  11 +-
 tests/script/general/parser/constCol.sim      |   4 +-
 tests/script/general/parser/create_db.sim     |   2 +-
 tests/script/general/parser/create_mt.sim     |   2 +-
 tests/script/general/parser/create_tb.sim     |   2 +-
 .../general/parser/dbtbnameValidate.sim       |   2 +-
 tests/script/general/parser/fill.sim          |   2 +-
 tests/script/general/parser/fill_stb.sim      |   2 +-
 tests/script/general/parser/fill_us.sim       |   2 +-
 tests/script/general/parser/first_last.sim    |   6 +-
 .../general/parser/first_last_query.sim       |   2 +-
 tests/script/general/parser/groupby.sim       |   2 +-
 tests/script/general/parser/import.sim        |   4 +-
 .../script/general/parser/import_commit1.sim  |   4 +-
 .../script/general/parser/import_commit2.sim  |   4 +-
 .../script/general/parser/import_commit3.sim  |   6 +-
 .../script/general/parser/insert_multiTbl.sim |   2 +-
 tests/script/general/parser/insert_tb.sim     |   6 +-
 tests/script/general/parser/interp.sim        |   4 +-
 tests/script/general/parser/interp_test.sim   |   2 +-
 tests/script/general/parser/join.sim          |   2 +-
 .../script/general/parser/join_multivnode.sim |   2 +-
 tests/script/general/parser/lastrow.sim       |   6 +-
 tests/script/general/parser/lastrow_query.sim |   2 +-
 tests/script/general/parser/limit.sim         |   6 +-
 tests/script/general/parser/limit1.sim        |   7 +-
 tests/script/general/parser/limit1_stb.sim    |   2 +-
 tests/script/general/parser/limit1_tb.sim     |   2 +-
 .../general/parser/limit1_tblocks100.sim      |   7 +-
 tests/script/general/parser/limit2.sim        |   4 +-
 tests/script/general/parser/limit2_query.sim  |   2 +-
 .../general/parser/limit2_tblocks100.sim      |   4 +-
 tests/script/general/parser/limit_stb.sim     |   2 +-
 tests/script/general/parser/limit_tb.sim      |   2 +-
 tests/script/general/parser/mixed_blocks.sim  |   2 +-
 tests/script/general/parser/nchar.sim         |   2 +-
 tests/script/general/parser/null_char.sim     |   4 +-
 .../parser/projection_limit_offset.sim        |   4 +-
 tests/script/general/parser/selectResNum.sim  |  11 +-
 .../general/parser/select_across_vnodes.sim   |   2 +-
 .../general/parser/select_from_cache_disk.sim |   6 +-
 .../general/parser/select_with_tags.sim       |   2 +-
 tests/script/general/parser/set_tag_vals.sim  |   2 +-
 .../general/parser/single_row_in_tb.sim       |   4 +-
 .../general/parser/single_row_in_tb_query.sim |   2 +-
 tests/script/general/parser/sliding.sim       |   2 +-
 tests/script/general/parser/slimit.sim        |   6 +-
 tests/script/general/parser/slimit1.sim       |   6 +-
 tests/script/general/parser/slimit1_query.sim |   2 +-
 .../general/parser/slimit_alter_tags.sim      |   6 +-
 tests/script/general/parser/slimit_query.sim  |   2 +-
 tests/script/general/parser/stream_on_sys.sim |   2 +-
 .../parser/tags_dynamically_specifiy.sim      |   4 +-
 tests/script/general/parser/tags_filter.sim   |   2 +-
 tests/script/general/parser/tbnameIn.sim      |   4 +-
 .../script/general/parser/tbnameIn_query.sim  |   2 +-
 tests/script/general/parser/testSuite.sim     | 176 +++++++++---------
 tests/script/general/parser/timestamp.sim     |   6 +-
 .../script/general/parser/timestamp_query.sim |   2 +-
 tests/script/general/parser/topbot.sim        |  10 +-
 tests/script/general/parser/union.sim         |   4 +-
 tests/script/general/parser/where.sim         |   2 +-
 77 files changed, 226 insertions(+), 233 deletions(-)

diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index 2a9e3a8873..5c15656f24 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = m_alt_db
@@ -114,7 +114,7 @@ endi
 sql drop table tb
 sql drop table mt
 
-sleep 1000
+sleep 500
 ### ALTER TABLE WHILE STREAMING [TBASE271]
 #sql create table tb1 (ts timestamp, c1 int, c2 nchar(5), c3 int)
 #sql create table strm as select count(*), avg(c1), first(c2), sum(c3) from tb1 interval(2s)
@@ -134,7 +134,7 @@ sleep 1000
 #  return -1
 #endi
 #sql alter table tb1 drop column c3
-#sleep 6000
+#sleep 3000
 #sql insert into tb1 values (now, 2, 'taos')
 #sleep 30000
 #sql select * from strm
@@ -145,9 +145,9 @@ sleep 1000
 #  return -1
 #endi
 #sql alter table tb1 add column c3 int
-#sleep 6000
+#sleep 3000
 #sql insert into tb1 values (now, 3, 'taos', 3);
-#sleep 1000
+#sleep 500
 #sql select * from strm
 #if $rows != 3 then
 #   return -1
@@ -186,7 +186,7 @@ sql create database $db
 sql use $db
 sql create table mt (ts timestamp, c1 int, c2 nchar(7), c3 int) tags (t1 int)
 sql create table tb using mt tags(1)
-sleep 1000
+sleep 500
 sql insert into tb values ('2018-11-01 16:30:00.000', 1, 'insert', 1)
 sql alter table mt drop column c3
 
diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim
index 0326f9b23f..e013242b82 100644
--- a/tests/script/general/parser/alter1.sim
+++ b/tests/script/general/parser/alter1.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 sql reset query cache
 
@@ -87,7 +87,7 @@ if $data13 != NULL then
   return -1
 endi
 
-sleep 1000
+sleep 500
 print ================== insert values into table
 sql insert into car1 values (now, 1, 1,1 ) (now +1s, 2,2,2,) car2 values (now, 1,3,3)
 
diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim
index b0d94ef68c..6b3f3a8f53 100644
--- a/tests/script/general/parser/alter_stable.sim
+++ b/tests/script/general/parser/alter_stable.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 print ========== alter_stable.sim
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index c72147be95..6deaf92a6c 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
@@ -208,11 +208,11 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 sql use $db
 
 #### auto create multiple tables
@@ -298,7 +298,7 @@ endi
 sql create table tu(ts timestamp, k int);
 sql_error create table txu using tu tags(0) values(now, 1);
 
-#[TBASE-675]
+print =================> [TBASE-675]
 sql insert into tu values(1565971200000, 1) (1565971200000,2) (1565971200001, 3)(1565971200001, 4)
 sql select * from tu
 if $rows != 2 then
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index 2a809fa9db..8a429cf91a 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -4,7 +4,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c maxTablesPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = db
@@ -49,7 +49,7 @@ while $t < $tbNum
 endw
 print ====== tables created
 
-sleep 60000
+sleep 500
 
 sql drop table tb2
 $x = 0
@@ -59,9 +59,7 @@ while $x < $rowNum
   $t1 = $t1 . '
   sql insert into tb1 using $stb tags( $t1 ) values ( $ts , $x ) 
   $x = $x + 1
-endw 
-  
-sleep 6000
+endw
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim
index 780916258b..e9e61f35bf 100644
--- a/tests/script/general/parser/binary_escapeCharacter.sim
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
@@ -4,7 +4,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 sql drop database if exists ecdb
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
index f5e91b933a..d5ba57e6c7 100644
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ca_db
@@ -34,7 +34,7 @@ while $i < $halfTbNum
   $tb1 = $tbPrefix . $tbId
   sql create table $tb using $stb tags( $i )
   sql create table $tb1 using $stb tags( $tbId )
-  
+
   $x = 0
   while $x < $rowNum
     $xs = $x * $delta
@@ -46,8 +46,7 @@ while $i < $halfTbNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) $tb1 values ( $ts , NULL , $c , NULL , $c , NULL , $c , NULL, NULL , $nchar )
     $x = $x + 1
   endw 
   $i = $i + 1
diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim
index c7aac1a8fa..2c03a3552a 100644
--- a/tests/script/general/parser/columnValue.sim
+++ b/tests/script/general/parser/columnValue.sim
@@ -5,7 +5,7 @@ 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 tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 print ========== columnValues.sim
diff --git a/tests/script/general/parser/columnValue_bigint.sim b/tests/script/general/parser/columnValue_bigint.sim
index 002240fa25..3546ca15ee 100644
--- a/tests/script/general/parser/columnValue_bigint.sim
+++ b/tests/script/general/parser/columnValue_bigint.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_bool.sim b/tests/script/general/parser/columnValue_bool.sim
index e43f2289e7..d68f375900 100644
--- a/tests/script/general/parser/columnValue_bool.sim
+++ b/tests/script/general/parser/columnValue_bool.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_double.sim b/tests/script/general/parser/columnValue_double.sim
index 009ef971c9..fd2da37838 100644
--- a/tests/script/general/parser/columnValue_double.sim
+++ b/tests/script/general/parser/columnValue_double.sim
@@ -1,5 +1,5 @@
 ####
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_float.sim b/tests/script/general/parser/columnValue_float.sim
index f7b77cdc0a..019cf176d0 100644
--- a/tests/script/general/parser/columnValue_float.sim
+++ b/tests/script/general/parser/columnValue_float.sim
@@ -1,5 +1,5 @@
 ####
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_int.sim b/tests/script/general/parser/columnValue_int.sim
index 46e466c417..1f84df5ca0 100644
--- a/tests/script/general/parser/columnValue_int.sim
+++ b/tests/script/general/parser/columnValue_int.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_smallint.sim b/tests/script/general/parser/columnValue_smallint.sim
index cdaceaa05f..af5c581871 100644
--- a/tests/script/general/parser/columnValue_smallint.sim
+++ b/tests/script/general/parser/columnValue_smallint.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/columnValue_tinyint.sim b/tests/script/general/parser/columnValue_tinyint.sim
index 31eff422d4..3efe52cc91 100644
--- a/tests/script/general/parser/columnValue_tinyint.sim
+++ b/tests/script/general/parser/columnValue_tinyint.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 sql create database if not exists db
 sql use db
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
index 5aa5b8f40c..c798bf9d7c 100644
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
@@ -4,7 +4,7 @@ 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 maxTablesperVnode -v 100
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sc_db
@@ -50,8 +50,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -83,12 +82,12 @@ endw
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 print ====== select from table and check num of rows returned
 sql use $db
diff --git a/tests/script/general/parser/constCol.sim b/tests/script/general/parser/constCol.sim
index b5a4d4abea..4a8e443281 100644
--- a/tests/script/general/parser/constCol.sim
+++ b/tests/script/general/parser/constCol.sim
@@ -353,8 +353,8 @@ if $rows != 3 then
 endi
 
 print =============================> td-2036
-if $data00 != 0.3000000 then
-  print expect: 0.3000000, actual:$data00
+if $data00 != 0.300000000 then
+  print expect: 0.300000000, actual:$data00
   return -1
 endi
 
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index c8337ea81d..3b7f24b6d9 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim
index d940853984..e11f322761 100644
--- a/tests/script/general/parser/create_mt.sim
+++ b/tests/script/general/parser/create_mt.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim
index 1027e2b25f..609aad2adb 100644
--- a/tests/script/general/parser/create_tb.sim
+++ b/tests/script/general/parser/create_tb.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim
index b46a222282..fd40ecc3f7 100644
--- a/tests/script/general/parser/dbtbnameValidate.sim
+++ b/tests/script/general/parser/dbtbnameValidate.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 print ========== db name and table name check in create and drop, describe
diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim
index 0b535272bd..9851a4e7fc 100644
--- a/tests/script/general/parser/fill.sim
+++ b/tests/script/general/parser/fill.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim
index a84aa0c557..83eb98c465 100644
--- a/tests/script/general/parser/fill_stb.sim
+++ b/tests/script/general/parser/fill_stb.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = fl1_db
diff --git a/tests/script/general/parser/fill_us.sim b/tests/script/general/parser/fill_us.sim
index b6de72464f..dc8ee8659d 100644
--- a/tests/script/general/parser/fill_us.sim
+++ b/tests/script/general/parser/fill_us.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = m_fl_db
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index e4f50ea365..a934d3bcab 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -4,7 +4,7 @@ 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 maxTablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = first_db
@@ -76,11 +76,11 @@ run general/parser/first_last_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/first_last_query.sim
 
diff --git a/tests/script/general/parser/first_last_query.sim b/tests/script/general/parser/first_last_query.sim
index 512fc70245..a982f10362 100644
--- a/tests/script/general/parser/first_last_query.sim
+++ b/tests/script/general/parser/first_last_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = first_db
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 145c4a008f..c0a6709fe4 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = group_db
diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim
index 9ef83fa35b..6da2483738 100644
--- a/tests/script/general/parser/import.sim
+++ b/tests/script/general/parser/import.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = impt_db
@@ -64,7 +64,7 @@ sleep 2000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 sql use $db
 sql select * from tb
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
index 9af1acfe77..9c5144a630 100644
--- a/tests/script/general/parser/import_commit1.sim
+++ b/tests/script/general/parser/import_commit1.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ic_db
@@ -40,7 +40,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 6000
+sleep 3000
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
index 3c8635f3fd..000394386e 100644
--- a/tests/script/general/parser/import_commit2.sim
+++ b/tests/script/general/parser/import_commit2.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ic_db
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 6000
+sleep 3000
 
 $ts = $ts0 + $delta
 $ts = $ts + 1
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
index 3ceb025f32..997a4a22aa 100644
--- a/tests/script/general/parser/import_commit3.sim
+++ b/tests/script/general/parser/import_commit3.sim
@@ -4,7 +4,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ic_db
@@ -39,7 +39,7 @@ while $x < $rowNum
 endw 
 print ====== tables created
 
-sleep 6000
+sleep 3000
 
 $ts = $ts + 1
 sql insert into $tb values ( $ts , -1, -1, -1, -1, -1)
@@ -47,7 +47,7 @@ $ts = $ts0 + $delta
 $ts = $ts + 1
 sql import into $tb values ( $ts , -2, -2, -2, -2, -2)
 
-sleep 6000
+sleep 3000
 
 sql show databases
 
diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim
index f3b9c4a390..887f97a198 100644
--- a/tests/script/general/parser/insert_multiTbl.sim
+++ b/tests/script/general/parser/insert_multiTbl.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 2000
 sql connect
-sleep 1000
+sleep 500
 print ======================== dnode1 start
 
 sql create database mul_db
diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim
index 5eb973520a..0a9eb9f678 100644
--- a/tests/script/general/parser/insert_tb.sim
+++ b/tests/script/general/parser/insert_tb.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== dnode1 start
 
@@ -103,7 +103,7 @@ if $rows != 1 then
 endi
 
 sql drop database $db
-sleep 1000
+sleep 500
 sql create database $db
 sql use $db
 sql create table stb1 (ts timestamp, c1 int) tags(t1 int)
@@ -136,7 +136,7 @@ if $data21 != 1.000000000 then
 endi
 
 sql drop database $db
-sleep 1000
+sleep 500
 sql create database $db
 sql use $db
 sql create table stb (ts timestamp, c1 int, c2 bigint, c3 float, c4 double, c5 nchar(10), c6 binary(20)) tags(t1 int, t2 bigint, t3 double, t4 float, t5 nchar(10))
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index c83d3ab5c4..8777c3ed9b 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = intp_db
@@ -60,7 +60,7 @@ run general/parser/interp_test.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/interp_test.sim b/tests/script/general/parser/interp_test.sim
index 6de8de0b7a..42738a8bd1 100644
--- a/tests/script/general/parser/interp_test.sim
+++ b/tests/script/general/parser/interp_test.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = intp_db
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index d6e4a6a5a7..3ee90cda35 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = join_db
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index 6bca0e75c4..52489bba01 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 1000
+sleep 500
 
 $dbPrefix = join_m_db
 $tbPrefix = join_tb
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index 7db233ee9d..cc71123a77 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lr_db
@@ -62,11 +62,11 @@ run general/parser/lastrow_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/lastrow_query.sim
 
diff --git a/tests/script/general/parser/lastrow_query.sim b/tests/script/general/parser/lastrow_query.sim
index 1a9b1a74a9..5b9c8b60c3 100644
--- a/tests/script/general/parser/lastrow_query.sim
+++ b/tests/script/general/parser/lastrow_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lr_db
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index 909ac71cbf..fb5e704bf1 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm_db
@@ -62,11 +62,11 @@ run general/parser/limit_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/limit_tb.sim
 run general/parser/limit_stb.sim
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index 59ecdb92b0..7236421ec2 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
@@ -48,8 +48,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -62,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit1_stb.sim b/tests/script/general/parser/limit1_stb.sim
index 3eee6132a4..d5846adc45 100644
--- a/tests/script/general/parser/limit1_stb.sim
+++ b/tests/script/general/parser/limit1_stb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_tb.sim b/tests/script/general/parser/limit1_tb.sim
index 52c4615c9f..1e473eb858 100644
--- a/tests/script/general/parser/limit1_tb.sim
+++ b/tests/script/general/parser/limit1_tb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index 2860305b3d..9a123e645c 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm1_db
@@ -48,8 +48,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -62,7 +61,7 @@ run general/parser/limit1_stb.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index 8ffa157945..47c3eb6d08 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -4,7 +4,7 @@ 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 rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm2_db
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
index 327c867be4..f9a1dd8e4b 100644
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm2_db
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
index 2f3e30de60..1aaa8e885a 100644
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -4,7 +4,7 @@ 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 rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm2_db
@@ -69,7 +69,7 @@ print ====== tables created
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 1000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/limit_stb.sim b/tests/script/general/parser/limit_stb.sim
index e43a78bc31..b41b7b726b 100644
--- a/tests/script/general/parser/limit_stb.sim
+++ b/tests/script/general/parser/limit_stb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm_db
diff --git a/tests/script/general/parser/limit_tb.sim b/tests/script/general/parser/limit_tb.sim
index eed78a37ec..b917627fdf 100644
--- a/tests/script/general/parser/limit_tb.sim
+++ b/tests/script/general/parser/limit_tb.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = lm_db
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index f6744f22ab..d3558560df 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = mb_db
diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim
index 082a6331a6..ab4ed2607a 100644
--- a/tests/script/general/parser/nchar.sim
+++ b/tests/script/general/parser/nchar.sim
@@ -5,7 +5,7 @@ system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 print ======================== dnode1 start
diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim
index 9ac83eb779..7b1c81a295 100644
--- a/tests/script/general/parser/null_char.sim
+++ b/tests/script/general/parser/null_char.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c tableMetaKeepTimer -v 3
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 print ========== NULL_char.sim
@@ -251,7 +251,7 @@ endi
 ################### nchar
 sql alter table st41 set tag tag_nchar = "��˼����"
 sql select tag_binary, tag_nchar, tag_int, tag_bool, tag_float, tag_double from  st41
-#sleep 1000
+#sleep 500
 #if $data01 != ��˼���� then
 #  print ==== expect ��˼����, actually $data01
 #  return -1
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 4cadc706d9..92ebb6fd79 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = group_db
@@ -402,7 +402,7 @@ sql_error select k, sum(k)+1 from tm0;
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
index b80cfa9ce4..464f363222 100644
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 200
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sc_db
@@ -50,8 +50,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
@@ -119,12 +118,12 @@ endw
 
 print ====== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 6000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ====== server restart completed
-sleep 1000
+sleep 500
 sql connect
-sleep 1000
+sleep 500
 sql use $db
 
 ##### repeat test after server restart
diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim
index ed8c3a51eb..44e5576dac 100644
--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 5
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sav_db
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index d778f20de0..0fa0848144 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = scd_db
@@ -35,11 +35,11 @@ sql insert into $tb values ('2018-09-17 09:00:00.030', 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 sql use $db
 
 # generate some data in cache
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 68d145a5f2..dab76f6004 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = select_tags_db
diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim
index 95ec4a77ec..bf29fe3902 100644
--- a/tests/script/general/parser/set_tag_vals.sim
+++ b/tests/script/general/parser/set_tag_vals.sim
@@ -4,7 +4,7 @@ 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 maxVgroupsPerDb -v 1
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = db
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index d5b61944ef..fe1edb1f73 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -4,7 +4,7 @@ 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 maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sr_db
@@ -32,7 +32,7 @@ run general/parser/single_row_in_tb_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
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 2292e6d0a1..9e90b91220 100644
--- a/tests/script/general/parser/single_row_in_tb_query.sim
+++ b/tests/script/general/parser/single_row_in_tb_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sr_db
diff --git a/tests/script/general/parser/sliding.sim b/tests/script/general/parser/sliding.sim
index b9fd66334d..4283421169 100644
--- a/tests/script/general/parser/sliding.sim
+++ b/tests/script/general/parser/sliding.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c debugFlag -v 135
 system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = sliding_db
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index 4b5f013d31..f7a23019cf 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 4
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_db
@@ -97,11 +97,11 @@ run general/parser/slimit_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/slimit_query.sim
 
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 9c69dd6c8b..7a2511eb76 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -56,11 +56,11 @@ run general/parser/slimit1_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/slimit1_query.sim
 
diff --git a/tests/script/general/parser/slimit1_query.sim b/tests/script/general/parser/slimit1_query.sim
index ad892fbf86..c205d45689 100644
--- a/tests/script/general/parser/slimit1_query.sim
+++ b/tests/script/general/parser/slimit1_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_alt_tg_db
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index 178f151475..1072f9ccb4 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -4,7 +4,7 @@ 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 maxtablesPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_alt_tg_db
@@ -171,11 +171,11 @@ endi
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 sql use $db
 ### repeat above queries
diff --git a/tests/script/general/parser/slimit_query.sim b/tests/script/general/parser/slimit_query.sim
index dc1116405f..3020f80472 100644
--- a/tests/script/general/parser/slimit_query.sim
+++ b/tests/script/general/parser/slimit_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = slm_db
diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim
index 4032871591..1c8eb82c79 100644
--- a/tests/script/general/parser/stream_on_sys.sim
+++ b/tests/script/general/parser/stream_on_sys.sim
@@ -6,7 +6,7 @@ system sh/cfg.sh -n dnode1 -c monitor       -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 print ======================== stream_on_sys.sim
 
diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim
index 6c79f30bd2..8303a9c86d 100644
--- a/tests/script/general/parser/tags_dynamically_specifiy.sim
+++ b/tests/script/general/parser/tags_dynamically_specifiy.sim
@@ -3,9 +3,9 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
-sleep 1000
+sleep 500
 
 $db = dytag_db
 $tbNum = 10
diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim
index 1ba7b60cfe..c3d0fdfc61 100644
--- a/tests/script/general/parser/tags_filter.sim
+++ b/tests/script/general/parser/tags_filter.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $db = tf_db
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index f1962d968f..87c4871792 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -3,7 +3,7 @@ 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/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ti_db
@@ -68,7 +68,7 @@ run general/parser/tbnameIn_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
diff --git a/tests/script/general/parser/tbnameIn_query.sim b/tests/script/general/parser/tbnameIn_query.sim
index 3f87d20327..ad7456f557 100644
--- a/tests/script/general/parser/tbnameIn_query.sim
+++ b/tests/script/general/parser/tbnameIn_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ti_db
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index 1374199548..0e12379659 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -1,113 +1,113 @@
-sleep 1000
-run general/parser/alter.sim
-sleep 1000
-run general/parser/alter1.sim
-sleep 1000
-run general/parser/alter_stable.sim
-sleep 1000
-run general/parser/auto_create_tb.sim
-sleep 1000
-run general/parser/auto_create_tb_drop_tb.sim
-sleep 1000
-run general/parser/col_arithmetic_operation.sim
-sleep 1000
-run general/parser/columnValue.sim
-sleep 1000
-run general/parser/commit.sim
-sleep 1000
-run general/parser/create_db.sim
-sleep 1000
-run general/parser/create_mt.sim
-sleep 1000
-run general/parser/create_tb.sim
-sleep 1000
-run general/parser/dbtbnameValidate.sim
-sleep 1000
-run general/parser/fill.sim
-sleep 1000
-run general/parser/fill_stb.sim
-sleep 1000
-#run general/parser/fill_us.sim               #
-sleep 1000
-run general/parser/first_last.sim
-sleep 1000
-run general/parser/import_commit1.sim
-sleep 1000
-run general/parser/import_commit2.sim
-sleep 1000
-run general/parser/import_commit3.sim
-sleep 1000
-#run general/parser/import_file.sim
-sleep 1000
-run general/parser/insert_tb.sim
-sleep 1000
-run general/parser/tags_dynamically_specifiy.sim
-sleep 1000
-run general/parser/interp.sim
-sleep 1000
-run general/parser/lastrow.sim
-sleep 1000
-run general/parser/limit.sim
-sleep 1000
-run general/parser/limit1.sim
-sleep 1000
-run general/parser/limit1_tblocks100.sim
-sleep 1000
-run general/parser/limit2.sim
-sleep 1000
-run general/parser/mixed_blocks.sim
-sleep 1000
-run general/parser/nchar.sim
-sleep 1000
-run general/parser/null_char.sim
-sleep 1000
-run general/parser/selectResNum.sim
-sleep 1000
+#sleep 500
+#run general/parser/alter.sim
+#sleep 500
+#run general/parser/alter1.sim
+#sleep 500
+#run general/parser/alter_stable.sim
+#sleep 500
+#run general/parser/auto_create_tb.sim
+#sleep 500
+#run general/parser/auto_create_tb_drop_tb.sim
+#sleep 500
+#run general/parser/col_arithmetic_operation.sim
+#sleep 500
+#run general/parser/columnValue.sim
+#sleep 500
+#run general/parser/commit.sim
+#sleep 500
+#run general/parser/create_db.sim
+#sleep 500
+#run general/parser/create_mt.sim
+#sleep 500
+#run general/parser/create_tb.sim
+#sleep 500
+#run general/parser/dbtbnameValidate.sim
+#sleep 500
+#run general/parser/fill.sim
+#sleep 500
+#run general/parser/fill_stb.sim
+#sleep 500
+##run general/parser/fill_us.sim               #
+#sleep 500
+#run general/parser/first_last.sim
+#sleep 500
+#run general/parser/import_commit1.sim
+#sleep 500
+#run general/parser/import_commit2.sim
+#sleep 500
+#run general/parser/import_commit3.sim
+#sleep 500
+##run general/parser/import_file.sim
+#sleep 500
+#run general/parser/insert_tb.sim
+#sleep 500
+#run general/parser/tags_dynamically_specifiy.sim
+#sleep 500
+#run general/parser/interp.sim
+#sleep 500
+#run general/parser/lastrow.sim
+#sleep 500
+#run general/parser/limit.sim
+#sleep 500
+#run general/parser/limit1.sim
+#sleep 500
+#run general/parser/limit1_tblocks100.sim
+#sleep 500
+#run general/parser/limit2.sim
+#sleep 500
+#run general/parser/mixed_blocks.sim
+#sleep 500
+#run general/parser/nchar.sim
+#sleep 500
+#run general/parser/null_char.sim
+#sleep 500
+#run general/parser/selectResNum.sim
+sleep 500
 run general/parser/select_across_vnodes.sim
-sleep 1000
+sleep 500
 run general/parser/select_from_cache_disk.sim
-sleep 1000
+sleep 500
 run general/parser/set_tag_vals.sim
-sleep 1000
+sleep 500
 run general/parser/single_row_in_tb.sim
-sleep 1000
+sleep 500
 run general/parser/slimit.sim
-sleep 1000
+sleep 500
 run general/parser/slimit1.sim
-sleep 1000
+sleep 500
 run general/parser/slimit_alter_tags.sim
-sleep 1000
+sleep 500
 run general/parser/tbnameIn.sim
-sleep 1000
+sleep 500
 run general/parser/slimit_alter_tags.sim  # persistent failed
-sleep 1000
+sleep 500
 run general/parser/join.sim
-sleep 1000
+sleep 500
 run general/parser/join_multivnode.sim
-sleep 1000
+sleep 500
 run general/parser/projection_limit_offset.sim
-sleep 1000
+sleep 500
 run general/parser/select_with_tags.sim
-sleep 1000
+sleep 500
 run general/parser/groupby.sim
-sleep 1000
+sleep 500
 run general/parser/tags_filter.sim
-sleep 1000
+sleep 500
 run general/parser/topbot.sim
-sleep 1000
+sleep 500
 run general/parser/union.sim
-sleep 1000
+sleep 500
 run general/parser/constCol.sim
-sleep 1000
+sleep 500
 run general/parser/where.sim
-sleep 1000
+sleep 500
 run general/parser/timestamp.sim
-sleep 1000
+sleep 500
 run general/parser/sliding.sim
 
-#sleep 1000
+#sleep 500
 #run general/parser/repeatStream.sim
-#sleep 1000
+#sleep 500
 #run general/parser/stream_on_sys.sim
-#sleep 1000
+#sleep 500
 #run general/parser/stream.sim
\ No newline at end of file
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index 4603e23813..72966459d0 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ts_db
@@ -59,10 +59,10 @@ run general/parser/timestamp_query.sim
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 1000
+sleep 500
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 run general/parser/timestamp_query.sim
diff --git a/tests/script/general/parser/timestamp_query.sim b/tests/script/general/parser/timestamp_query.sim
index ab892c0287..056e8bba6b 100644
--- a/tests/script/general/parser/timestamp_query.sim
+++ b/tests/script/general/parser/timestamp_query.sim
@@ -1,4 +1,4 @@
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = ts_db
diff --git a/tests/script/general/parser/topbot.sim b/tests/script/general/parser/topbot.sim
index c2b41888d7..08e2f6ab00 100644
--- a/tests/script/general/parser/topbot.sim
+++ b/tests/script/general/parser/topbot.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 200
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = tb_db
@@ -128,11 +128,11 @@ sql insert into test values(29999, 1)(70000, 2)(80000, 3)
 
 print ================== restart server to commit data into disk
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-sleep 5000
+sleep 3000
 system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 sql connect
-sleep 1000
+sleep 500
 
 sql select count(*) from t1.test where ts>10000 and ts<90000 interval(5000a)
 if $rows != 3 then
@@ -169,7 +169,7 @@ endw
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 1000
+sleep 500
 sql use db;
 
 $ts = 1000
@@ -221,7 +221,7 @@ sql insert into t2 values('2020-2-2 1:1:1', 1);
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
 system sh/exec.sh -n dnode1 -s start
 sql connect
-sleep 1000
+sleep 500
 
 sql use db
 sql select count(*), first(ts), last(ts) from t2 interval(1d);
diff --git a/tests/script/general/parser/union.sim b/tests/script/general/parser/union.sim
index 024b9c76ef..d779d75731 100644
--- a/tests/script/general/parser/union.sim
+++ b/tests/script/general/parser/union.sim
@@ -7,7 +7,7 @@ system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 
 system sh/exec.sh -n dnode1 -s start
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = union_db
@@ -96,7 +96,7 @@ while $i < $tbNum
 endw
 
 print sleep 1sec.
-sleep 1000
+sleep 500
 
 $i = 1
 $tb = $tbPrefix . $i
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 3ea354f4da..4a38e3c68c 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -5,7 +5,7 @@ system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablespervnode -v 4
 system sh/exec.sh -n dnode1 -s start
 
-sleep 1000
+sleep 500
 sql connect
 
 $dbPrefix = wh_db

From a29327ef42e3290909c77421b9fe66ab099ef540 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 13:44:47 +0800
Subject: [PATCH 31/41] [TD-225]

---
 src/client/src/tscLocalMerge.c |  4 +--
 src/client/src/tscSql.c        | 47 +++-------------------------------
 src/client/src/tscSubquery.c   |  6 ++---
 3 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index 5133309e8c..839f6474b3 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -884,11 +884,11 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
   tFilePage * pBeforeFillData = pLocalReducer->pResultBuf;
 
   pRes->data = pLocalReducer->pFinalRes;
-  pRes->numOfRows = pBeforeFillData->num;
+  pRes->numOfRows = (int32_t) pBeforeFillData->num;
 
   if (pQueryInfo->limit.offset > 0) {
     if (pQueryInfo->limit.offset < pRes->numOfRows) {
-      int32_t prevSize = (int32_t)pBeforeFillData->num;
+      int32_t prevSize = (int32_t) pBeforeFillData->num;
       tColModelErase(pLocalReducer->finalModel, pBeforeFillData, prevSize, 0, (int32_t)pQueryInfo->limit.offset - 1);
 
       /* remove the hole in column model */
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index fa4dcd1a76..a4ac9b9d92 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -394,7 +394,7 @@ int taos_affected_rows(TAOS_RES *tres) {
   SSqlObj* pSql = (SSqlObj*) tres;
   if (pSql == NULL || pSql->signature != pSql) return 0;
 
-  return (int)(pSql->res.numOfRows);
+  return pSql->res.numOfRows;
 }
 
 TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
@@ -440,53 +440,12 @@ int taos_retrieve(TAOS_RES *res) {
 
   tscResetForNextRetrieve(pRes);
 
-  if (pCmd->command < TSDB_SQL_LOCAL) {
-    pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
-  }
-  tscProcessSql(pSql);
-
-  return (int)pRes->numOfRows;
-}
-
-int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
-  SSqlObj *pSql = (SSqlObj *)res;
-  SSqlCmd *pCmd = &pSql->cmd;
-  SSqlRes *pRes = &pSql->res;
-
-  if (pRes->qhandle == 0 || pSql->signature != pSql) {
-    *rows = NULL;
-    return 0;
-  }
-
-  // Retrieve new block
-  tscResetForNextRetrieve(pRes);
   if (pCmd->command < TSDB_SQL_LOCAL) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
   }
 
   tscProcessSql(pSql);
-  if (pRes->numOfRows == 0) {
-    *rows = NULL;
-    return 0;
-  }
-
-  // secondary merge has handle this situation
-  if (pCmd->command != TSDB_SQL_RETRIEVE_LOCALMERGE) {
-    pRes->numOfClauseTotal += pRes->numOfRows;
-  }
-
-  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  if (pQueryInfo == NULL)
-    return 0;
-
-  assert(0);
-  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutput; ++i) {
-    tscGetResultColumnChr(pRes, &pQueryInfo->fieldsInfo, i, 0);
-  }
-
-  *rows = pRes->tsrow;
-
-  return (int)((pQueryInfo->order.order == TSDB_ORDER_DESC) ? pRes->numOfRows : -pRes->numOfRows);
+  return pRes->numOfRows;
 }
 
 static bool needToFetchNewBlock(SSqlObj* pSql) {
@@ -573,7 +532,7 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
   *rows = pRes->urow;
 
   tscClearSqlOwner(pSql);
-  return (int32_t) pRes->numOfRows;
+  return pRes->numOfRows;
 }
 
 int taos_select_db(TAOS *taos, const char *db) {
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 4f2d98433b..7066477aed 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -948,7 +948,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
     if (!pRes->completed) {
       taosGetTmpfilePath("ts-join", pSupporter->path);
       pSupporter->f = fopen(pSupporter->path, "w");
-      pRes->row = (int32_t)pRes->numOfRows;
+      pRes->row = pRes->numOfRows;
 
       taos_fetch_rows_a(tres, tsCompRetrieveCallback, param);
       return;
@@ -974,7 +974,7 @@ static void tsCompRetrieveCallback(void* param, TAOS_RES* tres, int32_t numOfRow
     
     // TODO check for failure
     pSupporter->f = fopen(pSupporter->path, "w");
-    pRes->row = (int32_t)pRes->numOfRows;
+    pRes->row = pRes->numOfRows;
 
     // set the callback function
     pSql->fp = tscJoinQueryCallback;
@@ -2059,7 +2059,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
     }
     
     int32_t ret = saveToBuffer(trsupport->pExtMemBuffer[idx], pDesc, trsupport->localBuffer, pRes->data,
-                               (int32_t)pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
+                               pRes->numOfRows, pQueryInfo->groupbyExpr.orderType);
     if (ret != 0) { // set no disk space error info, and abort retry
       tscAbortFurtherRetryRetrieval(trsupport, tres, TSDB_CODE_TSC_NO_DISKSPACE);
     } else if (pRes->completed) {

From af8f4bb2362d566c6bf9294367803acec9699c1e Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 13:53:56 +0800
Subject: [PATCH 32/41] [TD-225]

---
 src/client/src/tscLocalMerge.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscLocalMerge.c b/src/client/src/tscLocalMerge.c
index 839f6474b3..3c7d46f914 100644
--- a/src/client/src/tscLocalMerge.c
+++ b/src/client/src/tscLocalMerge.c
@@ -894,7 +894,7 @@ static void genFinalResWithoutFill(SSqlRes* pRes, SLocalReducer *pLocalReducer,
       /* remove the hole in column model */
       tColModelCompact(pLocalReducer->finalModel, pBeforeFillData, prevSize);
 
-      pRes->numOfRows -= pQueryInfo->limit.offset;
+      pRes->numOfRows -= (int32_t) pQueryInfo->limit.offset;
       pQueryInfo->limit.offset = 0;
     } else {
       pQueryInfo->limit.offset -= pRes->numOfRows;
@@ -962,7 +962,7 @@ static void doFillResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, bool doneO
       }
 
       pRes->data = pLocalReducer->pFinalRes;
-      pRes->numOfRows = newRows;
+      pRes->numOfRows = (int32_t) newRows;
 
       pQueryInfo->limit.offset = 0;
       break;

From 71fe2885d4044f93a05ed9ad172a11063ab6575b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 14:46:46 +0800
Subject: [PATCH 33/41] [TD-225]update sim.

---
 tests/script/general/parser/groupby.sim   |  11 +-
 tests/script/general/parser/interp.sim    |   3 +-
 tests/script/general/parser/tbnameIn.sim  |   3 +-
 tests/script/general/parser/testSuite.sim | 128 +++++++++++-----------
 tests/script/general/parser/union.sim     |  11 +-
 tests/script/general/parser/where.sim     |  11 +-
 6 files changed, 93 insertions(+), 74 deletions(-)

diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index c0a6709fe4..7f02fe6fa5 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -33,12 +33,19 @@ sql create database if not exists $db keep 36500
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int, t2 binary(12))
 
+$half = $tbNum / 2
+
 $i = 0
-while $i < $tbNum
+while $i < $half
   $tb = $tbPrefix . $i
   $tg2 = ' . abc
   $tg2 = $tg2 . '
+
+  $nextSuffix = $i + $half
+  $tb1 = $tbPrefix . $nextSuffix
+
   sql create table $tb using $mt tags( $i , $tg2 )
+  sql create table $tb1 using $mt tags( $nextSuffix , $tg2 )
 
   $x = 0
   while $x < $rowNum
@@ -55,7 +62,7 @@ while $i < $tbNum
     $nchar = $nchar . $c
     $nchar = $nchar . '
 
-    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar ) $tb1 values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
     $tstart = $tstart + 1
     $x = $x + 1
   endw
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index 8777c3ed9b..0d5c1804dd 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -47,8 +47,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index 87c4871792..d0f74ae53d 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -55,8 +55,7 @@ while $i < $halfNum
     $binary = $binary . '
     $nchar = 'nchar . $c 
     $nchar = $nchar . '
-    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar ) 
-    sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar ) 
+    sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )  $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
     $x = $x + 1
   endw 
 
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index 0e12379659..7c9dd2b6b5 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -1,67 +1,67 @@
-#sleep 500
-#run general/parser/alter.sim
-#sleep 500
-#run general/parser/alter1.sim
-#sleep 500
-#run general/parser/alter_stable.sim
-#sleep 500
-#run general/parser/auto_create_tb.sim
-#sleep 500
-#run general/parser/auto_create_tb_drop_tb.sim
-#sleep 500
-#run general/parser/col_arithmetic_operation.sim
-#sleep 500
-#run general/parser/columnValue.sim
-#sleep 500
-#run general/parser/commit.sim
-#sleep 500
-#run general/parser/create_db.sim
-#sleep 500
-#run general/parser/create_mt.sim
-#sleep 500
-#run general/parser/create_tb.sim
-#sleep 500
-#run general/parser/dbtbnameValidate.sim
-#sleep 500
-#run general/parser/fill.sim
-#sleep 500
-#run general/parser/fill_stb.sim
-#sleep 500
-##run general/parser/fill_us.sim               #
-#sleep 500
-#run general/parser/first_last.sim
-#sleep 500
-#run general/parser/import_commit1.sim
-#sleep 500
-#run general/parser/import_commit2.sim
-#sleep 500
-#run general/parser/import_commit3.sim
-#sleep 500
-##run general/parser/import_file.sim
-#sleep 500
-#run general/parser/insert_tb.sim
-#sleep 500
-#run general/parser/tags_dynamically_specifiy.sim
-#sleep 500
-#run general/parser/interp.sim
-#sleep 500
-#run general/parser/lastrow.sim
-#sleep 500
-#run general/parser/limit.sim
-#sleep 500
-#run general/parser/limit1.sim
-#sleep 500
-#run general/parser/limit1_tblocks100.sim
-#sleep 500
-#run general/parser/limit2.sim
-#sleep 500
-#run general/parser/mixed_blocks.sim
-#sleep 500
-#run general/parser/nchar.sim
-#sleep 500
-#run general/parser/null_char.sim
-#sleep 500
-#run general/parser/selectResNum.sim
+sleep 500
+run general/parser/alter.sim
+sleep 500
+run general/parser/alter1.sim
+sleep 500
+run general/parser/alter_stable.sim
+sleep 500
+run general/parser/auto_create_tb.sim
+sleep 500
+run general/parser/auto_create_tb_drop_tb.sim
+sleep 500
+run general/parser/col_arithmetic_operation.sim
+sleep 500
+run general/parser/columnValue.sim
+sleep 500
+run general/parser/commit.sim
+sleep 500
+run general/parser/create_db.sim
+sleep 500
+run general/parser/create_mt.sim
+sleep 500
+run general/parser/create_tb.sim
+sleep 500
+run general/parser/dbtbnameValidate.sim
+sleep 500
+run general/parser/fill.sim
+sleep 500
+run general/parser/fill_stb.sim
+sleep 500
+#run general/parser/fill_us.sim               #
+sleep 500
+run general/parser/first_last.sim
+sleep 500
+run general/parser/import_commit1.sim
+sleep 500
+run general/parser/import_commit2.sim
+sleep 500
+run general/parser/import_commit3.sim
+sleep 500
+#run general/parser/import_file.sim
+sleep 500
+run general/parser/insert_tb.sim
+sleep 500
+run general/parser/tags_dynamically_specifiy.sim
+sleep 500
+run general/parser/interp.sim
+sleep 500
+run general/parser/lastrow.sim
+sleep 500
+run general/parser/limit.sim
+sleep 500
+run general/parser/limit1.sim
+sleep 500
+run general/parser/limit1_tblocks100.sim
+sleep 500
+run general/parser/limit2.sim
+sleep 500
+run general/parser/mixed_blocks.sim
+sleep 500
+run general/parser/nchar.sim
+sleep 500
+run general/parser/null_char.sim
+sleep 500
+run general/parser/selectResNum.sim
 sleep 500
 run general/parser/select_across_vnodes.sim
 sleep 500
diff --git a/tests/script/general/parser/union.sim b/tests/script/general/parser/union.sim
index d779d75731..cb46ac6b0d 100644
--- a/tests/script/general/parser/union.sim
+++ b/tests/script/general/parser/union.sim
@@ -36,9 +36,16 @@ sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5
 $i = 0
 $t = 1578203484000
 
-while $i < $tbNum
+$half = $tbNum / 2
+
+while $i < $half
   $tb = $tbPrefix . $i
+
+  $nextSuffix = $i + $half
+  $tb1 = $tbPrefix . $nextSuffix
+
   sql create table $tb using $mt tags( $i )
+  sql create table $tb1 using $mt tags( $nextSuffix )
 
   $x = 0
   while $x < $rowNum
@@ -54,7 +61,7 @@ while $i < $tbNum
     $nchar = $nchar . '
 
     $t1 = $t + $ms
-    sql insert into $tb values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    sql insert into $tb values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )  $tb1 values ($t1 , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
     $x = $x + 1
   endw
 
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 4a38e3c68c..8e17220b5b 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -26,10 +26,17 @@ sql create database if not exists $db
 sql use $db
 sql create table $mt (ts timestamp, c1 int, c2 float, c3 bigint, c4 smallint, c5 tinyint, c6 double, c7 bool, c8 binary(10), c9 nchar(9)) TAGS(t1 int)
 
+$half = $tbNum / 2
+
 $i = 0
-while $i < $tbNum
+while $i < $half
   $tb = $tbPrefix . $i
+
+  $nextSuffix = $i + $half
+  $tb1 = $tbPrefix . $nextSuffix
+
   sql create table $tb using $mt tags( $i )
+  sql create table $tb1 using $mt tags( $nextSuffix )
 
   $x = 0
   while $x < $rowNum
@@ -42,7 +49,7 @@ while $i < $tbNum
     $binary = $binary . '
     $nchar = 'nchar . $c
     $nchar = $nchar . '
-    sql insert into $tb values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    sql insert into $tb values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )  $tb1 values ($ms , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
     $x = $x + 1
   endw
 

From 1e1e947310677984fdc42cab5e9aa4a1881d4b98 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 15:12:18 +0800
Subject: [PATCH 34/41] [TD-225]

---
 .../java/com/taosdata/jdbc/TSDBDriver.java     |  2 +-
 .../taosdata/jdbc/TSDBResultSetBlockData.java  | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

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 4dc48c84b3..06f88cebfa 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
@@ -89,7 +89,7 @@ public class TSDBDriver extends AbstractTaosDriver {
     /**
      * fetch data from native function in a batch model
      */
-    public static final String PROPERTY_KEY_BATCH_LOAD = "batch";
+    public static final String PROPERTY_KEY_BATCH_LOAD = "batchfetch";
     
     private TSDBDatabaseMetaData dbMetaData = null;
 
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 7373890428..9352cf5253 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
@@ -31,8 +31,6 @@ import java.util.List;
 
 public class TSDBResultSetBlockData {
 	private int numOfRows = 0;
-	private int numOfCols = 0;
-
 	private int rowIndex = 0;
 
 	private List<ColumnMetaData> columnMetaDataList;
@@ -40,22 +38,20 @@ public class TSDBResultSetBlockData {
 
 	public TSDBResultSetBlockData(List<ColumnMetaData> colMeta, int numOfCols) {
 		this.columnMetaDataList = colMeta;
-		this.setNumOfCols(numOfCols);
+		this.colData = new ArrayList<Object>(numOfCols);
 	}
 
 	public TSDBResultSetBlockData() {
 		this.colData = new ArrayList<Object>();
-		this.setNumOfCols(0);
 	}
 
 	public void clear() {
+		int size = this.colData.size();
 		if (this.colData != null) {
 			this.colData.clear();
 		}
-
-		if (this.numOfCols == 0) {
-			return;
-		}
+		
+		setNumOfCols(size);
 	}
 
 	public int getNumOfRows() {
@@ -67,12 +63,12 @@ public class TSDBResultSetBlockData {
 	}
 
 	public int getNumOfCols() {
-		return numOfCols;
+		return this.colData.size();
 	}
 
 	public void setNumOfCols(int numOfCols) {
-		this.numOfCols = numOfCols;
-		this.clear();
+		this.colData = new ArrayList<Object>(numOfCols);
+		this.colData.addAll(Collections.nCopies(numOfCols, null));
 	}
 
 	public boolean hasMore() {

From c3199e6f7939631773b9f289737ebc7b4cc9116f Mon Sep 17 00:00:00 2001
From: plum-lihui <huili@taosdata.com>
Date: Thu, 19 Nov 2020 15:31:40 +0800
Subject: [PATCH 35/41] [TD-2156]<hotfix>: change packaging tool

---
 packaging/tools/install.sh        | 2 +-
 packaging/tools/install_client.sh | 2 +-
 src/client/src/tscSubquery.c      | 6 +++---
 src/connector/grafanaplugin       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh
index aedfb0a683..ddf7114f08 100755
--- a/packaging/tools/install.sh
+++ b/packaging/tools/install.sh
@@ -312,7 +312,7 @@ function install_data() {
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo} cp -rf ${script_dir}/connector/ ${install_main_dir}/
 }
 
 function install_examples() {
diff --git a/packaging/tools/install_client.sh b/packaging/tools/install_client.sh
index 24586d3390..34a9bfaecb 100755
--- a/packaging/tools/install_client.sh
+++ b/packaging/tools/install_client.sh
@@ -163,7 +163,7 @@ function install_log() {
 }
 
 function install_connector() {
-    ${csudo} cp -rf ${script_dir}/connector/* ${install_main_dir}/connector
+    ${csudo} cp -rf ${script_dir}/connector/ ${install_main_dir}/
 }
 
 function install_examples() {
diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index c2594ddbd8..d4b5269423 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -594,7 +594,7 @@ void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArr
 
       if (taosArrayGetSize(result) > 0) {
         SVgroupTableInfo* prevGroup = taosArrayGet(result, taosArrayGetSize(result) - 1);
-        tscDebug("%p vgId:%d, tables:%"PRId64, pSql, prevGroup->vgInfo.vgId, taosArrayGetSize(prevGroup->itemList));
+        tscDebug("%p vgId:%d, tables:%"PRIzu, pSql, prevGroup->vgInfo.vgId, taosArrayGetSize(prevGroup->itemList));
       }
 
       taosArrayPush(result, &info);
@@ -612,7 +612,7 @@ void tscBuildVgroupTableInfo(SSqlObj* pSql, STableMetaInfo* pTableMetaInfo, SArr
 
   if (taosArrayGetSize(result) > 0) {
     SVgroupTableInfo* g = taosArrayGet(result, taosArrayGetSize(result) - 1);
-    tscDebug("%p vgId:%d, tables:%"PRId64, pSql, g->vgInfo.vgId, taosArrayGetSize(g->itemList));
+    tscDebug("%p vgId:%d, tables:%"PRIzu, pSql, g->vgInfo.vgId, taosArrayGetSize(g->itemList));
   }
 }
 
@@ -753,7 +753,7 @@ static int32_t getIntersectionOfTableTuple(SQueryInfo* pQueryInfo, SSqlObj* pPar
   }
 #endif
 
-  tscDebug("%p tags match complete, result: %"PRId64", %"PRId64, pParentSql, t1, t2);
+  tscDebug("%p tags match complete, result: %"PRIzu", %"PRIzu, pParentSql, t1, t2);
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/connector/grafanaplugin b/src/connector/grafanaplugin
index d598db167e..ec77d9049a 160000
--- a/src/connector/grafanaplugin
+++ b/src/connector/grafanaplugin
@@ -1 +1 @@
-Subproject commit d598db167eb256fe67409b7bb3d0eb7fffc3ff8c
+Subproject commit ec77d9049a719dabfd1a7c1122a209e201861944

From 2ae05f8daa0f3bb9186101e0d95cfca59f427cff Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 16:24:11 +0800
Subject: [PATCH 36/41] [TD-2144]

---
 src/query/src/qUtil.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/query/src/qUtil.c b/src/query/src/qUtil.c
index f4f89a8709..61d080bb6c 100644
--- a/src/query/src/qUtil.c
+++ b/src/query/src/qUtil.c
@@ -53,7 +53,7 @@ void cleanupTimeWindowInfo(SWindowResInfo *pWindowResInfo) {
     return;
   }
   if (pWindowResInfo->capacity == 0) {
-    assert(/*pWindowResInfo->hashList == NULL && */pWindowResInfo->pResult == NULL);
+    assert(pWindowResInfo->pResult == NULL);
     return;
   }
   
@@ -88,6 +88,11 @@ void clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num) {
 
   int16_t  type = pWindowResInfo->type;
   STableId* id  = TSDB_TABLEID(pRuntimeEnv->pQuery->current->pTable); // uid is always set to be 0.
+  int64_t uid = id->uid;
+  if (pRuntimeEnv->groupbyNormalCol) {
+    uid = 0;
+  }
+
   char    *key  = NULL;
   int16_t  bytes = -1;
 
@@ -97,14 +102,14 @@ void clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num) {
 
       // todo refactor
       if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-        key = varDataVal(pResult->key);
+        key   = varDataVal(pResult->key);
         bytes = varDataLen(pResult->key);
       } else {
         key = (char*) &pResult->win.skey;
         bytes = tDataTypeDesc[pWindowResInfo->type].nSize;
       }
 
-      SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, key, bytes, id->uid);
+      SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, key, bytes, uid);
       taosHashRemove(pRuntimeEnv->pResultRowHashTable, (const char *)pRuntimeEnv->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
     } else {
       break;
@@ -137,14 +142,14 @@ void clearFirstNTimeWindow(SQueryRuntimeEnv *pRuntimeEnv, int32_t num) {
       bytes = tDataTypeDesc[pWindowResInfo->type].nSize;
     }
 
-    SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, key, bytes, id->uid);
+    SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, key, bytes, uid);
     int32_t *p = (int32_t *)taosHashGet(pRuntimeEnv->pResultRowHashTable, (const char *)pRuntimeEnv->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes));
     assert(p != NULL); 
 
     int32_t  v = (*p - num);
     assert(v >= 0 && v <= pWindowResInfo->size);
 
-    SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, key, bytes, id->uid);
+    SET_RES_WINDOW_KEY(pRuntimeEnv->keyBuf, key, bytes, uid);
     taosHashPut(pRuntimeEnv->pResultRowHashTable, pRuntimeEnv->keyBuf, GET_RES_WINDOW_KEY_LEN(bytes), (char *)&v, sizeof(int32_t));
   }
   

From ec8c6d0c166b3374e3d4ec5fe55fe86623adf57c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 16:54:26 +0800
Subject: [PATCH 37/41] [TD-2159]<fix>: fix bugs in limit/offset in group by
 normal columns.

---
 src/client/src/tscFunctionImpl.c        |  4 +--
 src/query/src/qExecutor.c               |  2 ++
 tests/script/general/parser/groupby.sim | 35 +++++++++++++++++++++++--
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c
index 35dc94f37b..8c11913a66 100644
--- a/src/client/src/tscFunctionImpl.c
+++ b/src/client/src/tscFunctionImpl.c
@@ -681,7 +681,7 @@ static int32_t firstFuncRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, i
   }
   
   // no result for first query, data block is required
-  if (GET_RES_INFO(pCtx)->numOfRes <= 0) {
+  if (GET_RES_INFO(pCtx) == NULL || GET_RES_INFO(pCtx)->numOfRes <= 0) {
     return BLK_DATA_ALL_NEEDED;
   } else {
     return BLK_DATA_NO_NEEDED;
@@ -693,7 +693,7 @@ static int32_t lastFuncRequired(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, in
     return BLK_DATA_NO_NEEDED;
   }
   
-  if (GET_RES_INFO(pCtx)->numOfRes <= 0) {
+  if (GET_RES_INFO(pCtx) == NULL || GET_RES_INFO(pCtx)->numOfRes <= 0) {
     return BLK_DATA_ALL_NEEDED;
   } else {
     return BLK_DATA_NO_NEEDED;
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 2096cf4766..8e939cc10e 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5583,6 +5583,8 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
     pQuery->rec.rows = 0;
     copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
     clearFirstNTimeWindow(pRuntimeEnv, pQInfo->groupIndex);
+
+    limitResults(pRuntimeEnv);
   }
 }
 
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 7f02fe6fa5..7e693b3830 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -62,7 +62,7 @@ while $i < $half
     $nchar = $nchar . $c
     $nchar = $nchar . '
 
-    sql insert into $tb values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar ) $tb1 values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
+    sql insert into $tb values ($tstart , $c , $c , $x , $x , $c , $c , $c , $binary , $nchar ) $tb1 values ($tstart , $c , $c , $c , $c , $c , $c , $c , $binary , $nchar )
     $tstart = $tstart + 1
     $x = $x + 1
   endw
@@ -430,8 +430,39 @@ if $data97 != @group_tb0@ then
   return -1
 endi
 
-print ---------------------------------> group by binary|nchar data add cases
+sql select count(*),first(ts),last(ts),min(c3) from group_tb1 group by c4;
+if $rows != 10000 then
+  return -1
+endi
 
+if $data00 != 1 then
+  return -1
+endi
+
+if $data01 != @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data02 !=  @70-01-01 08:01:40.000@ then
+  return -1
+endi
+
+if $data03 != 0 then
+  return -1
+endi
+
+sql select count(*),first(ts),last(ts),min(c3) from group_tb1 group by c4 limit 1;
+if $rows != 1 then
+  return -1
+endi
+
+sql select count(*),first(ts),last(ts),min(c3),max(c3),sum(c3),avg(c3),sum(c4)/count(c4) from group_tb1 group by c8;
+if $rows != 10000 then
+  return -1
+endi
+
+print ---------------------------------> group by binary|nchar data add cases
+sql select count(*) from group_tb1 group by c8;
 
 #=========================== group by multi tags ======================
 sql create table st (ts timestamp, c int) tags (t1 int, t2 int, t3 int, t4 int);

From 4a7fc101a0ae16c39e6c3af38d8c8d42a24bc73a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 17:18:18 +0800
Subject: [PATCH 38/41] [TD-2159]

---
 src/client/src/tscSQLParser.c           |  4 +++-
 src/query/src/qExecutor.c               | 31 +++++++++++++++++--------
 tests/script/general/parser/groupby.sim |  5 ++++
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 069f7303d6..a149b277e0 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5509,7 +5509,9 @@ void doAddGroupColumnForSubquery(SQueryInfo* pQueryInfo, int32_t tagIndex) {
 
   tscAddSpecialColumnForSelect(pQueryInfo, (int32_t)size, TSDB_FUNC_PRJ, &colIndex, pSchema, TSDB_COL_NORMAL);
 
-  SInternalField* pInfo = tscFieldInfoGetInternalField(&pQueryInfo->fieldsInfo, (int32_t)size);
+  int32_t numOfFields = tscNumOfFields(pQueryInfo);
+  SInternalField* pInfo = tscFieldInfoGetInternalField(&pQueryInfo->fieldsInfo, numOfFields - 1);
+
   doLimitOutputNormalColOfGroupby(pInfo->pSqlExpr);
   pInfo->visible = false;
 }
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 8e939cc10e..ce4fe75669 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5533,10 +5533,12 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
   TSKEY newStartKey = TSKEY_INITIAL_VAL;
 
   // skip blocks without load the actual data block from file if no filter condition present
-  skipTimeInterval(pRuntimeEnv, &newStartKey);
-  if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols == 0 && pRuntimeEnv->pFillInfo == NULL) {
-    setQueryStatus(pQuery, QUERY_COMPLETED);
-    return;
+  if (!pRuntimeEnv->groupbyNormalCol) {
+    skipTimeInterval(pRuntimeEnv, &newStartKey);
+    if (pQuery->limit.offset > 0 && pQuery->numOfFilterCols == 0 && pRuntimeEnv->pFillInfo == NULL) {
+      setQueryStatus(pQuery, QUERY_COMPLETED);
+      return;
+    }
   }
 
   while (1) {
@@ -5551,7 +5553,7 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
     }
 
     // no result generated, abort
-    if (pQuery->rec.rows == 0) {
+    if (pQuery->rec.rows == 0 || pRuntimeEnv->groupbyNormalCol) {
       break;
     }
 
@@ -5579,12 +5581,21 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
 
   // all data scanned, the group by normal column can return
   if (pRuntimeEnv->groupbyNormalCol) {  // todo refactor with merge interval time result
-    pQInfo->groupIndex = 0;
-    pQuery->rec.rows = 0;
-    copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
-    clearFirstNTimeWindow(pRuntimeEnv, pQInfo->groupIndex);
+    // maxOutput <= 0, means current query does not generate any results
+    int32_t numOfClosed = numOfClosedTimeWindow(&pRuntimeEnv->windowResInfo);
 
-    limitResults(pRuntimeEnv);
+    if ((pQuery->limit.offset > 0 && pQuery->limit.offset < numOfClosed) || pQuery->limit.offset == 0) {
+      // skip offset result rows
+      clearFirstNTimeWindow(pRuntimeEnv, pQuery->limit.offset);
+
+      pQuery->rec.rows   = 0;
+      pQInfo->groupIndex = 0;
+      copyFromWindowResToSData(pQInfo, &pRuntimeEnv->windowResInfo);
+      clearFirstNTimeWindow(pRuntimeEnv, pQInfo->groupIndex);
+
+      doSecondaryArithmeticProcess(pQuery);
+      limitResults(pRuntimeEnv);
+    }
   }
 }
 
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 7e693b3830..ed9d7552c6 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -456,6 +456,11 @@ if $rows != 1 then
   return -1
 endi
 
+sql select count(*),first(ts),last(ts),min(c3) from group_tb1 group by c4 limit 20 offset 9990;
+if $rows != 10 then
+  return -1
+endi
+
 sql select count(*),first(ts),last(ts),min(c3),max(c3),sum(c3),avg(c3),sum(c4)/count(c4) from group_tb1 group by c8;
 if $rows != 10000 then
   return -1

From 63c3ae84b8c25bface315db8836e64122b28f53b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 17:23:18 +0800
Subject: [PATCH 39/41] [TD-2159] add test cases.

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

diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index ed9d7552c6..9c5e744f89 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -468,6 +468,42 @@ endi
 
 print ---------------------------------> group by binary|nchar data add cases
 sql select count(*) from group_tb1 group by c8;
+if $rows != 100 then
+  return -1
+endi
+
+sql select count(*),sum(c4), count(c4), sum(c4)/count(c4) from group_tb1 group by c8
+if $rows != 100 then
+  return -1
+endi
+
+if $data00 != 100 then
+  return -1
+endi
+
+if $data01 != 495000 then
+  return -1
+endi
+
+if $data02 != 100 then
+  return -1
+endi
+
+if $data03 != 4950.000000 then
+  return -1
+endi
+
+if $data10 != 100 then
+  return -1
+endi
+
+if $data11 != 495100 then
+  return -1
+endi
+
+if $data13 != 4951.000000 then
+  return -1
+endi
 
 #=========================== group by multi tags ======================
 sql create table st (ts timestamp, c int) tags (t1 int, t2 int, t3 int, t4 int);

From 5d09399ee963e3c151487866fcfde81c16a59c1b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 17:46:12 +0800
Subject: [PATCH 40/41] [TD-2159]

---
 tests/script/general/parser/groupby.sim | 35 ++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index 9c5e744f89..48298733ec 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -461,7 +461,7 @@ if $rows != 10 then
   return -1
 endi
 
-sql select count(*),first(ts),last(ts),min(c3),max(c3),sum(c3),avg(c3),sum(c4)/count(c4) from group_tb1 group by c8;
+sql select count(*),first(ts),last(ts),min(c3),max(c3),sum(c3),avg(c3),sum(c4)/count(c4) from group_tb1 group by c4;
 if $rows != 10000 then
   return -1
 endi
@@ -489,7 +489,8 @@ if $data02 != 100 then
   return -1
 endi
 
-if $data03 != 4950.000000 then
+if $data03 != 4950.000000000 then
+  print expect 4950.000000000 , acutal $data03
   return -1
 endi
 
@@ -501,10 +502,38 @@ if $data11 != 495100 then
   return -1
 endi
 
-if $data13 != 4951.000000 then
+if $data13 != 4951.000000000 then
   return -1
 endi
 
+print ====================> group by normal column + slimit + soffset
+sql select count(*), c8 from group_mt0 group by c8 limit 1 offset 0;
+if $rows != 100 then
+  return -1
+endi
+
+sql select sum(c2),c8,avg(c2), sum(c2)/count(*) from group_mt0 group by c8 slimit 2 soffset 99
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 79200.000000000 then
+  return -1
+endi
+
+if $data01 != @binary99@ then
+  return -1
+endi
+
+if $data02 != 99.000000000 then
+  return -1
+endi
+
+if $data03 != 99.000000000 then
+  return -1
+endi
+
+
 #=========================== group by multi tags ======================
 sql create table st (ts timestamp, c int) tags (t1 int, t2 int, t3 int, t4 int);
 sql create table t1 using st tags(1, 1, 1, 1);

From bc41fa4ae8e0b77c37e0d061004f9c75a49e36e8 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Thu, 19 Nov 2020 17:49:05 +0800
Subject: [PATCH 41/41] [TD-225]

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

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index ce4fe75669..6bd4c868b3 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5586,7 +5586,7 @@ static void tableIntervalProcess(SQInfo *pQInfo, STableQueryInfo* pTableInfo) {
 
     if ((pQuery->limit.offset > 0 && pQuery->limit.offset < numOfClosed) || pQuery->limit.offset == 0) {
       // skip offset result rows
-      clearFirstNTimeWindow(pRuntimeEnv, pQuery->limit.offset);
+      clearFirstNTimeWindow(pRuntimeEnv, (int32_t) pQuery->limit.offset);
 
       pQuery->rec.rows   = 0;
       pQInfo->groupIndex = 0;