Merge branch 'develop' into feature/2.0tsdb

860962a2 · hzcheng · 1accde3c · dd7e2952 · 860962a2 · 860962a2
158 changed file
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ tests/test/
 tests/taoshebei/
 tests/taoscsv/
 tests/taosdalipu/
-tests/pytest/
 tests/jenkins/
 tests/hdfs/
 *.iml

--- a/.gitmodules
+++ b/.gitmodules
+[submodule "src/connector/go"]
+	path = src/connector/go
+	url = https://github.com/taosdata/driver-go
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,15 @@ os:
  - linux
 #  - osx
+before_install:
+  - |-
+    case $TRAVIS_OS_NAME in
+      linux)
+        sudo apt -y update
+        sudo apt -y install python-pip python3-pip python-setuptools python3-setuptools
+        ;;
+    esac
 addons:
  coverity_scan:
@@ -50,18 +59,48 @@ script:
  - |-
    case $TRAVIS_OS_NAME in
      linux)
+        # Color setting
+        RED='\033[0;31m'
+        GREEN='\033[1;32m'
+        GREEN_DARK='\033[0;32m'
+        GREEN_UNDERLINE='\033[4;32m'
+        NC='\033[0m'
+        sudo make install
        cd ../tests/script
-        sudo ./test.sh 2>&1 | tee out.txt
+        sudo ./test.sh 2>&1 | grep 'success\|failed' | tee out.txt
-        cat out.txt
-        grep success out.txt
        total_success=`grep success out.txt | wc -l`
-        echo "Total $total_success success"
-        grep failed out.txt
+        if [ "$total_success" -gt "0" ]; then
+          total_success=`expr $total_success - 1`
+          echo -e "${GREEN} ### Total $total_success TSIM case(s) succeed! ### ${NC}"
+        fi
        total_failed=`grep failed out.txt | wc -l`
-        echo "Total $total_failed failed"
        if [ "$total_failed" -ne "0" ]; then
+          echo -e "${RED} ### Total $total_failed TSIM case(s) failed! ### ${NC}"
          exit $total_failed
        fi
+        pip install --user ../../src/connector/python/linux/python2/ 
+        pip3 install --user ../../src/connector/python/linux/python3/ 
+        cd ../pytest
+        sudo ./simpletest.sh 2>&1 | grep 'successfully executed\|failed' | tee pytest-out.txt
+        total_py_success=`grep 'successfully executed' pytest-out.txt | wc -l`
+        if [ "$total_py_success" -gt "0" ]; then
+          echo -e "${GREEN} ### Total $total_py_success python case(s) succeed! ### ${NC}"
+        fi
+        total_py_failed=`grep 'failed' pytest-out.txt | wc -l`
+        if [ "$total_py_failed" -ne "0" ]; then
+          echo -e "${RED} ### Total $total_py_failed python case(s) failed! ### ${NC}"
+          exit $total_py_failed
+        fi
        ;;
    esac
@@ -76,6 +115,10 @@ matrix:
          - build-essential
          - cmake
          - net-tools
+          - python-pip
+          - python-setuptools
+          - python3-pip
+          - python3-setuptools
 #  - os: osx
 #    addons:

--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -11,9 +11,9 @@ ENDIF ()
 IF (TD_VPEER)
  ADD_DEFINITIONS(-D_VPEER)
-  ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=3)
+  #ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=3)
 ELSE ()
-  ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=1)  
+  #ADD_DEFINITIONS(-DTSDB_REPLICA_MAX_NUM=1)  
 ENDIF ()
 IF (TD_ACCOUNT)

--- a/documentation/webdocs/markdowndocs/administrator-ch.md
+++ b/documentation/webdocs/markdowndocs/administrator-ch.md
@@ -102,6 +102,11 @@ RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接
 日志文件目录，客户端和服务器的运行日志将写入该目录。
+**shellActivityTimer**
+- 默认值：3
+系统在服务端保持结果集的最长时间，单位：秒，范围[1-120]。
 **maxUsers**
 - 默认值：10,000
@@ -133,7 +138,7 @@ RESTful服务使用的端口号，所有的HTTP请求（TCP）都需要向该接
 系统（服务端和客户端）运行日志开关：
 - 131 仅输出错误和警告信息
- 135 输入错误（ERROR）、警告（WARN）、信息（Info）
+- 135 输出错误（ERROR）、警告（WARN）、信息（Info）
 不同应用场景的数据往往具有不同的数据特征，比如保留天数、副本数、采集频次、记录大小、采集点的数量、压缩等都可完全不同。为获得在存储上的最高效率，TDengine提供如下存储相关的系统配置参数：
@@ -411,4 +416,4 @@ TDengine启动后，会自动创建一个监测数据库`LOG`，并自动将服
 这些监测信息的采集缺省是打开的，但可以修改配置文件里的选项`monitor`将其关闭或打开。
 [1]: https://github.com/taosdata/TDengine/tree/develop/importSampleData
\ No newline at end of file
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -22,7 +22,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  # generate dynamic library (*.so)
  ADD_LIBRARY(taos SHARED ${SRC})
-  TARGET_LINK_LIBRARIES(taos common trpc tutil pthread m rt)
+  TARGET_LINK_LIBRARIES(taos common query trpc tutil pthread m rt)
  SET_TARGET_PROPERTIES(taos PROPERTIES CLEAN_DIRECT_OUTPUT 1)
  #set version of .so

--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -24,6 +24,7 @@ extern "C" {
 * @date   2018/09/30
 */
 #include "os.h"
+#include "tbuffer.h"
 #include "qextbuffer.h"
 #include "taosdef.h"
 #include "tscSecondaryMerge.h"
@@ -176,8 +177,8 @@ void tscIncStreamExecutionCount(void* pStream);
 bool tscValidateColumnId(STableMetaInfo* pTableMetaInfo, int32_t colId);
 // get starter position of metric query condition (query on tags) in SSqlCmd.payload
-SCond* tsGetSTableQueryCondPos(STagCond* pCond, uint64_t tableIndex);
+SCond* tsGetSTableQueryCond(STagCond* pCond, uint64_t uid);
-void   tsSetSTableQueryCond(STagCond* pTagCond, uint64_t uid, const char* str);
+void   tsSetSTableQueryCond(STagCond* pTagCond, uint64_t uid, SBuffer* pBuf);
 void tscTagCondCopy(STagCond* dest, const STagCond* src);
 void tscTagCondRelease(STagCond* pCond);
@@ -199,7 +200,7 @@ int32_t tscGetQueryInfoDetailSafely(SSqlCmd *pCmd, int32_t subClauseIndex, SQuer
 STableMetaInfo* tscGetMeterMetaInfoByUid(SQueryInfo* pQueryInfo, uint64_t uid, int32_t* index);
 void            tscClearMeterMetaInfo(STableMetaInfo* pTableMetaInfo, bool removeFromCache);
-STableMetaInfo* tscAddMeterMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta, SSuperTableMeta* pMetricMeta,
+STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta, SArray* vgroupList,
                                    int16_t numOfTags, int16_t* tags);
 STableMetaInfo* tscAddEmptyMetaInfo(SQueryInfo *pQueryInfo);
 int32_t tscAddSubqueryInfo(SSqlCmd *pCmd);

--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -43,7 +43,7 @@ struct SSqlInfo;
 typedef struct SSqlGroupbyExpr {
  int16_t     tableIndex;
  int16_t     numOfGroupCols;
-  SColIndexEx columnInfo[TSDB_MAX_TAGS];  // group by columns information
+  SColIndex   columnInfo[TSDB_MAX_TAGS];  // group by columns information
  int16_t     orderIndex;                 // order by column index
  int16_t     orderType;                  // order by type: asc/desc
 } SSqlGroupbyExpr;
@@ -86,7 +86,7 @@ typedef struct STableMetaInfo {
 /* the structure for sql function in select clause */
 typedef struct SSqlExpr {
  char        aliasName[TSDB_COL_NAME_LEN];  // as aliasName
-  SColIndexEx colInfo;
+  SColIndex   colInfo;
  int64_t     uid;            // refactor use the pointer
  int16_t     functionId;     // function id in aAgg array
  int16_t     resType;        // return value type
@@ -141,6 +141,7 @@ struct SLocalReducer;
 typedef struct SCond {
  uint64_t uid;
+  int32_t  len;   // length of tag query condition data
  char *   cond;
 } SCond;
@@ -167,8 +168,7 @@ typedef struct STagCond {
  SJoinInfo joinInfo;
  // for different table, the query condition must be seperated
-  SCond   cond[TSDB_MAX_JOIN_TABLE_NUM];
+  SArray*  pCond;
-  int16_t numOfTagCond;
 } STagCond;
 typedef struct SParamInfo {
@@ -267,19 +267,19 @@ typedef struct {
    int32_t numOfTablesInSubmit;
  };
-  int32_t  clauseIndex;  // index of multiple subclause query
+  int32_t      clauseIndex;  // index of multiple subclause query
-  int8_t   isParseFinish;
+  int8_t       parseFinished;
-  short    numOfCols;
+  short        numOfCols;
-  uint32_t allocSize;
+  uint32_t     allocSize;
-  char *   payload;
+  char *       payload;
-  int      payloadLen;
+  int32_t      payloadLen;
  SQueryInfo **pQueryInfo;
  int32_t      numOfClause;
-  // submit data blocks branched according to vnode
+  SDataBlockList *pDataBlocks; // submit data blocks after parsing sql
-  SDataBlockList *pDataBlocks;
+  char *          curSql; // current sql, resume position of sql after parsing paused
+  void *          pTableList;  // referred table involved in sql
  // for parameter ('?') binding and batch processing
  int32_t batchSize;
  int32_t numOfParams;
@@ -351,15 +351,13 @@ typedef struct SSqlObj {
  char *            sqlstr;
  char              retry;
  char              maxRetry;
-  SRpcIpSet        *ipList;
+  SRpcIpSet         ipList;
  char              freed : 4;
  char              listed : 4;
  tsem_t            rspSem;
  SSqlCmd           cmd;
  SSqlRes           res;
  uint8_t           numOfSubs;
-  char *            asyncTblPos;
-  void *            pTableHashList;
  struct SSqlObj **pSubs;
  struct SSqlObj * prev, *next;
 } SSqlObj;
@@ -422,7 +420,7 @@ void    tscRestoreSQLFunctionForMetricQuery(SQueryInfo *pQueryInfo);
 int32_t tscCreateResPointerInfo(SSqlRes *pRes, SQueryInfo *pQueryInfo);
 void    tscDestroyResPointerInfo(SSqlRes *pRes);
-void tscFreeSqlCmdData(SSqlCmd *pCmd);
+void tscResetSqlCmdObj(SSqlCmd *pCmd);
 void tscFreeResData(SSqlObj *pSql);
 /**

--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -67,7 +67,7 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const
  pRes->numOfRows = 1;
  strtolower(pSql->sqlstr, sqlstr);
-  tscDump("%p pObj:%p, Async SQL: %s", pSql, pObj, pSql->sqlstr);
+  tscDump("%p SQL: %s", pSql, pSql->sqlstr);
  int32_t code = tsParseSql(pSql, true);
  if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
@@ -342,7 +342,7 @@ void tscProcessAsyncRes(SSchedMsg *pMsg) {
  (*pSql->fp)(pSql->param, taosres, code);
  if (shouldFree) {
-    tscTrace("%p Async sql is automatically freed in async res", pSql);
+    tscTrace("%p sqlObj is automatically freed in async res", pSql);
    tscFreeSqlObj(pSql);
  }
 }
@@ -463,14 +463,16 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code) {
      if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
    } else {  // normal async query continues
-      if (pCmd->isParseFinish) {
+      if (pCmd->parseFinished) {
-        tscTrace("%p resend data to vnode in metermeta callback since sql has been parsed completed", pSql);
+        tscTrace("%p re-send data to vnode in table Meta callback since sql parsed completed", pSql);
        STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
        code = tscGetTableMeta(pSql, pTableMetaInfo);
        assert(code == TSDB_CODE_SUCCESS);
        if (pTableMetaInfo->pTableMeta) {
+          // todo update the submit message according to the new table meta
+          // 1. table uid, 2. ip address
          code = tscSendMsgToServer(pSql);
          if (code == TSDB_CODE_SUCCESS) return;
        }

--- a/src/client/src/tscFunctionImpl.c
+++ b/src/client/src/tscFunctionImpl.c
@@ -691,7 +691,7 @@ static int32_t data_req_load_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end,
 // todo: if  column in current data block are null, opt for this case
 static int32_t first_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
    return BLK_DATA_NO_NEEDED;
  }
@@ -704,7 +704,7 @@ static int32_t first_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end,
 }
 static int32_t last_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    return BLK_DATA_NO_NEEDED;
  }
@@ -716,7 +716,7 @@ static int32_t last_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end,
 }
 static int32_t first_dist_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
    return BLK_DATA_NO_NEEDED;
  }
@@ -732,7 +732,7 @@ static int32_t first_dist_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY
 }
 static int32_t last_dist_data_req_info(SQLFunctionCtx *pCtx, TSKEY start, TSKEY end, int32_t colId) {
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    return BLK_DATA_NO_NEEDED;
  }
@@ -1483,7 +1483,7 @@ static bool first_last_function_setup(SQLFunctionCtx *pCtx) {
 // todo opt for null block
 static void first_function(SQLFunctionCtx *pCtx) {
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
    return;
  }
@@ -1513,7 +1513,7 @@ static void first_function(SQLFunctionCtx *pCtx) {
 }
 static void first_function_f(SQLFunctionCtx *pCtx, int32_t index) {
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
    return;
  }
@@ -1561,7 +1561,7 @@ static void first_dist_function(SQLFunctionCtx *pCtx) {
   * 1. data block that are not loaded
   * 2. scan data files in desc order
   */
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
    return;
  }
@@ -1596,7 +1596,7 @@ static void first_dist_function_f(SQLFunctionCtx *pCtx, int32_t index) {
    return;
  }
-  if (pCtx->order == TSQL_SO_DESC) {
+  if (pCtx->order == TSDB_ORDER_DESC) {
    return;
  }
@@ -1654,7 +1654,7 @@ static void first_dist_func_second_merge(SQLFunctionCtx *pCtx) {
 *    least one data in this block that is not null.(TODO opt for this case)
 */
 static void last_function(SQLFunctionCtx *pCtx) {
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    return;
  }
@@ -1683,7 +1683,7 @@ static void last_function(SQLFunctionCtx *pCtx) {
 }
 static void last_function_f(SQLFunctionCtx *pCtx, int32_t index) {
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    return;
  }
@@ -1730,7 +1730,7 @@ static void last_dist_function(SQLFunctionCtx *pCtx) {
   * 1. for scan data in asc order, no need to check data
   * 2. for data blocks that are not loaded, no need to check data
   */
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    return;
  }
@@ -1768,7 +1768,7 @@ static void last_dist_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   * 1. for scan data in asc order, no need to check data
   * 2. for data blocks that are not loaded, no need to check data
   */
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    return;
  }
@@ -2420,10 +2420,10 @@ static void top_bottom_func_finalizer(SQLFunctionCtx *pCtx) {
  // user specify the order of output by sort the result according to timestamp
  if (pCtx->param[1].i64Key == PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSQL_SO_ASC) ? resAscComparFn : resDescComparFn;
+    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSDB_ORDER_ASC) ? resAscComparFn : resDescComparFn;
    qsort(tvp, pResInfo->numOfRes, POINTER_BYTES, comparator);
  } else if (pCtx->param[1].i64Key > PRIMARYKEY_TIMESTAMP_COL_INDEX) {
-    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSQL_SO_ASC) ? resDataAscComparFn : resDataDescComparFn;
+    __compar_fn_t comparator = (pCtx->param[2].i64Key == TSDB_ORDER_ASC) ? resDataAscComparFn : resDataDescComparFn;
    qsort(tvp, pResInfo->numOfRes, POINTER_BYTES, comparator);
  }
@@ -2449,7 +2449,7 @@ static bool percentile_function_setup(SQLFunctionCtx *pCtx) {
  int32_t    orderIdx = 0;
  // tOrderDesc object
-  tOrderDescriptor *pDesc = tOrderDesCreate(&orderIdx, NUMOFCOLS, pModel, TSQL_SO_DESC);
+  tOrderDescriptor *pDesc = tOrderDesCreate(&orderIdx, NUMOFCOLS, pModel, TSDB_ORDER_DESC);
  ((SPercentileInfo *)(pResInfo->interResultBuf))->pMemBucket =
      tMemBucketCreate(1024, MAX_AVAILABLE_BUFFER_SIZE, pCtx->inputBytes, pCtx->inputType, pDesc);
@@ -2916,7 +2916,7 @@ static void col_project_function(SQLFunctionCtx *pCtx) {
  INC_INIT_VAL(pCtx, pCtx->size);
  char *pData = GET_INPUT_CHAR(pCtx);
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    memcpy(pCtx->aOutputBuf, pData, (size_t)pCtx->size * pCtx->inputBytes);
  } else {
    for(int32_t i = 0; i < pCtx->size; ++i) {
@@ -3011,7 +3011,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
  int32_t notNullElems = 0;
  int32_t step = GET_FORWARD_DIRECTION_FACTOR(pCtx->order);
-  int32_t i = (pCtx->order == TSQL_SO_ASC) ? 0 : pCtx->size - 1;
+  int32_t i = (pCtx->order == TSDB_ORDER_ASC) ? 0 : pCtx->size - 1;
  TSKEY * pTimestamp = pCtx->ptsOutputBuf;
@@ -3028,7 +3028,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
        if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
          pCtx->param[1].i64Key = pData[i];
          pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
          *pOutput = pData[i] - pCtx->param[1].i64Key;
          *pTimestamp = pCtx->ptsList[i];
@@ -3060,7 +3060,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
        if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
          pCtx->param[1].i64Key = pData[i];
          pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
          *pOutput = pData[i] - pCtx->param[1].i64Key;
          *pTimestamp = pCtx->ptsList[i];
@@ -3092,7 +3092,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
        if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
          pCtx->param[1].dKey = pData[i];
          pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
          *pOutput = pData[i] - pCtx->param[1].dKey;
          *pTimestamp = pCtx->ptsList[i];
          pOutput += 1;
@@ -3122,7 +3122,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
        if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
          pCtx->param[1].dKey = pData[i];
          pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
          *pOutput = pData[i] - pCtx->param[1].dKey;
          *pTimestamp = pCtx->ptsList[i];
@@ -3155,7 +3155,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
        if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
          pCtx->param[1].i64Key = pData[i];
          pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
          *pOutput = pData[i] - pCtx->param[1].i64Key;
          *pTimestamp = pCtx->ptsList[i];
          pOutput += 1;
@@ -3186,7 +3186,7 @@ static void diff_function(SQLFunctionCtx *pCtx) {
        if (pCtx->param[1].nType == INITIAL_VALUE_NOT_ASSIGNED) {  // initial value is not set yet
          pCtx->param[1].i64Key = pData[i];
          pCtx->param[1].nType = pCtx->inputType;
-        } else if ((i == 0 && pCtx->order == TSQL_SO_ASC) || (i == pCtx->size - 1 && pCtx->order == TSQL_SO_DESC)) {
+        } else if ((i == 0 && pCtx->order == TSDB_ORDER_ASC) || (i == pCtx->size - 1 && pCtx->order == TSDB_ORDER_DESC)) {
          *pOutput = pData[i] - pCtx->param[1].i64Key;
          *pTimestamp = pCtx->ptsList[i];
@@ -3298,17 +3298,17 @@ char *arithmetic_callback_function(void *param, char *name, int32_t colId) {
  SArithmeticSupport *pSupport = (SArithmeticSupport *)param;
  SSqlFunctionExpr *pExpr = pSupport->pExpr;
-  int32_t           colIndexInBuf = -1;
+  int32_t           colIndex = -1;
  for (int32_t i = 0; i < pExpr->binExprInfo.numOfCols; ++i) {
    if (colId == pExpr->binExprInfo.pReqColumns[i].colId) {
-      colIndexInBuf = pExpr->binExprInfo.pReqColumns[i].colIdxInBuf;
+      colIndex = pExpr->binExprInfo.pReqColumns[i].colIndex;
      break;
    }
  }
-  assert(colIndexInBuf >= 0 && colId >= 0);
+  assert(colIndex >= 0 && colId >= 0);
-  return pSupport->data[colIndexInBuf] + pSupport->offset * pSupport->elemSize[colIndexInBuf];
+  return pSupport->data[colIndex] + pSupport->offset * pSupport->elemSize[colIndex];
 }
 static void arithmetic_function(SQLFunctionCtx *pCtx) {
@@ -3578,121 +3578,6 @@ void spread_function_finalizer(SQLFunctionCtx *pCtx) {
  doFinalizer(pCtx);
 }
-/*
- * Compare two strings
- *    TSDB_MATCH:            Match
- *    TSDB_NOMATCH:          No match
- *    TSDB_NOWILDCARDMATCH:  No match in spite of having * or % wildcards.
- * Like matching rules:
- *      '%': Matches zero or more characters
- *      '_': Matches one character
- *
- */
-int patternMatch(const char *patterStr, const char *str, size_t size, const SPatternCompareInfo *pInfo) {
-  char c, c1;
-  int32_t i = 0;
-  int32_t j = 0;
-  while ((c = patterStr[i++]) != 0) {
-    if (c == pInfo->matchAll) { /* Match "*" */
-      while ((c = patterStr[i++]) == pInfo->matchAll || c == pInfo->matchOne) {
-        if (c == pInfo->matchOne && (j > size || str[j++] == 0)) {
-          // empty string, return not match
-          return TSDB_PATTERN_NOWILDCARDMATCH;
-        }
-      }
-      if (c == 0) {
-        return TSDB_PATTERN_MATCH; /* "*" at the end of the pattern matches */
-      }
-      char next[3] = {toupper(c), tolower(c), 0};
-      while (1) {
-        size_t n = strcspn(str, next);
-        str += n;
-        if (str[0] == 0 || (n >= size - 1)) {
-          break;
-        }
-        int32_t ret = patternMatch(&patterStr[i], ++str, size - n - 1, pInfo);
-        if (ret != TSDB_PATTERN_NOMATCH) {
-          return ret;
-        }
-      }
-      return TSDB_PATTERN_NOWILDCARDMATCH;
-    }
-    c1 = str[j++];
-    if (j <= size) {
-      if (c == c1 || tolower(c) == tolower(c1) || (c == pInfo->matchOne && c1 != 0)) {
-        continue;
-      }
-    }
-    return TSDB_PATTERN_NOMATCH;
-  }
-  return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
-}
-int WCSPatternMatch(const wchar_t *patterStr, const wchar_t *str, size_t size, const SPatternCompareInfo *pInfo) {
-  wchar_t c, c1;
-  wchar_t matchOne = L'_';  // "_"
-  wchar_t matchAll = L'%';  // "%"
-  int32_t i = 0;
-  int32_t j = 0;
-  while ((c = patterStr[i++]) != 0) {
-    if (c == matchAll) { /* Match "%" */
-      while ((c = patterStr[i++]) == matchAll || c == matchOne) {
-        if (c == matchOne && (j > size || str[j++] == 0)) {
-          return TSDB_PATTERN_NOWILDCARDMATCH;
-        }
-      }
-      if (c == 0) {
-        return TSDB_PATTERN_MATCH;
-      }
-      wchar_t accept[3] = {towupper(c), towlower(c), 0};
-      while (1) {
-        size_t n = wcsspn(str, accept);
-        str += n;
-        if (str[0] == 0 || (n >= size - 1)) {
-          break;
-        }
-        str++;
-        int32_t ret = WCSPatternMatch(&patterStr[i], str, wcslen(str), pInfo);
-        if (ret != TSDB_PATTERN_NOMATCH) {
-          return ret;
-        }
-      }
-      return TSDB_PATTERN_NOWILDCARDMATCH;
-    }
-    c1 = str[j++];
-    if (j <= size) {
-      if (c == c1 || towlower(c) == towlower(c1) || (c == matchOne && c1 != 0)) {
-        continue;
-      }
-    }
-    return TSDB_PATTERN_NOMATCH;
-  }
-  return (str[j] == 0 || j >= size) ? TSDB_PATTERN_MATCH : TSDB_PATTERN_NOMATCH;
-}
 static void getStatics_i8(int64_t *primaryKey, int32_t type, int8_t *data, int32_t numOfRow, int64_t *min, int64_t *max,
                          int64_t *sum, int16_t *minIndex, int16_t *maxIndex, int32_t *numOfNull) {
  *min = INT64_MAX;
@@ -4327,7 +4212,7 @@ static void ts_comp_function(SQLFunctionCtx *pCtx) {
  const char *input = GET_INPUT_CHAR(pCtx);
  // primary ts must be existed, so no need to check its existance
-  if (pCtx->order == TSQL_SO_ASC) {
+  if (pCtx->order == TSDB_ORDER_ASC) {
    tsBufAppend(pTSbuf, 0, pCtx->tag.i64Key, input, pCtx->size * TSDB_KEYSIZE);
  } else {
    for (int32_t i = pCtx->size - 1; i >= 0; --i) {

--- a/src/client/src/tscLocal.c
+++ b/src/client/src/tscLocal.c
@@ -240,7 +240,7 @@ static int32_t tscBuildMeterSchemaResultFields(SSqlObj *pSql, int32_t numOfCols,
  pCmd->numOfCols = numOfCols;
  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
-  pQueryInfo->order.order = TSQL_SO_ASC;
+  pQueryInfo->order.order = TSDB_ORDER_ASC;
  tscFieldInfoSetValue(&pQueryInfo->fieldsInfo, 0, TSDB_DATA_TYPE_BINARY, "Field", TSDB_COL_NAME_LEN);
  rowLen += TSDB_COL_NAME_LEN;
@@ -322,7 +322,7 @@ static int tscBuildMetricTagProjectionResult(SSqlObj *pSql) {
      STableIdInfo *pSidExt = tscGetMeterSidInfo(pSidList, j);
      for (int32_t k = 0; k < pQueryInfo->fieldsInfo.numOfOutputCols; ++k) {
-        SColIndexEx *pColIndex = &tscSqlExprGet(pQueryInfo, k)->colInfo;
+        SColIndex *pColIndex = &tscSqlExprGet(pQueryInfo, k)->colInfo;
        int16_t      offsetId = pColIndex->colIdx;
        assert((pColIndex->flag & TSDB_COL_TAG) != 0);
@@ -460,7 +460,7 @@ void tscSetLocalQueryResult(SSqlObj *pSql, const char *val, const char *columnNa
  pCmd->numOfCols = 1;
  SQueryInfo* pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
-  pQueryInfo->order.order = TSQL_SO_ASC;
+  pQueryInfo->order.order = TSDB_ORDER_ASC;
  tscClearFieldInfo(&pQueryInfo->fieldsInfo);

--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -21,7 +21,6 @@
 #include "os.h"
 #include "hash.h"
-//#include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
 #include "tsclient.h"
@@ -656,7 +655,7 @@ void sortRemoveDuplicates(STableDataBlocks *dataBuf) {
  }
 }
-static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableHashList, char **str, SParsedDataColInfo *spd,
+static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableList, char **str, SParsedDataColInfo *spd,
                                      int32_t *totalNum) {
  SSqlCmd *       pCmd = &pSql->cmd;
  STableMetaInfo *pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, 0);
@@ -664,7 +663,7 @@ static int32_t doParseInsertStatement(SSqlObj *pSql, void *pTableHashList, char
  STableComInfo tinfo = tscGetTableInfo(pTableMeta);
  STableDataBlocks *dataBuf = NULL;
-  int32_t ret = tscGetDataBlockFromList(pTableHashList, pCmd->pDataBlocks, pTableMeta->uid, TSDB_DEFAULT_PAYLOAD_SIZE,
+  int32_t ret = tscGetDataBlockFromList(pTableList, pCmd->pDataBlocks, pTableMeta->uid, TSDB_DEFAULT_PAYLOAD_SIZE,
                                        sizeof(SSubmitBlk), tinfo.rowSize, pTableMetaInfo->name,
                                        pTableMeta, &dataBuf);
  if (ret != TSDB_CODE_SUCCESS) {
@@ -942,7 +941,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
    }
    code = tscGetTableMeta(pSql, pTableMetaInfo);
-    if (pSql->asyncTblPos == NULL) {
+    if (pCmd->curSql == NULL) {
      assert(code == TSDB_CODE_ACTION_IN_PROGRESS);
    }
  }
@@ -1008,23 +1007,23 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
    return code;
  }
-  assert(((NULL == pSql->asyncTblPos) && (NULL == pSql->pTableHashList))
+  assert(((NULL == pCmd->curSql) && (NULL == pCmd->pTableList))
-      || ((NULL != pSql->asyncTblPos) && (NULL != pSql->pTableHashList)));
+      || ((NULL != pCmd->curSql) && (NULL != pCmd->pTableList)));
-  if ((NULL == pSql->asyncTblPos) && (NULL == pSql->pTableHashList)) {
+  if ((NULL == pCmd->curSql) && (NULL == pCmd->pTableList)) {
-    pSql->pTableHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
+    pCmd->pTableList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false);
    pSql->cmd.pDataBlocks = tscCreateBlockArrayList();
-    if (NULL == pSql->pTableHashList || NULL == pSql->cmd.pDataBlocks) {
+    if (NULL == pCmd->pTableList || NULL == pSql->cmd.pDataBlocks) {
      code = TSDB_CODE_CLI_OUT_OF_MEMORY;
      goto _error_clean;
    }
  } else {
-    assert((NULL != pSql->asyncTblPos) && (NULL != pSql->pTableHashList));
+    assert((NULL != pCmd->curSql) && (NULL != pCmd->pTableList));
-    str = pSql->asyncTblPos;
+    str = pCmd->curSql;
  }
-  tscTrace("%p create data block list for submit data:%p, asyncTblPos:%p, pTableHashList:%p", pSql, pSql->cmd.pDataBlocks, pSql->asyncTblPos, pSql->pTableHashList);
+  tscTrace("%p create data block list for submit data:%p, curSql:%p, pTableList:%p", pSql, pSql->cmd.pDataBlocks, pCmd->curSql, pCmd->pTableList);
  while (1) {
    int32_t   index = 0;
@@ -1052,7 +1051,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
      }
    }
-    pSql->asyncTblPos = sToken.z;
+    pCmd->curSql = sToken.z;
    // Check if the table name available or not
    if (validateTableName(sToken.z, sToken.n) != TSDB_CODE_SUCCESS) {
@@ -1064,7 +1063,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
      goto _error_clean;
    }
-    ptrdiff_t pos = pSql->asyncTblPos - pSql->sqlstr;
+    ptrdiff_t pos = pCmd->curSql - pSql->sqlstr;
    if ((code = tscCheckIfCreateTable(&str, pSql)) != TSDB_CODE_SUCCESS) {
      /*
@@ -1075,13 +1074,13 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
       */
      if (TSDB_CODE_ACTION_IN_PROGRESS == code) {
        tscTrace("%p waiting for get table meta during insert, then resume from offset: %" PRId64 " , %s", pSql,
-            pos, pSql->asyncTblPos);
+            pos, pCmd->curSql);
        return code;
      }
      // todo add to return
      tscError("%p async insert parse error, code:%d, %s", pSql, code, tstrerror(code));
-      pSql->asyncTblPos = NULL;
+      pCmd->curSql = NULL;
      goto _error_clean;       // TODO: should _clean or _error_clean to async flow ????
    }
@@ -1115,7 +1114,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
       * app here insert data in different vnodes, so we need to set the following
       * data in another submit procedure using async insert routines
       */
-      code = doParseInsertStatement(pSql, pSql->pTableHashList, &str, &spd, &totalNum);
+      code = doParseInsertStatement(pSql, pCmd->pTableList, &str, &spd, &totalNum);
      if (code != TSDB_CODE_SUCCESS) {
        goto _error_clean;
      }
@@ -1227,7 +1226,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
        goto _error_clean;
      }
-      code = doParseInsertStatement(pSql, pSql->pTableHashList, &str, &spd, &totalNum);
+      code = doParseInsertStatement(pSql, pCmd->pTableList, &str, &spd, &totalNum);
      if (code != TSDB_CODE_SUCCESS) {
        goto _error_clean;
      }
@@ -1257,11 +1256,11 @@ _error_clean:
  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
 _clean:
-  taosHashCleanup(pSql->pTableHashList);
+  taosHashCleanup(pCmd->pTableList);
+  pCmd->pTableList = NULL;
-  pSql->pTableHashList = NULL;
+  pCmd->curSql    = NULL;
-  pSql->asyncTblPos    = NULL;
+  pCmd->parseFinished  = 1;
-  pCmd->isParseFinish  = 1;
  return code;
 }
@@ -1305,17 +1304,15 @@ int tsParseSql(SSqlObj *pSql, bool initialParse) {
    tscFreeSqlObjPartial(pSql);
    pSql->sqlstr = p;
  } else {
-    tscTrace("continue parse sql: %s", pSql->asyncTblPos);
+    tscTrace("continue parse sql: %s", pSql->cmd.curSql);
  }
  if (tscIsInsertOrImportData(pSql->sqlstr)) {
    /*
-     * only for async multi-vnode insertion
+     * Set the fp before parse the sql string, in case of getTableMeta failed, in which
-     * Set the fp before parse the sql string, in case of getmetermeta failed, in which
+     * the error handle callback function can rightfully restore the user-defined callback function (fp).
-     * the error handle callback function can rightfully restore the user defined function (fp)
     */
    if (initialParse) {
-      // replace user defined callback function with multi-insert proxy function
      pSql->fetchFp = pSql->fp;
      pSql->fp = (void(*)())tscHandleMultivnodeInsert;
    }
@@ -1335,11 +1332,11 @@ int tsParseSql(SSqlObj *pSql, bool initialParse) {
  }
  /*
-   * the pRes->code may be modified or even released by another thread in tscTableMetaCallBack
+   * the pRes->code may be modified or released by another thread in tscTableMetaCallBack function,
-   * function, so do NOT use pRes->code to determine if the getMeterMeta/getMetricMeta function
+   * so do NOT use pRes->code to determine if the getTableMeta/getMetricMeta function
-   * invokes new threads to get data from mnode or simply retrieves data from cache.
+   * invokes new threads to get data from mgmt node or simply retrieves data from cache.
   *
-   * do NOT assign return code to pRes->code for the same reason for it may be released by another thread
+   * do NOT assign return code to pRes->code for the same reason since it may be released by another thread
   * pRes->code = ret;
   */
  return ret;
@@ -1457,7 +1454,6 @@ static int tscInsertDataFromFile(SSqlObj *pSql, FILE *fp, char *tmpTokenBuf) {
  return numOfRows;
 }
-// multi-vnodes insertion in sync query model
 void tscProcessMultiVnodesInsertFromFile(SSqlObj *pSql) {
  SSqlCmd *pCmd = &pSql->cmd;
  if (pCmd->command != TSDB_SQL_INSERT) {

--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
--- a/src/client/src/tscSecondaryMerge.c
+++ b/src/client/src/tscSecondaryMerge.c
@@ -45,7 +45,7 @@ int32_t treeComparator(const void *pLeft, const void *pRight, void *param) {
    return -1;
  }
-  if (pParam->groupOrderType == TSQL_SO_DESC) {  // desc
+  if (pParam->groupOrderType == TSDB_ORDER_DESC) {  // desc
    return compare_d(pDesc, pParam->numOfElems, pLocalData[pLeftIdx]->rowIdx, pLocalData[pLeftIdx]->filePage.data,
                     pParam->numOfElems, pLocalData[pRightIdx]->rowIdx, pLocalData[pRightIdx]->filePage.data);
  } else {
@@ -652,7 +652,7 @@ int32_t tscLocalReducerEnvCreate(SSqlObj *pSql, tExtMemBuffer ***pMemBuffer, tOr
  for (int32_t i = 0; i < pQueryInfo->exprsInfo.numOfExprs; ++i) {
    SSqlExpr *pExpr = tscSqlExprGet(pQueryInfo, i);
-    SSchema *p1 = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, pExpr->colInfo.colIdx);
+    SSchema *p1 = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, pExpr->colInfo.colIndex);
    int16_t inter = 0;
    int16_t type = -1;
@@ -990,7 +990,7 @@ static void doInterpolateResult(SSqlObj *pSql, SLocalReducer *pLocalReducer, boo
      savePrevRecordAndSetupInterpoInfo(pLocalReducer, pQueryInfo, pInterpoInfo);
    }
-    if (pQueryInfo->order.order == TSQL_SO_ASC) {
+    if (pQueryInfo->order.order == TSDB_ORDER_ASC) {
      for (int32_t i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
        TAOS_FIELD *pField = tscFieldInfoGetField(pQueryInfo, i);
        int16_t     offset = getColumnModelOffset(pLocalReducer->resColModel, i);
@@ -1168,7 +1168,7 @@ bool needToMerge(SQueryInfo *pQueryInfo, SLocalReducer *pLocalReducer, tFilePage
  } else {
    tOrderDescriptor *pDesc = pLocalReducer->pDesc;
    if (pDesc->orderIdx.numOfCols > 0) {
-      if (pDesc->tsOrder == TSQL_SO_ASC) {  // asc
+      if (pDesc->tsOrder == TSDB_ORDER_ASC) {  // asc
        // todo refactor comparator
        ret = compare_a(pLocalReducer->pDesc, 1, 0, pLocalReducer->prevRowOfInput, 1, 0, tmpBuffer->data);
      } else {  // desc

--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -37,12 +37,25 @@ int (*tscBuildMsg[TSDB_SQL_MAX])(SSqlObj *pSql, SSqlInfo *pInfo) = {0};
 int (*tscProcessMsgRsp[TSDB_SQL_MAX])(SSqlObj *pSql);
 void tscProcessActivityTimer(void *handle, void *tmrId);
 int tscKeepConn[TSDB_SQL_MAX] = {0};
 TSKEY tscGetSubscriptionProgress(void* sub, int64_t uid);
 void tscUpdateSubscriptionProgress(void* sub, int64_t uid, TSKEY ts);
 void tscSaveSubscriptionProgress(void* sub);
 static int32_t minMsgSize() { return tsRpcHeadSize + 100; }
+static void tscSetDnodeIpList(SSqlObj* pSql, STableMeta* pTableMeta) {
+  SRpcIpSet* pIpList = &pSql->ipList;
+  pIpList->numOfIps = pTableMeta->numOfVpeers;
+  pIpList->port     = tsDnodeShellPort;
+  pIpList->inUse    = 0;
+  for(int32_t i = 0; i < pTableMeta->numOfVpeers; ++i) {
+    pIpList->ip[i] = pTableMeta->vpeerDesc[i].ip;
+  }
+}
 void tscPrintMgmtIp() {
  if (tscMgmtIpList.numOfIps <= 0) {
    tscError("invalid mgmt IP list:%d", tscMgmtIpList.numOfIps);
@@ -169,17 +182,16 @@ void tscProcessActivityTimer(void *handle, void *tmrId) {
 }
 int tscSendMsgToServer(SSqlObj *pSql) {
-  char *pMsg = rpcMallocCont(pSql->cmd.payloadLen);
+  SSqlCmd* pCmd = &pSql->cmd;
+  char *pMsg = rpcMallocCont(pCmd->payloadLen);
  if (NULL == pMsg) {
    tscError("%p msg:%s malloc fail", pSql, taosMsg[pSql->cmd.msgType]);
    return TSDB_CODE_CLI_OUT_OF_MEMORY;
  }
-  pSql->ipList->ip[0] = inet_addr(tsPrivateIp);
  if (pSql->cmd.command < TSDB_SQL_MGMT) {
-    pSql->ipList->port = tsDnodeShellPort;
+    tscTrace("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList.port);
-    tscPrint("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList->port);
    memcpy(pMsg, pSql->cmd.payload + tsRpcHeadSize, pSql->cmd.payloadLen);
    SRpcMsg rpcMsg = {
@@ -189,10 +201,12 @@ int tscSendMsgToServer(SSqlObj *pSql) {
      .handle  = pSql,
      .code    = 0
    };
-    rpcSendRequest(pVnodeConn, pSql->ipList, &rpcMsg);
+    rpcSendRequest(pVnodeConn, &pSql->ipList, &rpcMsg);
  } else {
-    pSql->ipList->port = tsMnodeShellPort;
+    pSql->ipList = tscMgmtIpList;
-    tscTrace("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList->port);
+    pSql->ipList.port = tsMnodeShellPort;
+    tscTrace("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList.port);
    memcpy(pMsg, pSql->cmd.payload, pSql->cmd.payloadLen);
    SRpcMsg rpcMsg = {
        .msgType = pSql->cmd.msgType,
@@ -201,7 +215,7 @@ int tscSendMsgToServer(SSqlObj *pSql) {
        .handle  = pSql,
        .code   = 0
    };
-    rpcSendRequest(pTscMgmtConn, pSql->ipList, &rpcMsg);
+    rpcSendRequest(pTscMgmtConn, &pSql->ipList, &rpcMsg);
  }
  return TSDB_CODE_SUCCESS;
@@ -254,15 +268,18 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) {
        rpcFreeCont(rpcMsg->pCont);
        return;
      } else {
-        tscTrace("%p it shall renew meter meta, code:%d", pSql, tstrerror(rpcMsg->code));
+        tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), ++pSql->retry);
-        pSql->maxRetry = TSDB_VNODES_SUPPORT * 2;
+        pSql->maxRetry = TSDB_VNODES_SUPPORT * 2;  // todo move away
        pSql->res.code = rpcMsg->code;  // keep the previous error code
+        if (pSql->retry > pSql->maxRetry) {
-        rpcMsg->code = tscRenewMeterMeta(pSql, pTableMetaInfo->name);
+          tscError("%p max retry %d reached, give up", pSql, pSql->maxRetry);
+        } else {
-        if (pTableMetaInfo->pTableMeta) {
+          rpcMsg->code = tscRenewMeterMeta(pSql, pTableMetaInfo->name);
-          tscSendMsgToServer(pSql);
+          if (pTableMetaInfo->pTableMeta) {
+            tscSendMsgToServer(pSql);
+          }
          rpcFreeCont(rpcMsg->pCont);
          return;
        }
@@ -270,7 +287,11 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) {
    }
  }
-  pSql->retry = 0;
+  if (pRes->code == TSDB_CODE_SUCCESS) {
+    tscTrace("%p reset retry counter to be 0 due to success rsp, old:%d", pSql, pSql->retry);
+    pSql->retry = 0;
+  }
  pRes->rspLen = 0;
  if (pRes->code != TSDB_CODE_QUERY_CANCELLED) {
@@ -315,7 +336,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) {
      pMsg->numOfFailedBlocks = htonl(pMsg->numOfFailedBlocks);
      pRes->numOfRows += pMsg->affectedRows;
-      tscTrace("%p cmd:%d code:%d, inserted rows:%d, rsp len:%d", pSql, pCmd->command, pRes->code,
+      tscTrace("%p cmd:%d code:%s, inserted rows:%d, rsp len:%d", pSql, pCmd->command, tstrerror(pRes->code),
          pMsg->affectedRows, pRes->rspLen);
    } else {
      tscTrace("%p cmd:%d code:%s rsp len:%d", pSql, pCmd->command, tstrerror(pRes->code), pRes->rspLen);
@@ -329,7 +350,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) {
    void *taosres = tscKeepConn[pCmd->command] ? pSql : NULL;
    rpcMsg->code = pRes->code ? pRes->code : pRes->numOfRows;
-    tscTrace("%p Async SQL result:%s res:%p", pSql, tstrerror(pRes->code), pSql);
+    tscTrace("%p SQL result:%s res:%p", pSql, tstrerror(pRes->code), pSql);
    /*
     * Whether to free sqlObj or not should be decided before call the user defined function, since this SqlObj
@@ -343,7 +364,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg) {
    (*pSql->fp)(pSql->param, taosres, rpcMsg->code);
    if (shouldFree) {
-      tscTrace("%p Async sql is automatically freed", pSql);
+      tscTrace("%p sqlObj is automatically freed", pSql);
      tscFreeSqlObj(pSql);
    }
  }
@@ -405,7 +426,7 @@ int tscProcessSql(SSqlObj *pSql) {
    }
    // temp
-    pSql->ipList = &tscMgmtIpList;
+//    pSql->ipList = tscMgmtIpList;
 //    if (UTIL_TABLE_IS_NOMRAL_TABLE(pTableMetaInfo)) {
 //      pSql->index = pTableMetaInfo->pTableMeta->index;
 //    } else {  // it must be the parent SSqlObj for super table query
@@ -417,7 +438,7 @@ int tscProcessSql(SSqlObj *pSql) {
 //      }
 //    }
  } else if (pSql->cmd.command < TSDB_SQL_LOCAL) {
-    pSql->ipList = &tscMgmtIpList;
+    pSql->ipList = tscMgmtIpList;
  } else {  // local handler
    return (*tscProcessMsgRsp[pCmd->command])(pSql);
  }
@@ -501,7 +522,8 @@ int tscBuildRetrieveMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
  pRetrieveMsg->free = htons(pQueryInfo->type);
  pMsg += sizeof(pQueryInfo->type);
-  pRetrieveMsg->header.vgId = htonl(1);
+  STableMeta* pTableMeta = pQueryInfo->pTableMetaInfo[0]->pTableMeta;
+  pRetrieveMsg->header.vgId = htonl(pTableMeta->vgId);
  pMsg += sizeof(SRetrieveTableMsg);
  pRetrieveMsg->header.contLen = htonl(pSql->cmd.payloadLen);
@@ -532,10 +554,11 @@ int tscBuildSubmitMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
  pShellMsg->numOfBlocks = htonl(pSql->cmd.numOfTablesInSubmit);  // number of meters to be inserted
-  // pSql->cmd.payloadLen is set during copying data into paylaod
+  // pSql->cmd.payloadLen is set during copying data into payload
  pSql->cmd.msgType = TSDB_MSG_TYPE_SUBMIT;
-  tscTrace("%p build submit msg, vgId:%d numOfVnodes:%d", pSql, pTableMeta->vgId, htons(pMsgDesc->numOfVnodes));
+  tscSetDnodeIpList(pSql, pTableMeta);
+  tscTrace("%p build submit msg, vgId:%d numOfVnodes:%d", pSql, pTableMeta->vgId, htonl(pMsgDesc->numOfVnodes));
  return TSDB_CODE_SUCCESS;
 }
@@ -628,15 +651,22 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
  if (UTIL_TABLE_IS_NOMRAL_TABLE(pTableMetaInfo)) {
    numOfTables = 1;
+    tscSetDnodeIpList(pSql, pTableMeta);
    pQueryMsg->head.vgId = htonl(pTableMeta->vgId);
    tscTrace("%p queried tables:%d, table id: %s", pSql, 1, pTableMetaInfo->name);
-  } else {  // query on super table
+  } else {  // query super table
    if (pTableMetaInfo->vnodeIndex < 0) {
      tscError("%p error vnodeIdx:%d", pSql, pTableMetaInfo->vnodeIndex);
      return -1;
    }
-    uint32_t vnodeId = 1;
+    pSql->ipList.numOfIps = taosArrayGetSize(pTableMetaInfo->vgroupIdList);
+    pSql->ipList.port     = tsDnodeShellPort;
+    pSql->ipList.inUse    = 0;
+    for(int32_t i = 0; i < pSql->ipList.numOfIps; ++i) {
+      pSql->ipList.ip[i] = *(uint32_t*) taosArrayGet(pTableMetaInfo->vgroupIdList, i);
+    }
 #if 0
    SVnodeSidList *pVnodeSidList = tscGetVnodeSidList(pMetricMeta, pTableMetaInfo->vnodeIndex);
@@ -649,12 +679,13 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
    }
 #endif
+    uint32_t vnodeId = 1;
    tscTrace("%p query on vid:%d, number of tables:%d", pSql, vnodeId, numOfTables);
    pQueryMsg->head.vgId = htonl(vnodeId);
    numOfTables = 1;
  }
-  if (pQueryInfo->order.order == TSQL_SO_ASC) {
+  if (pQueryInfo->order.order == TSDB_ORDER_ASC) {
    pQueryMsg->window.skey = htobe64(pQueryInfo->stime);
    pQueryMsg->window.ekey = htobe64(pQueryInfo->etime);
  } else {
@@ -744,14 +775,14 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
    }
    if (!tscValidateColumnId(pTableMetaInfo, pExpr->colInfo.colId)) {
-      /* column id is not valid according to the cached metermeta, the meter meta is expired */
+      /* column id is not valid according to the cached metermeta, the table meta is expired */
      tscError("%p table schema is not matched with parsed sql", pSql);
      return -1;
    }
-    pSqlFuncExpr->colInfo.colId  = htons(pExpr->colInfo.colId);
+    pSqlFuncExpr->colInfo.colId    = htons(pExpr->colInfo.colId);
-    pSqlFuncExpr->colInfo.colIdx = htons(pExpr->colInfo.colIdx);
+    pSqlFuncExpr->colInfo.colIndex = htons(pExpr->colInfo.colIndex);
-    pSqlFuncExpr->colInfo.flag   = htons(pExpr->colInfo.flag);
+    pSqlFuncExpr->colInfo.flag     = htons(pExpr->colInfo.flag);
    pSqlFuncExpr->functionId  = htons(pExpr->functionId);
    pSqlFuncExpr->numOfParams = htons(pExpr->numOfParams);
@@ -799,16 +830,13 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
    pQueryMsg->orderType = htons(pGroupbyExpr->orderType);
    for (int32_t j = 0; j < pGroupbyExpr->numOfGroupCols; ++j) {
-      SColIndexEx *pCol = &pGroupbyExpr->columnInfo[j];
+      SColIndex *pCol = &pGroupbyExpr->columnInfo[j];
      *((int16_t *)pMsg) = pCol->colId;
      pMsg += sizeof(pCol->colId);
-      *((int16_t *)pMsg) += pCol->colIdx;
+      *((int16_t *)pMsg) += pCol->colIndex;
-      pMsg += sizeof(pCol->colIdx);
+      pMsg += sizeof(pCol->colIndex);
-      *((int16_t *)pMsg) += pCol->colIdxInBuf;
-      pMsg += sizeof(pCol->colIdxInBuf);
      *((int16_t *)pMsg) += pCol->flag;
      pMsg += sizeof(pCol->flag);
@@ -850,34 +878,19 @@ int tscBuildQueryMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
  }
  // serialize tag column query condition
-  if (pQueryInfo->tagCond.numOfTagCond > 0) {
+  if (pQueryInfo->tagCond.pCond != NULL && taosArrayGetSize(pQueryInfo->tagCond.pCond) > 0) {
    STagCond* pTagCond = &pQueryInfo->tagCond;
-    SCond *pCond = tsGetSTableQueryCondPos(pTagCond, pTableMeta->uid);
+    SCond *pCond = tsGetSTableQueryCond(pTagCond, pTableMeta->uid);
    if (pCond != NULL && pCond->cond != NULL) {
-      size_t condLen = strlen(pCond->cond) + 1;
+      pQueryMsg->tagCondLen = htons(pCond->len);
+      memcpy(pMsg, pCond->cond, pCond->len);
-      bool ret = taosMbsToUcs4(pCond->cond, condLen, pMsg, condLen * TSDB_NCHAR_SIZE);
+      pMsg += pCond->len;
-      if (!ret) {
-        tscError("%p mbs to ucs4 failed:%d", pSql, tsGetSTableQueryCondPos(pTagCond, pTableMeta->uid));
-        return 0;
-      }
-      pQueryMsg->tagCondLen = htons(condLen);
-      pMsg += condLen * TSDB_NCHAR_SIZE;
    }
  }
  // tbname in/like query expression should be sent to mgmt node
-  STagCond* pTagCond = &pQueryInfo->tagCond;
-  if (pTagCond->tbnameCond.cond != NULL) {
-    size_t s = strlen(pTagCond->tbnameCond.cond);
-    memcpy(pMsg, pTagCond->tbnameCond.cond, s);
-    pQueryMsg->nameCondLen = htons(s);
-    pMsg += s;
-  }
  msgLen = pMsg - pStart;
  tscTrace("%p msg built success,len:%d bytes", pSql, msgLen);
@@ -1530,7 +1543,7 @@ int tscBuildTableMetaMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
 }
 /**
- *  multi meter meta req pkg format:
+ *  multi table meta req pkg format:
 *  | SMgmtHead | SCMMultiTableInfoMsg | tableId0 | tableId1 | tableId2 | ......
 *      no used         4B
 **/
@@ -1575,8 +1588,10 @@ static UNUSED_FUNC int32_t tscEstimateMetricMetaMsgSize(SSqlCmd *pCmd) {
  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
  int32_t n = 0;
-  for (int32_t i = 0; i < pQueryInfo->tagCond.numOfTagCond; ++i) {
+  size_t size = taosArrayGetSize(pQueryInfo->tagCond.pCond);
-    n += strlen(pQueryInfo->tagCond.cond[i].cond);
+  for (int32_t i = 0; i < size; ++i) {
+    assert(0);
+//    n += strlen(pQueryInfo->tagCond.cond[i].cond);
  }
  int32_t tagLen = n * TSDB_NCHAR_SIZE;
@@ -1587,7 +1602,7 @@ static UNUSED_FUNC int32_t tscEstimateMetricMetaMsgSize(SSqlCmd *pCmd) {
  int32_t joinCondLen = (TSDB_TABLE_ID_LEN + sizeof(int16_t)) * 2;
  int32_t elemSize = sizeof(SSuperTableMetaElemMsg) * pQueryInfo->numOfTables;
-  int32_t colSize = pQueryInfo->groupbyExpr.numOfGroupCols*sizeof(SColIndexEx);
+  int32_t colSize = pQueryInfo->groupbyExpr.numOfGroupCols*sizeof(SColIndex);
  int32_t len = tagLen + joinCondLen + elemSize + colSize + defaultSize;
@@ -1659,13 +1674,13 @@ int tscBuildSTableVgroupMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
    // convert to unicode before sending to mnode for metric query
    int32_t condLen = 0;
    if (pTagCond->numOfTagCond > 0) {
-      SCond *pCond = tsGetSTableQueryCondPos(pTagCond, uid);
+      SCond *pCond = tsGetSTableQueryCond(pTagCond, uid);
      if (pCond != NULL && pCond->cond != NULL) {
        condLen = strlen(pCond->cond) + 1;
        bool ret = taosMbsToUcs4(pCond->cond, condLen, pMsg, condLen * TSDB_NCHAR_SIZE);
        if (!ret) {
-          tscError("%p mbs to ucs4 failed:%s", pSql, tsGetSTableQueryCondPos(pTagCond, uid));
+          tscError("%p mbs to ucs4 failed:%s", pSql, tsGetSTableQueryCond(pTagCond, uid));
          return 0;
        }
      }
@@ -1712,16 +1727,16 @@ int tscBuildSTableVgroupMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
        pElem->groupbyTagColumnList = htonl(offset);
        for (int32_t j = 0; j < pQueryInfo->groupbyExpr.numOfGroupCols; ++j) {
-          SColIndexEx *pCol = &pQueryInfo->groupbyExpr.columnInfo[j];
+          SColIndex *pCol = &pQueryInfo->groupbyExpr.columnInfo[j];
-          SColIndexEx *pDestCol = (SColIndexEx *)pMsg;
+          SColIndex *pDestCol = (SColIndex *)pMsg;
          pDestCol->colIdxInBuf = 0;
-          pDestCol->colIdx = htons(pCol->colIdx);
+          pDestCol->colIndex = htons(pCol->colIndex);
          pDestCol->colId = htons(pDestCol->colId);
          pDestCol->flag = htons(pDestCol->flag);
          strncpy(pDestCol->name, pCol->name, tListLen(pCol->name));
-          pMsg += sizeof(SColIndexEx);
+          pMsg += sizeof(SColIndex);
        }
      }
    }
@@ -1837,6 +1852,8 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
  for (int i = 0; i < TSDB_VNODES_SUPPORT; ++i) {
    pMetaMsg->vpeerDesc[i].vgId = htonl(pMetaMsg->vpeerDesc[i].vgId);
+    pMetaMsg->vpeerDesc[i].ip = htonl(pMetaMsg->vpeerDesc[i].ip);
+    pMetaMsg->vpeerDesc[i].dnodeId = htonl(pMetaMsg->vpeerDesc[i].dnodeId);
  }
  SSchema* pSchema = pMetaMsg->schema;
@@ -1880,7 +1897,7 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
 }
 /**
- *  multi meter meta rsp pkg format:
+ *  multi table meta rsp pkg format:
 *  | STaosRsp | ieType | SCMMultiTableInfoMsg | SMeterMeta0 | SSchema0 | SMeterMeta1 | SSchema1 | SMeterMeta2 | SSchema2
 *  |...... 1B        1B            4B
 **/
@@ -2112,7 +2129,8 @@ _error_clean:
  // todo opt performance
  for(int32_t i = 0; i < pStableVgroup->numOfDnodes; ++i) {
-    taosArrayPush(pInfo->vgroupIdList, &pStableVgroup->dnodeIps[i]);
+    int32_t ip = htonl(pStableVgroup->dnodeIps[i]);
+    taosArrayPush(pInfo->vgroupIdList, &ip);
  }
  return pSql->res.code;
@@ -2350,7 +2368,7 @@ void tscTableMetaCallBack(void *param, TAOS_RES *res, int code);
 static int32_t getTableMetaFromMgmt(SSqlObj *pSql, STableMetaInfo *pTableMetaInfo) {
  SSqlObj *pNew = calloc(1, sizeof(SSqlObj));
  if (NULL == pNew) {
-    tscError("%p malloc failed for new sqlobj to get meter meta", pSql);
+    tscError("%p malloc failed for new sqlobj to get table meta", pSql);
    return TSDB_CODE_CLI_OUT_OF_MEMORY;
  }
@@ -2365,7 +2383,7 @@ static int32_t getTableMetaFromMgmt(SSqlObj *pSql, STableMetaInfo *pTableMetaInf
  pNew->cmd.autoCreated = pSql->cmd.autoCreated;  // create table if not exists
  if (TSDB_CODE_SUCCESS != tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
-    tscError("%p malloc failed for payload to get meter meta", pSql);
+    tscError("%p malloc failed for payload to get table meta", pSql);
    free(pNew);
    return TSDB_CODE_CLI_OUT_OF_MEMORY;
@@ -2436,7 +2454,7 @@ static void tscWaitingForCreateTable(SSqlCmd *pCmd) {
 int tscRenewMeterMeta(SSqlObj *pSql, char *tableId) {
  int code = 0;
-  // handle metric meta renew process
+  // handle table meta renew process
  SSqlCmd *pCmd = &pSql->cmd;
  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
@@ -2447,9 +2465,10 @@ int tscRenewMeterMeta(SSqlObj *pSql, char *tableId) {
   * 2. if get metermeta failed, still get the metermeta
   */
  if (pTableMetaInfo->pTableMeta == NULL || !tscQueryOnMetric(pCmd)) {
+    STableMeta* pTableMeta = pTableMetaInfo->pTableMeta;
    if (pTableMetaInfo->pTableMeta) {
-      tscTrace("%p update meter meta, old: numOfTags:%d, numOfCols:%d, uid:%" PRId64 ", addr:%p", pSql,
+      tscTrace("%p update table meta, old: numOfTags:%d, numOfCols:%d, uid:%" PRId64 ", addr:%p", pSql,
-               pTableMetaInfo->numOfTags, pCmd->numOfCols, pTableMetaInfo->pTableMeta->uid, pTableMetaInfo->pTableMeta);
+               tscGetNumOfTags(pTableMeta), tscGetNumOfColumns(pTableMeta), pTableMeta->uid, pTableMeta);
    }
    tscWaitingForCreateTable(pCmd);
@@ -2478,7 +2497,6 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, int32_t clauseIndex) {
  }
 #if 0
  for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
    char tagstr[TSDB_MAX_TAGS_LEN + 1] = {0};
@@ -2517,7 +2535,7 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, int32_t clauseIndex) {
    STableMetaInfo *pMMInfo = tscGetMetaInfo(pQueryInfo, i);
    STableMeta *pTableMeta = taosCacheAcquireByName(tscCacheHandle, pMMInfo->name);
-    tscAddMeterMetaInfo(pNewQueryInfo, pMMInfo->name, pTableMeta, NULL, pMMInfo->numOfTags, pMMInfo->tagColumnIndex);
+    tscAddTableMetaInfo(pNewQueryInfo, pMMInfo->name, pTableMeta, NULL, pMMInfo->numOfTags, pMMInfo->tagColumnIndex);
  }
  if ((code = tscAllocPayload(&pNew->cmd, TSDB_DEFAULT_PAYLOAD_SIZE)) != TSDB_CODE_SUCCESS) {

--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -232,15 +232,16 @@ void taos_close(TAOS *taos) {
 int taos_query_imp(STscObj *pObj, SSqlObj *pSql) {
  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
-  pRes->numOfRows = 1;
+  pRes->numOfRows  = 1;
  pRes->numOfTotal = 0;
  pRes->numOfTotalInCurrentClause = 0;
-  pSql->asyncTblPos = NULL;
+  pCmd->curSql = NULL;
-  if (NULL != pSql->pTableHashList) {
+  if (NULL != pCmd->pTableList) {
-    taosHashCleanup(pSql->pTableHashList);
+    taosHashCleanup(pCmd->pTableList);
-    pSql->pTableHashList = NULL;
+    pCmd->pTableList = NULL;
  }
  tscDump("%p pObj:%p, SQL: %s", pSql, pObj, pSql->sqlstr);
@@ -329,7 +330,10 @@ int taos_num_fields(TAOS_RES *res) {
  }
  SFieldInfo *pFieldsInfo = &pQueryInfo->fieldsInfo;
-  return (pFieldsInfo->numOfOutputCols - pFieldsInfo->numOfHiddenCols);
+  if (pFieldsInfo)
+    return (pFieldsInfo->numOfOutputCols - pFieldsInfo->numOfHiddenCols);
+  else
+    return 0;
 }
 int taos_field_count(TAOS *taos) {
@@ -351,7 +355,11 @@ TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
  if (pSql == NULL || pSql->signature != pSql) return 0;
  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
-  return pQueryInfo->fieldsInfo.pFields;
+  if (pQueryInfo)
+    return pQueryInfo->fieldsInfo.pFields;
+  else
+    return NULL;
 }
 int taos_retrieve(TAOS_RES *res) {
@@ -401,13 +409,16 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
  }
  SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
+  if (pQueryInfo == NULL)
+    return 0;
  for (int i = 0; i < pQueryInfo->fieldsInfo.numOfOutputCols; ++i) {
    pRes->tsrow[i] = TSC_GET_RESPTR_BASE(pRes, pQueryInfo, i);
  }
  *rows = pRes->tsrow;
-  return (pQueryInfo->order.order == TSQL_SO_DESC) ? pRes->numOfRows : -pRes->numOfRows;
+  return (pQueryInfo->order.order == TSDB_ORDER_DESC) ? pRes->numOfRows : -pRes->numOfRows;
 }
 static void transferNcharData(SSqlObj *pSql, int32_t columnIndex, TAOS_FIELD *pField) {
@@ -502,14 +513,14 @@ static void **doSetResultRowData(SSqlObj *pSql) {
      }
      for(int32_t k = 0; k < sas->numOfCols; ++k) {
-        int32_t columnIndex = sas->pExpr->binExprInfo.pReqColumns[k].colIdxInBuf;
+        int32_t columnIndex = sas->pExpr->binExprInfo.pReqColumns[k].colIndex;
        SSqlExpr* pExpr = tscSqlExprGet(pQueryInfo, columnIndex);
        sas->elemSize[k] = pExpr->resBytes;
        sas->data[k] = (pRes->data + pRes->numOfRows* pExpr->offset) + pRes->row*pExpr->resBytes;
      }
-      tSQLBinaryExprCalcTraverse(sas->pExpr->binExprInfo.pBinExpr, 1, pRes->buffer[i], sas, TSQL_SO_ASC, getArithemicInputSrc);
+      tSQLBinaryExprCalcTraverse(sas->pExpr->binExprInfo.pBinExpr, 1, pRes->buffer[i], sas, TSDB_ORDER_ASC, getArithemicInputSrc);
      pRes->tsrow[i] = pRes->buffer[i];
      free(sas); //todo optimization
@@ -687,6 +698,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) {
 }
 int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
+#if 0
  SSqlObj *pSql = (SSqlObj *)res;
  SSqlCmd *pCmd = &pSql->cmd;
  SSqlRes *pRes = &pSql->res;
@@ -726,6 +738,10 @@ int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
  }
  return nRows;
+#endif
+  (*rows) = taos_fetch_row(res);
+  return ((*rows) != NULL)? 1:0;
 }
 int taos_select_db(TAOS *taos, const char *db) {
@@ -757,7 +773,7 @@ void taos_free_result_imp(TAOS_RES *res, int keepCmd) {
    tscTrace("%p qhandle is null, abort free, fp:%p", pSql, pSql->fp);
    if (tscShouldFreeAsyncSqlObj(pSql)) {
-      tscTrace("%p Async SqlObj is freed by app", pSql);
+      tscTrace("%p SqlObj is freed by app", pSql);
      tscFreeSqlObj(pSql);
    } else {
      if (keepCmd) {
@@ -841,7 +857,7 @@ void taos_free_result_imp(TAOS_RES *res, int keepCmd) {
      assert(pRes->numOfRows == 0 || (pCmd->command > TSDB_SQL_LOCAL));
      tscFreeSqlObj(pSql);
-      tscTrace("%p Async sql result is freed by app", pSql);
+      tscTrace("%p sql result is freed by app", pSql);
    } else {
      if (keepCmd) {
        tscFreeSqlResult(pSql);
@@ -1017,8 +1033,9 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
  SSqlObj *pSql = pObj->pSql;
  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
-  pRes->numOfRows = 1;
+  pRes->numOfRows  = 1;
  pRes->numOfTotal = 0;
  pRes->numOfTotalInCurrentClause = 0;
@@ -1041,10 +1058,10 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
  strtolower(pSql->sqlstr, sql);
-  pSql->asyncTblPos = NULL;
+  pCmd->curSql = NULL;
-  if (NULL != pSql->pTableHashList) {
+  if (NULL != pCmd->pTableList) {
-    taosHashCleanup(pSql->pTableHashList);
+    taosHashCleanup(pCmd->pTableList);
-    pSql->pTableHashList = NULL;
+    pCmd->pTableList = NULL;
  }
  pRes->code = (uint8_t)tsParseSql(pSql, false);

--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -26,7 +26,7 @@ typedef struct SInsertSupporter {
 static void freeSubqueryObj(SSqlObj* pSql);
 static bool doCompare(int32_t order, int64_t left, int64_t right) {
-  if (order == TSQL_SO_ASC) {
+  if (order == TSDB_ORDER_ASC) {
    return left < right;
  } else {
    return left > right;
@@ -136,8 +136,8 @@ static int64_t doTSBlockIntersect(SSqlObj* pSql, SJoinSubquerySupporter* pSuppor
   * 2. only one element for each tag.
   */
  if (output1->tsOrder == -1) {
-    output1->tsOrder = TSQL_SO_ASC;
+    output1->tsOrder = TSDB_ORDER_ASC;
-    output2->tsOrder = TSQL_SO_ASC;
+    output2->tsOrder = TSDB_ORDER_ASC;
  }
  tsBufFlush(output1);
@@ -1005,8 +1005,8 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
  SQueryInfo *    pQueryInfo = tscGetQueryInfoDetail(pCmd, pCmd->clauseIndex);
  STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-  int32_t numOfSubQueries = taosArrayGetSize(pTableMetaInfo->vgroupIdList);
+  pSql->numOfSubs = taosArrayGetSize(pTableMetaInfo->vgroupIdList);
-  assert(numOfSubQueries > 0);
+  assert(pSql->numOfSubs > 0);
  int32_t ret = tscLocalReducerEnvCreate(pSql, &pMemoryBuf, &pDesc, &pModel, nBufferSize);
  if (ret != 0) {
@@ -1017,16 +1017,15 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
    return pRes->code;
  }
-  pSql->pSubs = calloc(numOfSubQueries, POINTER_BYTES);
+  pSql->pSubs = calloc(pSql->numOfSubs, POINTER_BYTES);
-  pSql->numOfSubs = numOfSubQueries;
-  tscTrace("%p retrieved query data from %d vnode(s)", pSql, numOfSubQueries);
+  tscTrace("%p retrieved query data from %d vnode(s)", pSql, pSql->numOfSubs);
  SSubqueryState *pState = calloc(1, sizeof(SSubqueryState));
-  pState->numOfTotal = numOfSubQueries;
+  pState->numOfTotal = pSql->numOfSubs;
  pRes->code = TSDB_CODE_SUCCESS;
  int32_t i = 0;
-  for (; i < numOfSubQueries; ++i) {
+  for (; i < pSql->numOfSubs; ++i) {
    SRetrieveSupport *trs = (SRetrieveSupport *)calloc(1, sizeof(SRetrieveSupport));
    if (trs == NULL) {
      tscError("%p failed to malloc buffer for SRetrieveSupport, orderOfSub:%d, reason:%s", pSql, i, strerror(errno));
@@ -1070,22 +1069,22 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
    tscTrace("%p sub:%p create subquery success. orderOfSub:%d", pSql, pNew, trs->subqueryIndex);
  }
-  if (i < numOfSubQueries) {
+  if (i < pSql->numOfSubs) {
    tscError("%p failed to prepare subquery structure and launch subqueries", pSql);
    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, numOfSubQueries);
+    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, pSql->numOfSubs);
    doCleanupSubqueries(pSql, i, pState);
    return pRes->code;   // free all allocated resource
  }
  if (pRes->code == TSDB_CODE_QUERY_CANCELLED) {
-    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, numOfSubQueries);
+    tscLocalReducerEnvDestroy(pMemoryBuf, pDesc, pModel, pSql->numOfSubs);
    doCleanupSubqueries(pSql, i, pState);
    return pRes->code;
  }
-  for(int32_t j = 0; j < numOfSubQueries; ++j) {
+  for(int32_t j = 0; j < pSql->numOfSubs; ++j) {
    SSqlObj* pSub = pSql->pSubs[j];
    SRetrieveSupport* pSupport = pSub->param;
@@ -1450,7 +1449,7 @@ void tscRetrieveDataRes(void *param, TAOS_RES *tres, int code) {
      tscTrace("%p sub:%p reach the max retry count,set global code:%d", pParentSql, pSql, code);
      atomic_val_compare_exchange_32(&pState->code, 0, code);
    } else {  // does not reach the maximum retry count, go on
-      tscTrace("%p sub:%p failed code:%d, retry:%d", pParentSql, pSql, code, trsupport->numOfRetry);
+      tscTrace("%p sub:%p failed code:%s, retry:%d", pParentSql, pSql, tstrerror(code), trsupport->numOfRetry);
      SSqlObj *pNew = tscCreateSqlObjForSubquery(pParentSql, trsupport, pSql);
      if (pNew == NULL) {

--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -53,7 +53,7 @@ void tscGetMetricMetaCacheKey(SQueryInfo* pQueryInfo, char* str, uint64_t uid) {
  const int32_t maxKeySize = TSDB_MAX_TAGS_LEN;  // allowed max key size
-  SCond* cond = tsGetSTableQueryCondPos(pTagCond, uid);
+  SCond* cond = tsGetSTableQueryCond(pTagCond, uid);
  char join[512] = {0};
  if (pTagCond->joinInfo.hasJoin) {
@@ -92,28 +92,41 @@ void tscGetMetricMetaCacheKey(SQueryInfo* pQueryInfo, char* str, uint64_t uid) {
  free(tmp);
 }
-SCond* tsGetSTableQueryCondPos(STagCond* pTagCond, uint64_t uid) {
+SCond* tsGetSTableQueryCond(STagCond* pTagCond, uint64_t uid) {
-  for (int32_t i = 0; i < TSDB_MAX_JOIN_TABLE_NUM; ++i) {
+  if (pTagCond->pCond == NULL) {
-    if (uid == pTagCond->cond[i].uid) {
+    return NULL;
-      return &pTagCond->cond[i];
+  }
+  size_t size = taosArrayGetSize(pTagCond->pCond);
+  for (int32_t i = 0; i < size; ++i) {
+    SCond* pCond = taosArrayGet(pTagCond->pCond, i);
+    if (uid == pCond->uid) {
+      return pCond;
    }
  }
  return NULL;
 }
-// todo refactor by using SArray
+void tsSetSTableQueryCond(STagCond* pTagCond, uint64_t uid, SBuffer* pBuf) {
-void tsSetSTableQueryCond(STagCond* pTagCond, uint64_t uid, const char* str) {
+  if (tbufTell(pBuf) == 0) {
-  size_t len = strlen(str);
-  if (len == 0) {
    return;
  }
-  SCond* pDest = &pTagCond->cond[pTagCond->numOfTagCond];
+  SCond cond = {
-  pDest->uid = uid;
+    .uid = uid,
-  pDest->cond = strdup(str);
+    .len = tbufTell(pBuf),
+    .cond = NULL,
-  pTagCond->numOfTagCond += 1;
+  };
+  cond.cond = tbufGetData(pBuf, true);
+  if (pTagCond->pCond == NULL) {
+    pTagCond->pCond = taosArrayInit(3, sizeof(SCond));
+  }
+  taosArrayPush(pTagCond->pCond, &cond);
 }
 bool tscQueryOnMetric(SSqlCmd* pCmd) {
@@ -393,10 +406,16 @@ void tscDestroyResPointerInfo(SSqlRes* pRes) {
  pRes->data = NULL;  // pRes->data points to the buffer of pRsp, no need to free
 }
-void tscFreeSqlCmdData(SSqlCmd* pCmd) {
+void tscResetSqlCmdObj(SSqlCmd* pCmd) {
-  pCmd->command = 0;
+  pCmd->command   = 0;
  pCmd->numOfCols = 0;
-  pCmd->count = 0;
+  pCmd->count     = 0;
+  pCmd->curSql    = NULL;
+  pCmd->msgType   = 0;
+  pCmd->parseFinished = 0;
+  taosHashCleanup(pCmd->pTableList);
+  pCmd->pTableList= NULL;
  pCmd->pDataBlocks = tscDestroyBlockArrayList(pCmd->pDataBlocks);
  tscFreeSubqueryInfo(pCmd);
@@ -467,14 +486,10 @@ void tscFreeSqlObjPartial(SSqlObj* pSql) {
  tscFreeSqlResult(pSql);
  tfree(pSql->pSubs);
-  taosHashCleanup(pSql->pTableHashList);
  pSql->freed = 0;
  pSql->numOfSubs = 0;
-  pSql->pTableHashList = NULL;
-  pSql->asyncTblPos = NULL;
-  tscFreeSqlCmdData(pCmd);
+  tscResetSqlCmdObj(pCmd);
  tscTrace("%p partially free sqlObj completed", pSql);
 }
@@ -860,12 +875,10 @@ int tscAllocPayload(SSqlCmd* pCmd, int size) {
      pCmd->allocSize = size;
    }
-    memset(pCmd->payload, 0, pCmd->payloadLen);
+    memset(pCmd->payload, 0, pCmd->allocSize);
  }
-  //memset(pCmd->payload, 0, pCmd->allocSize);
  assert(pCmd->allocSize >= size);
  return TSDB_CODE_SUCCESS;
 }
@@ -1187,7 +1200,7 @@ SSqlExpr* tscSqlExprInsert(SQueryInfo* pQueryInfo, int32_t index, int16_t functi
    }
  }
-  pExpr->colInfo.colIdx = pColIndex->columnIndex;
+  pExpr->colInfo.colIndex = pColIndex->columnIndex;
  pExpr->resType = type;
  pExpr->resBytes = size;
  pExpr->interResBytes = interSize;
@@ -1209,7 +1222,7 @@ SSqlExpr* tscSqlExprUpdate(SQueryInfo* pQueryInfo, int32_t index, int16_t functi
  pExpr->functionId = functionId;
-  pExpr->colInfo.colIdx = srcColumnIndex;
+  pExpr->colInfo.colIndex = srcColumnIndex;
  pExpr->colInfo.colId = tscGetTableColumnSchema(pTableMetaInfo->pTableMeta, srcColumnIndex)->colId;
  pExpr->resType = type;
@@ -1644,26 +1657,46 @@ void tscTagCondCopy(STagCond* dest, const STagCond* src) {
  dest->tbnameCond.uid = src->tbnameCond.uid;
  memcpy(&dest->joinInfo, &src->joinInfo, sizeof(SJoinInfo));
+  dest->relType = src->relType;
-  for (int32_t i = 0; i < src->numOfTagCond; ++i) {
-    if (src->cond[i].cond != NULL) {
+  if (src->pCond == NULL) {
-      dest->cond[i].cond = strdup(src->cond[i].cond);
+    return;
+  }
+  size_t s = taosArrayGetSize(src->pCond);
+  dest->pCond = taosArrayInit(s, sizeof(SCond));
+  for (int32_t i = 0; i < s; ++i) {
+    SCond* pCond = taosArrayGet(src->pCond, i);
+    SCond c = {0};
+    c.len = pCond->len;
+    c.uid = pCond->uid;
+    if (pCond->len > 0) {
+      assert(pCond->cond != NULL);
+      c.cond = malloc(c.len);
+      memcpy(c.cond, pCond->cond, c.len);
    }
-    dest->cond[i].uid = src->cond[i].uid;
+    taosArrayPush(dest->pCond, &c);
  }
-  dest->relType = src->relType;
-  dest->numOfTagCond = src->numOfTagCond;
 }
-void tscTagCondRelease(STagCond* pCond) {
+void tscTagCondRelease(STagCond* pTagCond) {
-  free(pCond->tbnameCond.cond);
+  free(pTagCond->tbnameCond.cond);
-  for (int32_t i = 0; i < pCond->numOfTagCond; ++i) {
-    free(pCond->cond[i].cond);
+  if (pTagCond->pCond != NULL) {
+    size_t s = taosArrayGetSize(pTagCond->pCond);
+    for (int32_t i = 0; i < s; ++i) {
+      SCond* p = taosArrayGet(pTagCond->pCond, i);
+      tfree(p->cond);
+    }
+    taosArrayDestroy(pTagCond->pCond);
  }
-  memset(pCond, 0, sizeof(STagCond));
+  memset(pTagCond, 0, sizeof(STagCond));
 }
 void tscGetSrcColumnInfo(SSrcColumnInfo* pColInfo, SQueryInfo* pQueryInfo) {
@@ -1676,11 +1709,11 @@ void tscGetSrcColumnInfo(SSrcColumnInfo* pColInfo, SQueryInfo* pQueryInfo) {
    if (TSDB_COL_IS_TAG(pExpr->colInfo.flag)) {
      SSchema* pTagSchema = tscGetTableTagSchema(pTableMetaInfo->pTableMeta);
-      int16_t  actualTagIndex = pTableMetaInfo->tagColumnIndex[pExpr->colInfo.colIdx];
+      int16_t  actualTagIndex = pTableMetaInfo->tagColumnIndex[pExpr->colInfo.colIndex];
      pColInfo[i].type = (actualTagIndex != -1) ? pTagSchema[actualTagIndex].type : TSDB_DATA_TYPE_BINARY;
    } else {
-      pColInfo[i].type = pSchema[pExpr->colInfo.colIdx].type;
+      pColInfo[i].type = pSchema[pExpr->colInfo.colIndex].type;
    }
  }
 }
@@ -1882,8 +1915,8 @@ void tscFreeSubqueryInfo(SSqlCmd* pCmd) {
  tfree(pCmd->pQueryInfo);
 }
-STableMetaInfo* tscAddMeterMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta,
+STableMetaInfo* tscAddTableMetaInfo(SQueryInfo* pQueryInfo, const char* name, STableMeta* pTableMeta,
-                                    SSuperTableMeta* pMetricMeta, int16_t numOfTags, int16_t* tags) {
+                                    SArray* vgroupList, int16_t numOfTags, int16_t* tags) {
  void* pAlloc = realloc(pQueryInfo->pTableMetaInfo, (pQueryInfo->numOfTables + 1) * POINTER_BYTES);
  if (pAlloc == NULL) {
    return NULL;
@@ -1902,6 +1935,10 @@ STableMetaInfo* tscAddMeterMetaInfo(SQueryInfo* pQueryInfo, const char* name, ST
  pTableMetaInfo->pTableMeta = pTableMeta;
  pTableMetaInfo->numOfTags = numOfTags;
+  if (vgroupList != NULL) {
+    pTableMetaInfo->vgroupIdList = taosArrayClone(vgroupList);
+  }
  if (tags != NULL) {
    memcpy(pTableMetaInfo->tagColumnIndex, tags, sizeof(pTableMetaInfo->tagColumnIndex[0]) * numOfTags);
@@ -1912,7 +1949,7 @@ STableMetaInfo* tscAddMeterMetaInfo(SQueryInfo* pQueryInfo, const char* name, ST
 }
 STableMetaInfo* tscAddEmptyMetaInfo(SQueryInfo* pQueryInfo) {
-  return tscAddMeterMetaInfo(pQueryInfo, NULL, NULL, NULL, 0, NULL);
+  return tscAddTableMetaInfo(pQueryInfo, NULL, NULL, NULL, 0, NULL);
 }
 void doRemoveMeterMetaInfo(SQueryInfo* pQueryInfo, int32_t index, bool removeFromCache) {
@@ -1963,14 +2000,14 @@ void tscResetForNextRetrieve(SSqlRes* pRes) {
 }
 SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void* param, int32_t cmd, SSqlObj* pPrevSql) {
-  SSqlCmd*        pCmd = &pSql->cmd;
+  SSqlCmd* pCmd = &pSql->cmd;
-  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, tableIndex);
  SSqlObj* pNew = (SSqlObj*)calloc(1, sizeof(SSqlObj));
  if (pNew == NULL) {
-    tscError("%p new subquery failed, tableIndex:%d, vnodeIndex:%d", pSql, tableIndex, pTableMetaInfo->vnodeIndex);
+    tscError("%p new subquery failed, tableIndex:%d", pSql, tableIndex);
    return NULL;
  }
+  STableMetaInfo* pTableMetaInfo = tscGetTableMetaInfoFromCmd(pCmd, pCmd->clauseIndex, tableIndex);
  pNew->pTscObj = pSql->pTscObj;
  pNew->signature = pNew;
@@ -2086,12 +2123,12 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
  if (pPrevSql == NULL) {
    STableMeta* pTableMeta = taosCacheAcquireByName(tscCacheHandle, name);
-    SSuperTableMeta* pMetricMeta = NULL;
+//    SSuperTableMeta* pMetricMeta = NULL;
-    if (cmd == TSDB_SQL_SELECT) {
+//    if (cmd == TSDB_SQL_SELECT) {
-      pMetricMeta = taosCacheAcquireByName(tscCacheHandle, key);
+//      pMetricMeta = taosCacheAcquireByName(tscCacheHandle, key);
-    }
+//    }
-    pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pTableMeta, pMetricMeta, pTableMetaInfo->numOfTags,
+    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pTableMeta, pTableMetaInfo->vgroupIdList, pTableMetaInfo->numOfTags,
                                     pTableMetaInfo->tagColumnIndex);
  } else {  // transfer the ownership of pTableMeta/pMetricMeta to the newly create sql object.
 //    STableMetaInfo* pPrevInfo = tscGetTableMetaInfoFromCmd(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
@@ -2099,7 +2136,7 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
 //    STableMeta*  pPrevMeterMeta = taosCacheTransfer(tscCacheHandle, (void**)&pPrevInfo->pTableMeta);
 //    SSuperTableMeta* pPrevMetricMeta = taosCacheTransfer(tscCacheHandle, (void**)&pPrevInfo->pMetricMeta);
-//    pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pPrevMeterMeta, pPrevMetricMeta, pTableMetaInfo->numOfTags,
+//    pFinalInfo = tscAddTableMetaInfo(pNewQueryInfo, name, pPrevMeterMeta, pPrevMetricMeta, pTableMetaInfo->numOfTags,
 //                                     pTableMetaInfo->tagColumnIndex);
  }

--- a/src/common/inc/name.h
+++ b/src/common/inc/name.h
@@ -14,10 +14,10 @@ typedef struct SDataStatis {
  int16_t numOfNull;
 } SDataStatis;
-typedef struct SColumnInfoEx {
+typedef struct SColumnInfoData {
  SColumnInfo info;
  void* pData;    // the corresponding block data in memory
-} SColumnInfoEx;
+} SColumnInfoData;
 void extractTableName(const char *tableId, char *name);

--- a/src/common/src/dataformat.c
+++ b/src/common/src/dataformat.c
@@ -142,7 +142,7 @@ STSchema *tdDupSchema(STSchema *pSchema) {
 * Free the SSchema object created by tdNewSchema or tdDupSchema
 */
 void tdFreeSchema(STSchema *pSchema) {
-  if (pSchema == NULL) free(pSchema);
+  if (pSchema != NULL) free(pSchema);
 }
 /**

--- a/go @ 8c58c512
+++ b/go @ 8c58c512
+Subproject commit 8c58c512b6acda8bcdfa48fdc7140227b5221766
--- a/src/connector/go/src/taosSql/connection.go
+++ b/src/connector/go/src/taosSql/connection.go
-/*
- * 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 taosSql
-import "C"
-import (
-	"context"
-	"errors"
-	"database/sql/driver"
-	"unsafe"
-	"strconv"
-	"strings"
-	"time"
-)
-type taosConn struct {
-	taos             unsafe.Pointer
-	affectedRows     int
-	insertId         int
-	cfg              *config
-	status           statusFlag
-	parseTime        bool
-	reset            bool // set when the Go SQL package calls ResetSession
-}
-type taosSqlResult struct {
-	affectedRows int64
-	insertId     int64
-}
-func (res *taosSqlResult) LastInsertId() (int64, error) {
-	return res.insertId, nil
-}
-func (res *taosSqlResult) RowsAffected() (int64, error) {
-	return res.affectedRows, nil
-}
-func (mc *taosConn) Begin() (driver.Tx, error) {
-	taosLog.Println("taosSql not support transaction")
-	return nil, errors.New("taosSql not support transaction")
-}
-func (mc *taosConn) Close() (err error) {
-	if mc.taos == nil {
-		return errConnNoExist
-	}
-	mc.taos_close()
-	return nil
-}
-func (mc *taosConn) Prepare(query string) (driver.Stmt, error) {
-	if mc.taos == nil {		
-		return nil, errInvalidConn
-	}	
-	stmt := &taosSqlStmt{
-		mc:   mc,
-		pSql: query,
-	}
-    // find ? count and save  to stmt.paramCount
-	stmt.paramCount = strings.Count(query, "?")
-	//fmt.Printf("prepare alloc stmt:%p, sql:%s\n", stmt, query)
-	taosLog.Printf("prepare alloc stmt:%p, sql:%s\n", stmt, query)
-	return stmt, nil
-}
-func (mc *taosConn) interpolateParams(query string, args []driver.Value) (string, error) {
-	// Number of ? should be same to len(args)
-	if strings.Count(query, "?") != len(args) {
-		return "", driver.ErrSkip
-	}
-	buf := make([]byte, defaultBufSize)
-	buf = buf[:0]    // clear buf
-	argPos := 0
-	for i := 0; i < len(query); i++ {
-		q := strings.IndexByte(query[i:], '?')
-		if q == -1 {
-			buf = append(buf, query[i:]...)
-			break
-		}
-		buf = append(buf, query[i:i+q]...)
-		i += q
-		arg := args[argPos]
-		argPos++
-		if arg == nil {
-			buf = append(buf, "NULL"...)
-			continue
-		}
-		switch v := arg.(type) {
-		case int64:
-			buf = strconv.AppendInt(buf, v, 10)
-		case uint64:
-			// Handle uint64 explicitly because our custom ConvertValue emits unsigned values
-			buf = strconv.AppendUint(buf, v, 10)
-		case float64:
-			buf = strconv.AppendFloat(buf, v, 'g', -1, 64)
-		case bool:
-			if v {
-				buf = append(buf, '1')
-			} else {
-				buf = append(buf, '0')
-			}
-		case time.Time:
-			if v.IsZero() {
-				buf = append(buf, "'0000-00-00'"...)
-			} else {
-				v := v.In(mc.cfg.loc)
-				v = v.Add(time.Nanosecond * 500) // To round under microsecond
-				year := v.Year()
-				year100 := year / 100
-				year1 := year % 100
-				month := v.Month()
-				day := v.Day()
-				hour := v.Hour()
-				minute := v.Minute()
-				second := v.Second()
-				micro := v.Nanosecond() / 1000
-				buf = append(buf, []byte{
-					'\'',
-					digits10[year100], digits01[year100],
-					digits10[year1], digits01[year1],
-					'-',
-					digits10[month], digits01[month],
-					'-',
-					digits10[day], digits01[day],
-					' ',
-					digits10[hour], digits01[hour],
-					':',
-					digits10[minute], digits01[minute],
-					':',
-					digits10[second], digits01[second],
-				}...)
-				if micro != 0 {
-					micro10000 := micro / 10000
-					micro100 := micro / 100 % 100
-					micro1 := micro % 100
-					buf = append(buf, []byte{
-						'.',
-						digits10[micro10000], digits01[micro10000],
-						digits10[micro100], digits01[micro100],
-						digits10[micro1], digits01[micro1],
-					}...)
-				}
-				buf = append(buf, '\'')
-			}
-		case []byte:
-			if v == nil {
-				buf = append(buf, "NULL"...)
-			} else {
-				buf = append(buf, "_binary'"...)
-				if mc.status&statusNoBackslashEscapes == 0 {
-					buf = escapeBytesBackslash(buf, v)
-				} else {
-					buf = escapeBytesQuotes(buf, v)
-				}
-				buf = append(buf, '\'')
-			}
-		case string:
-			//buf = append(buf, '\'')
-			if mc.status&statusNoBackslashEscapes == 0 {
-				buf = escapeStringBackslash(buf, v)
-			} else {
-				buf = escapeStringQuotes(buf, v)
-			}
-			//buf = append(buf, '\'')
-		default:
-			return "", driver.ErrSkip
-		}
-		//if len(buf)+4 > mc.maxAllowedPacket {
-		if len(buf)+4 > maxTaosSqlLen {
-			return "", driver.ErrSkip
-		}
-	}
-	if argPos != len(args) {
-		return "", driver.ErrSkip
-	}
-	return string(buf), nil
-}
-func (mc *taosConn) Exec(query string, args []driver.Value) (driver.Result, error) {
-	if mc.taos == nil {
-		return nil, driver.ErrBadConn
-	}
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try to interpolate the parameters to save extra roundtrips for preparing and closing a statement
-		prepared, err := mc.interpolateParams(query, args)
-		if err != nil {
-			return nil, err
-		}
-		query = prepared
-	}
-	mc.affectedRows = 0
-	mc.insertId     = 0
-	_, err := mc.taosQuery(query)
-	if err == nil {
-		return &taosSqlResult{
-			affectedRows: int64(mc.affectedRows),
-			insertId:     int64(mc.insertId),
-		}, err
-	}
-	return nil, err
-}
-func (mc *taosConn) Query(query string, args []driver.Value) (driver.Rows, error) {
-	return mc.query(query, args)
-}
-func (mc *taosConn) query(query string, args []driver.Value) (*textRows, error) {
-	if mc.taos == nil {
-		return nil, driver.ErrBadConn
-	}
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try client-side prepare to reduce roundtrip
-		prepared, err := mc.interpolateParams(query, args)
-		if err != nil {
-			return nil, err
-		}
-		query = prepared
-	}
-	num_fields, err := mc.taosQuery(query)
-	if err == nil {
-		// Read Result
-		rows := new(textRows)
-		rows.mc = mc
-		// Columns field
-		rows.rs.columns, err = mc.readColumns(num_fields)
-		return rows, err
-	}
-	return nil, err
-}
-// Ping implements driver.Pinger interface
-func (mc *taosConn) Ping(ctx context.Context) (err error) {
-	if mc.taos != nil {
-	    return nil
-	}
-	return errInvalidConn
-}
-// BeginTx implements driver.ConnBeginTx interface
-func (mc *taosConn) BeginTx(ctx context.Context, opts driver.TxOptions) (driver.Tx, error) {
-	taosLog.Println("taosSql not support transaction")
-	return nil, errors.New("taosSql not support transaction")
-}
-func (mc *taosConn) QueryContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Rows, error) {
-	if mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-	rows, err := mc.query(query, dargs)
-	if err != nil {
-		return nil, err
-	}
-	return rows, err
-}
-func (mc *taosConn) ExecContext(ctx context.Context, query string, args []driver.NamedValue) (driver.Result, error) {
-	if mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-	return mc.Exec(query, dargs)
-}
-func (mc *taosConn) PrepareContext(ctx context.Context, query string) (driver.Stmt, error) {
-	if mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	stmt, err := mc.Prepare(query)
-	if err != nil {
-		return nil, err
-	}
-	return stmt, nil
-}
-func (stmt *taosSqlStmt) QueryContext(ctx context.Context, args []driver.NamedValue) (driver.Rows, error) {
-	if stmt.mc == nil {
-		return nil, errInvalidConn
-	}
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-	rows, err := stmt.query(dargs)
-	if err != nil {
-		return nil, err
-	}
-	return rows, err
-}
-func (stmt *taosSqlStmt) ExecContext(ctx context.Context, args []driver.NamedValue) (driver.Result, error) {
-	if stmt.mc == nil {
-		return nil, errInvalidConn
-	}
-	dargs, err := namedValueToValue(args)
-	if err != nil {
-		return nil, err
-	}
-	return stmt.Exec(dargs)
-}
-func (mc *taosConn) CheckNamedValue(nv *driver.NamedValue) (err error) {
-	nv.Value, err = converter{}.ConvertValue(nv.Value)
-	return
-}
-// ResetSession implements driver.SessionResetter.
-// (From Go 1.10)
-func (mc *taosConn) ResetSession(ctx context.Context) error {
-	if mc.taos == nil {
-		return driver.ErrBadConn
-	}
-	mc.reset = true
-	return nil
-}
--- a/src/connector/go/src/taosSql/connector.go
+++ b/src/connector/go/src/taosSql/connector.go
-/*
- * 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 taosSql
-import (
-	"context"
-	"database/sql/driver"
-)
-type connector struct {
-	cfg *config
-}
-// Connect implements driver.Connector interface.
-// Connect returns a connection to the database.
-func (c *connector) Connect(ctx context.Context) (driver.Conn, error) {
-	var err error
- 	// New taosConn
-	mc := &taosConn{
-		cfg:              c.cfg,
-		parseTime:        c.cfg.parseTime,
-	}
-	// Connect to Server
-	mc.taos, err = mc.taosConnect(mc.cfg.addr, mc.cfg.user, mc.cfg.passwd, mc.cfg.dbName, mc.cfg.port)
-    if err != nil {
-        return nil, err
-    }
-	return mc, nil
-}
-// Driver implements driver.Connector interface.
-// Driver returns &taosSQLDriver{}.
-func (c *connector) Driver() driver.Driver {
-	return &taosSQLDriver{}
-}
--- a/src/connector/go/src/taosSql/const.go
+++ b/src/connector/go/src/taosSql/const.go
-/*
- * 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 taosSql
-const (
-	timeFormat              = "2006-01-02 15:04:05"
-    maxTaosSqlLen           = 65380
-	defaultBufSize          = maxTaosSqlLen + 32
-)
-type fieldType byte
-type fieldFlag uint16
-const (
-	flagNotNULL fieldFlag = 1 << iota
-)
-type statusFlag uint16
-const (
-	statusInTrans statusFlag = 1 << iota
-	statusInAutocommit
-	statusReserved // Not in documentation
-	statusMoreResultsExists
-	statusNoGoodIndexUsed
-	statusNoIndexUsed
-	statusCursorExists
-	statusLastRowSent
-	statusDbDropped
-	statusNoBackslashEscapes
-	statusMetadataChanged
-	statusQueryWasSlow
-	statusPsOutParams
-	statusInTransReadonly
-	statusSessionStateChanged
-)
--- a/src/connector/go/src/taosSql/driver.go
+++ b/src/connector/go/src/taosSql/driver.go
-/*
- * 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 taosSql
-import (
-	"context"
-	"database/sql"
-	"database/sql/driver"
-)
-// taosSqlDriver is exported to make the driver directly accessible.
-// In general the driver is used via the database/sql package.
-type taosSQLDriver struct{}
-// Open new Connection.
-// the DSN string is formatted
-func (d taosSQLDriver) Open(dsn string) (driver.Conn, error) {
-	cfg, err := parseDSN(dsn)
-	if err != nil {
-		return nil, err
-	}
-	c := &connector{
-		cfg: cfg,
-	}
-	return c.Connect(context.Background())
-}
-func init() {
-	sql.Register("taosSql", &taosSQLDriver{})
-	taosLogInit()
-}
--- a/src/connector/go/src/taosSql/dsn.go
+++ b/src/connector/go/src/taosSql/dsn.go
-/*
- * 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 taosSql
-import (
-	"errors"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-)
-var (
-	errInvalidDSNUnescaped = errors.New("invalid DSN: did you forget to escape a param value?")
-	errInvalidDSNAddr      = errors.New("invalid DSN: network address not terminated (missing closing brace)")
-	errInvalidDSNPort      = errors.New("invalid DSN: network port is not a valid number")
-	errInvalidDSNNoSlash   = errors.New("invalid DSN: missing the slash separating the database name")
-)
-// Config is a configuration parsed from a DSN string.
-// If a new Config is created instead of being parsed from a DSN string,
-// the NewConfig function should be used, which sets default values.
-type config struct {
-	user              string // Username
-	passwd            string // Password (requires User)
-	net               string // Network type
-	addr              string // Network address (requires Net)
-	port              int
-	dbName            string            // Database name
-	params            map[string]string // Connection parameters
-	loc               *time.Location    // Location for time.Time values
-	columnsWithAlias  bool              // Prepend table alias to column names
-	interpolateParams bool              // Interpolate placeholders into query string
-	parseTime         bool              // Parse time values to time.Time
-}
-// NewConfig creates a new Config and sets default values.
-func newConfig() *config {
-	return &config{
-		loc:               time.UTC,
-		interpolateParams: true,
-		parseTime:         true,
-	}
-}
-// ParseDSN parses the DSN string to a Config
-func parseDSN(dsn string) (cfg *config, err error) {
-	taosLog.Println("input dsn:", dsn)
-	// New config with some default values
-	cfg = newConfig()
-	// [user[:password]@][net[(addr)]]/dbname[?param1=value1&paramN=valueN]
-	// Find the last '/' (since the password or the net addr might contain a '/')
-	foundSlash := false
-	for i := len(dsn) - 1; i >= 0; i-- {
-		if dsn[i] == '/' {
-			foundSlash = true
-			var j, k int
-			// left part is empty if i <= 0
-			if i > 0 {
-				// [username[:password]@][protocol[(address)]]
-				// Find the last '@' in dsn[:i]
-				for j = i; j >= 0; j-- {
-					if dsn[j] == '@' {
-						// username[:password]
-						// Find the first ':' in dsn[:j]
-						for k = 0; k < j; k++ {
-							if dsn[k] == ':' {
-								cfg.passwd = dsn[k+1 : j]
-								break
-							}
-						}
-						cfg.user = dsn[:k]
-						break
-					}
-				}
-				// [protocol[(address)]]
-				// Find the first '(' in dsn[j+1:i]
-				for k = j + 1; k < i; k++ {
-					if dsn[k] == '(' {
-						// dsn[i-1] must be == ')' if an address is specified
-						if dsn[i-1] != ')' {
-							if strings.ContainsRune(dsn[k+1:i], ')') {
-								return nil, errInvalidDSNUnescaped
-							}
-							return nil, errInvalidDSNAddr
-						}
-						strs := strings.Split(dsn[k+1:i-1], ":")
-						if len(strs) == 1 {
-							return nil, errInvalidDSNAddr
-						}
-						cfg.addr = strs[0]
-						cfg.port, err = strconv.Atoi(strs[1])
-						if err != nil {
-							return nil, errInvalidDSNPort
-						}
-						break
-					}
-				}
-				cfg.net = dsn[j+1 : k]
-			}
-			// dbname[?param1=value1&...&paramN=valueN]
-			// Find the first '?' in dsn[i+1:]
-			for j = i + 1; j < len(dsn); j++ {
-				if dsn[j] == '?' {
-					if err = parseDSNParams(cfg, dsn[j+1:]); err != nil {
-						return
-					}
-					break
-				}
-			}
-			cfg.dbName = dsn[i+1 : j]
-			break
-		}
-	}
-	if !foundSlash && len(dsn) > 0 {
-		return nil, errInvalidDSNNoSlash
-	}
-	taosLog.Printf("cfg info: %+v", cfg)
-	return
-}
-// parseDSNParams parses the DSN "query string"
-// Values must be url.QueryEscape'ed
-func parseDSNParams(cfg *config, params string) (err error) {
-	for _, v := range strings.Split(params, "&") {
-		param := strings.SplitN(v, "=", 2)
-		if len(param) != 2 {
-			continue
-		}
-		// cfg params
-		switch value := param[1]; param[0] {
-		case "columnsWithAlias":
-			var isBool bool
-			cfg.columnsWithAlias, isBool = readBool(value)
-			if !isBool {
-				return errors.New("invalid bool value: " + value)
-			}
-		// Enable client side placeholder substitution
-		case "interpolateParams":
-			var isBool bool
-			cfg.interpolateParams, isBool = readBool(value)
-			if !isBool {
-				return errors.New("invalid bool value: " + value)
-			}
-		// Time Location
-		case "loc":
-			if value, err = url.QueryUnescape(value); err != nil {
-				return
-			}
-			cfg.loc, err = time.LoadLocation(value)
-			if err != nil {
-				return
-			}
-		// time.Time parsing
-		case "parseTime":
-			var isBool bool
-			cfg.parseTime, isBool = readBool(value)
-			if !isBool {
-				return errors.New("invalid bool value: " + value)
-			}
-		default:
-			// lazy init
-			if cfg.params == nil {
-				cfg.params = make(map[string]string)
-			}
-			if cfg.params[param[0]], err = url.QueryUnescape(value); err != nil {
-				return
-			}
-		}
-	}
-	return
-}
--- a/src/connector/go/src/taosSql/result.go
+++ b/src/connector/go/src/taosSql/result.go
-/*
- * 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 taosSql
-/*
-#cgo CFLAGS : -I/usr/include
-#cgo LDFLAGS: -L/usr/lib -ltaos
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-*/
-import "C"
-import (
-	"database/sql/driver"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-	"unsafe"
-)
-/******************************************************************************
-*                              Result                                         *
-******************************************************************************/
-// Read Packets as Field Packets until EOF-Packet or an Error appears
-func (mc *taosConn) readColumns(count int) ([]taosSqlField, error) {
-	columns := make([]taosSqlField, count)
-	var result unsafe.Pointer
-	result = C.taos_use_result(mc.taos)
-	if result == nil {
-		return nil, errors.New("invalid result")
-	}
-	pFields := (*C.struct_taosField)(C.taos_fetch_fields(result))
-	// TODO: Optimized rewriting !!!!
-	fields := (*[1 << 30]C.struct_taosField)(unsafe.Pointer(pFields))
-	for i := 0; i < count; i++ {
-		//columns[i].tableName = ms.taos.
-		//fmt.Println(reflect.TypeOf(fields[i].name))
-		var charray []byte
-		for j := range fields[i].name {
-			//fmt.Println("fields[i].name[j]: ", fields[i].name[j])
-			if fields[i].name[j] != 0 {
-				charray = append(charray, byte(fields[i].name[j]))
-			} else {
-				break
-			}
-		}
-		columns[i].name = string(charray)
-		columns[i].length = (uint32)(fields[i].bytes)
-		columns[i].fieldType = fieldType(fields[i]._type)
-		columns[i].flags = 0
-		// columns[i].decimals  = 0
-		//columns[i].charSet    = 0
-	}
-	return columns, nil
-}
-func (rows *taosSqlRows) readRow(dest []driver.Value) error {
-	mc := rows.mc
-	if rows.rs.done || mc == nil {
-		return io.EOF
-	}
-	var result unsafe.Pointer
-	result = C.taos_use_result(mc.taos)
-	if result == nil {
-		return errors.New(C.GoString(C.taos_errstr(mc.taos)))
-	}
-	//var row *unsafe.Pointer
-	row := C.taos_fetch_row(result)
-	if row == nil {
-		rows.rs.done = true
-		C.taos_free_result(result)
-		rows.mc = nil
-		return io.EOF
-	}
-	// because sizeof(void*)  == sizeof(int*) == 8
-	// notes: sizeof(int) == 8 in go, but sizeof(int) == 4 in C.
-	for i := range dest {
-		currentRow := (unsafe.Pointer)(uintptr(*((*int)(unsafe.Pointer(uintptr(unsafe.Pointer(row)) + uintptr(i)*unsafe.Sizeof(int(0)))))))
-		if currentRow == nil {
-			dest[i] = nil
-			continue
-		}
-		switch rows.rs.columns[i].fieldType {
-		case C.TSDB_DATA_TYPE_BOOL:
-			if (*((*byte)(currentRow))) != 0 {
-				dest[i] = true
-			} else {
-				dest[i] = false
-			}
-			break
-		case C.TSDB_DATA_TYPE_TINYINT:
-			dest[i] = (int)(*((*byte)(currentRow)))
-			break
-		case C.TSDB_DATA_TYPE_SMALLINT:
-			dest[i] = (int16)(*((*int16)(currentRow)))
-			break
-		case C.TSDB_DATA_TYPE_INT:
-			dest[i] = (int)(*((*int32)(currentRow))) // notes int32 of go <----> int of C
-			break
-		case C.TSDB_DATA_TYPE_BIGINT:
-			dest[i] = (int64)(*((*int64)(currentRow)))
-			break
-		case C.TSDB_DATA_TYPE_FLOAT:
-			dest[i] = (*((*float32)(currentRow)))
-			break
-		case C.TSDB_DATA_TYPE_DOUBLE:
-			dest[i] = (*((*float64)(currentRow)))
-			break
-		case C.TSDB_DATA_TYPE_BINARY, C.TSDB_DATA_TYPE_NCHAR:
-			charLen := rows.rs.columns[i].length
-			var index uint32
-			binaryVal := make([]byte, charLen)
-			for index = 0; index < charLen; index++ {
-				binaryVal[index] = *((*byte)(unsafe.Pointer(uintptr(currentRow) + uintptr(index))))
-			}
-			dest[i] = string(binaryVal[:])
-			break
-		case C.TSDB_DATA_TYPE_TIMESTAMP:
-			if mc.cfg.parseTime == true {
-				timestamp := (int64)(*((*int64)(currentRow)))
-				dest[i] = timestampConvertToString(timestamp, int(C.taos_result_precision(result)))
-			} else {
-				dest[i] = (int64)(*((*int64)(currentRow)))
-			}
-			break
-		default:
-			fmt.Println("default fieldType: set dest[] to nil")
-			dest[i] = nil
-			break
-		}
-	}
-	return nil
-}
-// Read result as Field format until all rows or an Error appears
-// call this func in conn mode
-func (rows *textRows) readRow(dest []driver.Value) error {
-	return rows.taosSqlRows.readRow(dest)
-}
-// call thsi func in stmt mode
-func (rows *binaryRows) readRow(dest []driver.Value) error {
-	return rows.taosSqlRows.readRow(dest)
-}
-func timestampConvertToString(timestamp int64, precision int) string {
-	var decimal, sVal, nsVal int64
-	if precision == 0 {
-		decimal = timestamp % 1000
-		sVal = timestamp / 1000
-		nsVal = decimal * 1000
-	} else {
-		decimal = timestamp % 1000000
-		sVal = timestamp / 1000000
-		nsVal = decimal * 1000000
-	}
-	date_time := time.Unix(sVal, nsVal)
-	//const base_format = "2006-01-02 15:04:05"
-	str_time := date_time.Format(timeFormat)
-	return (str_time + "." + strconv.Itoa(int(decimal)))
-}
--- a/src/connector/go/src/taosSql/rows.go
+++ b/src/connector/go/src/taosSql/rows.go
-/*
- * 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 taosSql
-/*
-#cgo CFLAGS : -I/usr/include
-#cgo LDFLAGS: -L/usr/lib -ltaos
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-*/
-import "C"
-import (
-	"database/sql"
-	"database/sql/driver"
-	"io"
-	"math"
-	"reflect"
-)
-type taosSqlField struct {
-	tableName string
-	name      string
-	length    uint32
-	flags     fieldFlag   // indicate whether this field can is null
-	fieldType fieldType
-	decimals  byte
-	charSet   uint8
-}
-type resultSet struct {
-	columns     []taosSqlField
-	columnNames []string
-	done        bool
-}
-type taosSqlRows struct {
-	mc     *taosConn
-	rs     resultSet
-}
-type binaryRows struct {
-	taosSqlRows
-}
-type textRows struct {
-	taosSqlRows
-}
-func (rows *taosSqlRows) Columns() []string {
-	if rows.rs.columnNames != nil {
-		return rows.rs.columnNames
-	}
-	columns := make([]string, len(rows.rs.columns))
-	if rows.mc != nil && rows.mc.cfg.columnsWithAlias {
-		for i := range columns {
-			if tableName := rows.rs.columns[i].tableName; len(tableName) > 0 {
-				columns[i] = tableName + "." + rows.rs.columns[i].name
-			} else {
-				columns[i] = rows.rs.columns[i].name
-			}
-		}
-	} else {
-		for i := range columns {
-			columns[i] = rows.rs.columns[i].name
-		}
-	}
-	rows.rs.columnNames = columns
-	return columns
-}
-func (rows *taosSqlRows) ColumnTypeDatabaseTypeName(i int) string {
-	return rows.rs.columns[i].typeDatabaseName()
-}
-func (rows *taosSqlRows) ColumnTypeLength(i int) (length int64, ok bool) {
- 	return int64(rows.rs.columns[i].length), true
-}
-func (rows *taosSqlRows) ColumnTypeNullable(i int) (nullable, ok bool) {
-	return rows.rs.columns[i].flags&flagNotNULL == 0, true
-}
-func (rows *taosSqlRows) ColumnTypePrecisionScale(i int) (int64, int64, bool) {
-	column := rows.rs.columns[i]
-	decimals := int64(column.decimals)
-	switch column.fieldType {
-	case C.TSDB_DATA_TYPE_FLOAT:
-        fallthrough
-	case C.TSDB_DATA_TYPE_DOUBLE:
-		if decimals == 0x1f {
-			return math.MaxInt64, math.MaxInt64, true
-		}
-		return math.MaxInt64, decimals, true
-	}
-	return 0, 0, false
-}
-func (rows *taosSqlRows) ColumnTypeScanType(i int) reflect.Type {
-	return rows.rs.columns[i].scanType()
-}
-func (rows *taosSqlRows) Close() error {
-	if rows.mc != nil {
-		result := C.taos_use_result(rows.mc.taos)
-		if result != nil {
-			C.taos_free_result(result)
-		}
-		rows.mc = nil
-	}
-	return nil
-}
-func (rows *taosSqlRows) HasNextResultSet() (b bool) {
-	if rows.mc == nil {
-		return false
-	}
-	return rows.mc.status&statusMoreResultsExists != 0
-}
-func (rows *taosSqlRows) nextResultSet() (int, error) {
-	if rows.mc == nil {
-		return 0, io.EOF
-	}
-	// Remove unread packets from stream
-	if !rows.rs.done {
-		rows.rs.done = true
-	}
-	if !rows.HasNextResultSet() {
-		rows.mc = nil
-		return 0, io.EOF
-	}
-	rows.rs = resultSet{}
-	return 0,nil
-}
-func (rows *taosSqlRows) nextNotEmptyResultSet() (int, error) {
-	for {
-		resLen, err := rows.nextResultSet()
-		if err != nil {
-			return 0, err
-		}
-		if resLen > 0 {
-			return resLen, nil
-		}
-		rows.rs.done = true
-	}
-}
-func (rows *binaryRows) NextResultSet() error {
-	resLen, err := rows.nextNotEmptyResultSet()
-	if err != nil {
-		return err
-	}
-	rows.rs.columns, err = rows.mc.readColumns(resLen)
-	return err
-}
-// stmt.Query return binary rows, and get row from this func
-func (rows *binaryRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		// Fetch next row from stream
-		return rows.readRow(dest)
-	}
-	return io.EOF
-}
-func (rows *textRows) NextResultSet() (err error) {
-	resLen, err := rows.nextNotEmptyResultSet()
-	if err != nil {
-		return err
-	}
-	rows.rs.columns, err = rows.mc.readColumns(resLen)
-	return err
-}
-// db.Query return text rows, and get row from this func
-func (rows *textRows) Next(dest []driver.Value) error {
-	if mc := rows.mc; mc != nil {
-		// Fetch next row from stream
-		return rows.readRow(dest)
-	}
-	return io.EOF
-}
-func (mf *taosSqlField) typeDatabaseName() string {
-	//fmt.Println("######## (mf *taosSqlField) typeDatabaseName() mf.fieldType:", mf.fieldType)
-	switch mf.fieldType {
-	case C.TSDB_DATA_TYPE_BOOL:
-		return "BOOL"
-	case C.TSDB_DATA_TYPE_TINYINT:
-		return "TINYINT"
-	case C.TSDB_DATA_TYPE_SMALLINT:
-		return "SMALLINT"
-	case C.TSDB_DATA_TYPE_INT:
-		return "INT"
-	case C.TSDB_DATA_TYPE_BIGINT:
-		return "BIGINT"
-	case C.TSDB_DATA_TYPE_FLOAT:
-		return "FLOAT"
-	case C.TSDB_DATA_TYPE_DOUBLE:
-		return "DOUBLE"
-	case C.TSDB_DATA_TYPE_BINARY:
-		return "BINARY"
-	case C.TSDB_DATA_TYPE_NCHAR:
-		return "NCHAR"
-	case C.TSDB_DATA_TYPE_TIMESTAMP:
-		return "TIMESTAMP"
-	default:
-		return ""
-	}
-}
-var (
-	scanTypeFloat32   = reflect.TypeOf(float32(0))
-	scanTypeFloat64   = reflect.TypeOf(float64(0))
-	scanTypeInt8      = reflect.TypeOf(int8(0))
-	scanTypeInt16     = reflect.TypeOf(int16(0))
-	scanTypeInt32     = reflect.TypeOf(int32(0))
-	scanTypeInt64     = reflect.TypeOf(int64(0))
-	scanTypeNullTime  = reflect.TypeOf(NullTime{})
-	scanTypeRawBytes  = reflect.TypeOf(sql.RawBytes{})
-	scanTypeUnknown   = reflect.TypeOf(new(interface{}))
-)
-func (mf *taosSqlField) scanType() reflect.Type {
-	//fmt.Println("######## (mf *taosSqlField) scanType() mf.fieldType:", mf.fieldType)
-	switch mf.fieldType {
-	case C.TSDB_DATA_TYPE_BOOL:
-		return scanTypeInt8
-	case C.TSDB_DATA_TYPE_TINYINT:
-		return scanTypeInt8
-	case C.TSDB_DATA_TYPE_SMALLINT:
-		return scanTypeInt16
-	case C.TSDB_DATA_TYPE_INT:
-		return scanTypeInt32
-	case C.TSDB_DATA_TYPE_BIGINT:
-		return scanTypeInt64
-	case C.TSDB_DATA_TYPE_FLOAT:
-		return scanTypeFloat32
-	case C.TSDB_DATA_TYPE_DOUBLE:
-		return scanTypeFloat64
-	case C.TSDB_DATA_TYPE_BINARY:
-		return scanTypeRawBytes
-	case C.TSDB_DATA_TYPE_NCHAR:
-		return scanTypeRawBytes
-	case C.TSDB_DATA_TYPE_TIMESTAMP:
-		return scanTypeNullTime
-	default:
-		return scanTypeUnknown
-	}
-}
--- a/src/connector/go/src/taosSql/statement.go
+++ b/src/connector/go/src/taosSql/statement.go
-/*
- * 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 taosSql
-import (
-	"database/sql/driver"
-	"fmt"
-	"reflect"
-)
-type taosSqlStmt struct {
-	mc         *taosConn
-	id         uint32
-	pSql       string
-	paramCount int
-}
-func (stmt *taosSqlStmt) Close() error {
-	return nil
-}
-func (stmt *taosSqlStmt) NumInput() int {
-	return stmt.paramCount
-}
-func (stmt *taosSqlStmt) Exec(args []driver.Value) (driver.Result, error) {
-	if stmt.mc == nil || stmt.mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	return stmt.mc.Exec(stmt.pSql, args)
-}
-func (stmt *taosSqlStmt) Query(args []driver.Value) (driver.Rows, error) {
-	if  stmt.mc == nil || stmt.mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	return stmt.query(args)
-}
-func (stmt *taosSqlStmt) query(args []driver.Value) (*binaryRows, error) {
-	mc := stmt.mc
-	if  mc == nil || mc.taos == nil {
-		return nil, errInvalidConn
-	}
-	querySql := stmt.pSql
-	if len(args) != 0 {
-		if !mc.cfg.interpolateParams {
-			return nil, driver.ErrSkip
-		}
-		// try client-side prepare to reduce roundtrip
-		prepared, err := mc.interpolateParams(stmt.pSql, args)
-		if err != nil {
-			return nil, err
-		}
-		querySql = prepared
-	}
-	num_fields, err := mc.taosQuery(querySql)
-	if err == nil {
-		// Read Result
-		rows := new(binaryRows)
-		rows.mc = mc
-		// Columns field
-		rows.rs.columns, err = mc.readColumns(num_fields)
-		return rows, err
-	}
-	return nil, err
-}
-type converter struct{}
-// ConvertValue mirrors the reference/default converter in database/sql/driver
-// with _one_ exception.  We support uint64 with their high bit and the default
-// implementation does not.  This function should be kept in sync with
-// database/sql/driver defaultConverter.ConvertValue() except for that
-// deliberate difference.
-func (c converter) ConvertValue(v interface{}) (driver.Value, error) {
-	if driver.IsValue(v) {
-		return v, nil
-	}
-	if vr, ok := v.(driver.Valuer); ok {
-		sv, err := callValuerValue(vr)
-		if err != nil {
-			return nil, err
-		}
-		if !driver.IsValue(sv) {
-			return nil, fmt.Errorf("non-Value type %T returned from Value", sv)
-		}
-		return sv, nil
-	}
-	rv := reflect.ValueOf(v)
-	switch rv.Kind() {
-	case reflect.Ptr:
-		// indirect pointers
-		if rv.IsNil() {
-			return nil, nil
-		} else {
-			return c.ConvertValue(rv.Elem().Interface())
-		}
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return rv.Int(), nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return rv.Uint(), nil
-	case reflect.Float32, reflect.Float64:
-		return rv.Float(), nil
-	case reflect.Bool:
-		return rv.Bool(), nil
-	case reflect.Slice:
-		ek := rv.Type().Elem().Kind()
-		if ek == reflect.Uint8 {
-			return rv.Bytes(), nil
-		}
-		return nil, fmt.Errorf("unsupported type %T, a slice of %s", v, ek)
-	case reflect.String:
-		return rv.String(), nil
-	}
-	return nil, fmt.Errorf("unsupported type %T, a %s", v, rv.Kind())
-}
-var valuerReflectType = reflect.TypeOf((*driver.Valuer)(nil)).Elem()
-// callValuerValue returns vr.Value(), with one exception:
-// If vr.Value is an auto-generated method on a pointer type and the
-// pointer is nil, it would panic at runtime in the panicwrap
-// method. Treat it like nil instead.
-//
-// This is so people can implement driver.Value on value types and
-// still use nil pointers to those types to mean nil/NULL, just like
-// string/*string.
-//
-// This is an exact copy of the same-named unexported function from the
-// database/sql package.
-func callValuerValue(vr driver.Valuer) (v driver.Value, err error) {
-	if rv := reflect.ValueOf(vr); rv.Kind() == reflect.Ptr &&
-		rv.IsNil() &&
-		rv.Type().Elem().Implements(valuerReflectType) {
-		return nil, nil
-	}
-	return vr.Value()
-}
--- a/src/connector/go/src/taosSql/taosLog.go
+++ b/src/connector/go/src/taosSql/taosLog.go
-/*
- * 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 taosSql
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"strings"
-)
-// Various errors the driver might return.
-var (
-	errInvalidConn    = errors.New("invalid connection")
-	errConnNoExist    = errors.New("no existent connection ")
-)
-var taosLog *log.Logger
-// SetLogger is used to set the logger for critical errors.
-// The initial logger
-func taosLogInit() {
-	cfgName := "/etc/taos/taos.cfg"
-	logNameDefault := "/var/log/taos/taosgo.log"
-	var logName string
-	// get log path from cfg file
-	cfgFile, err := os.OpenFile(cfgName, os.O_RDONLY, 0644)
-	defer cfgFile.Close()
-	if err != nil {
-		fmt.Println(err)
-		logName = logNameDefault
-	} else {
-		logName, err = getLogNameFromCfg(cfgFile)
-		if err != nil {
-			fmt.Println(err)
-			logName = logNameDefault
-		}
-	}
-	logFile, err := os.OpenFile(logName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	taosLog = log.New(logFile, "", log.LstdFlags)
-	taosLog.SetPrefix("TAOS DRIVER ")
-	taosLog.SetFlags(log.LstdFlags|log.Lshortfile)
-}
-func getLogNameFromCfg(f *os.File) (string, error) {
-		// Create file buf, *Reader
-	r := bufio.NewReader(f)
-	for {
-		//read one line, return to slice b
-		b, _, err := r.ReadLine()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			panic(err)
-		}
-		// Remove space of left and right
-		s := strings.TrimSpace(string(b))
-		if strings.Index(s, "#") == 0 {
-			// comment line
-			continue
-		}
-		if len(s) == 0 {
-			continue
-		}
-		var ns string
-		// If there is a comment on the right of the line, must be remove
-		index := strings.Index(s, "#")
-		if index > 0 {
-			// Gets the string to the left of the comment to determine whether it is empty
-			ns = s[:index]
-			if len(ns) == 0 {
-				continue
-			}
-		} else {
-			ns = s;
-		}
-		ss := strings.Fields(ns)
-        if strings.Compare("logDir", ss[0]) != 0 {
-        	continue
-		}
-		if len(ss) < 2 {
-			break
-		}
-		// Add a filename after the path
-		logName := ss[1] + "/taosgo.log"
-		return logName,nil
-	}
-    return "", errors.New("no config log path, use default")
-}
--- a/src/connector/go/src/taosSql/taosSqlCgo.go
+++ b/src/connector/go/src/taosSql/taosSqlCgo.go
-/*
- * 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 taosSql
-/*
-#cgo CFLAGS : -I/usr/include
-#cgo LDFLAGS: -L/usr/lib -ltaos
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <taos.h>
-*/
-import "C"
-import (
-	"errors"
-	"unsafe"
-)
-func (mc *taosConn) taosConnect(ip, user, pass, db string, port int) (taos unsafe.Pointer, err error) {
-	cuser := C.CString(user)
-	cpass := C.CString(pass)
-	cip := C.CString(ip)
-	cdb := C.CString(db)
-	defer C.free(unsafe.Pointer(cip))
-	defer C.free(unsafe.Pointer(cuser))
-	defer C.free(unsafe.Pointer(cpass))
-	defer C.free(unsafe.Pointer(cdb))
-	taosObj := C.taos_connect(cip, cuser, cpass, cdb, (C.ushort)(port))
-	if taosObj == nil {
-		return nil, errors.New("taos_connect() fail!")
-	}
-	return (unsafe.Pointer)(taosObj), nil
-}
-func (mc *taosConn) taosQuery(sqlstr string) (int, error) {
-	//taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
-	csqlstr := C.CString(sqlstr)
-	defer C.free(unsafe.Pointer(csqlstr))
-	code := int(C.taos_query(mc.taos, csqlstr))
-	if 0 != code {
-		mc.taos_error()
-		errStr := C.GoString(C.taos_errstr(mc.taos))
-		taosLog.Println("taos_query() failed:", errStr)
-		taosLog.Printf("taosQuery() input sql:%s\n", sqlstr)
-		return 0, errors.New(errStr)
-	}
-	// read result and save into mc struct
-	num_fields := int(C.taos_field_count(mc.taos))
-	if 0 == num_fields { // there are no select and show kinds of commands
-		mc.affectedRows = int(C.taos_affected_rows(mc.taos))
-		mc.insertId = 0
-	}
-	return num_fields, nil
-}
-func (mc *taosConn) taos_close() {
-	C.taos_close(mc.taos)
-}
-func (mc *taosConn) taos_error() {
-	// free local resouce: allocated memory/metric-meta refcnt
-	//var pRes unsafe.Pointer
-	pRes := C.taos_use_result(mc.taos)
-	C.taos_free_result(pRes)
-}
--- a/src/connector/go/src/taosSql/utils.go
+++ b/src/connector/go/src/taosSql/utils.go
-/*
- * 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 taosSql
-/*
-#cgo CFLAGS : -I/usr/include
-#include <stdlib.h>
-#cgo LDFLAGS: -L/usr/lib -ltaos
-void taosSetAllocMode(int mode, const char* path, _Bool autoDump);
-void taosDumpMemoryLeak();
-*/
-import "C"
-import (
-	"database/sql/driver"
-	"errors"
-	"fmt"
-	"sync/atomic"
-	"time"
-	"unsafe"
-)
-// Returns the bool value of the input.
-// The 2nd return value indicates if the input was a valid bool value
-func readBool(input string) (value bool, valid bool) {
-	switch input {
-	case "1", "true", "TRUE", "True":
-		return true, true
-	case "0", "false", "FALSE", "False":
-		return false, true
-	}
-	// Not a valid bool value
-	return
-}
-/******************************************************************************
-*                           Time related utils                                *
-******************************************************************************/
-// NullTime represents a time.Time that may be NULL.
-// NullTime implements the Scanner interface so
-// it can be used as a scan destination:
-//
-//  var nt NullTime
-//  err := db.QueryRow("SELECT time FROM foo WHERE id=?", id).Scan(&nt)
-//  ...
-//  if nt.Valid {
-//     // use nt.Time
-//  } else {
-//     // NULL value
-//  }
-//
-// This NullTime implementation is not driver-specific
-type NullTime struct {
-	Time  time.Time
-	Valid bool // Valid is true if Time is not NULL
-}
-// Scan implements the Scanner interface.
-// The value type must be time.Time or string / []byte (formatted time-string),
-// otherwise Scan fails.
-func (nt *NullTime) Scan(value interface{}) (err error) {
-	if value == nil {
-		nt.Time, nt.Valid = time.Time{}, false
-		return
-	}
-	switch v := value.(type) {
-	case time.Time:
-		nt.Time, nt.Valid = v, true
-		return
-	case []byte:
-		nt.Time, err = parseDateTime(string(v), time.UTC)
-		nt.Valid = (err == nil)
-		return
-	case string:
-		nt.Time, err = parseDateTime(v, time.UTC)
-		nt.Valid = (err == nil)
-		return
-	}
-	nt.Valid = false
-	return fmt.Errorf("Can't convert %T to time.Time", value)
-}
-// Value implements the driver Valuer interface.
-func (nt NullTime) Value() (driver.Value, error) {
-	if !nt.Valid {
-		return nil, nil
-	}
-	return nt.Time, nil
-}
-func parseDateTime(str string, loc *time.Location) (t time.Time, err error) {
-	base := "0000-00-00 00:00:00.0000000"
-	switch len(str) {
-	case 10, 19, 21, 22, 23, 24, 25, 26: // up to "YYYY-MM-DD HH:MM:SS.MMMMMM"
-		if str == base[:len(str)] {
-			return
-		}
-		t, err = time.Parse(timeFormat[:len(str)], str)
-	default:
-		err = fmt.Errorf("invalid time string: %s", str)
-		return
-	}
-	// Adjust location
-	if err == nil && loc != time.UTC {
-		y, mo, d := t.Date()
-		h, mi, s := t.Clock()
-		t, err = time.Date(y, mo, d, h, mi, s, t.Nanosecond(), loc), nil
-	}
-	return
-}
-// zeroDateTime is used in formatBinaryDateTime to avoid an allocation
-// if the DATE or DATETIME has the zero value.
-// It must never be changed.
-// The current behavior depends on database/sql copying the result.
-var zeroDateTime = []byte("0000-00-00 00:00:00.000000")
-const digits01 = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
-const digits10 = "0000000000111111111122222222223333333333444444444455555555556666666666777777777788888888889999999999"
-/******************************************************************************
-*                       Convert from and to bytes                             *
-******************************************************************************/
-func uint64ToBytes(n uint64) []byte {
-	return []byte{
-		byte(n),
-		byte(n >> 8),
-		byte(n >> 16),
-		byte(n >> 24),
-		byte(n >> 32),
-		byte(n >> 40),
-		byte(n >> 48),
-		byte(n >> 56),
-	}
-}
-func uint64ToString(n uint64) []byte {
-	var a [20]byte
-	i := 20
-	// U+0030 = 0
-	// ...
-	// U+0039 = 9
-	var q uint64
-	for n >= 10 {
-		i--
-		q = n / 10
-		a[i] = uint8(n-q*10) + 0x30
-		n = q
-	}
-	i--
-	a[i] = uint8(n) + 0x30
-	return a[i:]
-}
-// treats string value as unsigned integer representation
-func stringToInt(b []byte) int {
-	val := 0
-	for i := range b {
-		val *= 10
-		val += int(b[i] - 0x30)
-	}
-	return val
-}
-// reserveBuffer checks cap(buf) and expand buffer to len(buf) + appendSize.
-// If cap(buf) is not enough, reallocate new buffer.
-func reserveBuffer(buf []byte, appendSize int) []byte {
-	newSize := len(buf) + appendSize
-	if cap(buf) < newSize {
-		// Grow buffer exponentially
-		newBuf := make([]byte, len(buf)*2+appendSize)
-		copy(newBuf, buf)
-		buf = newBuf
-	}
-	return buf[:newSize]
-}
-// escapeBytesBackslash escapes []byte with backslashes (\)
-// This escapes the contents of a string (provided as []byte) by adding backslashes before special
-// characters, and turning others into specific escape sequences, such as
-// turning newlines into \n and null bytes into \0.
-func escapeBytesBackslash(buf, v []byte) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-	for _, c := range v {
-		switch c {
-		case '\x00':
-			buf[pos] = '\\'
-			buf[pos+1] = '0'
-			pos += 2
-		case '\n':
-			buf[pos] = '\\'
-			buf[pos+1] = 'n'
-			pos += 2
-		case '\r':
-			buf[pos] = '\\'
-			buf[pos+1] = 'r'
-			pos += 2
-		case '\x1a':
-			buf[pos] = '\\'
-			buf[pos+1] = 'Z'
-			pos += 2
-		case '\'':
-			buf[pos] = '\\'
-			buf[pos+1] = '\''
-			pos += 2
-		case '"':
-			buf[pos] = '\\'
-			buf[pos+1] = '"'
-			pos += 2
-		case '\\':
-			buf[pos] = '\\'
-			buf[pos+1] = '\\'
-			pos += 2
-		default:
-			buf[pos] = c
-			pos++
-		}
-	}
-	return buf[:pos]
-}
-// escapeStringBackslash is similar to escapeBytesBackslash but for string.
-func escapeStringBackslash(buf []byte, v string) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-	for i := 0; i < len(v); i++ {
-		c := v[i]
-		switch c {
-		case '\x00':
-			buf[pos] = '\\'
-			buf[pos+1] = '0'
-			pos += 2
-		case '\n':
-			buf[pos] = '\\'
-			buf[pos+1] = 'n'
-			pos += 2
-		case '\r':
-			buf[pos] = '\\'
-			buf[pos+1] = 'r'
-			pos += 2
-		case '\x1a':
-			buf[pos] = '\\'
-			buf[pos+1] = 'Z'
-			pos += 2
-		//case '\'':
-		//	buf[pos] = '\\'
-		//	buf[pos+1] = '\''
-		//	pos += 2
-		case '"':
-			buf[pos] = '\\'
-			buf[pos+1] = '"'
-			pos += 2
-		case '\\':
-			buf[pos] = '\\'
-			buf[pos+1] = '\\'
-			pos += 2
-		default:
-			buf[pos] = c
-			pos++
-		}
-	}
-	return buf[:pos]
-}
-// escapeBytesQuotes escapes apostrophes in []byte by doubling them up.
-// This escapes the contents of a string by doubling up any apostrophes that
-// it contains. This is used when the NO_BACKSLASH_ESCAPES SQL_MODE is in
-// effect on the server.
-func escapeBytesQuotes(buf, v []byte) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-	for _, c := range v {
-		if c == '\'' {
-			buf[pos] = '\''
-			buf[pos+1] = '\''
-			pos += 2
-		} else {
-			buf[pos] = c
-			pos++
-		}
-	}
-	return buf[:pos]
-}
-// escapeStringQuotes is similar to escapeBytesQuotes but for string.
-func escapeStringQuotes(buf []byte, v string) []byte {
-	pos := len(buf)
-	buf = reserveBuffer(buf, len(v)*2)
-	for i := 0; i < len(v); i++ {
-		c := v[i]
-		if c == '\'' {
-			buf[pos] = '\''
-			buf[pos+1] = '\''
-			pos += 2
-		} else {
-			buf[pos] = c
-			pos++
-		}
-	}
-	return buf[:pos]
-}
-/******************************************************************************
-*                               Sync utils                                    *
-******************************************************************************/
-// noCopy may be embedded into structs which must not be copied
-// after the first use.
-//
-// See https://github.com/golang/go/issues/8005#issuecomment-190753527
-// for details.
-type noCopy struct{}
-// Lock is a no-op used by -copylocks checker from `go vet`.
-func (*noCopy) Lock() {}
-// atomicBool is a wrapper around uint32 for usage as a boolean value with
-// atomic access.
-type atomicBool struct {
-	_noCopy noCopy
-	value   uint32
-}
-// IsSet returns whether the current boolean value is true
-func (ab *atomicBool) IsSet() bool {
-	return atomic.LoadUint32(&ab.value) > 0
-}
-// Set sets the value of the bool regardless of the previous value
-func (ab *atomicBool) Set(value bool) {
-	if value {
-		atomic.StoreUint32(&ab.value, 1)
-	} else {
-		atomic.StoreUint32(&ab.value, 0)
-	}
-}
-// TrySet sets the value of the bool and returns whether the value changed
-func (ab *atomicBool) TrySet(value bool) bool {
-	if value {
-		return atomic.SwapUint32(&ab.value, 1) == 0
-	}
-	return atomic.SwapUint32(&ab.value, 0) > 0
-}
-// atomicError is a wrapper for atomically accessed error values
-type atomicError struct {
-	_noCopy noCopy
-	value   atomic.Value
-}
-// Set sets the error value regardless of the previous value.
-// The value must not be nil
-func (ae *atomicError) Set(value error) {
-	ae.value.Store(value)
-}
-// Value returns the current error value
-func (ae *atomicError) Value() error {
-	if v := ae.value.Load(); v != nil {
-		// this will panic if the value doesn't implement the error interface
-		return v.(error)
-	}
-	return nil
-}
-func namedValueToValue(named []driver.NamedValue) ([]driver.Value, error) {
-	dargs := make([]driver.Value, len(named))
-	for n, param := range named {
-		if len(param.Name) > 0 {
-			// TODO: support the use of Named Parameters #561
-			return nil, errors.New("taosSql: driver does not support the use of Named Parameters")
-		}
-		dargs[n] = param.Value
-	}
-	return dargs, nil
-}
-/******************************************************************************
-*                     Utils for C memory issues debugging                     *
-******************************************************************************/
-func SetAllocMode(mode int32, path string) {
-	cpath := C.CString(path)
-	defer C.free(unsafe.Pointer(cpath))
-	C.taosSetAllocMode(C.int(mode), cpath, false)
-}
-func DumpMemoryLeak() {
-	C.taosDumpMemoryLeak()
-}
--- a/src/dnode/CMakeLists.txt
+++ b/src/dnode/CMakeLists.txt
@@ -28,7 +28,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  ENDIF ()
  IF (TD_VPEER)
-    TARGET_LINK_LIBRARIES(taosd balance)
+    TARGET_LINK_LIBRARIES(taosd balance sync)
  ENDIF ()
  SET(PREPARE_ENV_CMD "prepare_env_cmd")

--- a/src/dnode/inc/dnodeMClient.h
+++ b/src/dnode/inc/dnodeMClient.h
@@ -24,6 +24,7 @@ int32_t  dnodeInitMClient();
 void     dnodeCleanupMClient();
 void     dnodeSendMsgToMnode(SRpcMsg *rpcMsg);
 uint32_t dnodeGetMnodeMasteIp();
+void *   dnodeGetMpeerInfos();
 #ifdef __cplusplus
 }

--- a/src/dnode/src/dnodeMClient.c
+++ b/src/dnode/src/dnodeMClient.c
@@ -15,33 +15,45 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "cJSON.h"
 #include "taosmsg.h"
 #include "tlog.h"
 #include "trpc.h"
 #include "tutil.h"
+#include "tsync.h"
 #include "dnode.h"
 #include "dnodeMClient.h"
 #include "dnodeModule.h"
 #include "dnodeMgmt.h"
+#define MPEER_CONTENT_LEN 2000
 static bool   dnodeReadMnodeIpList();
 static void   dnodeSaveMnodeIpList();
 static void   dnodeProcessRspFromMnode(SRpcMsg *pMsg);
 static void   dnodeProcessStatusRsp(SRpcMsg *pMsg);
 static void (*tsDnodeProcessMgmtRspFp[TSDB_MSG_TYPE_MAX])(SRpcMsg *);
 static void  *tsDnodeMClientRpc = NULL;
-static SRpcIpSet tsDnodeMnodeIpList  = {0};
+static SRpcIpSet    tsMnodeIpList  = {0};
+static SDMNodeInfos tsMnodeInfos = {0};
 int32_t dnodeInitMClient() {
  if (!dnodeReadMnodeIpList()) {
-    dTrace("failed to read mnode iplist, set it from cfg file");
+    memset(&tsMnodeIpList, 0, sizeof(SRpcIpSet));
-    memset(&tsDnodeMnodeIpList, 0, sizeof(SRpcIpSet));
+    memset(&tsMnodeInfos, 0, sizeof(SDMNodeInfos));
-    tsDnodeMnodeIpList.port = tsMnodeDnodePort;
+    tsMnodeIpList.port = tsMnodeDnodePort;
-    tsDnodeMnodeIpList.numOfIps = 1;
+    tsMnodeIpList.numOfIps = 1;
-    tsDnodeMnodeIpList.ip[0] = inet_addr(tsMasterIp);
+    tsMnodeIpList.ip[0] = inet_addr(tsMasterIp);
    if (tsSecondIp[0]) {
-      tsDnodeMnodeIpList.numOfIps = 2;
+      tsMnodeIpList.numOfIps = 2;
-      tsDnodeMnodeIpList.ip[1] = inet_addr(tsSecondIp);
+      tsMnodeIpList.ip[1] = inet_addr(tsSecondIp);
+    }
+  } else {
+    tsMnodeIpList.inUse = tsMnodeInfos.inUse;
+    tsMnodeIpList.numOfIps = tsMnodeInfos.nodeNum;
+    tsMnodeIpList.port = tsMnodeInfos.nodeInfos[0].nodePort;
+    for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
+      tsMnodeIpList.ip[i] = tsMnodeInfos.nodeInfos[i].nodeIp;
    }
  }
@@ -96,23 +108,31 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
  }
  SDMStatusRsp *pStatusRsp = pMsg->pCont;
-  if (pStatusRsp->ipList.numOfIps <= 0) {
+  SDMNodeInfos *mpeers = &pStatusRsp->mpeers;
-    dError("status msg is invalid, num of ips is %d", pStatusRsp->ipList.numOfIps);
+  if (mpeers->nodeNum <= 0) {
+    dError("status msg is invalid, num of ips is %d", mpeers->nodeNum);
    return;
  }
-  pStatusRsp->ipList.port = htons(pStatusRsp->ipList.port);
+  SRpcIpSet mgmtIpSet = {0};
-  for (int32_t i = 0; i < pStatusRsp->ipList.numOfIps; ++i) {
+  mgmtIpSet.inUse = mpeers->inUse;
-    pStatusRsp->ipList.ip[i] = htonl(pStatusRsp->ipList.ip[i]);
+  mgmtIpSet.numOfIps = mpeers->nodeNum;
+  mgmtIpSet.port = htons(mpeers->nodeInfos[0].nodePort);
+  for (int32_t i = 0; i < mpeers->nodeNum; i++) {
+    mgmtIpSet.ip[i] = htonl(mpeers->nodeInfos[i].nodeIp);
  }
-  //dTrace("status msg is received, result:%s", tstrerror(pMsg->code));
+  if (memcmp(&mgmtIpSet, &tsMnodeIpList, sizeof(SRpcIpSet)) != 0) {
+    memcpy(&tsMnodeIpList, &mgmtIpSet, sizeof(SRpcIpSet));  
-  if (memcmp(&(pStatusRsp->ipList), &tsDnodeMnodeIpList, sizeof(SRpcIpSet)) != 0) {
+    memcpy(&tsMnodeInfos, mpeers, sizeof(SDMNodeInfos));
-    dPrint("mnode ip list is changed, numOfIps:%d inUse:%d", pStatusRsp->ipList.numOfIps, pStatusRsp->ipList.inUse);
+    dPrint("mnode ip list is changed, numOfIps:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse);
-    memcpy(&tsDnodeMnodeIpList, &pStatusRsp->ipList, sizeof(SRpcIpSet));
+    for (int32_t i = 0; i < mpeers->nodeNum; i++) {
-    for (int32_t i = 0; i < tsDnodeMnodeIpList.numOfIps; ++i) {
+      tsMnodeInfos.nodeInfos[i].nodeId = htonl(mpeers->nodeInfos[i].nodeId);
-      dPrint("mnode index:%d ip:%s", i, taosIpStr(tsDnodeMnodeIpList.ip[i]));
+      tsMnodeInfos.nodeInfos[i].nodeIp = htonl(mpeers->nodeInfos[i].nodeIp);
+      tsMnodeInfos.nodeInfos[i].nodePort = htons(mpeers->nodeInfos[i].nodePort);
+      dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId,
+             taosIpStr(tsMnodeInfos.nodeInfos[i].nodeId), tsMnodeInfos.nodeInfos[i].nodePort,
+             tsMnodeInfos.nodeInfos[i].nodeName);
    }
    dnodeSaveMnodeIpList();
  }
@@ -129,70 +149,149 @@ static void dnodeProcessStatusRsp(SRpcMsg *pMsg) {
 void dnodeSendMsgToMnode(SRpcMsg *rpcMsg) {
  if (tsDnodeMClientRpc) {
-    rpcSendRequest(tsDnodeMClientRpc, &tsDnodeMnodeIpList, rpcMsg);
+    rpcSendRequest(tsDnodeMClientRpc, &tsMnodeIpList, rpcMsg);
  }
 }
 static bool dnodeReadMnodeIpList() {
  char ipFile[TSDB_FILENAME_LEN] = {0};
-  sprintf(ipFile, "%s/iplist", tsDnodeDir);
+  sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir);
  FILE *fp = fopen(ipFile, "r");
-  if (!fp) return false;
+  if (!fp) {
+    dTrace("failed to read mnode mgmtIpList.json, file not exist");
-  char option[32] = {0};
+    return false;
-  int32_t value = 0;
+  }
-  int32_t num = 0;
-  num = fscanf(fp, "%s %d", option, &value);
-  if (num != 2) return false;
-  if (strcmp(option, "inUse") != 0) return false;
-  tsDnodeMnodeIpList.inUse = (int8_t)value;;
-  num = fscanf(fp, "%s %d", option, &value);
+  bool  ret = false;
-  if (num != 2) return false;
+  int   maxLen = 2000;
-  if (strcmp(option, "numOfIps") != 0) return false;
+  char *content = calloc(1, maxLen + 1);
-  tsDnodeMnodeIpList.numOfIps = (int8_t)value;
+  int   len = fread(content, 1, maxLen, fp);
+  if (len <= 0) {
+    free(content);
+    fclose(fp);
+    dError("failed to read mnode mgmtIpList.json, content is null");
+    return false;
+  }
-  num = fscanf(fp, "%s %d", option, &value);
+  cJSON* root = cJSON_Parse(content);
-  if (num != 2) return false;
+  if (root == NULL) {
-  if (strcmp(option, "port") != 0) return false;
+    dError("failed to read mnode mgmtIpList.json, invalid json format");
-  tsDnodeMnodeIpList.port = (uint16_t)value;
+    goto PARSE_OVER;
+  }
-  for (int32_t i = 0; i < tsDnodeMnodeIpList.numOfIps; i++) {
+  cJSON* inUse = cJSON_GetObjectItem(root, "inUse");
-    num = fscanf(fp, "%s %d", option, &value);
+  if (!inUse || inUse->type != cJSON_Number) {
-    if (num != 2) return false;
+    dError("failed to read mnode mgmtIpList.json, inUse not found");
-    if (strncmp(option, "ip", 2) != 0) return false;
+    goto PARSE_OVER;
-    tsDnodeMnodeIpList.ip[i] = (uint32_t)value;
  }
+  tsMnodeInfos.inUse = inUse->valueint;
-  fclose(fp);
+  cJSON* nodeNum = cJSON_GetObjectItem(root, "nodeNum");
-  dPrint("read mnode iplist successed");
+  if (!nodeNum || nodeNum->type != cJSON_Number) {
-  for (int32_t i = 0; i < tsDnodeMnodeIpList.numOfIps; i++) {
+    dError("failed to read mnode mgmtIpList.json, nodeNum not found");
-    dPrint("mnode index:%d ip:%s", i, taosIpStr(tsDnodeMnodeIpList.ip[i]));
+    goto PARSE_OVER;
-  } 
+  }
+  tsMnodeInfos.nodeNum = nodeNum->valueint;
+  cJSON* nodeInfos = cJSON_GetObjectItem(root, "nodeInfos");
+  if (!nodeInfos || nodeInfos->type != cJSON_Array) {
+    dError("failed to read mnode mgmtIpList.json, nodeInfos not found");
+    goto PARSE_OVER;
+  }
+  int size = cJSON_GetArraySize(nodeInfos);
+  if (size != tsMnodeInfos.nodeNum) {
+    dError("failed to read mnode mgmtIpList.json, nodeInfos size not matched");
+    goto PARSE_OVER;
+  }
+  for (int i = 0; i < size; ++i) {
+    cJSON* nodeInfo = cJSON_GetArrayItem(nodeInfos, i);
+    if (nodeInfo == NULL) continue;
+    cJSON *nodeId = cJSON_GetObjectItem(nodeInfo, "nodeId");
+    if (!nodeId || nodeId->type != cJSON_Number) {
+      dError("failed to read mnode mgmtIpList.json, nodeId not found");
+      goto PARSE_OVER;
+    }
+    tsMnodeInfos.nodeInfos[i].nodeId = nodeId->valueint;
-  return true;
+    cJSON *nodeIp = cJSON_GetObjectItem(nodeInfo, "nodeIp");
+    if (!nodeIp || nodeIp->type != cJSON_String || nodeIp->valuestring == NULL) {
+      dError("failed to read mnode mgmtIpList.json, nodeIp not found");
+      goto PARSE_OVER;
+    }
+    tsMnodeInfos.nodeInfos[i].nodeIp = inet_addr(nodeIp->valuestring);
+    cJSON *nodePort = cJSON_GetObjectItem(nodeInfo, "nodePort");
+    if (!nodePort || nodePort->type != cJSON_Number) {
+      dError("failed to read mnode mgmtIpList.json, nodePort not found");
+      goto PARSE_OVER;
+    }
+    tsMnodeInfos.nodeInfos[i].nodePort = (uint16_t)nodePort->valueint;
+    cJSON *nodeName = cJSON_GetObjectItem(nodeInfo, "nodeName");
+    if (!nodeIp || nodeName->type != cJSON_String || nodeName->valuestring == NULL) {
+      dError("failed to read mnode mgmtIpList.json, nodeName not found");
+      goto PARSE_OVER;
+    }
+    strncpy(tsMnodeInfos.nodeInfos[i].nodeName, nodeName->valuestring, TSDB_NODE_NAME_LEN);
+  }
+  ret = true;
+  dPrint("read mnode iplist successed, numOfIps:%d inUse:%d", tsMnodeInfos.nodeNum, tsMnodeInfos.inUse);
+  for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
+    dPrint("mnode:%d, ip:%s:%u name:%s", tsMnodeInfos.nodeInfos[i].nodeId,
+            taosIpStr(tsMnodeInfos.nodeInfos[i].nodeId), tsMnodeInfos.nodeInfos[i].nodePort,
+            tsMnodeInfos.nodeInfos[i].nodeName);
+  }
+PARSE_OVER:
+  free(content);
+  cJSON_Delete(root);
+  fclose(fp);
+  return ret;
 }
 static void dnodeSaveMnodeIpList() {
  char ipFile[TSDB_FILENAME_LEN] = {0};
-  sprintf(ipFile, "%s/iplist", tsDnodeDir);
+  sprintf(ipFile, "%s/mgmtIpList.json", tsDnodeDir);
  FILE *fp = fopen(ipFile, "w");
  if (!fp) return;
-  fprintf(fp, "inUse %d\n", tsDnodeMnodeIpList.inUse);
+  int32_t len = 0;
-  fprintf(fp, "numOfIps %d\n", tsDnodeMnodeIpList.numOfIps);
+  int32_t maxLen = 2000;
-  fprintf(fp, "port %u\n", tsDnodeMnodeIpList.port);
+  char *  content = calloc(1, maxLen + 1);
-  for (int32_t i = 0; i < tsDnodeMnodeIpList.numOfIps; i++) {
-    fprintf(fp, "ip%d %u\n", i, tsDnodeMnodeIpList.ip[i]);
+  len += snprintf(content + len, maxLen - len, "{\n");
+  len += snprintf(content + len, maxLen - len, "  \"inUse\": %d,\n", tsMnodeInfos.inUse);
+  len += snprintf(content + len, maxLen - len, "  \"nodeNum\": %d,\n", tsMnodeInfos.nodeNum);
+  len += snprintf(content + len, maxLen - len, "  \"nodeInfos\": [{\n");
+  for (int32_t i = 0; i < tsMnodeInfos.nodeNum; i++) {
+    len += snprintf(content + len, maxLen - len, "    \"nodeId\": %d,\n", tsMnodeInfos.nodeInfos[i].nodeId);
+    len += snprintf(content + len, maxLen - len, "    \"nodeIp\": \"%s\",\n", taosIpStr(tsMnodeInfos.nodeInfos[i].nodeIp));
+    len += snprintf(content + len, maxLen - len, "    \"nodePort\": %u,\n", tsMnodeInfos.nodeInfos[i].nodePort);
+    len += snprintf(content + len, maxLen - len, "    \"nodeName\": \"%s\"\n",  tsMnodeInfos.nodeInfos[i].nodeName);
+    if (i < tsMnodeInfos.nodeNum -1) {
+      len += snprintf(content + len, maxLen - len, "  },{\n");  
+    } else {
+      len += snprintf(content + len, maxLen - len, "  }]\n");  
+    }
  }
+  len += snprintf(content + len, maxLen - len, "}\n"); 
+  fwrite(content, 1, len, fp);
  fclose(fp);
+  free(content);
  dPrint("save mnode iplist successed");
 }
 uint32_t dnodeGetMnodeMasteIp() {
-  return tsDnodeMnodeIpList.ip[0];
+  return tsMnodeIpList.ip[tsMnodeIpList.inUse];
+}
+void* dnodeGetMpeerInfos() {
+  return &tsMnodeInfos;
 }
\ No newline at end of file
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -28,7 +28,7 @@
 #include "dnodeRead.h"
 #include "dnodeShell.h"
 #include "dnodeWrite.h"
-#include "mgmtGrant.h"
+#include "tgrant.h"
 static int32_t dnodeInitSystem();
 static int32_t dnodeInitStorage();
@@ -220,7 +220,6 @@ static int32_t dnodeInitStorage() {
  sprintf(tsMnodeDir, "%s/mnode", dataDir);
  sprintf(tsVnodeDir, "%s/vnode", dataDir);
  sprintf(tsDnodeDir, "%s/dnode", dataDir);
-  mkdir(tsMnodeDir, 0755);
  mkdir(tsVnodeDir, 0755);
  mkdir(tsDnodeDir, 0755);

--- a/src/dnode/src/dnodeMgmt.c
+++ b/src/dnode/src/dnodeMgmt.c
@@ -20,7 +20,6 @@
 #include "taosmsg.h"
 #include "tlog.h"
 #include "trpc.h"
-#include "tstatus.h"
 #include "tsdb.h"
 #include "ttime.h"
 #include "ttimer.h"
@@ -46,7 +45,7 @@ static void    *tsDnodeTmr = NULL;
 static void    *tsStatusTimer = NULL;
 static uint32_t tsRebootTime;
 static int32_t  tsDnodeId = 0;
-static char     tsDnodeName[TSDB_DNODE_NAME_LEN];
+static char     tsDnodeName[TSDB_NODE_NAME_LEN];
 int32_t dnodeInitMgmt() {
  dnodeReadDnodeId();
@@ -132,7 +131,7 @@ static int32_t dnodeOpenVnodes() {
  char vnodeDir[TSDB_FILENAME_LEN * 3];
  int32_t failed = 0;
-  int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * 10000);
+  int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * TSDB_MAX_VNODES);
  int32_t  numOfVnodes = dnodeGetVnodeList(vnodeList);
  for (int32_t i = 0; i < numOfVnodes; ++i) {
@@ -147,7 +146,7 @@ static int32_t dnodeOpenVnodes() {
 }
 static void dnodeCloseVnodes() {
-  int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * 10000);
+  int32_t *vnodeList = (int32_t *)malloc(sizeof(int32_t) * TSDB_MAX_VNODES);
  int32_t  numOfVnodes = dnodeGetVnodeList(vnodeList);
  for (int32_t i = 0; i < numOfVnodes; ++i) {

--- a/src/dnode/src/dnodeRead.c
+++ b/src/dnode/src/dnodeRead.c
@@ -32,27 +32,51 @@ typedef struct {
  SRpcMsg  rpcMsg;
 } SReadMsg;
+typedef struct {
+  pthread_t  thread;    // thread 
+  int32_t    workerId;  // worker ID
+} SReadWorker;
+typedef struct {
+  int32_t    max;       // max number of workers
+  int32_t    min;       // min number of workers
+  int32_t    num;       // current number of workers
+  SReadWorker *readWorker;
+} SReadWorkerPool;
 static void *dnodeProcessReadQueue(void *param);
-static void  dnodeHandleIdleReadWorker();
+static void  dnodeHandleIdleReadWorker(SReadWorker *);
 // module global variable
-static taos_qset readQset;
+static SReadWorkerPool readPool;
-static int32_t   threads;    // number of query threads
+static taos_qset       readQset;
-static int32_t   maxThreads;
-static int32_t   minThreads;
 int32_t dnodeInitRead() {
  readQset = taosOpenQset();
-  minThreads = 3;
+  readPool.min = 2;
-  maxThreads = tsNumOfCores * tsNumOfThreadsPerCore;
+  readPool.max = tsNumOfCores * tsNumOfThreadsPerCore;
-  if (maxThreads <= minThreads * 2) maxThreads = 2 * minThreads;
+  if (readPool.max <= readPool.min * 2) readPool.max = 2 * readPool.min;
+  readPool.readWorker = (SReadWorker *) calloc(sizeof(SReadWorker), readPool.max);
+  if (readPool.readWorker == NULL) return -1;
+  for (int i=0; i < readPool.max; ++i) {
+    SReadWorker *pWorker = readPool.readWorker + i;
+    pWorker->workerId = i;
+  }
  dPrint("dnode read is opened");
  return 0;
 }
 void dnodeCleanupRead() {
+  for (int i=0; i < readPool.max; ++i) {
+    SReadWorker *pWorker = readPool.readWorker + i;
+    if (pWorker->thread) 
+      pthread_join(pWorker->thread, NULL);
+  }
  taosCloseQset(readQset);
  dPrint("dnode read is closed");
 }
@@ -116,18 +140,25 @@ void *dnodeAllocateRqueue(void *pVnode) {
  taosAddIntoQset(readQset, queue, pVnode);
  // spawn a thread to process queue
-  if (threads < maxThreads) {
+  if (readPool.num < readPool.max) {
-    pthread_t thread;
+    do {
-    pthread_attr_t thAttr;
+      SReadWorker *pWorker = readPool.readWorker + readPool.num;
-    pthread_attr_init(&thAttr);
-    pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
+      pthread_attr_t thAttr;
+      pthread_attr_init(&thAttr);
-    if (pthread_create(&thread, &thAttr, dnodeProcessReadQueue, readQset) != 0) {
+      pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
-      dError("failed to create thread to process read queue, reason:%s", strerror(errno));
-    }
+      if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessReadQueue, pWorker) != 0) {
+        dError("failed to create thread to process read queue, reason:%s", strerror(errno));
+      }
+      pthread_attr_destroy(&thAttr);
+      readPool.num++;
+      dTrace("read worker:%d is launched, total:%d", pWorker->workerId, readPool.num);
+    } while (readPool.num < readPool.min);
  }
-  dTrace("pVnode:%p, queue:%p is allocated", pVnode, queue); 
+  dTrace("pVnode:%p, read queue:%p is allocated", pVnode, queue); 
  return queue;
 }
@@ -167,14 +198,14 @@ void dnodeSendRpcReadRsp(void *pVnode, SReadMsg *pRead, int32_t code) {
 }
 static void *dnodeProcessReadQueue(void *param) {
-  taos_qset  qset = (taos_qset)param;
+  SReadWorker *pWorker = param;
-  SReadMsg  *pReadMsg;
+  SReadMsg    *pReadMsg;
-  int        type;
+  int          type;
-  void      *pVnode;
+  void        *pVnode;
  while (1) {
-    if (taosReadQitemFromQset(qset, &type, (void **)&pReadMsg, (void **)&pVnode) == 0) {
+    if (taosReadQitemFromQset(readQset, &type, (void **)&pReadMsg, &pVnode) == 0) {
-      dnodeHandleIdleReadWorker();
+      dnodeHandleIdleReadWorker(pWorker);
      continue;
    }
@@ -186,11 +217,12 @@ static void *dnodeProcessReadQueue(void *param) {
  return NULL;
 }
-static void dnodeHandleIdleReadWorker() {
+static void dnodeHandleIdleReadWorker(SReadWorker *pWorker) {
  int32_t num = taosGetQueueNumber(readQset);
-  if (num == 0 || (num <= minThreads && threads > minThreads)) {
+  if (num == 0 || (num <= readPool.min && readPool.num > readPool.min)) {
-    threads--;
+    readPool.num--;
+    dTrace("read worker:%d is released, total:%d", pWorker->workerId, readPool.num);
    pthread_exit(NULL);
  } else {
    usleep(100);

--- a/src/dnode/src/dnodeWrite.c
+++ b/src/dnode/src/dnodeWrite.c
@@ -28,6 +28,7 @@
 #include "vnode.h"
 typedef struct {
+  taos_qall  qall;
  taos_qset  qset;      // queue set
  pthread_t  thread;    // thread 
  int32_t    workerId;  // worker ID
@@ -40,7 +41,7 @@ typedef struct {
  SRpcMsg  rpcMsg;
 } SWriteMsg;
-typedef struct _wworker_pool {
+typedef struct {
  int32_t        max;        // max number of workers
  int32_t        nextId;     // from 0 to max-1, cyclic
  SWriteWorker  *writeWorker;
@@ -65,6 +66,14 @@ int32_t dnodeInitWrite() {
 }
 void dnodeCleanupWrite() {
+  for (int32_t i = 0; i < wWorkerPool.max; ++i) {
+    SWriteWorker *pWorker =  wWorkerPool.writeWorker + i;
+    if (pWorker->thread) {
+      pthread_join(pWorker->thread, NULL);
+    }
+  }
  free(wWorkerPool.writeWorker);
  dPrint("dnode write is closed");
 }
@@ -113,6 +122,7 @@ void *dnodeAllocateWqueue(void *pVnode) {
    if (pWorker->qset == NULL) return NULL;
    taosAddIntoQset(pWorker->qset, queue, pVnode);
+    pWorker->qall = taosAllocateQall();
    wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
    pthread_attr_t thAttr;
@@ -122,13 +132,17 @@ void *dnodeAllocateWqueue(void *pVnode) {
    if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessWriteQueue, pWorker) != 0) {
      dError("failed to create thread to process read queue, reason:%s", strerror(errno));
      taosCloseQset(pWorker->qset);
+    } else {
+      dTrace("write worker:%d is launched", pWorker->workerId);
    }
+    pthread_attr_destroy(&thAttr);
  } else {
    taosAddIntoQset(pWorker->qset, queue, pVnode);
    wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
  }
-  dTrace("pVnode:%p, queue:%p is allocated", pVnode, queue);
+  dTrace("pVnode:%p, write queue:%p is allocated", pVnode, queue);
  return queue;
 }
@@ -160,17 +174,14 @@ void dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code) {
 static void *dnodeProcessWriteQueue(void *param) {
  SWriteWorker *pWorker = (SWriteWorker *)param;
-  taos_qall     qall;
  SWriteMsg    *pWrite;
  SWalHead     *pHead;
  int32_t       numOfMsgs;
  int           type;
  void         *pVnode, *item;
-  qall = taosAllocateQall();
  while (1) {
-    numOfMsgs = taosReadAllQitemsFromQset(pWorker->qset, qall, &pVnode);
+    numOfMsgs = taosReadAllQitemsFromQset(pWorker->qset, pWorker->qall, &pVnode);
    if (numOfMsgs <=0) { 
      dnodeHandleIdleWorker(pWorker);  // thread exit if no queues anymore
      continue;
@@ -178,7 +189,7 @@ static void *dnodeProcessWriteQueue(void *param) {
    for (int32_t i = 0; i < numOfMsgs; ++i) {
      pWrite = NULL;
-      taosGetQitem(qall, &type, &item);
+      taosGetQitem(pWorker->qall, &type, &item);
      if (type == TAOS_QTYPE_RPC) {
        pWrite = (SWriteMsg *)item;
        pHead = (SWalHead *)(pWrite->pCont - sizeof(SWalHead));
@@ -196,9 +207,9 @@ static void *dnodeProcessWriteQueue(void *param) {
    walFsync(vnodeGetWal(pVnode));
    // browse all items, and process them one by one
-    taosResetQitems(qall);
+    taosResetQitems(pWorker->qall);
    for (int32_t i = 0; i < numOfMsgs; ++i) {
-      taosGetQitem(qall, &type, &item);
+      taosGetQitem(pWorker->qall, &type, &item);
      if (type == TAOS_QTYPE_RPC) {
        pWrite = (SWriteMsg *)item;
        dnodeSendRpcWriteRsp(pVnode, item, pWrite->rpcMsg.code); 
@@ -209,8 +220,6 @@ static void *dnodeProcessWriteQueue(void *param) {
    }
  }
-  taosFreeQall(qall);
  return NULL;
 }
@@ -218,11 +227,13 @@ static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
  int32_t num = taosGetQueueNumber(pWorker->qset);
  if (num > 0) {
-     usleep(100);
+     usleep(1000);
     sched_yield(); 
  } else {
+     taosFreeQall(pWorker->qall);
     taosCloseQset(pWorker->qset);
     pWorker->qset = NULL;
+     dTrace("write worker:%d is released", pWorker->workerId);
     pthread_exit(NULL);
  }
 }
--- a/src/inc/dnode.h
+++ b/src/inc/dnode.h
@@ -42,7 +42,7 @@ void *dnodeAllocateWqueue(void *pVnode);
 void  dnodeFreeWqueue(void *queue);
 void *dnodeAllocateRqueue(void *pVnode);
 void  dnodeFreeRqueue(void *rqueue);
-void  dnodeSendWriteResponse(void *pVnode, void *param, int32_t code);
+void  dnodeSendRpcWriteRsp(void *pVnode, void *param, int32_t code);
 #ifdef __cplusplus
 }

--- a/src/inc/mnode.h
+++ b/src/inc/mnode.h
--- a/src/rpc/inc/rpcServer.h
+++ b/src/rpc/inc/rpcServer.h
@@ -13,19 +13,37 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef _rpc_server_header_
+#ifndef TDENGINE_MPEER_H
-#define _rpc_server_header_
+#define TDENGINE_MPEER_H
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "taosdef.h"
+struct _mnode_obj;
-void *taosInitTcpServer(char *ip, uint16_t port, char *label, int numOfThreads, void *fp, void *shandle);
+enum _TAOS_MN_STATUS {
-void taosCleanUpTcpServer(void *param);
+  TAOS_MN_STATUS_OFFLINE,
-void taosCloseTcpServerConnection(void *param);
+  TAOS_MN_STATUS_DROPPING,
-int  taosSendTcpServerData(uint32_t ip, uint16_t port, void *data, int len, void *chandle);
+  TAOS_MN_STATUS_READY
+};
+int32_t mpeerInit();
+void    mpeerCleanup();
+int32_t mpeerGetMnodesNum();
+void *  mpeerGetNextMnode(void *pNode, struct _mnode_obj **pMnode);
+void    mpeerReleaseMnode(struct _mnode_obj *pMnode);
+bool    mpeerInServerStatus();   
+bool    mpeerIsMaster();
+bool    mpeerCheckRedirect();
+void    mpeerGetPrivateIpList(SRpcIpSet *ipSet);
+void    mpeerGetPublicIpList(SRpcIpSet *ipSet);
+void    mpeerGetMpeerInfos(void *mpeers);
+char *  mpeerGetMnodeStatusStr(int32_t status);
+char *  mpeerGetMnodeRoleStr(int32_t role);
 #ifdef __cplusplus
 }

--- a/src/mnode/inc/mgmtAcct.h
+++ b/src/mnode/inc/mgmtAcct.h
--- a/src/mnode/inc/mgmtBalance.h
+++ b/src/mnode/inc/mgmtBalance.h
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
--- a/src/mnode/inc/mgmtMnode.h
+++ b/src/mnode/inc/mgmtMnode.h
--- a/src/inc/tcluster.h
+++ b/src/inc/tcluster.h
--- a/src/mnode/inc/mgmtGrant.h
+++ b/src/mnode/inc/mgmtGrant.h
@@ -13,8 +13,8 @@
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
-#ifndef TDENGINE_MGMT_GRANT_H
+#ifndef TDENGINE_GTANT_H
-#define TDENGINE_MGMT_GRANT_H
+#define TDENGINE_GTANT_H
 #ifdef __cplusplus
 "C" {

--- a/src/inc/trpc.h
+++ b/src/inc/trpc.h
--- a/src/inc/tsync.h
+++ b/src/inc/tsync.h
--- a/src/inc/twal.h
+++ b/src/inc/twal.h
--- a/src/inc/vnode.h
+++ b/src/inc/vnode.h
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -284,7 +284,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 /* Function to do regular expression check */
 int regex_match(const char *s, const char *reg, int cflags) {
  regex_t regex;
-  char    msgbuf[100];
+  char    msgbuf[100] = {0};
  /* Compile regular expression */
  if (regcomp(&regex, reg, cflags) != 0) {

--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
--- a/src/mnode/CMakeLists.txt
+++ b/src/mnode/CMakeLists.txt
@@ -13,5 +13,5 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
  AUX_SOURCE_DIRECTORY(src SRC)
  ADD_LIBRARY(mnode ${SRC})
-  TARGET_LINK_LIBRARIES(mnode trpc tutil pthread)
+  #TARGET_LINK_LIBRARIES(mnode trpc tutil pthread)
 ENDIF ()
\ No newline at end of file
--- a/src/mnode/inc/mgmtDb.h
+++ b/src/mnode/inc/mgmtDb.h
--- a/src/mnode/inc/mgmtDnode.h
+++ b/src/mnode/inc/mgmtDnode.h
--- a/src/mnode/inc/mgmtSdb.h
+++ b/src/mnode/inc/mgmtSdb.h
--- a/src/mnode/inc/mgmtShell.h
+++ b/src/mnode/inc/mgmtShell.h
--- a/src/mnode/inc/mgmtUser.h
+++ b/src/mnode/inc/mgmtUser.h
--- a/src/mnode/inc/mgmtVgroup.h
+++ b/src/mnode/inc/mgmtVgroup.h
--- a/src/mnode/src/mgmtAcct.c
+++ b/src/mnode/src/mgmtAcct.c
--- a/src/mnode/src/mgmtBalance.c
+++ b/src/mnode/src/mgmtBalance.c
--- a/src/mnode/src/mgmtDClient.c
+++ b/src/mnode/src/mgmtDClient.c
--- a/src/mnode/src/mgmtDServer.c
+++ b/src/mnode/src/mgmtDServer.c
--- a/src/mnode/src/mgmtDb.c
+++ b/src/mnode/src/mgmtDb.c
--- a/src/mnode/src/mgmtDnode.c
+++ b/src/mnode/src/mgmtDnode.c
--- a/src/mnode/src/mgmtGrant.c
+++ b/src/mnode/src/mgmtGrant.c
--- a/src/mnode/src/mgmtMain.c
+++ b/src/mnode/src/mgmtMain.c
--- a/src/mnode/src/mgmtMnode.c
+++ b/src/mnode/src/mgmtMnode.c
--- a/src/mnode/src/mgmtProfile.c
+++ b/src/mnode/src/mgmtProfile.c
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
--- a/src/mnode/src/mgmtShell.c
+++ b/src/mnode/src/mgmtShell.c
--- a/src/mnode/src/mgmtTable.c
+++ b/src/mnode/src/mgmtTable.c
--- a/src/mnode/src/mgmtUser.c
+++ b/src/mnode/src/mgmtUser.c
--- a/src/mnode/src/mgmtVgroup.c
+++ b/src/mnode/src/mgmtVgroup.c
--- a/src/plugins/http/inc/cJSON.h
+++ b/src/plugins/http/inc/cJSON.h
--- a/src/plugins/http/inc/tgHandle.h
+++ b/src/plugins/http/inc/tgHandle.h
--- a/src/plugins/http/src/cJSON.c
+++ b/src/plugins/http/src/cJSON.c
--- a/src/plugins/http/src/httpSystem.c
+++ b/src/plugins/http/src/httpSystem.c
--- a/src/plugins/http/src/tgHandle.c
+++ b/src/plugins/http/src/tgHandle.c
--- a/src/query/inc/qast.h
+++ b/src/query/inc/qast.h
--- a/src/query/inc/queryExecutor.h
+++ b/src/query/inc/queryExecutor.h
--- a/src/query/inc/sql.y
+++ b/src/query/inc/sql.y
--- a/src/query/inc/tsqlfunction.h
+++ b/src/query/inc/tsqlfunction.h
--- a/src/query/src/qast.c
+++ b/src/query/src/qast.c
--- a/src/query/src/qextbuffer.c
+++ b/src/query/src/qextbuffer.c
--- a/src/query/src/qinterpolation.c
+++ b/src/query/src/qinterpolation.c
--- a/src/query/src/qpercentile.c
+++ b/src/query/src/qpercentile.c
--- a/src/query/src/qsyntaxtreefunction.c
+++ b/src/query/src/qsyntaxtreefunction.c
--- a/src/query/src/qtsbuf.c
+++ b/src/query/src/qtsbuf.c
--- a/src/query/src/queryExecutor.c
+++ b/src/query/src/queryExecutor.c
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
--- a/src/query/tests/astTest.cpp
+++ b/src/query/tests/astTest.cpp
--- a/src/query/tests/tsBufTest.cpp
+++ b/src/query/tests/tsBufTest.cpp
--- a/src/rpc/inc/rpcClient.h
+++ b/src/rpc/inc/rpcClient.h
--- a/src/rpc/src/rpcCache.c
+++ b/src/rpc/src/rpcCache.c
--- a/src/rpc/src/rpcClient.c
+++ b/src/rpc/src/rpcClient.c
--- a/src/rpc/src/rpcHaship.c
+++ b/src/rpc/src/rpcHaship.c
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
--- a/src/rpc/src/rpcServer.c
+++ b/src/rpc/src/rpcServer.c
--- a/src/rpc/src/rpcUdp.c
+++ b/src/rpc/src/rpcUdp.c
--- a/src/rpc/test/rclient.c
+++ b/src/rpc/test/rclient.c
--- a/tests/tsim/inc/cJSON.h
+++ b/tests/tsim/inc/cJSON.h
--- a/src/util/inc/tarray.h
+++ b/src/util/inc/tarray.h
--- a/src/util/inc/tcompare.h
+++ b/src/util/inc/tcompare.h
--- a/src/util/inc/tmodule.h
+++ b/src/util/inc/tmodule.h
--- a/src/util/inc/tskiplist.h
+++ b/src/util/inc/tskiplist.h
--- a/src/util/inc/tstatus.h
+++ b/src/util/inc/tstatus.h
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
--- a/tests/tsim/src/cJSON.c
+++ b/tests/tsim/src/cJSON.c
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
--- a/src/util/src/ihash.c
+++ b/src/util/src/ihash.c
--- a/src/util/src/tarray.c
+++ b/src/util/src/tarray.c
--- a/src/util/src/tcompare.c
+++ b/src/util/src/tcompare.c
--- a/src/util/src/tglobalcfg.c
+++ b/src/util/src/tglobalcfg.c
--- a/src/util/src/tqueue.c
+++ b/src/util/src/tqueue.c
--- a/src/util/src/tsched.c
+++ b/src/util/src/tsched.c
--- a/src/util/src/tskiplist.c
+++ b/src/util/src/tskiplist.c
--- a/src/util/src/tstatus.c
+++ b/src/util/src/tstatus.c
--- a/src/util/src/tstring.c
+++ b/src/util/src/tstring.c
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
--- a/src/util/tests/skiplistTest.cpp
+++ b/src/util/tests/skiplistTest.cpp
--- a/src/vnode/main/inc/vnodeInt.h
+++ b/src/vnode/main/inc/vnodeInt.h
--- a/src/vnode/main/src/vnodeMain.c
+++ b/src/vnode/main/src/vnodeMain.c
--- a/src/vnode/main/src/vnodeRead.c
+++ b/src/vnode/main/src/vnodeRead.c
--- a/src/vnode/main/src/vnodeWrite.c
+++ b/src/vnode/main/src/vnodeWrite.c
--- a/src/vnode/tsdb/inc/tsdb.h
+++ b/src/vnode/tsdb/inc/tsdb.h
--- a/src/vnode/tsdb/inc/tsdbMain.h
+++ b/src/vnode/tsdb/inc/tsdbMain.h
--- a/src/vnode/tsdb/src/tsdbFile.c
+++ b/src/vnode/tsdb/src/tsdbFile.c
--- a/src/vnode/tsdb/src/tsdbMain.c
+++ b/src/vnode/tsdb/src/tsdbMain.c
--- a/src/vnode/tsdb/src/tsdbMeta.c
+++ b/src/vnode/tsdb/src/tsdbMeta.c
--- a/src/vnode/tsdb/src/tsdbMetaFile.c
+++ b/src/vnode/tsdb/src/tsdbMetaFile.c
--- a/src/vnode/tsdb/src/tsdbRead.c
+++ b/src/vnode/tsdb/src/tsdbRead.c
--- a/src/vnode/tsdb/tests/tsdbTests.cpp
+++ b/src/vnode/tsdb/tests/tsdbTests.cpp
--- a/src/vnode/wal/src/walMain.c
+++ b/src/vnode/wal/src/walMain.c
--- a/src/vnode/wal/test/waltest.c
+++ b/src/vnode/wal/test/waltest.c
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
--- a/tests/pytest/insert/__init__.py
+++ b/tests/pytest/insert/__init__.py
--- a/tests/pytest/insert/basic.py
+++ b/tests/pytest/insert/basic.py
--- a/tests/pytest/simpletest.sh
+++ b/tests/pytest/simpletest.sh
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
--- a/tests/pytest/util/__init__.py
+++ b/tests/pytest/util/__init__.py
--- a/tests/pytest/util/cases.py
+++ b/tests/pytest/util/cases.py
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
--- a/tests/pytest/util/log.py
+++ b/tests/pytest/util/log.py
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
--- a/tests/script/basicSuite.sim
+++ b/tests/script/basicSuite.sim
--- a/tests/script/general/db/basic4.sim
+++ b/tests/script/general/db/basic4.sim
--- a/tests/script/general/db/basic5.sim
+++ b/tests/script/general/db/basic5.sim
--- a/tests/script/general/table/basic1.sim
+++ b/tests/script/general/table/basic1.sim
--- a/tests/script/general/table/basic2.sim
+++ b/tests/script/general/table/basic2.sim
--- a/tests/script/sh/stop_dnodes.sh
+++ b/tests/script/sh/stop_dnodes.sh
--- a/tests/script/tmp/prepare.sim
+++ b/tests/script/tmp/prepare.sim
--- a/tests/test/c/CMakeLists.txt
+++ b/tests/test/c/CMakeLists.txt
--- a/tests/test/c/benchmarkPerTable.c
+++ b/tests/test/c/benchmarkPerTable.c