From 82d75cbdef7e2f5042c547b5c11ff5ec7e293d9a Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 1 Jun 2020 23:28:38 +0800
Subject: [PATCH 01/64] [td-225] add error code

---
 src/inc/taoserror.h        | 15 ++++++++-------
 src/mnode/src/mnodeTable.c |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index db910c9cae..17e1cabb6a 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -92,14 +92,15 @@ TAOS_DEFINE_ERROR(TSDB_CODE_NO_USER_FROM_CONN,          0, 0x0185, "can not get
 // table
 TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ALREADY_EXIST,        0, 0x0200, "table already exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_ID,           0, 0x0201, "invalid table id")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_TYPE,         0, 0x0202, "invalid table typee")
-TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUPER_TABLE,            0, 0x0203, "no super table")           // operation only available for super table
-TAOS_DEFINE_ERROR(TSDB_CODE_TAG_ALREAY_EXIST,           0, 0x0204, "tag already exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_TAG_NOT_EXIST,              0, 0x0205, "tag not exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_ALREAY_EXIST,         0, 0x0206, "field already exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_NOT_EXIST,            0, 0x0207, "field not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_TYPE,         0, 0x0202, "invalid table type")
+TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_NAME,         0, 0x0203, "invalid table name")
+TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUPER_TABLE,            0, 0x0204, "no super table")           // operation only available for super table
+TAOS_DEFINE_ERROR(TSDB_CODE_TAG_ALREAY_EXIST,           0, 0x0205, "tag already exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_TAG_NOT_EXIST,              0, 0x0206, "tag not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_ALREAY_EXIST,         0, 0x0207, "field already exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_NOT_EXIST,            0, 0x0208, "field not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_COL_NAME_TOO_LONG,          0, 0x0209, "column name too long")
-TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TAGS,              0, 0x0209, "too many tags")
+TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TAGS,              0, 0x020A, "too many tags")
 
 
 // dnode & mnode
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 84a1f659d5..bd566bfe5b 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -742,7 +742,7 @@ static int32_t mnodeProcessTableMetaMsg(SMnodeMsg *pMsg) {
   if (pMsg->pTable == NULL) {
     if (!pInfo->createFlag) {
       mError("table:%s, failed to get table meta, table not exist", pInfo->tableId);
-      return TSDB_CODE_INVALID_TABLE_ID;
+      return TSDB_CODE_INVALID_TABLE_NAME;
     } else {
       mTrace("table:%s, failed to get table meta, start auto create table ", pInfo->tableId);
       return mnodeAutoCreateChildTable(pMsg);

From 0944c0cd84134b9513832047d1c05ea6a5c55209 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 1 Jun 2020 23:30:10 +0800
Subject: [PATCH 02/64] [td-314] [td-437] refactor C API.

---
 src/client/inc/tsclient.h         |   3 +-
 src/client/src/TSDBJNIConnector.c |  30 ++---
 src/client/src/tscServer.c        |  10 +-
 src/client/src/tscSql.c           | 196 ++++++++++++------------------
 src/client/src/tscStream.c        |  20 +--
 src/client/src/tscSub.c           |  12 +-
 src/client/src/tscUtil.c          |  47 +++----
 src/inc/taos.h                    |  11 +-
 src/kit/shell/src/shellEngine.c   |  82 ++++++-------
 src/kit/shell/src/shellImport.c   |   9 +-
 src/kit/shell/src/shellMain.c     |  11 +-
 tests/tsim/src/simExe.c           |  28 +++--
 12 files changed, 213 insertions(+), 246 deletions(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index f1b620176d..d40f8782f4 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -293,7 +293,6 @@ typedef struct STscObj {
   char               sversion[TSDB_VERSION_LEN];
   char               writeAuth : 1;
   char               superAuth : 1;
-  struct SSqlObj *   pSql;
   struct SSqlObj *   pHb;
   struct SSqlObj *   sqlList;
   struct SSqlStream *streamList;
@@ -408,7 +407,7 @@ void doAsyncQuery(STscObj *pObj, SSqlObj *pSql, void (*fp)(), void *param, const
 void tscProcessMultiVnodesInsertFromFile(SSqlObj *pSql);
 void tscKillSTableQuery(SSqlObj *pSql);
 void tscInitResObjForLocalQuery(SSqlObj *pObj, int32_t numOfRes, int32_t rowLen);
-bool tscIsUpdateQuery(STscObj *pObj);
+bool tscIsUpdateQuery(SSqlObj* pSql);
 bool tscHasReachLimitation(SQueryInfo *pQueryInfo, SSqlRes *pRes);
 
 char *tscGetErrorMsgPayload(SSqlCmd *pCmd);
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 6ab1b73d1e..69e045eca4 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -268,18 +268,18 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
   }
 
   jniTrace("jobj:%p, conn:%p, sql:%s", jobj, tscon, dst);
-
-  int code = taos_query(tscon, dst);
-  if (code != 0) {
-    jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(code), taos_errstr(tscon));
+  
+  SSqlObj *pSql = taos_query(tscon, dst);
+  if (pSql == NULL || pSql->res.code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(pSql->res.code), taos_errstr(tscon));
     free(dst);
     return JNI_TDENGINE_ERROR;
   } else {
-    int32_t  affectRows = 0;
-    SSqlObj *pSql = ((STscObj *)tscon)->pSql;
-
+    int32_t affectRows = 0;
+    int32_t code = pSql->res.code;
+    
     if (pSql->cmd.command == TSDB_SQL_INSERT) {
-      affectRows = taos_affected_rows(tscon);
+      affectRows = taos_affected_rows(pSql);
       jniTrace("jobj:%p, conn:%p, code:%s, affect rows:%d", jobj, tscon, tstrerror(code), affectRows);
     } else {
       jniTrace("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
@@ -306,20 +306,20 @@ JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(J
 }
 
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con) {
-  TAOS *tscon = (TAOS *)con;
-  if (tscon == NULL) {
+  SSqlObj *pSql = (TAOS_RES *) con;
+  if (pSql == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
 
   jlong ret = 0;
-
-  if (tscIsUpdateQuery(tscon)) {
+  STscObj* pObj = pSql->pTscObj;
+  
+  if (tscIsUpdateQuery(pSql)) {
     ret = 0;  // for update query, no result pointer
-    jniTrace("jobj:%p, conn:%p, no resultset", jobj, tscon);
+    jniTrace("jobj:%p, conn:%p, no resultset", jobj, pObj);
   } else {
-    ret = (jlong) taos_use_result(tscon);
-    jniTrace("jobj:%p, conn:%p, get resultset:%p", jobj, tscon, (void *) ret);
+    jniTrace("jobj:%p, conn:%p, get resultset:%p", jobj, pObj, (void *) ret);
   }
 
   return ret;
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 8ca590a1f6..5b7009f958 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -220,9 +220,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
   if (pObj->signature != pObj) {
     tscTrace("%p sql is already released or DB connection is closed, freed:%d pObj:%p signature:%p", pSql, pSql->freed,
              pObj, pObj->signature);
-    if (pSql != pObj->pSql) {
-      tscFreeSqlObj(pSql);
-    }
+    tscFreeSqlObj(pSql);
     rpcFreeCont(rpcMsg->pCont);
     return;
   }
@@ -257,6 +255,9 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
         rpcMsg->code = TSDB_CODE_NOT_READY;
         rpcFreeCont(rpcMsg->pCont);
         return;
+      } else if (pCmd->command == TSDB_SQL_META) {
+//        rpcFreeCont(rpcMsg->pCont);
+//        return;
       } else {
         tscWarn("%p it shall renew table meta, code:%s, retry:%d", pSql, tstrerror(rpcMsg->code), ++pSql->retry);
         
@@ -331,7 +332,6 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
     rpcMsg->code = (*tscProcessMsgRsp[pCmd->command])(pSql);
   
   if (rpcMsg->code != TSDB_CODE_ACTION_IN_PROGRESS) {
-    void *taosres = tscKeepConn[pCmd->command] ? pSql : NULL;
     rpcMsg->code = pRes->code ? pRes->code : pRes->numOfRows;
     
     tscTrace("%p SQL result:%s res:%p", pSql, tstrerror(pRes->code), pSql);
@@ -345,7 +345,7 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
      * the tscShouldBeFreed will success and tscFreeSqlObj free it immediately.
      */
     bool shouldFree = tscShouldBeFreed(pSql);
-    (*pSql->fp)(pSql->param, taosres, rpcMsg->code);
+    (*pSql->fp)(pSql->param, pSql, rpcMsg->code);
 
     if (shouldFree) {
       tscTrace("%p sqlObj is automatically freed", pSql);
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index a4cbd7f7ec..e491678e58 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -52,7 +52,7 @@ static bool validPassword(const char* passwd) {
   return validImpl(passwd, TSDB_PASSWORD_LEN);
 }
 
-STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, const char *db, uint16_t port,
+SSqlObj *taosConnectImpl(const char *ip, const char *user, const char *pass, const char *db, uint16_t port,
                        void (*fp)(void *, TAOS_RES *, int), void *param, void **taos) {
   taos_init();
   
@@ -120,10 +120,8 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
   pSql->pTscObj = pObj;
   pSql->signature = pSql;
   pSql->maxRetry = TSDB_MAX_REPLICA_NUM;
-  
   tsem_init(&pSql->rspSem, 0, 0);
   
-  pObj->pSql = pSql;
   pObj->pDnodeConn = pDnodeConn;
   
   pSql->fp = fp;
@@ -143,42 +141,38 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
 
   // tsRpcHeaderSize will be updated during RPC initialization, so only after it initialization, this value is valid
   tsInsertHeadSize = tsRpcHeadSize + sizeof(SMsgDesc) + sizeof(SSubmitMsg);
-  return pObj;
+  return pSql;
 }
 
 static void syncConnCallback(void *param, TAOS_RES *tres, int code) {
-  STscObj *pObj = (STscObj *)param;
-  assert(pObj != NULL && pObj->pSql != NULL);
+  SSqlObj *pSql = (SSqlObj *) tres;
+  assert(pSql != NULL);
   
-  if (code < 0) {
-    pObj->pSql->res.code = code;
-  }
-  
-  sem_post(&pObj->pSql->rspSem);
+  sem_post(&pSql->rspSem);
 }
 
 TAOS *taos_connect(const char *ip, const char *user, const char *pass, const char *db, uint16_t port) {
   tscTrace("try to create a connection to %s:%u, user:%s db:%s", ip, port, user, db);
 
-  STscObj *pObj = taosConnectImpl(ip, user, pass, db, port, NULL, NULL, NULL);
-  if (pObj != NULL) {
-    SSqlObj* pSql = pObj->pSql;
-    assert(pSql != NULL);
-    
+  STscObj* pObj = NULL;
+  SSqlObj *pSql = taosConnectImpl(ip, user, pass, db, port, syncConnCallback, NULL, (void**) &pObj);
+  if (pSql != NULL) {
     pSql->fp = syncConnCallback;
-    pSql->param = pObj;
+    pSql->param = pSql;
     
     tscProcessSql(pSql);
     sem_wait(&pSql->rspSem);
     
     if (pSql->res.code != TSDB_CODE_SUCCESS) {
       terrno = pSql->res.code;
+      taos_free_result(pSql);
       taos_close(pObj);
       return NULL;
     }
     
     tscTrace("%p DB connection is opening, dnodeConn:%p", pObj, pObj->pDnodeConn);
-    
+    taos_free_result(pSql);
+  
     // version compare only requires the first 3 segments of the version string
     int code = taosCheckVersion(version, taos_get_server_info(pObj), 3);
     if (code != 0) {
@@ -195,17 +189,14 @@ TAOS *taos_connect(const char *ip, const char *user, const char *pass, const cha
 
 TAOS *taos_connect_a(char *ip, char *user, char *pass, char *db, uint16_t port, void (*fp)(void *, TAOS_RES *, int),
                      void *param, void **taos) {
-  STscObj* pObj = taosConnectImpl(ip, user, pass, db, port, fp, param, taos);
-  if (pObj == NULL) {
+  SSqlObj* pSql = taosConnectImpl(ip, user, pass, db, port, fp, param, taos);
+  if (pSql == NULL) {
     return NULL;
   }
   
-  SSqlObj* pSql = pObj->pSql;
-  
   pSql->res.code = tscProcessSql(pSql);
-  tscTrace("%p DB async connection is opening", pObj);
-  
-  return pObj;
+  tscTrace("%p DB async connection is opening", taos);
+  return taos;
 }
 
 void taos_close(TAOS *taos) {
@@ -265,41 +256,32 @@ int taos_query_imp(STscObj *pObj, SSqlObj *pSql) {
 }
 
 static void waitForQueryRsp(void *param, TAOS_RES *tres, int code) {
-  assert(param != NULL);
-  SSqlObj *pSql = ((STscObj *)param)->pSql;
-  
-  // valid error code is less than 0
-  if (code < 0) {
-    pSql->res.code = code;
-  }
+  assert(tres != NULL);
   
+  SSqlObj *pSql = (SSqlObj *) tres;
   sem_post(&pSql->rspSem);
 }
 
-int taos_query(TAOS *taos, const char *sqlstr) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) {
-    terrno = TSDB_CODE_DISCONNECTED;
-    return TSDB_CODE_DISCONNECTED;
-  }
-  
-  SSqlObj* pSql = pObj->pSql;
-  size_t   sqlLen = strlen(sqlstr);
-  doAsyncQuery(pObj, pSql, waitForQueryRsp, taos, sqlstr, sqlLen);
-
-  // wait for the callback function to post the semaphore
-  tsem_wait(&pSql->rspSem);
-  return pSql->res.code;
-}
-
-TAOS_RES *taos_use_result(TAOS *taos) {
+TAOS_RES* taos_query(TAOS *taos, const char *sqlstr) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
     terrno = TSDB_CODE_DISCONNECTED;
     return NULL;
   }
+  
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+  if (pSql == NULL) {
+    tscError("failed to malloc sqlObj");
+    terrno = TSDB_CODE_CLI_OUT_OF_MEMORY;
+    return NULL;
+  }
+  
+  size_t sqlLen = strlen(sqlstr);
+  doAsyncQuery(pObj, pSql, waitForQueryRsp, taos, sqlstr, sqlLen);
 
-  return pObj->pSql;
+  // wait for the callback function to post the semaphore
+  tsem_wait(&pSql->rspSem);
+  return pSql;
 }
 
 int taos_result_precision(TAOS_RES *res) {
@@ -332,18 +314,18 @@ int taos_num_fields(TAOS_RES *res) {
   return num;
 }
 
-int taos_field_count(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) return 0;
+int taos_field_count(TAOS_RES *tres) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  if (pSql == NULL || pSql->signature != pSql) return 0;
 
-  return taos_num_fields(pObj->pSql);
+  return taos_num_fields(pSql);
 }
 
-int taos_affected_rows(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) return 0;
+int taos_affected_rows(TAOS_RES *tres) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  if (pSql == NULL || pSql->signature != pSql) return 0;
 
-  return (pObj->pSql->res.numOfRows);
+  return (pSql->res.numOfRows);
 }
 
 TAOS_FIELD *taos_fetch_fields(TAOS_RES *res) {
@@ -385,9 +367,8 @@ int taos_fetch_block_impl(TAOS_RES *res, TAOS_ROW *rows) {
   SSqlObj *pSql = (SSqlObj *)res;
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
-  STscObj *pObj = pSql->pTscObj;
 
-  if (pRes->qhandle == 0 || pObj->pSql != pSql) {
+  if (pRes->qhandle == 0 || pSql->signature != pSql) {
     *rows = NULL;
     return 0;
   }
@@ -521,7 +502,11 @@ int taos_select_db(TAOS *taos, const char *db) {
   }
 
   snprintf(sql, tListLen(sql), "use %s", db);
-  return taos_query(taos, sql);
+  SSqlObj* pSql = taos_query(taos, sql);
+  int32_t code = pSql->res.code;
+  taos_free_result(pSql);
+  
+  return code;
 }
 
 void taos_free_result(TAOS_RES *res) {
@@ -533,83 +518,62 @@ void taos_free_result(TAOS_RES *res) {
 
   tscTrace("%p start to free result", pSql);
 
-  if (pSql->signature != pSql) return;
-
-  STscObj* pObj = pSql->pTscObj;
-  if (pRes == NULL || pRes->qhandle == 0) {
-    /* Query rsp is not received from vnode, so the qhandle is NULL */
-    tscTrace("%p qhandle is null, abort free, fp:%p", pSql, pSql->fp);
-    
-    // The semaphore can not be changed while freeing async sub query objects.
-    if (pObj->pSql != pSql) {
-      tscTrace("%p SqlObj is freed by app", pSql);
-      tscFreeSqlObj(pSql);
-    } else {
-      tscPartiallyFreeSqlObj(pSql);
-    }
+  if (pSql->signature != pSql) {
+    tscTrace("%p result has been freed", pSql);
+    return;
+  }
   
+  // The semaphore can not be changed while freeing async sub query objects.
+  if (pRes == NULL || pRes->qhandle == 0) {
+    tscTrace("%p SqlObj is freed by app, phandle is null", pSql);
+    tscFreeSqlObj(pSql);
     return;
   }
 
   // set freeFlag to 1 in retrieve message if there are un-retrieved results data in node
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(&pSql->cmd, 0);
   if (pQueryInfo == NULL) {
-    tscPartiallyFreeSqlObj(pSql);
+    tscFreeSqlObj(pSql);
     return;
   }
 
   pQueryInfo->type = TSDB_QUERY_TYPE_FREE_RESOURCE;
-  STscObj* pTscObj = pSql->pTscObj;
-
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
 
   /*
-   * case 1. Partial data have been retrieved from vnodes, but not all data has been retrieved yet.
-   *         We need to recycle the connection by noticing the vnode return 0 results.
-   * case 2. When the query response is received from vnodes and the numOfRows is set to 0, the user calls
-   *         taos_free_result before the taos_fetch_row is called in non-stream computing,
-   *         we need to recycle the connection.
-   * case 3. If the query process is cancelled by user in stable query, tscProcessSql should not be called
-   *         for each subquery. Because the failure of execution tsProcessSql may trigger the callback function
-   *         be executed, and the retry efforts may result in double free the resources, e.g.,SRetrieveSupport
+   * If the query process is cancelled by user in stable query, tscProcessSql should not be called
+   * for each subquery. Because the failure of execution tsProcessSql may trigger the callback function
+   * be executed, and the retry efforts may result in double free the resources, e.g.,SRetrieveSupport
    */
-  if ((pCmd->command == TSDB_SQL_SELECT ||
-       pCmd->command == TSDB_SQL_SHOW ||
-       pCmd->command == TSDB_SQL_RETRIEVE ||
-       pCmd->command == TSDB_SQL_FETCH) && pRes->code == TSDB_CODE_SUCCESS && pRes->completed == false &&
+  if (pRes->code == TSDB_CODE_SUCCESS && pRes->completed == false &&
+      (pCmd->command == TSDB_SQL_SELECT || pCmd->command == TSDB_SQL_SHOW ||
+       pCmd->command == TSDB_SQL_RETRIEVE || pCmd->command == TSDB_SQL_FETCH) &&
        (pCmd->command == TSDB_SQL_SELECT && pSql->pStream == NULL && pTableMetaInfo->pTableMeta != NULL)) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
 
-    tscTrace("%p send msg to free qhandle in vnode, code:%d, numOfRows:%d, command:%s", pSql, pRes->code, pRes->numOfRows,
-        sqlCmd[pCmd->command]);
-
+    tscTrace("%p send msg to free qhandle in node, code:%d, command:%s", pSql, pRes->code, sqlCmd[pCmd->command]);
     pSql->freed = 1;
     tscProcessSql(pSql);
-  
-    // waits for response and then goes on
-    if (pTscObj->pSql == pSql) {
+
+    // in case of sync model query, waits for response and then goes on
+    if (pSql->fp == waitForQueryRsp || pSql->fp == waitForRetrieveRsp) {
       sem_wait(&pSql->rspSem);
     }
-  } else { // if no free resource msg is sent to vnode, we free this object immediately.
-    if (pTscObj->pSql != pSql) {
-      tscFreeSqlObj(pSql);
-      tscTrace("%p sql result is freed by app", pSql);
-    } else {
-      tscPartiallyFreeSqlObj(pSql);
-      tscTrace("%p sql result is freed by app", pSql);
-    }
   }
+
+  tscFreeSqlObj(pSql);
+  tscTrace("%p sql result is freed by app", pSql);
 }
 
 // todo should not be used in async query
-int taos_errno(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
+int taos_errno(TAOS_RES *tres) {
+  SSqlObj *pSql = (SSqlObj *) tres;
 
-  if (pObj == NULL || pObj->signature != pObj) {
+  if (pSql == NULL || pSql->signature != pSql) {
     return terrno;
   }
 
-  return pObj->pSql->res.code;
+  return pSql->res.code;
 }
 
 /*
@@ -632,14 +596,13 @@ static bool hasAdditionalErrorInfo(int32_t code, SSqlCmd *pCmd) {
 }
 
 // todo should not be used in async model
-char *taos_errstr(TAOS *taos) {
-  STscObj *pObj = (STscObj *)taos;
+char *taos_errstr(TAOS_RES *tres) {
+  SSqlObj *pSql = (SSqlObj *) tres;
 
-  if (pObj == NULL || pObj->signature != pObj)
-    return (char*)tstrerror(terrno);
+  if (pSql == NULL || pSql->signature != pSql) {
+    return (char*) tstrerror(terrno);
+  }
 
-  SSqlObj* pSql = pObj->pSql;
-  
   if (hasAdditionalErrorInfo(pSql->res.code, &pSql->cmd)) {
     return pSql->cmd.payload;
   } else {
@@ -769,7 +732,8 @@ int taos_validate_sql(TAOS *taos, const char *sql) {
     return TSDB_CODE_DISCONNECTED;
   }
 
-  SSqlObj *pSql = pObj->pSql;
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
+  
   SSqlRes *pRes = &pSql->res;
   SSqlCmd *pCmd = &pSql->cmd;
   
@@ -902,7 +866,7 @@ int taos_load_table_info(TAOS *taos, const char *tableNameList) {
     return TSDB_CODE_DISCONNECTED;
   }
 
-  SSqlObj *pSql = pObj->pSql;
+  SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
   SSqlRes *pRes = &pSql->res;
 
   pRes->numOfTotal = 0;  // the number of getting table meta from server
diff --git a/src/client/src/tscStream.c b/src/client/src/tscStream.c
index 1b1aaa54c9..9e1628bb9b 100644
--- a/src/client/src/tscStream.c
+++ b/src/client/src/tscStream.c
@@ -459,14 +459,14 @@ static int64_t tscGetLaunchTimestamp(const SSqlStream *pStream) {
   return (pStream->precision == TSDB_TIME_PRECISION_MICRO) ? timer / 1000L : timer;
 }
 
-static void setErrorInfo(STscObj* pObj, int32_t code, char* info) {
-  if (pObj == NULL) {
+static void setErrorInfo(SSqlObj* pSql, int32_t code, char* info) {
+  if (pSql == NULL) {
     return;
   }
 
-  SSqlCmd* pCmd = &pObj->pSql->cmd;
+  SSqlCmd* pCmd = &pSql->cmd;
 
-  pObj->pSql->res.code = code;
+  pSql->res.code = code;
   
   if (info != NULL) {
     strncpy(pCmd->payload, info, pCmd->payloadLen);
@@ -480,7 +480,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
 
   SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
-    setErrorInfo(pObj, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
+    setErrorInfo(pSql, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
     return NULL;
   }
 
@@ -490,14 +490,14 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
   SSqlRes *pRes = &pSql->res;
   int ret = tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE);
   if (TSDB_CODE_SUCCESS != ret) {
-    setErrorInfo(pObj, ret, NULL);
+    setErrorInfo(pSql, ret, NULL);
     free(pSql);
     return NULL;
   }
 
   pSql->sqlstr = strdup(sqlstr);
   if (pSql->sqlstr == NULL) {
-    setErrorInfo(pObj, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
+    setErrorInfo(pSql, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
 
     tfree(pSql);
     return NULL;
@@ -511,7 +511,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
   tscResetSqlCmdObj(&pSql->cmd);
   ret = tscAllocPayload(&pSql->cmd, TSDB_DEFAULT_PAYLOAD_SIZE);
   if (TSDB_CODE_SUCCESS != ret) {
-    setErrorInfo(pObj, ret, NULL);
+    setErrorInfo(pSql, ret, NULL);
     tscError("%p open stream failed, sql:%s, code:%d", pSql, sqlstr, TSDB_CODE_CLI_OUT_OF_MEMORY);
     tscFreeSqlObj(pSql);
     return NULL;
@@ -521,7 +521,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
   SQLInfoDestroy(&SQLInfo);
 
   if (pRes->code != TSDB_CODE_SUCCESS) {
-    setErrorInfo(pObj, pRes->code, pCmd->payload);
+    setErrorInfo(pSql, pRes->code, pCmd->payload);
 
     tscError("%p open stream failed, sql:%s, reason:%s, code:%d", pSql, sqlstr, pCmd->payload, pRes->code);
     tscFreeSqlObj(pSql);
@@ -530,7 +530,7 @@ TAOS_STREAM *taos_open_stream(TAOS *taos, const char *sqlstr, void (*fp)(void *p
 
   SSqlStream *pStream = (SSqlStream *)calloc(1, sizeof(SSqlStream));
   if (pStream == NULL) {
-    setErrorInfo(pObj, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
+    setErrorInfo(pSql, TSDB_CODE_CLI_OUT_OF_MEMORY, NULL);
 
     tscError("%p open stream failed, sql:%s, reason:%s, code:%d", pSql, sqlstr, pCmd->payload, pRes->code);
     tscFreeSqlObj(pSql);
diff --git a/src/client/src/tscSub.c b/src/client/src/tscSub.c
index 5831ddad4a..f6cbe4a42e 100644
--- a/src/client/src/tscSub.c
+++ b/src/client/src/tscSub.c
@@ -181,21 +181,23 @@ static SArray* getTableList( SSqlObj* pSql ) {
   const char* p = strstr( pSql->sqlstr, " from " );
   char* sql = alloca(strlen(p) + 32);
   sprintf(sql, "select tbid(tbname)%s", p);
-  int code = taos_query( pSql->pTscObj, sql );
-  if (code != TSDB_CODE_SUCCESS) {
-    tscError("failed to retrieve table id: %s", tstrerror(code));
+  
+  SSqlObj* pSql1 = taos_query(pSql->pTscObj, sql);
+  if (terrno != TSDB_CODE_SUCCESS) {
+    tscError("failed to retrieve table id: %s", tstrerror(terrno));
     return NULL;
   }
 
-  TAOS_RES* res = taos_use_result( pSql->pTscObj );
   TAOS_ROW row;
   SArray* result = taosArrayInit( 128, sizeof(STidTags) );
-  while ((row = taos_fetch_row(res))) {
+  while ((row = taos_fetch_row(pSql1))) {
     STidTags tags;
     memcpy(&tags, row[0], sizeof(tags));
     taosArrayPush(result, &tags);
   }
 
+  taos_free_result(pSql1);
+  
   return result;
 }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 4b9d2b920f..e85dd578ab 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -409,8 +409,10 @@ void tscPartiallyFreeSqlObj(SSqlObj* pSql) {
 }
 
 void tscFreeSqlObj(SSqlObj* pSql) {
-  if (pSql == NULL || pSql->signature != pSql) return;
-
+  if (pSql == NULL || pSql->signature != pSql) {
+    return;
+  }
+  
   tscTrace("%p start to free sql object", pSql);
   tscPartiallyFreeSqlObj(pSql);
 
@@ -749,20 +751,7 @@ void tscCloseTscObj(STscObj* pObj) {
   assert(pObj != NULL);
   
   pObj->signature = NULL;
-  SSqlObj* pSql = pObj->pSql;
-  
-  if (pSql) {
-    terrno = pSql->res.code;
-    sem_destroy(&pSql->rspSem);
-  }
-  
   taosTmrStopA(&(pObj->pTimer));
-  tscFreeSqlObj(pSql);
-
-  if (pSql) {
-    sem_destroy(&pSql->rspSem);
-  }
-  
   pthread_mutex_destroy(&pObj->mutex);
   
   if (pObj->pDnodeConn != NULL) {
@@ -1474,22 +1463,27 @@ bool tscShouldFreeHeatBeat(SSqlObj* pHb) {
  * If connection need to be recycled, the SqlObj also should be freed.
  */
 bool tscShouldBeFreed(SSqlObj* pSql) {
-  if (pSql == NULL || pSql->signature != pSql || pSql->fp == NULL) {
+  if (pSql == NULL || pSql->signature != pSql) {
     return false;
   }
-
+  
+  assert(pSql->fp != NULL);
+  
   STscObj* pTscObj = pSql->pTscObj;
-  if (pSql->pStream != NULL || pTscObj->pHb == pSql || pTscObj->pSql == pSql || pSql->pSubscription != NULL) {
+  if (pSql->pStream != NULL || pTscObj->pHb == pSql || pSql->pSubscription != NULL) {
     return false;
   }
 
   int32_t command = pSql->cmd.command;
-  if (command == TSDB_SQL_CONNECT || command == TSDB_SQL_INSERT) {
+  if (command == TSDB_SQL_META || command == TSDB_SQL_STABLEVGROUP) {//TODO subquery should be freed here
     return true;
-  } else {
-    return tscKeepConn[command] == 0 ||
-           (pSql->res.code != TSDB_CODE_ACTION_IN_PROGRESS && pSql->res.code != TSDB_CODE_SUCCESS);
   }
+  
+  // all subqueries should be automatically freed
+//  if (pSql->cmd.pQueryInfo != NULL && pSql->cmd.pQueryInfo[0]->type & TSDB_QUERY_TYPE_SUBQUERY) {
+//    return true;
+//  }
+  return false;
 }
 
 /**
@@ -1952,15 +1946,14 @@ int16_t tscGetJoinTagColIndexByUid(STagCond* pTagCond, uint64_t uid) {
   }
 }
 
-bool tscIsUpdateQuery(STscObj* pObj) {
-  if (pObj == NULL || pObj->signature != pObj) {
+bool tscIsUpdateQuery(SSqlObj* pSql) {
+  if (pSql == NULL || pSql->signature != pSql) {
     terrno = TSDB_CODE_DISCONNECTED;
     return TSDB_CODE_DISCONNECTED;
   }
 
-  SSqlCmd* pCmd = &pObj->pSql->cmd;
-  return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) ||
-          TSDB_SQL_USE_DB == pCmd->command);
+  SSqlCmd* pCmd = &pSql->cmd;
+  return ((pCmd->command >= TSDB_SQL_INSERT && pCmd->command <= TSDB_SQL_DROP_DNODE) || TSDB_SQL_USE_DB == pCmd->command);
 }
 
 int32_t tscInvalidSQLErrMsg(char* msg, const char* additionalInfo, const char* sql) {
diff --git a/src/inc/taos.h b/src/inc/taos.h
index 2f23b10a61..947cbe6759 100644
--- a/src/inc/taos.h
+++ b/src/inc/taos.h
@@ -88,14 +88,13 @@ int        taos_stmt_execute(TAOS_STMT *stmt);
 TAOS_RES * taos_stmt_use_result(TAOS_STMT *stmt);
 int        taos_stmt_close(TAOS_STMT *stmt);
 
-DLL_EXPORT int taos_query(TAOS *taos, const char *sql);
-DLL_EXPORT TAOS_RES *taos_use_result(TAOS *taos);
+DLL_EXPORT TAOS_RES *taos_query(TAOS *taos, const char *sql);
 DLL_EXPORT TAOS_ROW taos_fetch_row(TAOS_RES *res);
 DLL_EXPORT int taos_result_precision(TAOS_RES *res);  // get the time precision of result
 DLL_EXPORT void taos_free_result(TAOS_RES *res);
-DLL_EXPORT int taos_field_count(TAOS *taos);
+DLL_EXPORT int taos_field_count(TAOS_RES *tres);
 DLL_EXPORT int taos_num_fields(TAOS_RES *res);
-DLL_EXPORT int taos_affected_rows(TAOS *taos);
+DLL_EXPORT int taos_affected_rows(TAOS_RES *taos);
 DLL_EXPORT TAOS_FIELD *taos_fetch_fields(TAOS_RES *res);
 DLL_EXPORT int taos_select_db(TAOS *taos, const char *db);
 DLL_EXPORT int taos_print_row(char *str, TAOS_ROW row, TAOS_FIELD *fields, int num_fields);
@@ -112,9 +111,9 @@ int* taos_fetch_lengths(TAOS_RES *res);
 // TODO: the return value should be `const`
 DLL_EXPORT char *taos_get_server_info(TAOS *taos);
 DLL_EXPORT char *taos_get_client_info();
-DLL_EXPORT char *taos_errstr(TAOS *taos);
+DLL_EXPORT char *taos_errstr(TAOS_RES *tres);
 
-DLL_EXPORT int taos_errno(TAOS *taos);
+DLL_EXPORT int taos_errno(TAOS_RES *tres);
 
 DLL_EXPORT void taos_query_a(TAOS *taos, const char *sql, void (*fp)(void *param, TAOS_RES *, int code), void *param);
 DLL_EXPORT void taos_fetch_rows_a(TAOS_RES *res, void (*fp)(void *param, TAOS_RES *, int numOfRows), void *param);
diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c
index 5b4da875de..a01decc6c6 100644
--- a/src/kit/shell/src/shellEngine.c
+++ b/src/kit/shell/src/shellEngine.c
@@ -275,22 +275,28 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
 
   st = taosGetTimestampUs();
 
-  if (taos_query(con, command)) {
-    taos_error(con);
+  TAOS_RES* pSql = taos_query(con, command);
+  if (taos_errno(pSql)) {
+    taos_error(pSql);
     return;
   }
 
   if (regex_match(command, "^\\s*use\\s+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) {
     fprintf(stdout, "Database changed.\n\n");
     fflush(stdout);
+    
+    taos_free_result(pSql);
     return;
   }
 
-  int num_fields = taos_field_count(con);
+  int num_fields = taos_field_count(pSql);
   if (num_fields != 0) {  // select and show kinds of commands
     int error_no = 0;
-    int numOfRows = shellDumpResult(con, fname, &error_no, printMode);
-    if (numOfRows < 0) return;
+    int numOfRows = shellDumpResult(pSql, fname, &error_no, printMode);
+    if (numOfRows < 0) {
+      taos_free_result(pSql);
+      return;
+    }
 
     et = taosGetTimestampUs();
     if (error_no == 0) {
@@ -299,7 +305,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
       printf("Query interrupted (%s), %d row(s) in set (%.6fs)\n", taos_errstr(con), numOfRows, (et - st) / 1E6);
     }
   } else {
-    int num_rows_affacted = taos_affected_rows(con);
+    int num_rows_affacted = taos_affected_rows(pSql);
     et = taosGetTimestampUs();
     printf("Query OK, %d row(s) affected (%.6fs)\n", num_rows_affacted, (et - st) / 1E6);
   }
@@ -309,6 +315,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
   if (fname != NULL) {
     wordfree(&full_path);
   }
+  
+  taos_free_result(pSql);
 }
 
 /* Function to do regular expression check */
@@ -461,6 +469,7 @@ static int dumpResultToFile(const char* fname, TAOS_RES* result) {
   } while( row != NULL);
 
   fclose(fp);
+  taos_free_result(result);
   return numOfRows;
 }
 
@@ -548,15 +557,15 @@ static void printField(const char* val, TAOS_FIELD* field, int width, int32_t le
 }
 
 
-static int verticalPrintResult(TAOS_RES* result) {
-  TAOS_ROW row = taos_fetch_row(result);
+static int verticalPrintResult(TAOS_RES* tres) {
+  TAOS_ROW row = taos_fetch_row(tres);
   if (row == NULL) {
     return 0;
   }
 
-  int num_fields = taos_num_fields(result);
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  int precision = taos_result_precision(result);
+  int num_fields = taos_num_fields(tres);
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
+  int precision = taos_result_precision(tres);
 
   int maxColNameLen = 0;
   for (int col = 0; col < num_fields; col++) {
@@ -569,7 +578,7 @@ static int verticalPrintResult(TAOS_RES* result) {
   int numOfRows = 0;
   do {
     printf("*************************** %d.row ***************************\n", numOfRows + 1);
-    int32_t* length = taos_fetch_lengths(result);
+    int32_t* length = taos_fetch_lengths(tres);
     for (int i = 0; i < num_fields; i++) {
       TAOS_FIELD* field = fields + i;
 
@@ -581,7 +590,7 @@ static int verticalPrintResult(TAOS_RES* result) {
     }
 
     numOfRows++;
-    row = taos_fetch_row(result);
+    row = taos_fetch_row(tres);
   } while(row != NULL);
 
   return numOfRows;
@@ -656,15 +665,15 @@ static void printHeader(TAOS_FIELD* fields, int* width, int num_fields) {
 }
 
 
-static int horizontalPrintResult(TAOS_RES* result) {
-  TAOS_ROW row = taos_fetch_row(result);
+static int horizontalPrintResult(TAOS_RES* tres) {
+  TAOS_ROW row = taos_fetch_row(tres);
   if (row == NULL) {
     return 0;
   }
 
-  int num_fields = taos_num_fields(result);
-  TAOS_FIELD *fields = taos_fetch_fields(result);
-  int precision = taos_result_precision(result);
+  int num_fields = taos_num_fields(tres);
+  TAOS_FIELD *fields = taos_fetch_fields(tres);
+  int precision = taos_result_precision(tres);
 
   int width[TSDB_MAX_COLUMNS];
   for (int col = 0; col < num_fields; col++) {
@@ -675,7 +684,7 @@ static int horizontalPrintResult(TAOS_RES* result) {
 
   int numOfRows = 0;
   do {
-    int32_t* length = taos_fetch_lengths(result);
+    int32_t* length = taos_fetch_lengths(tres);
     for (int i = 0; i < num_fields; i++) {
       putchar(' ');
       printField(row[i], fields + i, width[i], length[i], precision);
@@ -684,32 +693,24 @@ static int horizontalPrintResult(TAOS_RES* result) {
     }
     putchar('\n');
     numOfRows++;
-    row = taos_fetch_row(result);
+    row = taos_fetch_row(tres);
   } while(row != NULL);
 
   return numOfRows;
 }
 
 
-int shellDumpResult(TAOS *con, char *fname, int *error_no, bool vertical) {
+int shellDumpResult(TAOS_RES *tres, char *fname, int *error_no, bool vertical) {
   int numOfRows = 0;
-
-  TAOS_RES* result = taos_use_result(con);
-  if (result == NULL) {
-    taos_error(con);
-    return -1;
-  }
-
   if (fname != NULL) {
-    numOfRows = dumpResultToFile(fname, result);
+    numOfRows = dumpResultToFile(fname, tres);
   } else if(vertical) {
-    numOfRows = verticalPrintResult(result);
+    numOfRows = verticalPrintResult(tres);
   } else {
-    numOfRows = horizontalPrintResult(result);
+    numOfRows = horizontalPrintResult(tres);
   }
 
-  *error_no = taos_errno(con);
-  taos_free_result(result);
+  *error_no = taos_errno(tres);
   return numOfRows;
 }
 
@@ -771,12 +772,11 @@ void write_history() {
   fclose(f);
 }
 
-void taos_error(TAOS *con) {
-  fprintf(stderr, "\nDB error: %s\n", taos_errstr(con));
+void taos_error(TAOS_RES *tres) {
+  fprintf(stderr, "\nDB error: %s\n", taos_errstr(tres));
 
   /* free local resouce: allocated memory/metric-meta refcnt */
-  TAOS_RES *pRes = taos_use_result(con);
-  taos_free_result(pRes);
+  taos_free_result(tres);
 }
 
 int isCommentLine(char *line) {
@@ -858,8 +858,9 @@ void shellGetGrantInfo(void *con) {
 
   char sql[] = "show grants";
 
-  int code = taos_query(con, sql);
-
+  TAOS_RES* pSql = taos_query(con, sql);
+  int code = taos_errno(pSql);
+  
   if (code != TSDB_CODE_SUCCESS) {
     if (code == TSDB_CODE_OPS_NOT_SUPPORT) {
       fprintf(stdout, "Server is Community Edition, version is %s\n\n", taos_get_server_info(con));
@@ -869,12 +870,11 @@ void shellGetGrantInfo(void *con) {
     return;
   }
 
-  int num_fields = taos_field_count(con);
+  int num_fields = taos_field_count(result);
   if (num_fields == 0) {
     fprintf(stderr, "\nInvalid grant information.\n");
     exit(0);
   } else {
-    result = taos_use_result(con);
     if (result == NULL) {
       fprintf(stderr, "\nGrant information is null.\n");
       exit(0);
diff --git a/src/kit/shell/src/shellImport.c b/src/kit/shell/src/shellImport.c
index 70660254a5..1dea6bca70 100644
--- a/src/kit/shell/src/shellImport.c
+++ b/src/kit/shell/src/shellImport.c
@@ -192,11 +192,14 @@ static void shellSourceFile(TAOS *con, char *fptr) {
     }
 
     memcpy(cmd + cmd_len, line, read_len);
-    if (taos_query(con, cmd)) {
+    
+    TAOS_RES* pSql = taos_query(con, cmd);
+    int32_t code = taos_errno(pSql);
+    
+    if (code != 0) {
       fprintf(stderr, "DB error: %s: %s (%d)\n", taos_errstr(con), fname, lineNo);
       /* free local resouce: allocated memory/metric-meta refcnt */
-      TAOS_RES *pRes = taos_use_result(con);
-      taos_free_result(pRes);
+      taos_free_result(pSql);
     }
 
     memset(cmd, 0, MAX_COMMAND_SIZE);
diff --git a/src/kit/shell/src/shellMain.c b/src/kit/shell/src/shellMain.c
index 3485a964d7..1fbe04208c 100644
--- a/src/kit/shell/src/shellMain.c
+++ b/src/kit/shell/src/shellMain.c
@@ -18,21 +18,21 @@
 #include "tsclient.h"
 #include "tutil.h"
 
-TAOS*     con;
+TAOS_RES* con;
 pthread_t pid;
 
 // TODO: IMPLEMENT INTERRUPT HANDLER.
 void interruptHandler(int signum) {
 #ifdef LINUX
-  TAOS_RES* res = taos_use_result(con);
-  taos_stop_query(res);
-  if (res != NULL) {
+  taos_stop_query(con);
+  if (con != NULL) {
     /*
      * we need to free result in async model, in order to avoid free
      * results while the master thread is waiting for server response.
      */
-    tscQueueAsyncFreeResult(res);
+    tscQueueAsyncFreeResult(con);
   }
+  
   result = NULL;
 #else
   printf("\nReceive ctrl+c or other signal, quit shell.\n");
@@ -90,7 +90,6 @@ int main(int argc, char* argv[]) {
   /* Initialize the shell */
   con = shellInit(&args);
   if (con == NULL) {
-    taos_error(con);
     exit(EXIT_FAILURE);
   }
 
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index 0c35e3668c..1be446fa08 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -635,9 +635,13 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
   SCmdLine *line = &script->lines[script->linePos];
   int ret = -1;
 
+  TAOS_RES* pSql = NULL;
+  
   for (int attempt = 0; attempt < 3; ++attempt) {
     simLogSql(rest);
-    ret = taos_query(script->taos, rest);
+    pSql = taos_query(script->taos, rest);
+    ret = terrno;
+    
     if (ret == TSDB_CODE_TABLE_ALREADY_EXIST ||
         ret == TSDB_CODE_DB_ALREADY_EXIST) {
       simTrace("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
@@ -663,10 +667,9 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
   }
 
   int numOfRows = 0;
-  int num_fields = taos_field_count(script->taos);
+  int num_fields = taos_field_count(pSql);
   if (num_fields != 0) {
-    TAOS_RES *result = taos_use_result(script->taos);
-    if (result == NULL) {
+    if (pSql == NULL) {
       simTrace("script:%s, taos:%p, %s failed, result is null", script->fileName, script->taos, rest);
       if (line->errorJump == SQL_JUMP_TRUE) {
         script->linePos = line->jump;
@@ -679,10 +682,10 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
 
     TAOS_ROW row;
 
-    while ((row = taos_fetch_row(result))) {
+    while ((row = taos_fetch_row(pSql))) {
       if (numOfRows < MAX_QUERY_ROW_NUM) {
-        TAOS_FIELD *fields = taos_fetch_fields(result);
-        int* length = taos_fetch_lengths(result);
+        TAOS_FIELD *fields = taos_fetch_fields(pSql);
+        int* length = taos_fetch_lengths(pSql);
         
         for (int i = 0; i < num_fields; i++) {
           char *value = NULL;
@@ -768,9 +771,9 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
       }
     }
 
-    taos_free_result(result);
+    taos_free_result(pSql);
   } else {
-    numOfRows = taos_affected_rows(script->taos);
+    numOfRows = taos_affected_rows(pSql);
   }
 
   sprintf(script->rows, "%d", numOfRows);
@@ -911,13 +914,17 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
   }
 
   int ret;
+  TAOS_RES* pSql = NULL;
   if (simAsyncQuery) {
     char command[4096];
     sprintf(command, "curl -H 'Authorization: Taosd %s' -d '%s' 127.0.0.1:6020/rest/sql", script->auth, rest);
     ret = simExecuteRestFulCommand(script, command);
   }
   else {
-    ret = taos_query(script->taos, rest);
+    pSql = taos_query(script->taos, rest);
+    ret = terrno;
+    
+    taos_free_result(pSql);
   }
 
   if (ret != TSDB_CODE_SUCCESS) {
@@ -926,6 +933,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
     script->linePos++;
     return true;
   }
+  
   sprintf(script->error, "lineNum:%d. sql:%s expect failed, but success, ret:%d:%s", line->lineNum, rest, ret, tstrerror(ret));
 
   return false;

From cf840735e27b48676cb3eedaeee9ca687ae3c8bc Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 1 Jun 2020 23:31:05 +0800
Subject: [PATCH 03/64] [td-225] change error to warning

---
 src/os/linux/src/linuxSysPara.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/os/linux/src/linuxSysPara.c b/src/os/linux/src/linuxSysPara.c
index 5794ad0302..af2d3c2633 100644
--- a/src/os/linux/src/linuxSysPara.c
+++ b/src/os/linux/src/linuxSysPara.c
@@ -245,10 +245,10 @@ static void taosGetSystemLocale() {  // get and set default locale
       strncpy(tsCharset, revisedCharset, tListLen(tsCharset));
 
       free(revisedCharset);
-      uError("charset not configured, set to system default:%s", tsCharset);
+      uWarn("charset not configured, set to system default:%s", tsCharset);
     } else {
       strcpy(tsCharset, "UTF-8");
-      uError("can't get locale and charset from system, set it to UTF-8");
+      uWarn("can't get locale and charset from system, set it to UTF-8");
     }
   }
 }

From 4be7a595bb0138ec5cfdd858b0dc5604234234f9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 00:38:46 +0800
Subject: [PATCH 04/64] [td-225] fix invalid read in taocache

---
 src/util/inc/tcache.h | 2 +-
 src/util/src/hash.c   | 4 +---
 src/util/src/tcache.c | 9 +++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/util/inc/tcache.h b/src/util/inc/tcache.h
index 6dd707b763..6a22bdea6a 100644
--- a/src/util/inc/tcache.h
+++ b/src/util/inc/tcache.h
@@ -47,7 +47,7 @@ typedef struct SCacheDataNode {
 typedef struct STrashElem {
   struct STrashElem *prev;
   struct STrashElem *next;
-  SCacheDataNode *        pData;
+  SCacheDataNode    *pData;
 } STrashElem;
 
 typedef struct {
diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index 93b8e30f1e..95d0ce7081 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -529,7 +529,7 @@ void taosHashTableResize(SHashObj *pHashObj) {
 }
 
 SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, size_t dsize, uint32_t hashVal) {
-  size_t totalSize = dsize + sizeof(SHashNode) + keyLen + 1;  // one extra byte for null
+  size_t totalSize = dsize + sizeof(SHashNode) + keyLen;
   
   SHashNode *pNewNode = calloc(1, totalSize);
   if (pNewNode == NULL) {
@@ -544,7 +544,6 @@ SHashNode *doCreateHashNode(const void *key, size_t keyLen, const void *pData, s
   pNewNode->keyLen = keyLen;
   
   pNewNode->hashVal = hashVal;
-  
   return pNewNode;
 }
 
@@ -559,7 +558,6 @@ SHashNode *doUpdateHashNode(SHashNode *pNode, const void *key, size_t keyLen, co
   memcpy(pNewNode->data, pData, dsize);
   
   pNewNode->key = pNewNode->data + dsize;
-  
   assert(memcmp(pNewNode->key, key, keyLen) == 0 && keyLen == pNewNode->keyLen);
   
   memcpy(pNewNode->key, key, keyLen);
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index 2641d2eacb..82873f9906 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -77,7 +77,7 @@ static FORCE_INLINE void taosFreeNode(void *data) {
  * @param lifespan total survial expiredTime from now
  * @return         SCacheDataNode
  */
-static SCacheDataNode *taosCreateHashNode(const char *key, size_t keyLen, const char *pData, size_t size,
+static SCacheDataNode *taosCreateCacheNode(const char *key, size_t keyLen, const char *pData, size_t size,
                                           uint64_t duration) {
   size_t totalSize = size + sizeof(SCacheDataNode) + keyLen + 1;
   
@@ -242,13 +242,14 @@ static SCacheDataNode *taosUpdateCacheImpl(SCacheObj *pCacheObj, SCacheDataNode
   
   // only a node is not referenced by any other object, in-place update it
   if (T_REF_VAL_GET(pNode) == 0) {
-    size_t newSize = sizeof(SCacheDataNode) + dataSize + keyLen;
+    size_t newSize = sizeof(SCacheDataNode) + dataSize + keyLen + 1;
     
     pNewNode = (SCacheDataNode *)realloc(pNode, newSize);
     if (pNewNode == NULL) {
       return NULL;
     }
     
+    memset(pNewNode, 0, newSize);
     pNewNode->signature = (uint64_t)pNewNode;
     memcpy(pNewNode->data, pData, dataSize);
     
@@ -267,7 +268,7 @@ static SCacheDataNode *taosUpdateCacheImpl(SCacheObj *pCacheObj, SCacheDataNode
   } else {
     taosCacheMoveToTrash(pCacheObj, pNode);
     
-    pNewNode = taosCreateHashNode(key, keyLen, pData, dataSize, duration);
+    pNewNode = taosCreateCacheNode(key, keyLen, pData, dataSize, duration);
     if (pNewNode == NULL) {
       return NULL;
     }
@@ -293,7 +294,7 @@ static SCacheDataNode *taosUpdateCacheImpl(SCacheObj *pCacheObj, SCacheDataNode
  */
 static FORCE_INLINE SCacheDataNode *taosAddToCacheImpl(SCacheObj *pCacheObj, const char *key, size_t keyLen, const void *pData,
                                                        size_t dataSize, uint64_t duration) {
-  SCacheDataNode *pNode = taosCreateHashNode(key, keyLen, pData, dataSize, duration);
+  SCacheDataNode *pNode = taosCreateCacheNode(key, keyLen, pData, dataSize, duration);
   if (pNode == NULL) {
     return NULL;
   }

From d05eaa5c8d44bb9b308f632541933e5ea1810780 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 00:39:19 +0800
Subject: [PATCH 05/64] [td-225] update log

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

diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index e491678e58..cda7d956ab 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -551,7 +551,7 @@ void taos_free_result(TAOS_RES *res) {
        (pCmd->command == TSDB_SQL_SELECT && pSql->pStream == NULL && pTableMetaInfo->pTableMeta != NULL)) {
     pCmd->command = (pCmd->command > TSDB_SQL_MGMT) ? TSDB_SQL_RETRIEVE : TSDB_SQL_FETCH;
 
-    tscTrace("%p send msg to free qhandle in node, code:%d, command:%s", pSql, pRes->code, sqlCmd[pCmd->command]);
+    tscTrace("%p start to send msg to free qhandle in dnode, command:%s", pSql, sqlCmd[pCmd->command]);
     pSql->freed = 1;
     tscProcessSql(pSql);
 

From f343d6d320cb0a3b412a3b13d6850d4677acb1f3 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 00:53:00 +0800
Subject: [PATCH 06/64] [td-314] check for sql str length

---
 src/client/src/tscAsync.c |  6 +++---
 src/client/src/tscSql.c   | 26 ++++++++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 96837e4dd4..084367d615 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -56,8 +56,8 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const
     return;
   }
   
-  pSql->sqlstr = realloc(pSql->sqlstr, sqlLen + 1);
-  
+  // todo check for OOM problem
+  pSql->sqlstr = calloc(1, sqlLen + 1);
   if (pSql->sqlstr == NULL) {
     tscError("%p failed to malloc sql string buffer", pSql);
     tscQueueAsyncError(fp, param, TSDB_CODE_CLI_OUT_OF_MEMORY);
@@ -95,7 +95,7 @@ void taos_query_a(TAOS *taos, const char *sqlstr, __async_cb_func_t fp, void *pa
   
   int32_t sqlLen = strlen(sqlstr);
   if (sqlLen > tsMaxSQLStringLen) {
-    tscError("sql string too long");
+    tscError("sql string exceeds max length:%d", tsMaxSQLStringLen);
     terrno = TSDB_CODE_INVALID_SQL;
     tscQueueAsyncError(fp, param, TSDB_CODE_INVALID_SQL);
     return;
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index cda7d956ab..ba2b900dd5 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -269,6 +269,15 @@ TAOS_RES* taos_query(TAOS *taos, const char *sqlstr) {
     return NULL;
   }
   
+  int32_t sqlLen = strlen(sqlstr);
+  if (sqlLen > tsMaxSQLStringLen) {
+    tscError("sql string exceeds max length:%d", tsMaxSQLStringLen);
+    terrno = TSDB_CODE_INVALID_SQL;
+    return NULL;
+  }
+  
+  taosNotePrintTsc(sqlstr);
+  
   SSqlObj* pSql = calloc(1, sizeof(SSqlObj));
   if (pSql == NULL) {
     tscError("failed to malloc sqlObj");
@@ -276,7 +285,6 @@ TAOS_RES* taos_query(TAOS *taos, const char *sqlstr) {
     return NULL;
   }
   
-  size_t sqlLen = strlen(sqlstr);
   doAsyncQuery(pObj, pSql, waitForQueryRsp, taos, sqlstr, sqlLen);
 
   // wait for the callback function to post the semaphore
@@ -510,22 +518,20 @@ int taos_select_db(TAOS *taos, const char *db) {
 }
 
 void taos_free_result(TAOS_RES *res) {
-  if (res == NULL) return;
-
   SSqlObj *pSql = (SSqlObj *)res;
-  SSqlRes *pRes = &pSql->res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
-  tscTrace("%p start to free result", pSql);
-
-  if (pSql->signature != pSql) {
+  tscTrace("%p start to free result", res);
+  
+  if (pSql == NULL || pSql->signature != pSql) {
     tscTrace("%p result has been freed", pSql);
     return;
   }
   
+  SSqlRes *pRes = &pSql->res;
+  SSqlCmd *pCmd = &pSql->cmd;
+
   // The semaphore can not be changed while freeing async sub query objects.
   if (pRes == NULL || pRes->qhandle == 0) {
-    tscTrace("%p SqlObj is freed by app, phandle is null", pSql);
+    tscTrace("%p SqlObj is freed by app, qhandle is null", pSql);
     tscFreeSqlObj(pSql);
     return;
   }

From caa9cb42540c80742bcf1f7c1c4b9785636587fa Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 2 Jun 2020 02:03:20 +0000
Subject: [PATCH 07/64] remove table sversion

---
 src/tsdb/inc/tsdbMain.h     | 1 -
 src/tsdb/src/tsdbMeta.c     | 4 ++--
 src/tsdb/src/tsdbRWHelper.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index e1b85ae99d..ded5f6eb36 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -73,7 +73,6 @@ typedef struct STable {
   int8_t         type;
   STableId       tableId;
   uint64_t       superUid;  // Super table UID
-  int32_t        sversion;
   STSchema *     schema;
   STSchema *     tagSchema;
   SKVRow         tagVal;
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 2ea0aaca90..52aa1c69cb 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -41,7 +41,7 @@ void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) {
   T_APPEND_MEMBER(ptr, &(pTable->tableId), STableId, uid);
   T_APPEND_MEMBER(ptr, &(pTable->tableId), STableId, tid);
   T_APPEND_MEMBER(ptr, pTable, STable, superUid);
-  T_APPEND_MEMBER(ptr, pTable, STable, sversion);
+  // T_APPEND_MEMBER(ptr, pTable, STable, sversion);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
     ptr = tdEncodeSchema(ptr, pTable->schema);
@@ -87,7 +87,7 @@ STable *tsdbDecodeTable(void *cont, int contLen) {
   T_READ_MEMBER(ptr, uint64_t, pTable->tableId.uid);
   T_READ_MEMBER(ptr, int32_t, pTable->tableId.tid);
   T_READ_MEMBER(ptr, uint64_t, pTable->superUid);
-  T_READ_MEMBER(ptr, int32_t, pTable->sversion);
+  // T_READ_MEMBER(ptr, int32_t, pTable->sversion);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
     pTable->schema = tdDecodeSchema(&ptr);
diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index 5bdf37c81e..fd317e9d0c 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -289,8 +289,8 @@ void tsdbSetHelperTable(SRWHelper *pHelper, STable *pTable, STsdbRepo *pRepo) {
 
   pHelper->tableInfo.tid = pTable->tableId.tid;
   pHelper->tableInfo.uid = pTable->tableId.uid;
-  pHelper->tableInfo.sversion = pTable->sversion;
   STSchema *pSchema = tsdbGetTableSchema(pRepo->tsdbMeta, pTable);
+  pHelper->tableInfo.sversion = schemaVersion(pSchema);
 
   tdInitDataCols(pHelper->pDataCols[0], pSchema);
   tdInitDataCols(pHelper->pDataCols[1], pSchema);

From 1777a19c30e10a599300c722c7e6aa9dc9585991 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 10:43:41 +0800
Subject: [PATCH 08/64] [td-225] init semaphore

---
 src/client/src/tscAsync.c | 1 +
 src/client/src/tscUtil.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/client/src/tscAsync.c b/src/client/src/tscAsync.c
index 084367d615..0a700a570a 100644
--- a/src/client/src/tscAsync.c
+++ b/src/client/src/tscAsync.c
@@ -50,6 +50,7 @@ void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const
   pSql->maxRetry  = TSDB_MAX_REPLICA_NUM;
   pSql->fp        = fp;
   
+  sem_init(&pSql->rspSem, 0, 0);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
     tscError("failed to malloc payload");
     tscQueueAsyncError(fp, param, TSDB_CODE_CLI_OUT_OF_MEMORY);
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index e85dd578ab..2dba0c350e 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -426,6 +426,7 @@ void tscFreeSqlObj(SSqlObj* pSql) {
   pCmd->allocSize = 0;
   
   tfree(pSql->sqlstr);
+  sem_destroy(&pSql->rspSem);
   free(pSql);
 }
 

From cfa288674a59865853684ccf4b744a97a152cfe4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 12:14:04 +0800
Subject: [PATCH 09/64] [td-225]

---
 src/client/src/tscServer.c | 9 ---------
 src/client/src/tscUtil.c   | 9 +++------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 5b7009f958..4f81af62c2 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -335,15 +335,6 @@ void tscProcessMsgFromServer(SRpcMsg *rpcMsg, SRpcIpSet *pIpSet) {
     rpcMsg->code = pRes->code ? pRes->code : pRes->numOfRows;
     
     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
-     * may be freed in UDF, and reused by other threads before tscShouldBeFreed called, in which case
-     * tscShouldBeFreed checks an object which is actually allocated by other threads.
-     *
-     * If this block of memory is re-allocated for an insert thread, in which tscKeepConn[command] equals to 0,
-     * the tscShouldBeFreed will success and tscFreeSqlObj free it immediately.
-     */
     bool shouldFree = tscShouldBeFreed(pSql);
     (*pSql->fp)(pSql->param, pSql, rpcMsg->code);
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 2dba0c350e..3e7e0b9ed8 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1475,15 +1475,12 @@ bool tscShouldBeFreed(SSqlObj* pSql) {
     return false;
   }
 
+  // only the table meta and super table vgroup query will free resource automatically
   int32_t command = pSql->cmd.command;
-  if (command == TSDB_SQL_META || command == TSDB_SQL_STABLEVGROUP) {//TODO subquery should be freed here
+  if (command == TSDB_SQL_META || command == TSDB_SQL_STABLEVGROUP) {
     return true;
   }
-  
-  // all subqueries should be automatically freed
-//  if (pSql->cmd.pQueryInfo != NULL && pSql->cmd.pQueryInfo[0]->type & TSDB_QUERY_TYPE_SUBQUERY) {
-//    return true;
-//  }
+
   return false;
 }
 

From 185284956daead3dcc24ce84e0dcb76b81228344 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 12:45:26 +0800
Subject: [PATCH 10/64] [td-314] update jni

---
 .../jni/com_taosdata_jdbc_TSDBJNIConnector.h  |  6 +-
 src/client/src/TSDBJNIConnector.c             | 71 ++++++++++---------
 2 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
index 8dbe63d75a..b37301cdad 100644
--- a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
@@ -62,7 +62,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp
  * Method:    executeQueryImp
  * Signature: ([BJ)I
  */
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp
   (JNIEnv *, jobject, jbyteArray, jlong);
 
 /*
@@ -87,7 +87,7 @@ JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp
-  (JNIEnv *, jobject, jlong);
+  (JNIEnv *env, jobject jobj, jlong con, jlong tres);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
@@ -103,7 +103,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp
-  (JNIEnv *, jobject, jlong);
+  (JNIEnv *env, jobject jobj, jlong con, jlong res);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 69e045eca4..e8f818699e 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -172,14 +172,14 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setOptions(JNIEnv
     }
     (*env)->ReleaseStringUTFChars(env, optionValue, charset);
   } else if (optionIndex == TSDB_OPTION_TIMEZONE) {
-    const char *timezone = (*env)->GetStringUTFChars(env, optionValue, NULL);
-    if (timezone && strlen(timezone) != 0) {
-      res = taos_options(TSDB_OPTION_TIMEZONE, timezone);
+    const char *tz1 = (*env)->GetStringUTFChars(env, optionValue, NULL);
+    if (tz1 && strlen(tz1) != 0) {
+      res = taos_options(TSDB_OPTION_TIMEZONE, tz1);
       jniTrace("set timezone to %s, result:%d", timezone, res);
     } else {
       jniTrace("input timezone is empty");
     }
-    (*env)->ReleaseStringUTFChars(env, optionValue, timezone);
+    (*env)->ReleaseStringUTFChars(env, optionValue, tz1);
   } else {
     jniError("option index:%d is not found", optionIndex);
   }
@@ -241,7 +241,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
   return ret;
 }
 
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(JNIEnv *env, jobject jobj,
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(JNIEnv *env, jobject jobj,
                                                                                jbyteArray jsql, jlong con) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
@@ -270,24 +270,22 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(J
   jniTrace("jobj:%p, conn:%p, sql:%s", jobj, tscon, dst);
   
   SSqlObj *pSql = taos_query(tscon, dst);
-  if (pSql == NULL || pSql->res.code != TSDB_CODE_SUCCESS) {
-    jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(pSql->res.code), taos_errstr(tscon));
-    free(dst);
-    return JNI_TDENGINE_ERROR;
+  int32_t code = taos_errno(pSql);
+  
+  if (code != TSDB_CODE_SUCCESS) {
+    jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(code), taos_errstr(pSql));
   } else {
     int32_t affectRows = 0;
-    int32_t code = pSql->res.code;
-    
     if (pSql->cmd.command == TSDB_SQL_INSERT) {
       affectRows = taos_affected_rows(pSql);
       jniTrace("jobj:%p, conn:%p, code:%s, affect rows:%d", jobj, tscon, tstrerror(code), affectRows);
     } else {
       jniTrace("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
     }
-
-    free(dst);
-    return affectRows;
   }
+  
+  free(dst);
+  return (jlong) pSql;
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con) {
@@ -300,29 +298,34 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNI
   return (jint)-taos_errno(tscon);
 }
 
-JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong con) {
-  TAOS *tscon = (TAOS *)con;
-  return (*env)->NewStringUTF(env, (const char *)taos_errstr(tscon));
+JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong tres) {
+  TAOS_RES *pSql = (TAOS_RES *) tres;
+  return (*env)->NewStringUTF(env, (const char *)taos_errstr(pSql));
 }
 
-JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con) {
-  SSqlObj *pSql = (TAOS_RES *) con;
-  if (pSql == NULL) {
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con, jlong tres) {
+  TAOS *tscon = (TAOS *)con;
+  if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
-
-  jlong ret = 0;
+  
+  if ((void *) tres == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+  
+  SSqlObj *pSql = (TAOS_RES *) tres;
   STscObj* pObj = pSql->pTscObj;
   
   if (tscIsUpdateQuery(pSql)) {
-    ret = 0;  // for update query, no result pointer
-    jniTrace("jobj:%p, conn:%p, no resultset", jobj, pObj);
+    taos_free_result(pSql);     // free result here
+    jniTrace("jobj:%p, conn:%p, no resultset, %p", jobj, pObj, (void*) tres);
+    return 0;
   } else {
-    jniTrace("jobj:%p, conn:%p, get resultset:%p", jobj, pObj, (void *) ret);
+    jniTrace("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *) tres);
+    return tres;
   }
-
-  return ret;
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(JNIEnv *env, jobject jobj, jlong con,
@@ -344,16 +347,20 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp(JNIEnv *env, jobject jobj,
-                                                                                  jlong con) {
+                                                                                  jlong con, jlong res) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
-
-  jint ret = taos_affected_rows(tscon);
-
-  jniTrace("jobj:%p, conn:%p, affect rows:%d", jobj, tscon, (void *)con, ret);
+  
+  if ((void *)res == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+  
+  jint ret = taos_affected_rows((SSqlObj*) res);
+  jniTrace("jobj:%p, conn:%p, sql:%p, affect rows:%d", jobj, tscon, (void *)con, res, ret);
 
   return ret;
 }

From 5800fdf92d1337ede203e52bd17a4f70498c56ac Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 12:48:56 +0800
Subject: [PATCH 11/64] [td-314]

---
 src/client/src/TSDBJNIConnector.c | 131 +++++++++++++++++-------------
 1 file changed, 74 insertions(+), 57 deletions(-)

diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index e8f818699e..7012307771 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -13,19 +13,35 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "com_taosdata_jdbc_TSDBJNIConnector.h"
 #include "os.h"
 #include "taos.h"
-#include "tscSubquery.h"
+#include "tlog.h"
 #include "tscUtil.h"
 #include "tsclient.h"
-#include "tlog.h"
 #include "ttime.h"
 
-#define jniError(...)  { if (jniDebugFlag & DEBUG_ERROR) { taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); }}
-#define jniWarn(...)   { if (jniDebugFlag & DEBUG_WARN)  { taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); }}
-#define jniTrace(...)  { if (jniDebugFlag & DEBUG_TRACE) { taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); }}
-#define jniPrint(...)  { taosPrintLog("JNI ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
+#include "com_taosdata_jdbc_TSDBJNIConnector.h"
+
+#define jniError(...)                                        \
+  {                                                          \
+    if (jniDebugFlag & DEBUG_ERROR) {                        \
+      taosPrintLog("ERROR JNI ", jniDebugFlag, __VA_ARGS__); \
+    }                                                        \
+  }
+#define jniWarn(...)                                        \
+  {                                                         \
+    if (jniDebugFlag & DEBUG_WARN) {                        \
+      taosPrintLog("WARN JNI ", jniDebugFlag, __VA_ARGS__); \
+    }                                                       \
+  }
+#define jniTrace(...)                                  \
+  {                                                    \
+    if (jniDebugFlag & DEBUG_TRACE) {                  \
+      taosPrintLog("JNI ", jniDebugFlag, __VA_ARGS__); \
+    }                                                  \
+  }
+#define jniPrint(...) \
+  { taosPrintLog("JNI ", tscEmbedded ? 255 : uDebugFlag, __VA_ARGS__); }
 
 int __init = 0;
 
@@ -117,7 +133,8 @@ void jniGetGlobalMethod(JNIEnv *env) {
   jniTrace("native method register finished");
 }
 
-JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setAllocModeImp(JNIEnv *env, jobject jobj, jint jMode, jstring jPath, jboolean jAutoDump) {
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_setAllocModeImp(JNIEnv *env, jobject jobj, jint jMode,
+                                                                               jstring jPath, jboolean jAutoDump) {
   if (jPath != NULL) {
     const char *path = (*env)->GetStringUTFChars(env, jPath, NULL);
     taosSetAllocMode(jMode, path, !!jAutoDump);
@@ -219,9 +236,9 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
   }
 
   /*
-  * set numOfThreadsPerCore = 0
-  * means only one thread for client side scheduler
-  */
+   * set numOfThreadsPerCore = 0
+   * means only one thread for client side scheduler
+   */
   tsNumOfThreadsPerCore = 0.0;
 
   ret = (jlong)taos_connect((char *)host, (char *)user, (char *)pass, (char *)dbname, jport);
@@ -242,7 +259,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_connectImp(JNIEn
 }
 
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(JNIEnv *env, jobject jobj,
-                                                                               jbyteArray jsql, jlong con) {
+                                                                                jbyteArray jsql, jlong con) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is already closed", jobj);
@@ -264,14 +281,14 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(
 
   (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)dst);
   if ((*env)->ExceptionCheck(env)) {
-    //todo handle error
+    // todo handle error
   }
 
   jniTrace("jobj:%p, conn:%p, sql:%s", jobj, tscon, dst);
-  
+
   SSqlObj *pSql = taos_query(tscon, dst);
-  int32_t code = taos_errno(pSql);
-  
+  int32_t  code = taos_errno(pSql);
+
   if (code != TSDB_CODE_SUCCESS) {
     jniError("jobj:%p, conn:%p, code:%s, msg:%s", jobj, tscon, tstrerror(code), taos_errstr(pSql));
   } else {
@@ -283,9 +300,9 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(
       jniTrace("jobj:%p, conn:%p, code:%s", jobj, tscon, tstrerror(code));
     }
   }
-  
+
   free(dst);
-  return (jlong) pSql;
+  return (jlong)pSql;
 }
 
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con) {
@@ -299,31 +316,32 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNI
 }
 
 JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong tres) {
-  TAOS_RES *pSql = (TAOS_RES *) tres;
+  TAOS_RES *pSql = (TAOS_RES *)tres;
   return (*env)->NewStringUTF(env, (const char *)taos_errstr(pSql));
 }
 
-JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con, jlong tres) {
+JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getResultSetImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                                jlong tres) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
-  
-  if ((void *) tres == NULL) {
+
+  if ((void *)tres == NULL) {
     jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
-  
-  SSqlObj *pSql = (TAOS_RES *) tres;
-  STscObj* pObj = pSql->pTscObj;
-  
+
+  SSqlObj *pSql = (TAOS_RES *)tres;
+  STscObj *pObj = pSql->pTscObj;
+
   if (tscIsUpdateQuery(pSql)) {
-    taos_free_result(pSql);     // free result here
-    jniTrace("jobj:%p, conn:%p, no resultset, %p", jobj, pObj, (void*) tres);
+    taos_free_result(pSql);  // free result here
+    jniTrace("jobj:%p, conn:%p, no resultset, %p", jobj, pObj, (void *)tres);
     return 0;
   } else {
-    jniTrace("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *) tres);
+    jniTrace("jobj:%p, conn:%p, get resultset, %p", jobj, pObj, (void *)tres);
     return tres;
   }
 }
@@ -346,20 +364,20 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_freeResultSetImp(
   return JNI_SUCCESS;
 }
 
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp(JNIEnv *env, jobject jobj,
-                                                                                  jlong con, jlong res) {
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getAffectedRowsImp(JNIEnv *env, jobject jobj, jlong con,
+                                                                                  jlong res) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
     return JNI_CONNECTION_NULL;
   }
-  
+
   if ((void *)res == NULL) {
     jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
     return JNI_RESULT_SET_NULL;
   }
-  
-  jint ret = taos_affected_rows((SSqlObj*) res);
+
+  jint ret = taos_affected_rows((SSqlObj *)res);
   jniTrace("jobj:%p, conn:%p, sql:%p, affect rows:%d", jobj, tscon, (void *)con, res, ret);
 
   return ret;
@@ -412,7 +430,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getSchemaMetaData
  * @return
  */
 jstring jniFromNCharToByteArray(JNIEnv *env, char *nchar, int32_t maxBytes) {
-  int        len = (int)strlen(nchar);
+  int len = (int)strlen(nchar);
   if (len > maxBytes) {  // no terminated symbol exists '\0'
     len = maxBytes;
   }
@@ -483,24 +501,22 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
         float fv = 0;
         fv = GET_FLOAT_VAL(row[i]);
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetFloatFp, i, (jfloat)fv);
-      }
-        break;
+      } break;
       case TSDB_DATA_TYPE_DOUBLE: {
         double dv = 0;
         dv = GET_DOUBLE_VAL(row[i]);
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetDoubleFp, i, (jdouble)dv);
-      }
-        break;
+      } break;
       case TSDB_DATA_TYPE_BINARY: {
-        strncpy(tmp, row[i], (size_t) fields[i].bytes);  // handle the case that terminated does not exist
+        strncpy(tmp, row[i], (size_t)fields[i].bytes);  // handle the case that terminated does not exist
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetStringFp, i, (*env)->NewStringUTF(env, tmp));
 
-        memset(tmp, 0, (size_t) fields[i].bytes);
+        memset(tmp, 0, (size_t)fields[i].bytes);
         break;
       }
       case TSDB_DATA_TYPE_NCHAR: {
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteArrayFp, i,
-                               jniFromNCharToByteArray(env, (char*)row[i], fields[i].bytes));
+                               jniFromNCharToByteArray(env, (char *)row[i], fields[i].bytes));
         break;
       }
       case TSDB_DATA_TYPE_TIMESTAMP:
@@ -528,7 +544,8 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_closeConnectionIm
 }
 
 JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_subscribeImp(JNIEnv *env, jobject jobj, jlong con,
-                                                                             jboolean restart, jstring jtopic, jstring jsql, jint jinterval) {
+                                                                             jboolean restart, jstring jtopic,
+                                                                             jstring jsql, jint jinterval) {
   jlong sub = 0;
   TAOS *taos = (TAOS *)con;
   char *topic = NULL;
@@ -559,7 +576,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_subscribeImp(JNI
   return sub;
 }
 
-static jobject convert_one_row(JNIEnv *env, TAOS_ROW row, TAOS_FIELD* fields, int num_fields) {
+static jobject convert_one_row(JNIEnv *env, TAOS_ROW row, TAOS_FIELD *fields, int num_fields) {
   jobject rowobj = (*env)->NewObject(env, g_rowdataClass, g_rowdataConstructor, num_fields);
   jniTrace("created a rowdata object, rowobj:%p", rowobj);
 
@@ -588,25 +605,23 @@ static jobject convert_one_row(JNIEnv *env, TAOS_ROW row, TAOS_FIELD* fields, in
         float fv = 0;
         fv = GET_FLOAT_VAL(row[i]);
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetFloatFp, i, (jfloat)fv);
-      }
-        break;
-      case TSDB_DATA_TYPE_DOUBLE:{
+      } break;
+      case TSDB_DATA_TYPE_DOUBLE: {
         double dv = 0;
         dv = GET_DOUBLE_VAL(row[i]);
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetDoubleFp, i, (jdouble)dv);
-      }
-        break;
+      } break;
       case TSDB_DATA_TYPE_BINARY: {
         char tmp[TSDB_MAX_BYTES_PER_ROW] = {0};
-        strncpy(tmp, row[i], (size_t) fields[i].bytes);  // handle the case that terminated does not exist
+        strncpy(tmp, row[i], (size_t)fields[i].bytes);  // handle the case that terminated does not exist
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetStringFp, i, (*env)->NewStringUTF(env, tmp));
 
-        memset(tmp, 0, (size_t) fields[i].bytes);
+        memset(tmp, 0, (size_t)fields[i].bytes);
         break;
       }
       case TSDB_DATA_TYPE_NCHAR:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetByteArrayFp, i,
-                              jniFromNCharToByteArray(env, (char*)row[i], fields[i].bytes));
+                               jniFromNCharToByteArray(env, (char *)row[i], fields[i].bytes));
         break;
       case TSDB_DATA_TYPE_TIMESTAMP:
         (*env)->CallVoidMethod(env, rowobj, g_rowdataSetTimestampFp, i, (jlong) * ((int64_t *)row[i]));
@@ -618,7 +633,8 @@ static jobject convert_one_row(JNIEnv *env, TAOS_ROW row, TAOS_FIELD* fields, in
   return rowobj;
 }
 
-JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNIEnv *env, jobject jobj, jlong sub, jint timeout) {
+JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNIEnv *env, jobject jobj, jlong sub,
+                                                                             jint timeout) {
   jniTrace("jobj:%p, in TSDBJNIConnector_consumeImp, sub:%ld", jobj, sub);
   jniGetGlobalMethod(env);
 
@@ -626,10 +642,10 @@ JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNI
   jobject   rows = (*env)->NewObject(env, g_arrayListClass, g_arrayListConstructFp);
 
   int64_t start = taosGetTimestampMs();
-  int count = 0;
+  int     count = 0;
 
   while (true) {
-    TAOS_RES *  res = taos_consume(tsub);
+    TAOS_RES *res = taos_consume(tsub);
     if (res == NULL) {
       jniError("jobj:%p, tsub:%p, taos_consume returns NULL", jobj, tsub);
       return NULL;
@@ -662,7 +678,8 @@ JNIEXPORT jobject JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_consumeImp(JNI
   return rows;
 }
 
-JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_unsubscribeImp(JNIEnv *env, jobject jobj, jlong sub, jboolean keepProgress) {
+JNIEXPORT void JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_unsubscribeImp(JNIEnv *env, jobject jobj, jlong sub,
+                                                                              jboolean keepProgress) {
   TAOS_SUB *tsub = (TAOS_SUB *)sub;
   taos_unsubscribe(tsub, keepProgress);
 }
@@ -685,7 +702,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_validateCreateTab
   char *dst = (char *)calloc(1, sizeof(char) * (len + 1));
   (*env)->GetByteArrayRegion(env, jsql, 0, len, (jbyte *)dst);
   if ((*env)->ExceptionCheck(env)) {
-    //todo handle error
+    // todo handle error
   }
 
   int code = taos_validate_sql(tscon, dst);

From 268c6dd26bdb5aea11e95d827ef56dccf6135193 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 2 Jun 2020 05:53:04 +0000
Subject: [PATCH 12/64] TD-90

---
 src/tsdb/src/tsdbMeta.c | 57 +++++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 52aa1c69cb..3ea22f2b91 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -41,7 +41,6 @@ void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) {
   T_APPEND_MEMBER(ptr, &(pTable->tableId), STableId, uid);
   T_APPEND_MEMBER(ptr, &(pTable->tableId), STableId, tid);
   T_APPEND_MEMBER(ptr, pTable, STable, superUid);
-  // T_APPEND_MEMBER(ptr, pTable, STable, sversion);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
     ptr = tdEncodeSchema(ptr, pTable->schema);
@@ -87,7 +86,6 @@ STable *tsdbDecodeTable(void *cont, int contLen) {
   T_READ_MEMBER(ptr, uint64_t, pTable->tableId.uid);
   T_READ_MEMBER(ptr, int32_t, pTable->tableId.tid);
   T_READ_MEMBER(ptr, uint64_t, pTable->superUid);
-  // T_READ_MEMBER(ptr, int32_t, pTable->sversion);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
     pTable->schema = tdDecodeSchema(&ptr);
@@ -360,6 +358,34 @@ _err:
   return NULL;
 }
 
+static int tsdbUpdateTableTagSchema(STable *pTable, STSchema *newSchema) {
+  ASSERT(pTable->type == TSDB_SUPER_TABLE);
+  ASSERT(schemaVersion(pTable->tagSchema) < schemaVersion(newSchema));
+  STSchema *pOldSchema = pTable->tagSchema;
+  STSchema *pNewSchema = tdDupSchema(newSchema);
+  if (pNewSchema == NULL) return TSDB_CODE_SERV_OUT_OF_MEMORY;
+  pTable->tagSchema = pNewSchema;
+  tdFreeSchema(pOldSchema);
+
+  return TSDB_CODE_SUCCESS;
+}
+
+static int tsdbCheckAndUpdateTable(STable *pTable, STableCfg *pCfg) {
+  ASSERT(pTable->type != TSDB_CHILD_TABLE);
+
+  if (pTable->type == TSDB_SUPER_TABLE) {
+    if (schemaVersion(pTable->tagSchema) < schemaVersion(pCfg->tagSchema)) {
+      int32_t code = tsdbUpdateTableTagSchema(pTable, pCfg->tagSchema);
+      if (code != TSDB_CODE_SUCCESS) return code;
+    }
+  }
+
+  {
+    // TODO: try to update the data schema
+  }
+  return TSDB_CODE_SUCCESS;
+}
+
 int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) {
   STsdbRepo *pRepo = (STsdbRepo *)repo;
   STsdbMeta *pMeta = pRepo->tsdbMeta;
@@ -384,6 +410,8 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) {
       if (super == NULL) return -1;
     } else {
       if (super->type != TSDB_SUPER_TABLE) return -1;
+      if (super->tableId.uid != pCfg->superUid) return -1;
+      tsdbCheckAndUpdateTable(super, pCfg);
     }
   }
 
@@ -458,23 +486,30 @@ STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
   if (tsdbTableSetName(pCfg, pMsg->tableId, true) < 0) goto _err;
 
   if (numOfTags > 0) {
-    int   accBytes = 0;
-    char *pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
-
-    SKVRowBuilder kvRowBuilder = {0};
+    // Decode tag schema
     tdResetTSchemaBuilder(&schemaBuilder, htonl(pMsg->tversion));
-    if (tdInitKVRowBuilder(&kvRowBuilder) < 0) goto _err;
     for (int i = numOfCols; i < numOfCols + numOfTags; i++) {
       tdAddColToSchema(&schemaBuilder, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
-      tdAddColToKVRow(&kvRowBuilder, htons(pSchema[i].colId), pSchema[i].type, pTagData + accBytes);
-      accBytes += htons(pSchema[i].bytes);
     }
     if (tsdbTableSetTagSchema(pCfg, tdGetSchemaFromBuilder(&schemaBuilder), false) < 0) goto _err;
     if (tsdbTableSetSName(pCfg, pMsg->superTableId, true) < 0) goto _err;
     if (tsdbTableSetSuperUid(pCfg, htobe64(pMsg->superTableUid)) < 0) goto _err;
 
-    tsdbTableSetTagValue(pCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
-    tdDestroyKVRowBuilder(&kvRowBuilder);
+    // Decode tag values
+    if (pMsg->tagDataLen) {
+      int   accBytes = 0;
+      char *pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
+
+      SKVRowBuilder kvRowBuilder = {0};
+      if (tdInitKVRowBuilder(&kvRowBuilder) < 0) goto _err;
+      for (int i = numOfCols; i < numOfCols + numOfTags; i++) {
+        tdAddColToKVRow(&kvRowBuilder, htons(pSchema[i].colId), pSchema[i].type, pTagData + accBytes);
+        accBytes += htons(pSchema[i].bytes);
+      }
+
+      tsdbTableSetTagValue(pCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
+      tdDestroyKVRowBuilder(&kvRowBuilder);
+    }
   }
 
   if (pMsg->tableType == TSDB_STREAM_TABLE) {

From 1a5138b3aea7ded94b15aa5e6cba5a45344f15aa Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Jun 2020 15:00:31 +0800
Subject: [PATCH 13/64] fix deadlocks while free resultset

---
 src/client/src/tscSubquery.c | 3 ++-
 tests/tsim/src/simExe.c      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/src/tscSubquery.c b/src/client/src/tscSubquery.c
index 99163ba327..1fdbd43408 100644
--- a/src/client/src/tscSubquery.c
+++ b/src/client/src/tscSubquery.c
@@ -1715,6 +1715,7 @@ static void multiVnodeInsertMerge(void* param, TAOS_RES* tres, int numOfRows) {
     pParentObj->res.numOfRows += numOfRows;
   }
   
+  taos_free_result(tres);
   int32_t completed = atomic_add_fetch_32(&pState->numOfCompleted, 1);
   if (completed < total) {
     return;
@@ -1732,7 +1733,7 @@ static void multiVnodeInsertMerge(void* param, TAOS_RES* tres, int numOfRows) {
   pParentObj->fp = pParentObj->fetchFp;
   
   // all data has been sent to vnode, call user function
-  (*pParentObj->fp)(pParentObj->param, tres, numOfRows);
+  (*pParentObj->fp)(pParentObj->param, pParentObj, numOfRows);
 }
 
 int32_t tscHandleMultivnodeInsert(SSqlObj *pSql) {
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index 1be446fa08..ed193fd182 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -771,11 +771,11 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
       }
     }
 
-    taos_free_result(pSql);
   } else {
     numOfRows = taos_affected_rows(pSql);
   }
 
+  taos_free_result(pSql);
   sprintf(script->rows, "%d", numOfRows);
 
   script->linePos++;

From cfeb5f2b7a32a4d4b50b959775b61d36ec31778e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Jun 2020 15:35:33 +0800
Subject: [PATCH 14/64] update restful interface while taosc interface changed

---
 src/plugins/http/src/httpSql.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/plugins/http/src/httpSql.c b/src/plugins/http/src/httpSql.c
index 45cc3fcfdf..c82a235eba 100644
--- a/src/plugins/http/src/httpSql.c
+++ b/src/plugins/http/src/httpSql.c
@@ -58,10 +58,10 @@ void httpProcessMultiSqlRetrieveCallBack(void *param, TAOS_RES *result, int numO
     if (numOfRows < 0) {
       httpError("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, retrieve failed code:%s, sql:%s",
                 pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, tstrerror(numOfRows), sql);
-    } else {
-      taos_free_result(result);
-    }
-
+    } 
+    
+    taos_free_result(result);
+    
     if (singleCmd->cmdReturnType == HTTP_CMD_RETURN_TYPE_WITH_RETURN && encode->stopJsonFp) {
       (encode->stopJsonFp)(pContext, singleCmd);
     }
@@ -103,12 +103,15 @@ void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
     }
     multiCmds->pos++;
     httpProcessMultiSql(pContext);
+
+    taos_free_result(result);
     return;
   }
 
-  if (result == NULL) {
+  int num_fields = taos_field_count(result);
+  if (num_fields == 0) {
     // not select or show commands
-    int affectRows = code;
+    int affectRows = taos_affected_rows(result);
     httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, affect rows:%d, sql:%s",
               pContext, pContext->fd, pContext->ipstr, pContext->user, multiCmds->pos, affectRows, sql);
 
@@ -132,6 +135,7 @@ void httpProcessMultiSqlCallBack(void *param, TAOS_RES *result, int code) {
       multiCmds->pos++;
     }
 
+    taos_free_result(result);
     httpProcessMultiSql(pContext);
   } else {
     httpTrace("context:%p, fd:%d, ip:%s, user:%s, process pos:%d, start retrieve, sql:%s",
@@ -212,9 +216,9 @@ void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int num
     if (numOfRows < 0) {
       httpError("context:%p, fd:%d, ip:%s, user:%s, retrieve failed, code:%s", pContext, pContext->fd, pContext->ipstr,
                 pContext->user, tstrerror(numOfRows));
-    } else {
-      taos_free_result(result);
-    }
+    } 
+    
+    taos_free_result(result);    
 
     if (encode->stopJsonFp) {
       (encode->stopJsonFp)(pContext, &pContext->singleCmd);
@@ -247,12 +251,14 @@ void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
                 pContext, pContext->fd, pContext->ipstr, pContext->user, pContext->session->taos, tstrerror(code), pObj);
       httpSendTaosdErrorResp(pContext, code);
     }
+    taos_free_result(result);
     return;
   }
 
-  if (result == NULL) {
+  int num_fields = taos_field_count(result);
+  if (num_fields == 0) {
     // not select or show commands
-    int affectRows = code;
+    int affectRows = taos_affected_rows(result);
 
     httpTrace("context:%p, fd:%d, ip:%s, user:%s, affect rows:%d, stop query, sqlObj:%p",
               pContext, pContext->fd, pContext->ipstr, pContext->user, affectRows, result);
@@ -269,6 +275,7 @@ void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
       (encode->stopJsonFp)(pContext, &pContext->singleCmd);
     }
 
+    taos_free_result(result);
     httpCloseContextByApp(pContext);
   } else {
     httpTrace("context:%p, fd:%d, ip:%s, user:%s, start retrieve", pContext, pContext->fd, pContext->ipstr,

From 7e4c7e7c517620b66bdff2c78d1c5df2f201dec9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 15:47:24 +0800
Subject: [PATCH 15/64] [td-90] add protocol to update the tags value of
 tables.

---
 src/client/inc/tsclient.h      |  1 +
 src/client/src/tscSQLParser.c  | 39 ++++++++++++++++++++++++++++------
 src/client/src/tscSchemaUtil.c |  2 ++
 src/client/src/tscServer.c     | 36 +++++++++++++++++++------------
 src/common/inc/qsqltype.h      |  3 ++-
 src/dnode/src/dnodeShell.c     |  3 ++-
 src/inc/taosmsg.h              | 14 +++++++++++-
 tests/examples/c/demo.c        |  5 +++--
 8 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/src/client/inc/tsclient.h b/src/client/inc/tsclient.h
index f1b620176d..7bf5b05923 100644
--- a/src/client/inc/tsclient.h
+++ b/src/client/inc/tsclient.h
@@ -56,6 +56,7 @@ typedef struct STableMeta {
   STableComInfo tableInfo;
   uint8_t       tableType;
   int16_t       sversion;
+  int16_t       tversion;
   SCMVgroupInfo vgroupInfo;
   int32_t       sid;       // the index of one table in a virtual node
   uint64_t      uid;       // unique id of a table
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 965e85efbd..4e05e71a0b 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -4402,7 +4402,9 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_UPDATE_TAG_VAL) {
     // Note: update can only be applied to table not super table.
-    // the following is handle display tags value for meters created according to super table
+    // the following is used to handle tags value for table created according to super table
+    pCmd->command = TSDB_SQL_UPDATE_TAGS_VAL;
+    
     tVariantList* pVarList = pAlterSQL->varList;
     tVariant*     pTagName = &pVarList->a[0].pVar;
 
@@ -4425,15 +4427,38 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
 
     // validate the length of binary
     if ((pTagsSchema->type == TSDB_DATA_TYPE_BINARY || pTagsSchema->type == TSDB_DATA_TYPE_NCHAR) &&
-        pVarList->a[1].pVar.nLen > pTagsSchema->bytes) {
+        (pVarList->a[1].pVar.nLen + VARSTR_HEADER_SIZE) > pTagsSchema->bytes) {
       return invalidSqlErrMsg(pQueryInfo->msg, msg14);
     }
-
-    char name1[128] = {0};
-    strncpy(name1, pTagName->pz, pTagName->nLen);
   
-    TAOS_FIELD f = tscCreateField(TSDB_DATA_TYPE_INT, name1, tDataTypeDesc[TSDB_DATA_TYPE_INT].nSize);
-    tscFieldInfoAppend(&pQueryInfo->fieldsInfo, &f);
+    int32_t size = sizeof(SUpdateTableTagValMsg) + pTagsSchema->bytes + TSDB_EXTRA_PAYLOAD_SIZE;
+    if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
+      tscError("%p failed to malloc for alter table msg", pSql);
+      return TSDB_CODE_CLI_OUT_OF_MEMORY;
+    }
+
+    SUpdateTableTagValMsg* pUpdateMsg = (SUpdateTableTagValMsg*) (pCmd->payload + tsRpcHeadSize);
+    pUpdateMsg->head.vgId = htonl(pTableMeta->vgroupInfo.vgId);
+    pUpdateMsg->tid = htonl(pTableMeta->sid);
+    pUpdateMsg->uid = htobe64(pTableMeta->uid);
+    pUpdateMsg->colId = htons(pTagsSchema->colId);
+    pUpdateMsg->type  = htons(pTagsSchema->type);
+    pUpdateMsg->bytes = htons(pTagsSchema->bytes);
+    pUpdateMsg->tversion = htons(pTableMeta->tversion);
+    
+    tVariantDump(&pVarList->a[1].pVar, pUpdateMsg->data, pTagsSchema->type, true);
+    
+    int32_t len = 0;
+    if (pTagsSchema->type != TSDB_DATA_TYPE_BINARY && pTagsSchema->type != TSDB_DATA_TYPE_NCHAR) {
+      len = tDataTypeDesc[pTagsSchema->type].nSize;
+    } else {
+      len = varDataLen(pUpdateMsg->data);
+    }
+    
+    pUpdateMsg->tagValLen = htonl(len);  // length may be changed after dump data
+    
+    int32_t total = sizeof(SUpdateTableTagValMsg) + len;
+    pUpdateMsg->head.contLen = htonl(total);
     
   } else if (pAlterSQL->type == TSDB_ALTER_TABLE_ADD_COLUMN) {
     tFieldList* pFieldList = pAlterSQL->pAddColumns;
diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c
index 35bc3c4a80..ce36a73bfc 100644
--- a/src/client/src/tscSchemaUtil.c
+++ b/src/client/src/tscSchemaUtil.c
@@ -168,6 +168,8 @@ STableMeta* tscCreateTableMetaFromMsg(STableMetaMsg* pTableMetaMsg, size_t* size
   pTableMeta->sid = pTableMetaMsg->sid;
   pTableMeta->uid = pTableMetaMsg->uid;
   pTableMeta->vgroupInfo = pTableMetaMsg->vgroup;
+  pTableMeta->sversion = pTableMetaMsg->sversion;
+  pTableMeta->tversion = pTableMetaMsg->tversion;
   
   memcpy(pTableMeta->schema, pTableMetaMsg->schema, schemaSize);
   
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 8ca590a1f6..86f9eac11d 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1260,28 +1260,24 @@ int tscEstimateAlterTableMsgLength(SSqlCmd *pCmd) {
 }
 
 int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
-  SCMAlterTableMsg *pAlterTableMsg;
-  char *          pMsg;
-  int             msgLen = 0;
-  int             size = 0;
+  char *pMsg;
+  int   msgLen = 0;
 
-  SSqlCmd *   pCmd = &pSql->cmd;
+  SSqlCmd    *pCmd = &pSql->cmd;
   SQueryInfo *pQueryInfo = tscGetQueryInfoDetail(pCmd, 0);
 
   STableMetaInfo *pTableMetaInfo = tscGetMetaInfo(pQueryInfo, 0);
-
-  size = tscEstimateAlterTableMsgLength(pCmd);
+  
+  SAlterTableSQL *pAlterInfo = pInfo->pAlterInfo;
+  int size = tscEstimateAlterTableMsgLength(pCmd);
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, size)) {
     tscError("%p failed to malloc for alter table msg", pSql);
     return -1;
   }
-
-  pAlterTableMsg = (SCMAlterTableMsg *)pCmd->payload;
-
+  
+  SCMAlterTableMsg *pAlterTableMsg = (SCMAlterTableMsg *)pCmd->payload;
   tscGetDBInfoFromMeterId(pTableMetaInfo->name, pAlterTableMsg->db);
 
-  SAlterTableSQL *pAlterInfo = pInfo->pAlterInfo;
-
   strcpy(pAlterTableMsg->tableId, pTableMetaInfo->name);
   pAlterTableMsg->type = htons(pAlterInfo->type);
 
@@ -1289,7 +1285,7 @@ int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSchema *pSchema = pAlterTableMsg->schema;
   for (int i = 0; i < tscNumOfFields(pQueryInfo); ++i) {
     TAOS_FIELD *pField = tscFieldInfoGetField(&pQueryInfo->fieldsInfo, i);
-
+  
     pSchema->type = pField->type;
     strcpy(pSchema->name, pField->name);
     pSchema->bytes = htons(pField->bytes);
@@ -1302,6 +1298,7 @@ int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   pMsg += pAlterInfo->tagData.dataLen;
 
   msgLen = pMsg - (char*)pAlterTableMsg;
+
   pCmd->payloadLen = msgLen;
   pCmd->msgType = TSDB_MSG_TYPE_CM_ALTER_TABLE;
 
@@ -1310,6 +1307,16 @@ int tscBuildAlterTableMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   return TSDB_CODE_SUCCESS;
 }
 
+int tscBuildUpdateTagMsg(SSqlObj* pSql, SSqlInfo *pInfo) {
+  SSqlCmd* pCmd = &pSql->cmd;
+  pCmd->msgType = TSDB_MSG_TYPE_UPDATE_TAG_VAL;
+  
+  SUpdateTableTagValMsg* pUpdateMsg = (SUpdateTableTagValMsg*) (pCmd->payload + tsRpcHeadSize);
+  pCmd->payloadLen = htonl(pUpdateMsg->head.contLen);
+  
+  return TSDB_CODE_SUCCESS;
+}
+
 int tscAlterDbMsg(SSqlObj *pSql, SSqlInfo *pInfo) {
   SSqlCmd *pCmd = &pSql->cmd;
   pCmd->payloadLen = sizeof(SCMAlterDbMsg);
@@ -1804,7 +1811,7 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
 
   pMetaMsg->sid = htonl(pMetaMsg->sid);
   pMetaMsg->sversion = htons(pMetaMsg->sversion);
-  
+  pMetaMsg->tversion = htons(pMetaMsg->tversion);
   pMetaMsg->vgroup.vgId = htonl(pMetaMsg->vgroup.vgId);
   
   pMetaMsg->uid = htobe64(pMetaMsg->uid);
@@ -2552,6 +2559,7 @@ void tscInitMsgsFp() {
   tscBuildMsg[TSDB_SQL_DROP_DNODE] = tscBuildDropDnodeMsg;
   tscBuildMsg[TSDB_SQL_CFG_DNODE] = tscBuildCfgDnodeMsg;
   tscBuildMsg[TSDB_SQL_ALTER_TABLE] = tscBuildAlterTableMsg;
+  tscBuildMsg[TSDB_SQL_UPDATE_TAGS_VAL] = tscBuildUpdateTagMsg;
   tscBuildMsg[TSDB_SQL_ALTER_DB] = tscAlterDbMsg;
 
   tscBuildMsg[TSDB_SQL_CONNECT] = tscBuildConnectMsg;
diff --git a/src/common/inc/qsqltype.h b/src/common/inc/qsqltype.h
index d1e5bcaa52..6f6493d17c 100644
--- a/src/common/inc/qsqltype.h
+++ b/src/common/inc/qsqltype.h
@@ -35,7 +35,8 @@ enum {
   TSDB_DEFINE_SQL_TYPE( TSDB_SQL_SELECT, "select" )
   TSDB_DEFINE_SQL_TYPE( TSDB_SQL_FETCH, "fetch" )
   TSDB_DEFINE_SQL_TYPE( TSDB_SQL_INSERT, "insert" )
-
+  TSDB_DEFINE_SQL_TYPE( TSDB_SQL_UPDATE_TAGS_VAL, "update-tag-val" )
+  
   // the SQL below is for mgmt node
   TSDB_DEFINE_SQL_TYPE( TSDB_SQL_MGMT, "mgmt" )
   TSDB_DEFINE_SQL_TYPE( TSDB_SQL_CREATE_DB, "create-db" )
diff --git a/src/dnode/src/dnodeShell.c b/src/dnode/src/dnodeShell.c
index b09e14e283..074f21f972 100644
--- a/src/dnode/src/dnodeShell.c
+++ b/src/dnode/src/dnodeShell.c
@@ -40,7 +40,8 @@ int32_t dnodeInitShell() {
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_SUBMIT] = dnodeDispatchToVnodeWriteQueue;
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_QUERY]  = dnodeDispatchToVnodeReadQueue;
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_FETCH]  = dnodeDispatchToVnodeReadQueue;
-
+  dnodeProcessShellMsgFp[TSDB_MSG_TYPE_UPDATE_TAG_VAL] = dnodeDispatchToVnodeWriteQueue;
+  
   // the following message shall be treated as mnode write
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_CREATE_ACCT] = dnodeDispatchToMnodeWriteQueue;
   dnodeProcessShellMsgFp[TSDB_MSG_TYPE_CM_ALTER_ACCT]  = dnodeDispatchToMnodeWriteQueue;
diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h
index da6d0847ec..b5d4ee7758 100644
--- a/src/inc/taosmsg.h
+++ b/src/inc/taosmsg.h
@@ -43,7 +43,7 @@ enum {
 TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_SUBMIT, "submit" )
 TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_QUERY, "query" )
 TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_FETCH, "fetch" )
-TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY0, "dummy0" )
+TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_UPDATE_TAG_VAL, "update-tag-val" )
 TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY1, "dummy1" )
 TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY2, "dummy2" )
 TAOS_DEFINE_MESSAGE_TYPE( TSDB_MSG_TYPE_DUMMY3, "dummy3" )
@@ -276,6 +276,18 @@ typedef struct {
   // char    tagVal[];
 } SCMAlterTableMsg;
 
+typedef struct {
+  SMsgHead  head;
+  int64_t   uid;
+  int32_t   tid;
+  int16_t   tversion;
+  int16_t   colId;
+  int16_t   type;
+  int16_t   bytes;
+  int32_t   tagValLen;
+  char      data[];
+} SUpdateTableTagValMsg;
+
 typedef struct {
   char clientVersion[TSDB_VERSION_LEN];
   char msgVersion[TSDB_VERSION_LEN];
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index e27c73891f..b25e3c32fe 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[]) {
     return 0;
   }
   
-  taos_options(TSDB_OPTION_CONFIGDIR, "/home/lisa/Documents/workspace/TDinternal/community/sim/tsim/cfg");
+  taos_options(TSDB_OPTION_CONFIGDIR, "~/sec/cfg");
   
   // init TAOS
   taos_init();
@@ -108,7 +108,8 @@ int main(int argc, char *argv[]) {
   printf("success to connect to server\n");
   
 //  multiThreadTest(1, taos);
-  doQuery(taos, "select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from lm2_db0.lm2_stb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10;");
+  doQuery(taos, "use test");
+  doQuery(taos, "alter table tm99 set tag a=99");
 //  for(int32_t i = 0; i < 100000; ++i) {
 //    doQuery(taos, "insert into t1 values(now, 2)");
 //  }

From c27268dd426ed8d3c6db14641f21b752709e1cbd Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Jun 2020 15:53:36 +0800
Subject: [PATCH 16/64] update error code

---
 src/inc/taoserror.h                   | 16 +++++++---------
 src/mnode/src/mnodeTable.c            |  2 +-
 tests/script/unique/http/opentsdb.sim |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 17e1cabb6a..04d6633af0 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -93,15 +93,13 @@ TAOS_DEFINE_ERROR(TSDB_CODE_NO_USER_FROM_CONN,          0, 0x0185, "can not get
 TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_ALREADY_EXIST,        0, 0x0200, "table already exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_ID,           0, 0x0201, "invalid table id")
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_TYPE,         0, 0x0202, "invalid table type")
-TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_TABLE_NAME,         0, 0x0203, "invalid table name")
-TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUPER_TABLE,            0, 0x0204, "no super table")           // operation only available for super table
-TAOS_DEFINE_ERROR(TSDB_CODE_TAG_ALREAY_EXIST,           0, 0x0205, "tag already exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_TAG_NOT_EXIST,              0, 0x0206, "tag not exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_ALREAY_EXIST,         0, 0x0207, "field already exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_NOT_EXIST,            0, 0x0208, "field not exist")
-TAOS_DEFINE_ERROR(TSDB_CODE_COL_NAME_TOO_LONG,          0, 0x0209, "column name too long")
-TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TAGS,              0, 0x020A, "too many tags")
-
+TAOS_DEFINE_ERROR(TSDB_CODE_NOT_SUPER_TABLE,            0, 0x0203, "no super table")           // operation only available for super table
+TAOS_DEFINE_ERROR(TSDB_CODE_TAG_ALREAY_EXIST,           0, 0x0204, "tag already exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_TAG_NOT_EXIST,              0, 0x0205, "tag not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_ALREAY_EXIST,         0, 0x0206, "field already exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_FIELD_NOT_EXIST,            0, 0x0207, "field not exist")
+TAOS_DEFINE_ERROR(TSDB_CODE_COL_NAME_TOO_LONG,          0, 0x0208, "column name too long")
+TAOS_DEFINE_ERROR(TSDB_CODE_TOO_MANY_TAGS,              0, 0x0209, "too many tags")
 
 // dnode & mnode
 TAOS_DEFINE_ERROR(TSDB_CODE_NO_ENOUGH_DNODES,           0, 0x0280, "no enough dnodes")
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index bd566bfe5b..84a1f659d5 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -742,7 +742,7 @@ static int32_t mnodeProcessTableMetaMsg(SMnodeMsg *pMsg) {
   if (pMsg->pTable == NULL) {
     if (!pInfo->createFlag) {
       mError("table:%s, failed to get table meta, table not exist", pInfo->tableId);
-      return TSDB_CODE_INVALID_TABLE_NAME;
+      return TSDB_CODE_INVALID_TABLE_ID;
     } else {
       mTrace("table:%s, failed to get table meta, start auto create table ", pInfo->tableId);
       return mnodeAutoCreateChildTable(pMsg);
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
index 827f02bc1f..19d1c48c3d 100644
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.sim
@@ -75,7 +75,7 @@ endi
 
 system_content curl -u root:taosdata -d  '[{"metric": "ab1234567890123456789012345678ab1234567890123456789012345678","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","dc": "lga"}}]' 127.0.0.1:6020/opentsdb/db/put
 print $system_content
-if $system_content != @{"errors":[{"datapoint":{"metric":"ab1234567890123456789012345678ab1234567890123456789012345678","stable":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb","table":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb_lga_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"status":"error","code":-2147483389}}],"failed":1,"success":0,"affected_rows":0}@ then
+if $system_content != @{"errors":[{"datapoint":{"metric":"ab1234567890123456789012345678ab1234567890123456789012345678","stable":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb","table":"ab1234567890123456789012345678ab1234567890123456789012345678_d_bbb_lga_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","host":"web01"},"status":"error","code":-2147482999}}],"failed":1,"success":0,"affected_rows":0}@ then
   return -1
 endi
 
@@ -125,7 +125,7 @@ endi
 
 system_content curl -u root:taosdata -d  '[{"metric": "sys_cpu","timestamp": 1346846400,"value": 18,"tags": {"host": "web01","group1": "1","group1": "1","group1": "1","group1": "1","group1": "1","dc": "lga"}}]' 127.0.0.1:6020/opentsdb/db/put
 print $system_content
-if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbbbbbb","table":"sys_cpu_d_bbbbbbb_lga_1_1_1_1_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","group1":"1","group1":"1","group1":"1","group1":"1","host":"web01"},"status":"error","code":-2147483445}}],"failed":1,"success":0,"affected_rows":0}@ then
+if $system_content != @{"errors":[{"datapoint":{"metric":"sys_cpu","stable":"sys_cpu_d_bbbbbbb","table":"sys_cpu_d_bbbbbbb_lga_1_1_1_1_1_web01","timestamp":1346846400,"value":18.000000,"tags":{"dc":"lga","group1":"1","group1":"1","group1":"1","group1":"1","group1":"1","host":"web01"},"status":"error","code":-2147483135}}],"failed":1,"success":0,"affected_rows":0}@ then
   return -1
 endi
 

From efdc51595292f73a0b865adc71cf335f053f499b Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Jun 2020 16:06:45 +0800
Subject: [PATCH 17/64] scripts

---
 tests/script/general/field/binary.sim | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim
index 8bf1c84b93..b51f023efe 100644
--- a/tests/script/general/field/binary.sim
+++ b/tests/script/general/field/binary.sim
@@ -60,17 +60,10 @@ if $rows != 75 then
   return -1
 endi
 
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol -x step13
-  return -1
-step13:
-
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol -x step14
-  return -1
-step14:
-
-sql select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol -x step15
-  return -1
-step15:
+print select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1'
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where ts < now + 4m and tbcol = '1' group by tgcol 
+sql_error select count(tbcol), avg(tbcol), sum(tbcol), min(tbcol), max(tbcol), first(tbcol), last(tbcol) from $mt where tbcol = '1' interval(1d) group by tgcol 
 
 #can't filter binary fields
 

From 7baed335332cf6a163b015de372af789884437ec Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 16:19:36 +0800
Subject: [PATCH 18/64] [td-314] update sim

---
 src/client/src/tscSQLParser.c | 1 -
 tests/tsim/src/simExe.c       | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 965e85efbd..37af50dbce 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -1465,7 +1465,6 @@ static int32_t setExprInfoForFunctions(SQueryInfo* pQueryInfo, SSchema* pSchema,
 
 int32_t addExprAndResultField(SQueryInfo* pQueryInfo, int32_t colIndex, tSQLExprItem* pItem, bool finalResult) {
   STableMetaInfo* pTableMetaInfo = NULL;
-  
   int32_t optr = pItem->pNode->nSQLOptr;
 
   const char* msg1 = "not support column types";
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index ed193fd182..f5b09a4840 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -640,7 +640,7 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
   for (int attempt = 0; attempt < 3; ++attempt) {
     simLogSql(rest);
     pSql = taos_query(script->taos, rest);
-    ret = terrno;
+    ret = taos_errno(pSql);
     
     if (ret == TSDB_CODE_TABLE_ALREADY_EXIST ||
         ret == TSDB_CODE_DB_ALREADY_EXIST) {
@@ -922,8 +922,7 @@ bool simExecuteSqlErrorCmd(SScript *script, char *rest) {
   }
   else {
     pSql = taos_query(script->taos, rest);
-    ret = terrno;
-    
+    ret = taos_errno(pSql);
     taos_free_result(pSql);
   }
 

From 9d492a8d93268cb9e1f7ea0d152b5fcbdc215479 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 17:09:56 +0800
Subject: [PATCH 19/64] [td-225] fix bugs in dynamic set tags values during on
 demand create table

---
 src/client/src/tscParseInsert.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 79872e22c8..999d103c12 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -925,7 +925,11 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
 
       for (int32_t i = 0; i < spd.numOfCols; ++i) {
         if (!spd.hasVal[i]) {  // current tag column do not have any value to insert, set it to null
-          setNull(ptr, pTagSchema[i].type, pTagSchema[i].bytes);
+          if (pTagSchema[i].type == TSDB_DATA_TYPE_BINARY || pTagSchema[i].type == TSDB_DATA_TYPE_NCHAR) {
+            setVardataNull(ptr, pTagSchema[i].type);
+          } else {
+            setNull(ptr, pTagSchema[i].type, pTagSchema[i].bytes);
+          }
         }
 
         ptr += pTagSchema[i].bytes;

From 9b0b1e240b84748a4aeac972619969be3089b1a0 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 17:24:26 +0800
Subject: [PATCH 20/64] [td-225] refactor codes

---
 src/client/inc/tscUtil.h        |  5 +----
 src/client/src/tscParseInsert.c | 16 +++++++---------
 src/client/src/tscSQLParser.c   | 26 ++++++++++++--------------
 src/client/src/tscSql.c         |  6 ++----
 src/client/src/tscUtil.c        | 13 +++++--------
 src/inc/taosdef.h               |  2 +-
 src/util/inc/tutil.h            |  2 +-
 src/util/src/tutil.c            |  7 +++++--
 src/util/tests/stringTest.cpp   |  4 ++--
 9 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/src/client/inc/tscUtil.h b/src/client/inc/tscUtil.h
index e4857dd18d..b3e05cb0ca 100644
--- a/src/client/inc/tscUtil.h
+++ b/src/client/inc/tscUtil.h
@@ -132,10 +132,7 @@ bool tscIsSelectivityWithTagQuery(SSqlCmd* pCmd);
 void tscAddSpecialColumnForSelect(SQueryInfo* pQueryInfo, int32_t outputColIndex, int16_t functionId, SColumnIndex* pIndex,
                                   SSchema* pColSchema, int16_t isTag);
 
-//void addRequiredTagColumn(SQueryInfo* pQueryInfo, int32_t tagColIndex, int32_t tableIndex);
-void addRequiredTagColumn(STableMetaInfo* pTableMetaInfo, SColumnIndex* index);
-
-int32_t tscSetTableId(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql);
+int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql);
 void    tscClearInterpInfo(SQueryInfo* pQueryInfo);
 
 bool tscIsInsertData(char* sqlstr);
diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c
index 999d103c12..4d5e20564e 100644
--- a/src/client/src/tscParseInsert.c
+++ b/src/client/src/tscParseInsert.c
@@ -793,7 +793,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
     }
 
     STableMetaInfo *pSTableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, STABLE_INDEX);
-    tscSetTableId(pSTableMeterMetaInfo, &sToken, pSql);
+    tscSetTableFullName(pSTableMeterMetaInfo, &sToken, pSql);
 
     strncpy(pTag->name, pSTableMeterMetaInfo->name, TSDB_TABLE_ID_LEN);
     code = tscGetTableMeta(pSql, pSTableMeterMetaInfo);
@@ -834,9 +834,8 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
         sql += index;
 
         if (TK_STRING == sToken.type) {
-          sToken.n = strdequote(sToken.z);
-          strtrim(sToken.z);
-          sToken.n = (uint32_t)strlen(sToken.z);
+          strdequote(sToken.z);
+          sToken.n = strtrim(sToken.z);
         }
 
         if (sToken.type == TK_RP) {
@@ -948,7 +947,7 @@ static int32_t tscCheckIfCreateTable(char **sqlstr, SSqlObj *pSql) {
       return tscInvalidSQLErrMsg(pCmd->payload, "invalid table name", *sqlstr);
     }
 
-    int32_t ret = tscSetTableId(pTableMetaInfo, &tableToken, pSql);
+    int32_t ret = tscSetTableFullName(pTableMetaInfo, &tableToken, pSql);
     if (ret != TSDB_CODE_SUCCESS) {
       return ret;
     }
@@ -1091,7 +1090,7 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
       goto _error_clean;
     }
 
-    if ((code = tscSetTableId(pTableMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
+    if ((code = tscSetTableFullName(pTableMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
       goto _error_clean;
     }
 
@@ -1209,9 +1208,8 @@ int doParseInsertSql(SSqlObj *pSql, char *str) {
         str += index;
 
         if (TK_STRING == sToken.type) {
-          sToken.n = strdequote(sToken.z);
-          strtrim(sToken.z);
-          sToken.n = (uint32_t)strlen(sToken.z);
+          strdequote(sToken.z);
+          sToken.n = strtrim(sToken.z);
         }
 
         if (sToken.type == TK_RP) {
diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 37af50dbce..88c3578633 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -163,8 +163,7 @@ static int32_t handlePassword(SSqlCmd* pCmd, SSQLToken* pPwd) {
   }
 
   strdequote(pPwd->z);
-  strtrim(pPwd->z);  // trim space before and after passwords
-  pPwd->n = strlen(pPwd->z);
+  pPwd->n = strtrim(pPwd->z);  // trim space before and after passwords
 
   if (pPwd->n <= 0) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
@@ -226,7 +225,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       } else if (pInfo->type == TSDB_SQL_DROP_TABLE) {
         assert(pInfo->pDCLInfo->nTokens == 1);
 
-        if (tscSetTableId(pTableMetaInfo, pzName, pSql) != TSDB_CODE_SUCCESS) {
+        if (tscSetTableFullName(pTableMetaInfo, pzName, pSql) != TSDB_CODE_SUCCESS) {
           return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg3);
         }
       } else if (pInfo->type == TSDB_SQL_DROP_DNODE) {
@@ -353,7 +352,7 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
-      if (tscSetTableId(pTableMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+      if (tscSetTableFullName(pTableMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
         return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
       }
 
@@ -686,7 +685,7 @@ int32_t parseSlidingClause(SQueryInfo* pQueryInfo, SQuerySQL* pQuerySql) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t tscSetTableId(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql) {
+int32_t tscSetTableFullName(STableMetaInfo* pTableMetaInfo, SSQLToken* pzTableName, SSqlObj* pSql) {
   const char* msg = "name too long";
 
   SSqlCmd* pCmd = &pSql->cmd;
@@ -4293,7 +4292,7 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg1);
   }
 
-  if (tscSetTableId(pTableMetaInfo, &(pAlterSQL->name), pSql) != TSDB_CODE_SUCCESS) {
+  if (tscSetTableFullName(pTableMetaInfo, &(pAlterSQL->name), pSql) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg2);
   }
 
@@ -4645,8 +4644,7 @@ int32_t validateColumnName(char* name) {
 
   if (token.type == TK_STRING) {
     strdequote(token.z);
-    strtrim(token.z);
-    token.n = (uint32_t)strlen(token.z);
+    token.n = strtrim(token.z);
 
     int32_t k = tSQLGetToken(token.z, &token.type);
     if (k != token.n) {
@@ -5490,7 +5488,7 @@ int32_t doCheckForCreateTable(SSqlObj* pSql, int32_t subClauseIndex, SSqlInfo* p
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (tscSetTableId(pTableMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
+  if (tscSetTableFullName(pTableMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
@@ -5545,7 +5543,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
-  if (tscSetTableId(pStableMeterMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
+  if (tscSetTableFullName(pStableMeterMetaInfo, pToken, pSql) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
   }
 
@@ -5591,7 +5589,7 @@ int32_t doCheckForCreateFromStable(SSqlObj* pSql, SSqlInfo* pInfo) {
   }
 
   STableMetaInfo* pTableMeterMetaInfo = tscGetMetaInfo(pQueryInfo, TABLE_INDEX);
-  ret = tscSetTableId(pTableMeterMetaInfo, &pInfo->pCreateTableInfo->name, pSql);
+  ret = tscSetTableFullName(pTableMeterMetaInfo, &pInfo->pCreateTableInfo->name, pSql);
   if (ret != TSDB_CODE_SUCCESS) {
     return ret;
   }
@@ -5634,7 +5632,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg1);
   }
 
-  if (tscSetTableId(pTableMetaInfo, &srcToken, pSql) != TSDB_CODE_SUCCESS) {
+  if (tscSetTableFullName(pTableMetaInfo, &srcToken, pSql) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg2);
   }
 
@@ -5665,7 +5663,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
   }
 
   // set the created table[stream] name
-  if (tscSetTableId(pTableMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
+  if (tscSetTableFullName(pTableMetaInfo, pzTableName, pSql) != TSDB_CODE_SUCCESS) {
     return invalidSqlErrMsg(pQueryInfo->msg, msg1);
   }
 
@@ -5774,7 +5772,7 @@ int32_t doCheckForQuery(SSqlObj* pSql, SQuerySQL* pQuerySql, int32_t index) {
     STableMetaInfo* pMeterInfo1 = tscGetMetaInfo(pQueryInfo, i);
 
     SSQLToken t = {.type = TSDB_DATA_TYPE_BINARY, .n = pTableItem->nLen, .z = pTableItem->pz};
-    if (tscSetTableId(pMeterInfo1, &t, pSql) != TSDB_CODE_SUCCESS) {
+    if (tscSetTableFullName(pMeterInfo1, &t, pSql) != TSDB_CODE_SUCCESS) {
       return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg1);
     }
 
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index ba2b900dd5..d3760811d6 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -817,9 +817,7 @@ static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t t
     tblName[len] = '\0';
 
     str = nextStr + 1;
-
-    strtrim(tblName);
-    len = (uint32_t)strlen(tblName);
+    len = strtrim(tblName);
 
     SSQLToken sToken = {.n = len, .type = TK_ID, .z = tblName};
     tSQLGetToken(tblName, &sToken.type);
@@ -831,7 +829,7 @@ static int tscParseTblNameList(SSqlObj *pSql, const char *tblNameList, int32_t t
       return code;
     }
 
-    if ((code = tscSetTableId(pTableMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
+    if ((code = tscSetTableFullName(pTableMetaInfo, &sToken, pSql)) != TSDB_CODE_SUCCESS) {
       return code;
     }
 
diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index 3e7e0b9ed8..efba7d8af9 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -1231,9 +1231,8 @@ void tscColumnListDestroy(SArray* pColumnList) {
  *
  */
 static int32_t validateQuoteToken(SSQLToken* pToken) {
-  pToken->n = strdequote(pToken->z);
-  strtrim(pToken->z);
-  pToken->n = (uint32_t)strlen(pToken->z);
+  strdequote(pToken->z);
+  pToken->n = strtrim(pToken->z);
 
   int32_t k = tSQLGetToken(pToken->z, &pToken->type);
 
@@ -1255,9 +1254,8 @@ int32_t tscValidateName(SSQLToken* pToken) {
   char* sep = strnchr(pToken->z, TS_PATH_DELIMITER[0], pToken->n, true);
   if (sep == NULL) {  // single part
     if (pToken->type == TK_STRING) {
-      pToken->n = strdequote(pToken->z);
-      strtrim(pToken->z);
-      pToken->n = (uint32_t)strlen(pToken->z);
+      strdequote(pToken->z);
+      pToken->n = strtrim(pToken->z);
 
       int len = tSQLGetToken(pToken->z, &pToken->type);
 
@@ -1282,8 +1280,7 @@ int32_t tscValidateName(SSQLToken* pToken) {
     char*   pStr = pToken->z;
 
     if (pToken->type == TK_SPACE) {
-      strtrim(pToken->z);
-      pToken->n = (uint32_t)strlen(pToken->z);
+      pToken->n = strtrim(pToken->z);
     }
 
     pToken->n = tSQLGetToken(pToken->z, &pToken->type);
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 2aca057ba7..f83dd794d1 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -322,7 +322,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_QUERY_TYPE_SUBQUERY                       0x02u
 #define TSDB_QUERY_TYPE_STABLE_SUBQUERY                0x04u     // two-stage subquery for super table
 
-#define TSDB_QUERY_TYPE_TABLE_QUERY                    0x08u     // query ordinary table; below only apply to client side
+#define TSDB_QUERY_TYPE_TABLE_QUERY                    0x08u    // query ordinary table; below only apply to client side
 #define TSDB_QUERY_TYPE_STABLE_QUERY                   0x10u    // query on super table
 #define TSDB_QUERY_TYPE_JOIN_QUERY                     0x20u    // join query
 #define TSDB_QUERY_TYPE_PROJECTION_QUERY               0x40u    // select *,columns... query
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index 984df23879..f0c90c62fc 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -113,7 +113,7 @@ extern "C" {
 
 int32_t strdequote(char *src);
 
-void strtrim(char *src);
+size_t strtrim(char *src);
 
 char *strnchr(char *haystack, char needle, int32_t len, bool skipquote);
 
diff --git a/src/util/src/tutil.c b/src/util/src/tutil.c
index 6bc60615ce..6a5c8b6799 100644
--- a/src/util/src/tutil.c
+++ b/src/util/src/tutil.c
@@ -60,7 +60,7 @@ int32_t strdequote(char *z) {
   return j + 1;  // only one quote, do nothing
 }
 
-void strtrim(char *z) {
+size_t strtrim(char *z) {
   int32_t i = 0;
   int32_t j = 0;
 
@@ -71,7 +71,7 @@ void strtrim(char *z) {
 
   if (z[j] == 0) {
     z[0] = 0;
-    return;
+    return 0;
   }
 
   delta = j;
@@ -89,9 +89,12 @@ void strtrim(char *z) {
 
   if (stop > 0) {
     z[stop - delta] = 0;
+    return (stop - delta);
   } else if (j != i) {
     z[i] = 0;
   }
+  
+  return i;
 }
 
 char **strsplit(char *z, const char *delim, int32_t *num) {
diff --git a/src/util/tests/stringTest.cpp b/src/util/tests/stringTest.cpp
index ef8df90e3e..0dc1ee7a77 100644
--- a/src/util/tests/stringTest.cpp
+++ b/src/util/tests/stringTest.cpp
@@ -20,10 +20,10 @@ TEST(testCase, string_dequote_test) {
   EXPECT_STRCASEEQ(t1, "abc");
 
   char t21[] = " abc ";
-  strtrim(t21);
+  int32_t lx = strtrim(t21);
 
   EXPECT_STREQ("abc", t21);
-  EXPECT_EQ(3, strlen(t21));
+  EXPECT_EQ(3, lx);
 }
 
 TEST(testCase, string_replace_test) {

From acbe0ff73d1dea5a297eee513548b5b8971e07a2 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 17:24:49 +0800
Subject: [PATCH 21/64] [td-225] fix memory leaks

---
 tests/tsim/src/simExe.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index f5b09a4840..1230f52f63 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -642,14 +642,13 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
     pSql = taos_query(script->taos, rest);
     ret = taos_errno(pSql);
     
-    if (ret == TSDB_CODE_TABLE_ALREADY_EXIST ||
-        ret == TSDB_CODE_DB_ALREADY_EXIST) {
+    if (ret == TSDB_CODE_TABLE_ALREADY_EXIST || ret == TSDB_CODE_DB_ALREADY_EXIST) {
       simTrace("script:%s, taos:%p, %s success, ret:%d:%s", script->fileName, script->taos, rest, ret, tstrerror(ret));
       ret = 0;
       break;
     } else if (ret != 0) {
       simTrace("script:%s, taos:%p, %s failed, ret:%d:%s, error:%s",
-               script->fileName, script->taos, rest, ret, tstrerror(ret), taos_errstr(script->taos));
+               script->fileName, script->taos, rest, ret, tstrerror(ret), taos_errstr(pSql));
 
       if (line->errorJump == SQL_JUMP_TRUE) {
         script->linePos = line->jump;
@@ -659,6 +658,8 @@ bool simExecuteNativeSqlCommand(SScript *script, char *rest, bool isSlow) {
     } else {
       break;
     }
+    
+    taos_free_result(pSql);
   }
 
   if (ret) {

From d5e6947202ba78d93069cae9731e72049b7020a0 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 2 Jun 2020 09:27:34 +0000
Subject: [PATCH 22/64] TD-90

---
 src/common/inc/tdataformat.h |   3 +-
 src/common/src/tdataformat.c | 131 +++++++++++++++++++++--------------
 2 files changed, 81 insertions(+), 53 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index f71f52edc5..9854183f82 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -278,9 +278,10 @@ typedef struct {
 #define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
 #define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
 #define kvRowFree(r) tfree(r)
+#define kvRowEnd(r) POINTER_SHIFT(r, kvRowLen(r))
 
 SKVRow tdKVRowDup(SKVRow row);
-SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value);
+int    tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value);
 void * tdEncodeKVRow(void *buf, SKVRow row);
 void * tdDecodeKVRow(void *buf, SKVRow *row);
 
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 9816f0472f..920c612612 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -477,69 +477,96 @@ SKVRow tdKVRowDup(SKVRow row) {
   return trow;
 }
 
-SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value) {
-  // TODO
-  return NULL;
-  // SColIdx *pColIdx = NULL;
-  // SKVRow rrow = row;
-  // SKVRow nrow = NULL;
-  // void *ptr = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(row), sizeof(SColIdx), comparTagId, TD_GE);
+int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
+  SColIdx *pColIdx = NULL;
+  SKVRow   row = *orow;
+  SKVRow   nrow = NULL;
+  void *   ptr = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_GE);
 
-  // if (ptr == NULL || ((SColIdx *)ptr)->colId < colId) { // need to add a column value to the row
-  //   int tlen = kvDataRowLen(row) + sizeof(SColIdx) + (IS_VAR_DATA_TYPE(type) ? varDataTLen(value) :
-  //   TYPE_BYTES[type]); nrow = malloc(tlen); if (nrow == NULL) return NULL;
+  if (ptr == NULL || ((SColIdx *)ptr)->colId < colId) { // need to add a column value to the row
+    // int tlen = kvDataRowLen(row) + sizeof(SColIdx) + (IS_VAR_DATA_TYPE(type) ? varDataTLen(value) :
+    // TYPE_BYTES[type]); nrow = malloc(tlen); if (nrow == NULL) return NULL;
 
-  //   kvDataRowSetNCols(nrow, kvDataRowNCols(row)+1);
-  //   kvDataRowSetLen(nrow, tlen);
+    // kvDataRowSetNCols(nrow, kvDataRowNCols(row)+1);
+    // kvDataRowSetLen(nrow, tlen);
 
-  //   if (ptr == NULL) ptr = kvDataRowValues(row);
+    // if (ptr == NULL) ptr = kvDataRowValues(row);
 
-  //   // Copy the columns before the col
-  //   if (POINTER_DISTANCE(ptr, kvDataRowColIdx(row)) > 0) {
-  //     memcpy(kvDataRowColIdx(nrow), kvDataRowColIdx(row), POINTER_DISTANCE(ptr, kvDataRowColIdx(row)));
-  //     memcpy(kvDataRowValues(nrow), kvDataRowValues(row), ((SColIdx *)ptr)->offset); // TODO: here is not correct
-  //   }
+    // // Copy the columns before the col
+    // if (POINTER_DISTANCE(ptr, kvDataRowColIdx(row)) > 0) {
+    //   memcpy(kvDataRowColIdx(nrow), kvDataRowColIdx(row), POINTER_DISTANCE(ptr, kvDataRowColIdx(row)));
+    //   memcpy(kvDataRowValues(nrow), kvDataRowValues(row), ((SColIdx *)ptr)->offset); // TODO: here is not correct
+    // }
 
-  //   // Set the new col value
-  //   pColIdx = (SColIdx *)POINTER_SHIFT(nrow, POINTER_DISTANCE(ptr, row));
-  //   pColIdx->colId = colId;
-  //   pColIdx->offset = ((SColIdx *)ptr)->offset; // TODO: here is not correct
+    // // Set the new col value
+    // pColIdx = (SColIdx *)POINTER_SHIFT(nrow, POINTER_DISTANCE(ptr, row));
+    // pColIdx->colId = colId;
+    // pColIdx->offset = ((SColIdx *)ptr)->offset; // TODO: here is not correct
 
-  //   if (IS_VAR_DATA_TYPE(type)) {
-  //     memcpy(POINTER_SHIFT(kvDataRowValues(nrow), pColIdx->offset), value, varDataLen(value));
-  //   } else {
-  //     memcpy(POINTER_SHIFT(kvDataRowValues(nrow), pColIdx->offset), value, TYPE_BYTES[type]);
-  //   }
+    // if (IS_VAR_DATA_TYPE(type)) {
+    //   memcpy(POINTER_SHIFT(kvDataRowValues(nrow), pColIdx->offset), value, varDataLen(value));
+    // } else {
+    //   memcpy(POINTER_SHIFT(kvDataRowValues(nrow), pColIdx->offset), value, TYPE_BYTES[type]);
+    // }
 
-  //   // Copy the columns after the col
-  //   if (POINTER_DISTANCE(kvDataRowValues(row), ptr) > 0) {
-  //     // TODO: memcpy();
-  //   }
-  // } else {
-  //   // TODO
-  //   ASSERT(((SColIdx *)ptr)->colId == colId);
-  //   if (IS_VAR_DATA_TYPE(type)) {
-  //     void *pOldVal = kvDataRowColVal(row, (SColIdx *)ptr);
+    // // Copy the columns after the col
+    // if (POINTER_DISTANCE(kvDataRowValues(row), ptr) > 0) {
+    //   // TODO: memcpy();
+    // }
+  } else {
+    ASSERT(((SColIdx *)ptr)->colId == colId);
+    if (IS_VAR_DATA_TYPE(type)) {
+      void *pOldVal = kvRowColVal(row, (SColIdx *)ptr);
 
-  //     if (varDataTLen(value) == varDataTLen(pOldVal)) { // just update the column value in place
-  //       memcpy(pOldVal, value, varDataTLen(value));
-  //     } else { // enlarge the memory
-  //       // rrow = realloc(rrow, kvDataRowLen(rrow) + varDataTLen(value) - varDataTLen(pOldVal));
-  //       // if (rrow == NULL) return NULL;
-  //       // memmove();
-  //       // for () {
-  //       //   ((SColIdx *)ptr)->offset += balabala;
-  //       // }
+      if (varDataTLen(value) == varDataTLen(pOldVal)) { // just update the column value in place
+        memcpy(pOldVal, value, varDataTLen(value));
+      } else { // need to reallocate the memory
+        int16_t diff = varDataTLen(value) - varDataTLen(pOldVal);
+        int16_t nlen = kvRowLen(row) + diff;
+        ASSERT(nlen > 0);
+        nrow = malloc(nlen);
+        if (nrow == NULL) {
+          // TODO: deal with the error here
+        }
 
-  //       // kvDataRowSetLen();
+        kvRowSetLen(nrow, nlen);
+        kvRowSetNCols(nrow, kvRowNCols(row));
 
-  //     }
-  //   } else {
-  //     memcpy(kvDataRowColVal(row, (SColIdx *)ptr), value, TYPE_BYTES[type]);
-  //   }
-  // }
+        // Copy part ahead
+        nlen = POINTER_DISTANCE(ptr, kvRowColIdx(row));
+        ASSERT(nlen % sizeof(SColIdx) == 0);
+        if (nlen > 0) {
+          ASSERT(((SColIdx *)ptr)->offset > 0);
+          memcpy(kvRowColIdx(nrow), kvRowColIdx(row), nlen);
+          memcpy(kvRowValues(nrow), kvRowValues(row), ((SColIdx *)ptr)->offset);
+        }
 
-  // return rrow;
+        // Construct current column value
+        int colIdx = nlen / sizeof(SColIdx);
+        pColIdx = kvRowColIdxAt(nrow, colIdx);
+        pColIdx->colId = ((SColIdx *)ptr)->colId;
+        pColIdx->offset = ((SColIdx *)ptr)->offset;
+        memcpy(kvRowColVal(nrow, pColIdx), value, varDataTLen(value));
+ 
+        // Construct columns after
+        if (kvRowNCols(nrow) - colIdx - 1 > 0) {
+          for (int i = colIdx + 1; i < kvRowNCols(nrow); i++) {
+            kvRowColIdxAt(nrow, i)->colId = kvRowColIdxAt(row, i)->colId;
+            kvRowColIdxAt(nrow, i)->offset += diff;
+          }
+          memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx + 1)), kvRowColVal(row, kvRowColIdxAt(row, colIdx + 1)),
+                 POINTER_DISTANCE(kvRowEnd(row), kvRowColVal(row, kvRowColIdxAt(row, colIdx + 1))));
+        }
+
+        free(row);
+        *orow = nrow;
+      }
+    } else {
+      memcpy(kvRowColVal(row, (SColIdx *)ptr), value, TYPE_BYTES[type]);
+    }
+  }
+
+  return 0;
 }
 
 void *tdEncodeKVRow(void *buf, SKVRow row) {

From 057df32571d8aef734e8662fabcf1b3d22544604 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 17:27:56 +0800
Subject: [PATCH 23/64] [td-225] fix invalid write

---
 src/client/src/tscProfile.c               |  2 +-
 tests/examples/c/demo.c                   | 26 ++-------
 tests/script/general/parser/testSuite.sim | 71 +++++++++++------------
 3 files changed, 40 insertions(+), 59 deletions(-)

diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index 74294d38e0..ee89b5f580 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -94,7 +94,7 @@ void tscSaveSlowQuery(SSqlObj *pSql) {
   tscTrace("%p query time:%" PRId64 " sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
 
   char *sql = malloc(200);
-  int   len = snprintf(sql, 200, "insert into %s.slowquery values(now, '%s', %" PRId64 ", %" PRId64 ", '", tsMonitorDbName,
+  int   len = snprintf(sql, 190, "insert into %s.slowquery values(now, '%s', %" PRId64 ", %" PRId64 ", '", tsMonitorDbName,
           pSql->pTscObj->user, pSql->stime, pSql->res.useconds);
   int sqlLen = snprintf(sql + len, TSDB_SHOW_SQL_LEN, "%s", pSql->sqlstr);
   if (sqlLen > TSDB_SHOW_SQL_LEN - 1) {
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index e27c73891f..e5746084e5 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -26,13 +26,12 @@
 void taosMsleep(int mseconds);
 
 static int32_t doQuery(TAOS* taos, const char* sql) {
-  int32_t code = taos_query(taos, sql);
-  if (code != 0) {
+  TAOS_RES* res = taos_query(taos, sql);
+  if (taos_errno(res) != 0) {
     printf("failed to execute query, reason:%s\n", taos_errstr(taos));
     return -1;
   }
   
-  TAOS_RES* res = taos_use_result(taos);
   TAOS_ROW row = NULL;
   char buf[512] = {0};
   
@@ -46,7 +45,6 @@ static int32_t doQuery(TAOS* taos, const char* sql) {
   }
   
   taos_free_result(res);
-
   return 0;
 }
 
@@ -81,6 +79,7 @@ static __attribute__((unused)) void multiThreadTest(int32_t numOfThreads, void*
     pthread_join(threadId[i], NULL);
   }
   
+  free(threadId);
   pthread_attr_destroy(&thattr);
 }
 
@@ -108,24 +107,11 @@ int main(int argc, char *argv[]) {
   printf("success to connect to server\n");
   
 //  multiThreadTest(1, taos);
-  doQuery(taos, "select max(c1), min(c2), sum(c3), avg(c4), first(c7), last(c8), first(c9) from lm2_db0.lm2_stb0 where ts >= 1537146000000 and ts <= 1543145400000 interval(5m) fill(value, -1, -2) group by t1 limit 2 offset 10;");
+   doQuery(taos, "insert into tb9 (ts, c1, c2) using stb (t1, t2) tags ('tag4', 4)   values ( now + 4s, 'binary4', 4);");
 //  for(int32_t i = 0; i < 100000; ++i) {
 //    doQuery(taos, "insert into t1 values(now, 2)");
 //  }
 //  doQuery(taos, "create table t1(ts timestamp, k binary(12), f nchar(2))");
-
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:1', 'abc')");
-//  doQuery(taos, "create table if not exists tm0 (ts timestamp, k int);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:1', 1);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:2', 2);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:3', 3);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:4', 4);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:5', 5);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:6', 6);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:7', 7);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:8', 8);");
-//  doQuery(taos, "insert into tm0 values('2020-1-1 1:1:9', 9);");
-//  doQuery(taos, "select sum(k),count(*) from m1 group by a");
   
   taos_close(taos);
   return 0;
@@ -172,10 +158,6 @@ int main(int argc, char *argv[]) {
     exit(1);
   }
   
-  
-  result = taos_use_result(taos);
-  
-  
   if (result == NULL) {
     printf("failed to get result, reason:%s\n", taos_errstr(taos));
     exit(1);
diff --git a/tests/script/general/parser/testSuite.sim b/tests/script/general/parser/testSuite.sim
index cc95246f06..4a3da2f2a0 100644
--- a/tests/script/general/parser/testSuite.sim
+++ b/tests/script/general/parser/testSuite.sim
@@ -40,45 +40,47 @@
 #run general/parser/nchar.sim
 #sleep 2000
 ##run general/parser/null_char.sim
-sleep 2000
-run general/parser/single_row_in_tb.sim
-sleep 2000
-run general/parser/select_from_cache_disk.sim
-sleep 2000
-run general/parser/selectResNum.sim
-sleep 2000
-run general/parser/mixed_blocks.sim
-sleep 2000
-run general/parser/limit1.sim
-sleep 2000
-run general/parser/limit.sim
-sleep 2000
-run general/parser/limit1_tblocks100.sim
-sleep 2000
-run general/parser/select_across_vnodes.sim
-sleep 2000
-run general/parser/slimit1.sim
-sleep 2000
-run general/parser/tbnameIn.sim
-sleep 2000
+#sleep 2000
+#run general/parser/single_row_in_tb.sim
+#sleep 2000
+#run general/parser/select_from_cache_disk.sim
+#sleep 2000
+#run general/parser/selectResNum.sim
+#sleep 2000
+#run general/parser/mixed_blocks.sim
+#sleep 2000
+#run general/parser/limit1.sim
+#sleep 2000
+#run general/parser/limit.sim
+#sleep 2000
+#run general/parser/limit1_tblocks100.sim
+#sleep 2000
+#run general/parser/select_across_vnodes.sim
+#sleep 2000
+#run general/parser/slimit1.sim
+#sleep 2000
+#run general/parser/tbnameIn.sim
+#sleep 2000
 run general/parser/projection_limit_offset.sim
 sleep 2000
 run general/parser/limit2.sim
 sleep 2000
-run general/parser/fill.sim
-sleep 2000
-run general/parser/fill_stb.sim
-sleep 2000
-run general/parser/where.sim
-sleep 2000
-run general/parser/slimit.sim
-sleep 2000
-run general/parser/select_with_tags.sim
-sleep 2000
-run general/parser/interp.sim
-
+#run general/parser/fill.sim
+#sleep 2000
+#run general/parser/fill_stb.sim
+#sleep 2000
+#run general/parser/where.sim
+#sleep 2000
+#run general/parser/slimit.sim
+#sleep 2000
+#run general/parser/select_with_tags.sim
+#sleep 2000
+#run general/parser/interp.sim
 sleep 2000
 run general/parser/tags_dynamically_specifiy.sim
+sleep 2000
+run general/parser/groupby.sim
+
 sleep 2000
 run general/parser/set_tag_vals.sim
 
@@ -97,9 +99,6 @@ sleep 2000
 run general/parser/join.sim
 sleep 2000
 run general/parser/join_multivnode.sim
-
-sleep 2000
-run general/parser/groupby.sim
 sleep 2000
 run general/parser/binary_escapeCharacter.sim
 sleep 2000

From 3cad355909539c35d69749cfd5b56da0e53b1044 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 17:38:11 +0800
Subject: [PATCH 24/64] [td-225] handle super table missing error

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

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 63be743ef4..93a96eee13 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5833,9 +5833,11 @@ int32_t qCreateQueryInfo(void *tsdb, int32_t vgId, SQueryTableMsg *pQueryMsg, qi
         numOfGroupByCols = 0;
       }
       
-      // todo handle the error
-      /*int32_t ret =*/tsdbQuerySTableByTagCond(tsdb, id->uid, tagCond, pQueryMsg->tagCondLen, pQueryMsg->tagNameRelType, tbnameCond, &groupInfo, pGroupColIndex,
+      code = tsdbQuerySTableByTagCond(tsdb, id->uid, tagCond, pQueryMsg->tagCondLen, pQueryMsg->tagNameRelType, tbnameCond, &groupInfo, pGroupColIndex,
                                           numOfGroupByCols);
+      if (code != TSDB_CODE_SUCCESS) {
+        goto _over;
+      }
     } else {
       SArray* pTableGroup = taosArrayInit(1, POINTER_BYTES);
 

From fa27be4f8820253d5c0b9796c4e4ecc23db8d66c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 18:08:19 +0800
Subject: [PATCH 25/64] [td-225] fix bugs found by script

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

diff --git a/src/query/src/qfill.c b/src/query/src/qfill.c
index 8c8a50a3d8..a8cd62ef98 100644
--- a/src/query/src/qfill.c
+++ b/src/query/src/qfill.c
@@ -247,7 +247,7 @@ int taosDoLinearInterpolation(int32_t type, SPoint* point1, SPoint* point2, SPoi
 }
 
 static void setTagsValue(SFillInfo* pColInfo, tFilePage** data, char** pTags, int32_t start, int32_t num) {
-  for (int32_t j = 0, i = start; i < pColInfo->numOfCols + pColInfo->numOfTags; ++i, ++j) {
+  for (int32_t j = 0, i = start; i < pColInfo->numOfCols; ++i, ++j) {
     SFillColInfo* pCol = &pColInfo->pFillCol[i];
     
     char* val1 = elePtrAt(data[i]->data, pCol->col.bytes, num);
@@ -344,7 +344,7 @@ static void doInterpoResultImpl(SFillInfo* pFillInfo, tFilePage** data, int32_t*
       setTagsValue(pFillInfo, data, pTags, numOfValCols, *num);
   
     }
-  } else { /* default value interpolation */
+  } else { /* fill the default value */
     for (int32_t i = 1; i < numOfValCols; ++i) {
       SFillColInfo* pCol = &pFillInfo->pFillCol[i];
       

From 363fc8b93e334d4ae290da87e7ca556dae8feb22 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 18:08:50 +0800
Subject: [PATCH 26/64] [td-225] update the output log format

---
 src/tsdb/src/tsdbRead.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 46cc897eac..4a48bcefe7 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -193,7 +193,7 @@ TsdbQueryHandleT* tsdbQueryTables(TsdbRepoT* tsdb, STsdbQueryCond* pCond, STable
     }
   }
   
-  uTrace("%p total numOfTable:%d in query", pQueryHandle, taosArrayGetSize(pQueryHandle->pTableCheckInfo));
+  tsdbTrace("%p total numOfTable:%d in query", pQueryHandle, taosArrayGetSize(pQueryHandle->pTableCheckInfo));
 
   tsdbInitDataBlockLoadInfo(&pQueryHandle->dataBlockLoadInfo);
   tsdbInitCompBlockLoadInfo(&pQueryHandle->compBlockLoadInfo);
@@ -282,10 +282,10 @@ static bool initTableMemIterator(STsdbQueryHandle* pHandle, STableCheckInfo* pCh
   
     SDataRow row = SL_GET_NODE_DATA(node);
     TSKEY key = dataRowKey(row);  // first timestamp in buffer
-    uTrace("%p uid:%" PRId64", tid:%d check data in mem from skey:%" PRId64 ", order:%d, %p", pHandle,
+    tsdbTrace("%p uid:%" PRId64", tid:%d check data in mem from skey:%" PRId64 ", order:%d, %p", pHandle,
            pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, key, order, pHandle->qinfo);
   } else {
-    uTrace("%p uid:%" PRId64 ", tid:%d no data in mem", pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid);
+    tsdbTrace("%p uid:%" PRId64 ", tid:%d no data in mem", pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid);
   }
   
   if (!imemEmpty) {
@@ -294,10 +294,10 @@ static bool initTableMemIterator(STsdbQueryHandle* pHandle, STableCheckInfo* pCh
   
     SDataRow row = SL_GET_NODE_DATA(node);
     TSKEY key = dataRowKey(row);  // first timestamp in buffer
-    uTrace("%p uid:%" PRId64", tid:%d check data in imem from skey:%" PRId64 ", order:%d, %p", pHandle,
+    tsdbTrace("%p uid:%" PRId64", tid:%d check data in imem from skey:%" PRId64 ", order:%d, %p", pHandle,
            pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, key, order, pHandle->qinfo);
   } else {
-    uTrace("%p uid:%"PRId64", tid:%d no data in imem", pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid);
+    tsdbTrace("%p uid:%"PRId64", tid:%d no data in imem", pHandle, pCheckInfo->tableId.uid, pCheckInfo->tableId.tid);
   }
   
   return true;
@@ -338,7 +338,7 @@ static bool hasMoreDataInCache(STsdbQueryHandle* pHandle) {
 
   SDataRow row = SL_GET_NODE_DATA(node);
   pCheckInfo->lastKey = dataRowKey(row);  // first timestamp in buffer
-  uTrace("%p uid:%" PRId64", tid:%d check data in buffer from skey:%" PRId64 ", order:%d, %p", pHandle,
+  tsdbTrace("%p uid:%" PRId64", tid:%d check data in buffer from skey:%" PRId64 ", order:%d, %p", pHandle,
       pCheckInfo->tableId.uid, pCheckInfo->tableId.tid, pCheckInfo->lastKey, pHandle->order, pHandle->qinfo);
   
   // all data in mem are checked already.
@@ -1038,7 +1038,7 @@ static void doMergeTwoLevelData(STsdbQueryHandle* pQueryHandle, STableCheckInfo*
   cur->rows = numOfRows;
   cur->pos = pos;
 
-  uTrace("%p uid:%" PRIu64",tid:%d data block created, brange:%"PRIu64"-%"PRIu64" %p", pQueryHandle, cur->win.skey,
+  tsdbTrace("%p uid:%" PRIu64",tid:%d data block created, brange:%"PRIu64"-%"PRIu64" %p", pQueryHandle, cur->win.skey,
       cur->win.ekey, cur->rows, pQueryHandle->qinfo);
 }
 
@@ -1138,7 +1138,7 @@ static int32_t dataBlockOrderCompar(const void* pLeft, const void* pRight, void*
   if (pLeftBlockInfoEx->compBlock->offset == pRightBlockInfoEx->compBlock->offset &&
       pLeftBlockInfoEx->compBlock->last == pRightBlockInfoEx->compBlock->last) {
     // todo add more information
-    uError("error in header file, two block with same offset:%p", pLeftBlockInfoEx->compBlock->offset);
+    tsdbError("error in header file, two block with same offset:%p", pLeftBlockInfoEx->compBlock->offset);
   }
 
   return pLeftBlockInfoEx->compBlock->offset > pRightBlockInfoEx->compBlock->offset ? 1 : -1;
@@ -1200,7 +1200,7 @@ static int32_t createDataBlocksInfo(STsdbQueryHandle* pQueryHandle, int32_t numO
     numOfQualTables++;
   }
 
-  uTrace("%p create data blocks info struct completed, %d blocks in %d tables", pQueryHandle, cnt, numOfQualTables);
+  tsdbTrace("%p create data blocks info struct completed, %d blocks in %d tables", pQueryHandle, cnt, numOfQualTables);
 
   assert(cnt <= numOfBlocks && numOfQualTables <= numOfTables);  // the pTableQueryInfo[j]->numOfBlocks may be 0
   sup.numOfTables = numOfQualTables;
@@ -1236,7 +1236,7 @@ static int32_t createDataBlocksInfo(STsdbQueryHandle* pQueryHandle, int32_t numO
    * }
    */
 
-  uTrace("%p %d data blocks sort completed", pQueryHandle, cnt);
+  tsdbTrace("%p %d data blocks sort completed", pQueryHandle, cnt);
   cleanBlockOrderSupporter(&sup, numOfTables);
   free(pTree);
 
@@ -1257,7 +1257,7 @@ static bool getDataBlocksInFilesImpl(STsdbQueryHandle* pQueryHandle) {
       break;
     }
     
-    uTrace("%p %d blocks found in file for %d table(s), fid:%d", pQueryHandle, numOfBlocks,
+    tsdbTrace("%p %d blocks found in file for %d table(s), fid:%d", pQueryHandle, numOfBlocks,
            numOfTables, pQueryHandle->pFileGroup->fileId);
     
     assert(numOfBlocks >= 0);
@@ -1583,7 +1583,7 @@ static int tsdbReadRowsFromCache(SSkipListIterator* pIter, STable* pTable, TSKEY
     if ((key > maxKey && ASCENDING_TRAVERSE(pQueryHandle->order)) ||
         (key < maxKey && !ASCENDING_TRAVERSE(pQueryHandle->order))) {
       
-      uTrace("%p key:%"PRIu64" beyond qrange:%"PRId64" - %"PRId64", no more data in buffer", pQueryHandle, key, pQueryHandle->window.skey,
+      tsdbTrace("%p key:%"PRIu64" beyond qrange:%"PRId64" - %"PRId64", no more data in buffer", pQueryHandle, key, pQueryHandle->window.skey,
           pQueryHandle->window.ekey);
       
       break;
@@ -1958,7 +1958,7 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
   
   size_t size = taosArrayGetSize(pTableList);
   if (size == 0) {
-    uTrace("no qualified tables");
+    tsdbTrace("no qualified tables");
     return pTableGroup;
   }
   
@@ -1970,7 +1970,7 @@ SArray* createTableGroup(SArray* pTableList, STSchema* pTagSchema, SColIndex* pC
     }
     
     taosArrayPush(pTableGroup, &sa);
-    uTrace("all %d tables belong to one group", size);
+    tsdbTrace("all %d tables belong to one group", size);
   } else {
     STableGroupSupporter *pSupp = (STableGroupSupporter *) calloc(1, sizeof(STableGroupSupporter));
     pSupp->tsdbMeta = tsdbGetMeta(tsdb);
@@ -2069,12 +2069,12 @@ int32_t tsdbQuerySTableByTagCond(TsdbRepoT* tsdb, uint64_t uid, const char* pTag
                                  SColIndex* pColIndex, int32_t numOfCols) {
   STable* pTable = tsdbGetTableByUid(tsdbGetMeta(tsdb), uid);
   if (pTable == NULL) {
-    uError("%p failed to get stable, uid:%" PRIu64, tsdb, uid);
+    tsdbError("%p failed to get stable, uid:%" PRIu64, tsdb, uid);
     return TSDB_CODE_INVALID_TABLE_ID;
   }
   
   if (pTable->type != TSDB_SUPER_TABLE) {
-    uError("%p query normal tag not allowed, uid:%" PRIu64 ", tid:%d, name:%s",
+    tsdbError("%p query normal tag not allowed, uid:%" PRIu64 ", tid:%d, name:%s",
            tsdb, uid, pTable->tableId.tid, pTable->name);
     
     return TSDB_CODE_OPS_NOT_SUPPORT; //basically, this error is caused by invalid sql issued by client
@@ -2090,7 +2090,7 @@ int32_t tsdbQuerySTableByTagCond(TsdbRepoT* tsdb, uint64_t uid, const char* pTag
       pGroupInfo->numOfTables = taosArrayGetSize(res);
       pGroupInfo->pGroupList  = createTableGroup(res, pTagSchema, pColIndex, numOfCols, tsdb);
       
-      uTrace("no tbname condition or tagcond, all tables belongs to one group, numOfTables:%d", pGroupInfo->numOfTables);
+      tsdbTrace("no tbname condition or tagcond, all tables belongs to one group, numOfTables:%d", pGroupInfo->numOfTables);
     } else {
       // todo add error
     }

From ceb929764b51bb0f498db3a9db071a473d08da93 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 18:15:53 +0800
Subject: [PATCH 27/64] [td-225] fix memory leaks

---
 src/query/src/qfill.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/query/src/qfill.c b/src/query/src/qfill.c
index a8cd62ef98..84b2b2c5cf 100644
--- a/src/query/src/qfill.c
+++ b/src/query/src/qfill.c
@@ -110,6 +110,12 @@ void taosDestoryFillInfo(SFillInfo* pFillInfo) {
   tfree(pFillInfo->prevValues);
   tfree(pFillInfo->nextValues);
   tfree(pFillInfo->pTags);
+  
+  for(int32_t i = 0; i < pFillInfo->numOfCols; ++i) {
+    tfree(pFillInfo->pData[i]);
+  }
+  
+  tfree(pFillInfo->pData);
   tfree(pFillInfo);
 }
 

From 15bc41f5e328df040ccc6859815df81d3e57ace4 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 18:16:36 +0800
Subject: [PATCH 28/64] [td-225] add query cost summary right before the qinfo
 is destoried.

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

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 93a96eee13..2e9069bbf1 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3664,10 +3664,8 @@ int32_t doFillGapsInResults(SQueryRuntimeEnv* pRuntimeEnv, tFilePage **pDst, int
   }
 }
 
-void queryCostStatis(SQInfo *pQInfo) {
+static void queryCostStatis(SQInfo *pQInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
-//  SQuery *pQuery = pRuntimeEnv->pQuery;
-
   SQueryCostInfo *pSummary = &pRuntimeEnv->summary;
 //  if (pRuntimeEnv->pResultBuf == NULL) {
 ////    pSummary->tmpBufferInDisk = 0;
@@ -4790,7 +4788,6 @@ static void tableQueryImpl(SQInfo *pQInfo) {
     }
 
     qTrace("QInfo:%p query over, %d rows are returned", pQInfo, pQuery->rec.total);
-    queryCostStatis(pQInfo);
     return;
   }
 
@@ -4822,10 +4819,6 @@ static void tableQueryImpl(SQInfo *pQInfo) {
   } else {// todo set the table uid and tid in log
     qTrace("QInfo:%p query paused, %" PRId64 " rows returned, numOfTotal:%" PRId64 " rows",
         pQInfo, pQuery->rec.rows, pQuery->rec.total + pQuery->rec.rows);
-    
-    if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
-      queryCostStatis(pQInfo);
-    }
   }
 }
 
@@ -5877,6 +5870,9 @@ _over:
 
 void qDestroyQueryInfo(qinfo_t pQInfo) {
   qTrace("QInfo:%p query completed", pQInfo);
+  
+  // print the query cost summary
+  queryCostStatis(pQInfo);
   freeQInfo(pQInfo);
 }
 

From 0211243730293863ea57f8ccb728681f936adf58 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 2 Jun 2020 10:16:50 +0000
Subject: [PATCH 29/64] TD-90

---
 src/common/src/tdataformat.c | 61 ++++++++++++++++++++----------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 920c612612..8a408cc519 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -484,35 +484,44 @@ int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
   void *   ptr = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_GE);
 
   if (ptr == NULL || ((SColIdx *)ptr)->colId < colId) { // need to add a column value to the row
-    // int tlen = kvDataRowLen(row) + sizeof(SColIdx) + (IS_VAR_DATA_TYPE(type) ? varDataTLen(value) :
-    // TYPE_BYTES[type]); nrow = malloc(tlen); if (nrow == NULL) return NULL;
+    int diff = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
+    nrow = malloc(kvRowLen(row) + sizeof(SColIdx) + diff);
+    if (nrow == NULL) return -1;
 
-    // kvDataRowSetNCols(nrow, kvDataRowNCols(row)+1);
-    // kvDataRowSetLen(nrow, tlen);
+    kvRowSetLen(nrow, kvRowLen(row) + sizeof(SColIdx) + diff);
+    kvRowSetNCols(nrow, kvRowNCols(row) + 1);
 
-    // if (ptr == NULL) ptr = kvDataRowValues(row);
+    if (ptr == NULL) {
+      memcpy(kvRowColIdx(nrow), kvRowColIdx(row), sizeof(SColIdx) * kvRowNCols(row));
+      memcpy(kvRowValues(nrow), kvRowValues(row), POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row)));
+      int colIdx = kvRowNCols(nrow) - 1;
+      kvRowColIdxAt(nrow, colIdx)->colId = colId;
+      kvRowColIdxAt(nrow, colIdx)->offset = POINTER_DISTANCE(kvRowEnd(row), kvRowValues(row));
+      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx)), value, diff);
+    } else {
+      int16_t tlen = POINTER_DISTANCE(ptr, kvRowColIdx(row));
+      if (tlen > 0) {
+        memcpy(kvRowColIdx(nrow), kvRowColIdx(row), tlen);
+        memcpy(kvRowValues(nrow), kvRowValues(row), ((SColIdx *)ptr)->offset);
+      }
 
-    // // Copy the columns before the col
-    // if (POINTER_DISTANCE(ptr, kvDataRowColIdx(row)) > 0) {
-    //   memcpy(kvDataRowColIdx(nrow), kvDataRowColIdx(row), POINTER_DISTANCE(ptr, kvDataRowColIdx(row)));
-    //   memcpy(kvDataRowValues(nrow), kvDataRowValues(row), ((SColIdx *)ptr)->offset); // TODO: here is not correct
-    // }
+      int colIdx = tlen / sizeof(SColIdx);
+      kvRowColIdxAt(nrow, colIdx)->colId = colId;
+      kvRowColIdxAt(nrow, colIdx)->offset = ((SColIdx *)ptr)->offset;
+      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx)), value, diff);
 
-    // // Set the new col value
-    // pColIdx = (SColIdx *)POINTER_SHIFT(nrow, POINTER_DISTANCE(ptr, row));
-    // pColIdx->colId = colId;
-    // pColIdx->offset = ((SColIdx *)ptr)->offset; // TODO: here is not correct
+      for (int i = colIdx; i < kvRowNCols(row); i++) {
+        kvRowColIdxAt(nrow, i + 1)->colId = kvRowColIdxAt(row, i)->colId;
+        kvRowColIdxAt(nrow, i + 1)->offset = kvRowColIdxAt(row, i)->offset + diff;
+      }
+      memcpy(kvRowColVal(nrow, kvRowColIdxAt(nrow, colIdx + 1)), kvRowColVal(row, kvRowColIdxAt(row, colIdx)),
+             POINTER_DISTANCE(kvRowEnd(row), kvRowColVal(row, kvRowColIdxAt(row, colIdx)))
 
-    // if (IS_VAR_DATA_TYPE(type)) {
-    //   memcpy(POINTER_SHIFT(kvDataRowValues(nrow), pColIdx->offset), value, varDataLen(value));
-    // } else {
-    //   memcpy(POINTER_SHIFT(kvDataRowValues(nrow), pColIdx->offset), value, TYPE_BYTES[type]);
-    // }
+      );
+    }
 
-    // // Copy the columns after the col
-    // if (POINTER_DISTANCE(kvDataRowValues(row), ptr) > 0) {
-    //   // TODO: memcpy();
-    // }
+    *orow = nrow;
+    free(row);
   } else {
     ASSERT(((SColIdx *)ptr)->colId == colId);
     if (IS_VAR_DATA_TYPE(type)) {
@@ -525,9 +534,7 @@ int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
         int16_t nlen = kvRowLen(row) + diff;
         ASSERT(nlen > 0);
         nrow = malloc(nlen);
-        if (nrow == NULL) {
-          // TODO: deal with the error here
-        }
+        if (nrow == NULL) return -1;
 
         kvRowSetLen(nrow, nlen);
         kvRowSetNCols(nrow, kvRowNCols(row));
@@ -558,8 +565,8 @@ int tdSetKVRowDataOfCol(SKVRow *orow, int16_t colId, int8_t type, void *value) {
                  POINTER_DISTANCE(kvRowEnd(row), kvRowColVal(row, kvRowColIdxAt(row, colIdx + 1))));
         }
 
-        free(row);
         *orow = nrow;
+        free(row);
       }
     } else {
       memcpy(kvRowColVal(row, (SColIdx *)ptr), value, TYPE_BYTES[type]);

From 2ed00136f9a46885bcec12e36ed6740967b635ca Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 18:21:34 +0800
Subject: [PATCH 30/64] [td-225] fix memory leaks.

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

diff --git a/src/query/src/qfill.c b/src/query/src/qfill.c
index 84b2b2c5cf..7b3ea5c1f0 100644
--- a/src/query/src/qfill.c
+++ b/src/query/src/qfill.c
@@ -116,6 +116,8 @@ void taosDestoryFillInfo(SFillInfo* pFillInfo) {
   }
   
   tfree(pFillInfo->pData);
+  tfree(pFillInfo->pFillCol);
+  
   tfree(pFillInfo);
 }
 

From 2d6d09ad1b0676c9e1949aed3c02e1c50203b5fc Mon Sep 17 00:00:00 2001
From: Shuaiqiang Chang <sqchang@taosdata.com>
Date: Tue, 2 Jun 2020 18:27:04 +0800
Subject: [PATCH 31/64] feat: taosdemo, taosdump

---
 src/kit/taosdemo/taosdemo.c |  51 +++++++++--------
 src/kit/taosdump/taosdump.c | 109 ++++++++++++++++--------------------
 2 files changed, 75 insertions(+), 85 deletions(-)

diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index cf84ecad43..1cdff80faa 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -708,27 +708,24 @@ void *readTable(void *sarg) {
       sprintf(command, "select %s from %s%d where ts>= %" PRId64, aggreFunc[j], tb_prefix, i, sTime);
 
       double t = getCurrentTime();
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "Failed to query\n");
+      TAOS_RES *pSql = taos_query(taos, command);
+      int32_t code = taos_errno(pSql);
+
+      if (code != 0) {
+        fprintf(stderr, "Failed to query:%s\n", taos_errstr(taos));
+        taos_free_result(pSql);
         taos_close(taos);
         exit(EXIT_FAILURE);
       }
 
-      TAOS_RES *result = taos_use_result(taos);
-      if (result == NULL) {
-        fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
-        taos_close(taos);
-        exit(1);
-      }
-
-      while (taos_fetch_row(result) != NULL) {
+      while (taos_fetch_row(pSql) != NULL) {
         count++;
       }
 
       t = getCurrentTime() - t;
       totalT += t;
 
-      taos_free_result(result);
+      taos_free_result(pSql);
     }
 
     fprintf(fp, "|%10s  |   %10d   |  %12.2f   |   %10.2f  |\n",
@@ -779,20 +776,18 @@ void *readMetric(void *sarg) {
       fprintf(fp, "%s\n", command);
 
       double t = getCurrentTime();
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "Failed to query\n");
-        taos_close(taos);
-        exit(EXIT_FAILURE);
-      }
 
-      TAOS_RES *result = taos_use_result(taos);
-      if (result == NULL) {
-        fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
+      TAOS_RES *pSql = taos_query(taos, command);
+      int32_t code = taos_errno(pSql);
+
+      if (code != 0) {
+        fprintf(stderr, "Failed to query:%s\n", taos_errstr(taos));
+        taos_free_result(pSql);
         taos_close(taos);
         exit(1);
       }
       int count = 0;
-      while (taos_fetch_row(result) != NULL) {
+      while (taos_fetch_row(pSql) != NULL) {
         count++;
       }
       t = getCurrentTime() - t;
@@ -800,7 +795,7 @@ void *readMetric(void *sarg) {
       fprintf(fp, "| Speed: %12.2f(per s) | Latency: %.4f(ms) |\n", num_of_tables * num_of_DPT / t, t * 1000);
       printf("select %10s took %.6f second(s)\n\n", aggreFunc[j], t);
 
-      taos_free_result(result);
+      taos_free_result(pSql);
     }
     fprintf(fp, "\n");
   }
@@ -811,10 +806,19 @@ void *readMetric(void *sarg) {
 
 void queryDB(TAOS *taos, char *command) {
   int i = 5;
-  while (i > 0) {
-    if (taos_query(taos, command) == 0) break;
+  TAOS_RES *pSql = NULL;
+  int32_t code = -1;
+  while (i > 0 && code != 0) {
+    pSql = taos_query(taos, command);
+    code = taos_errno(pSql);
+    taos_free_result(pSql);
+    pSql = NULL;
+    if (code == 0) {
+      break;
+    }
     i--; 
   }
+
   if (i == 0) {
     fprintf(stderr, "Failed to run %s, reason: %s\n", command, taos_errstr(taos));
     taos_close(taos);
@@ -947,6 +951,7 @@ void callBack(void *param, TAOS_RES *res, int code) {
       break;
     }
   }
+   tb_info->timestamp = tmp_time;
 
   taos_query_a(tb_info->taos, buffer, callBack, tb_info);
 
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index 9886a91f48..6b7ffb2001 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -372,14 +372,12 @@ int taosGetTableRecordInfo(char *table, STableRecordInfo *pTableRecordInfo) {
   memset(pTableRecordInfo, 0, sizeof(STableRecordInfo));
 
   sprintf(command, "show tables like %s", table);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
+  TAOS_RES *result = taos_query(taos, command);\
+  int32_t code = taos_errno(result);
 
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
+  if (code != 0) {
+    fprintf(stderr, "failed to run command %s, error: %s\n", command, taos_errstr(result));
+    taos_free_result(result);
     return -1;
   }
 
@@ -400,14 +398,12 @@ int taosGetTableRecordInfo(char *table, STableRecordInfo *pTableRecordInfo) {
   if (isSet) return 0;
 
   sprintf(command, "show stables like %s", table);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
 
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
+  result = taos_query(taos, command);
+  code = taos_errno(result);
+  if (code != 0) {
+    fprintf(stderr, "failed to run command %s, error: %s\n", command, taos_errstr(result));
+    taos_free_result(result);
     return -1;
   }
 
@@ -467,14 +463,11 @@ int taosDumpOut(SDumpArguments *arguments) {
   taosDumpCharset(fp);
 
   sprintf(command, "show databases");
-  if (taos_query(taos, command) != 0) {
+  result = taos_query(taos, command);
+  int32_t code = taos_errno(result);
+  if (code != 0) {
     fprintf(stderr, "failed to run command: %s, reason: %s\n", command, taos_errstr(taos));
-    goto _exit_failure;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
+    taos_free_result(result);
     goto _exit_failure;
   }
 
@@ -612,7 +605,7 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) {
   taosDumpCreateDbClause(dbInfo, arguments->with_property, fp);
 
   sprintf(command, "use %s", dbInfo->name);
-  if (taos_query(taos, command) != 0) {
+  if (taos_errno(taos_query(taos, command)) != 0) {
     fprintf(stderr, "invalid database %s\n", dbInfo->name);
     return -1;
   }
@@ -620,14 +613,11 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) {
   fprintf(fp, "USE %s\n\n", dbInfo->name);
 
   sprintf(command, "show tables");
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
+  result = taos_query(taos,command);
+  int32_t code = taos_errno(result);
+  if (code != 0) {
+    fprintf(stderr, "failed to run command %s, error: %s\n", command, taos_errstr(result));
+    taos_free_result(result);
     return -1;
   }
 
@@ -725,14 +715,11 @@ void taosDumpCreateMTableClause(STableDef *tableDes, char *metric, int numOfCols
     TAOS_ROW row = NULL;
 
     sprintf(command, "select %s from %s limit 1", tableDes->cols[counter].field, tableDes->name);
-    if (taos_query(taos, command) != 0) {
-      fprintf(stderr, "failed to run command %s\n", command);
-      return;
-    }
 
-    result = taos_use_result(taos);
-    if (result == NULL) {
-      fprintf(stderr, "failed to use result\n");
+    result = taos_query(taos, command);
+    int32_t code = taos_errno(result);
+    if (code != 0) {
+      fprintf(stderr, "failed to run command %s, error: %s\n", command, taos_errstr(result));
       return;
     }
 
@@ -806,14 +793,12 @@ int taosGetTableDes(char *table, STableDef *tableDes) {
   int count = 0;
 
   sprintf(command, "describe %s", table);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
 
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
+  result = taos_query(taos, command);
+  int32_t code = taos_errno(result);
+  if (code != 0) {
+    fprintf(stderr, "failed to run command %s, error: %s\n", command, taos_errstr(result));
+    taos_free_result(result);
     return -1;
   }
 
@@ -889,14 +874,11 @@ int32_t taosDumpMetric(char *metric, SDumpArguments *arguments, FILE *fp) {
   strcpy(tableRecord.metric, metric);
 
   sprintf(command, "select tbname from %s", metric);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s\n", command);
-    return -1;
-  }
-
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
+  result = taos_query(taos, command);
+  int32_t code = taos_errno(result);
+  if (code != 0) {
+    fprintf(stderr, "failed to run command %s, error: %s\n", command, taos_errstr(result));
+    taos_free_result(result);
     return -1;
   }
 
@@ -942,18 +924,16 @@ int taosDumpTableData(FILE *fp, char *tbname, SDumpArguments *arguments) {
 
   sprintf(command, "select * from %s where _c0 >= %" PRId64 " and _c0 <= %" PRId64 " order by _c0 asc", tbname, arguments->start_time,
           arguments->end_time);
-  if (taos_query(taos, command) != 0) {
-    fprintf(stderr, "failed to run command %s, reason: %s\n", command, taos_errstr(taos));
+          
+  result = taos_query(taos, command);
+  int32_t code = taos_errno(result);
+  if (code != 0) {
+    fprintf(stderr, "failed to run command %s, reason: %s\n", command, taos_errstr(result));
+    taos_free_result(result);
     return -1;
   }
 
-  result = taos_use_result(taos);
-  if (result == NULL) {
-    fprintf(stderr, "failed to use result\n");
-    return -1;
-  }
-
-  numFields = taos_field_count(taos);
+  numFields = taos_field_count(result);
   assert(numFields > 0);
   TAOS_FIELD *fields = taos_fetch_fields(result);
   tbuf = (char *)malloc(COMMAND_SIZE);
@@ -1242,9 +1222,14 @@ int taosDumpIn(SDumpArguments *arguments) {
         tcommand = command;
       }
       taosReplaceCtrlChar(tcommand);
-      if (taos_query(taos, tcommand) != 0)
+      result = taos_query(taos, tcommand);
+      int32_t code = taos_errno(result);
+      if (code != 0) 
+      {
         fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason: %s \ncontinue...\n", linenu, command,
                 taos_errstr(taos));
+      }
+      taos_free_result(result);
     }
 
     pstr = command;

From c4e08bbfe9a9f45207f6d776474b92fbd0dbfb3c Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 19:02:22 +0800
Subject: [PATCH 32/64] [td-225] update the slow query buffer

---
 src/client/src/tscProfile.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index ee89b5f580..8585a3dac7 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -89,12 +89,22 @@ void tscSaveSlowQueryFp(void *handle, void *tmrId) {
 
 void tscSaveSlowQuery(SSqlObj *pSql) {
   const static int64_t SLOW_QUERY_INTERVAL = 3000000L;
-  if (pSql->res.useconds < SLOW_QUERY_INTERVAL) return;
+  size_t size = 200;  // other part of sql string, expect the main sql str
+  
+  if (pSql->res.useconds < SLOW_QUERY_INTERVAL) {
+    return;
+  }
 
   tscTrace("%p query time:%" PRId64 " sql:%s", pSql, pSql->res.useconds, pSql->sqlstr);
-
-  char *sql = malloc(200);
-  int   len = snprintf(sql, 190, "insert into %s.slowquery values(now, '%s', %" PRId64 ", %" PRId64 ", '", tsMonitorDbName,
+  int32_t sqlSize = TSDB_SHOW_SQL_LEN + size;
+  
+  char *sql = malloc(sqlSize);
+  if (sql == NULL) {
+    tscError("%p failed to allocate memory to sent slow to dnode", pSql);
+    return;
+  }
+  
+  int len = snprintf(sql, size, "insert into %s.slowquery values(now, '%s', %" PRId64 ", %" PRId64 ", '", tsMonitorDbName,
           pSql->pTscObj->user, pSql->stime, pSql->res.useconds);
   int sqlLen = snprintf(sql + len, TSDB_SHOW_SQL_LEN, "%s", pSql->sqlstr);
   if (sqlLen > TSDB_SHOW_SQL_LEN - 1) {

From 40513a8dc951d03e6fa8c3c9d11d1a8da6b76878 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Tue, 2 Jun 2020 11:10:28 +0000
Subject: [PATCH 33/64] TD-90

---
 src/inc/taoserror.h        |  1 +
 src/inc/tsdb.h             |  1 +
 src/tsdb/src/tsdbMain.c    | 30 ++++++++++++++++++++++++++++++
 src/vnode/src/vnodeWrite.c | 16 +++++++++++-----
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index db910c9cae..474eeb4f86 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -172,6 +172,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_FILE_FORMAT,        0, 0x0500, "invalid file
 
 // TSDB
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CONFIG,             0, 0x0580, "invalid TSDB configuration")
+TAOS_DEFINE_ERROR(TSDB_CODE_TAG_VER_OUT_OF_DATE,        0, 0x0581, "tag version is out of date")
 
 
 #ifdef TAOS_ERROR_C
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 3680a46d85..a2b5b44878 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -115,6 +115,7 @@ STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg);
 int   tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg);
 int   tsdbDropTable(TsdbRepoT *pRepo, STableId tableId);
 int   tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg);
+int   tsdbUpdateTagValue(TsdbRepoT *repo, SUpdateTableTagValMsg *pMsg);
 TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, uint64_t uid);
 
 uint32_t tsdbGetFileInfo(TsdbRepoT *repo, char *name, uint32_t *index, int32_t *size);
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index e79873d1b9..abce4e9a62 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -410,6 +410,36 @@ int tsdbAlterTable(TsdbRepoT *pRepo, STableCfg *pCfg) {
   return 0;
 }
 
+int tsdbUpdateTagValue(TsdbRepoT *repo, SUpdateTableTagValMsg *pMsg) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
+  int16_t    tversion = htons(pMsg->tversion);
+
+  STable *pTable = tsdbGetTableByUid(pMeta, htobe64(pMsg->uid));
+  if (pTable == NULL) return TSDB_CODE_INVALID_TABLE_ID;
+  if (pTable->tableId.tid != htonl(pMsg->tid)) return TSDB_CODE_INVALID_TABLE_ID;
+
+  if (pTable->type != TSDB_CHILD_TABLE) {
+    tsdbError("vgId:%d failed to update tag value of table %s since its type is %d", pRepo->config.tsdbId,
+              varDataVal(pTable->name), pTable->type);
+    return TSDB_CODE_INVALID_TABLE_TYPE;
+  }
+
+  if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) > tversion) {
+    // TODO: Need to update
+  }
+
+  if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) > tversion) {
+    tsdbError(
+        "vgId:%d failed to update tag value of table %s since version out of date, client tag version:%d server tag "
+        "version:%d",
+        pRepo->config.tsdbId, varDataVal(pTable->name), tversion, schemaVersion(pTable->tagSchema));
+    return TSDB_CODE_TAG_VER_OUT_OF_DATE;
+  }
+  tdSetKVRowDataOfCol(&pTable->tagVal, htons(pMsg->colId), htons(pMsg->type), pMsg->data);
+  return TSDB_CODE_SUCCESS;
+}
+
 TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, uint64_t uid) {
   STsdbRepo *pRepo = (STsdbRepo *)repo;
 
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 73d58527b5..a605d20cac 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -29,11 +29,12 @@
 #include "tcq.h"
 
 static int32_t (*vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MAX])(SVnodeObj *, void *, SRspRet *);
-static int32_t  vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
-static int32_t  vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
-static int32_t  vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
-static int32_t  vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
-static int32_t  vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pMsg, SRspRet *);
+static int32_t vnodeProcessUpdateTagValMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet);
 
 void vnodeInitWriteFp(void) {
   vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_SUBMIT]          = vnodeProcessSubmitMsg;
@@ -41,6 +42,7 @@ void vnodeInitWriteFp(void) {
   vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_DROP_TABLE]   = vnodeProcessDropTableMsg;
   vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_ALTER_TABLE]  = vnodeProcessAlterTableMsg;
   vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_MD_DROP_STABLE]  = vnodeProcessDropStableMsg;
+  vnodeProcessWriteMsgFp[TSDB_MSG_TYPE_UPDATE_TAG_VAL]  = vnodeProcessUpdateTagValMsg;
 }
 
 int32_t vnodeProcessWrite(void *param1, int qtype, void *param2, void *item) {
@@ -156,6 +158,10 @@ static int32_t vnodeProcessDropStableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
   return code;
 }
 
+static int32_t vnodeProcessUpdateTagValMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+  return tsdbUpdateTagValue(pVnode->tsdb, (SUpdateTableTagValMsg *)pCont);
+}
+
 int vnodeWriteToQueue(void *param, void *data, int type) {
   SVnodeObj *pVnode = param;
   SWalHead *pHead = data;

From 52b8bd52d5f569f8073495f38a456fd25b866f85 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 19:14:22 +0800
Subject: [PATCH 34/64] [td-225] update script

---
 src/client/src/tscProfile.c                  | 2 +-
 tests/script/general/parser/limit2_query.sim | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index 8585a3dac7..161591959b 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -88,7 +88,7 @@ void tscSaveSlowQueryFp(void *handle, void *tmrId) {
 }
 
 void tscSaveSlowQuery(SSqlObj *pSql) {
-  const static int64_t SLOW_QUERY_INTERVAL = 3000000L;
+  const static int64_t SLOW_QUERY_INTERVAL = 3000000L; // todo configurable
   size_t size = 200;  // other part of sql string, expect the main sql str
   
   if (pSql->res.useconds < SLOW_QUERY_INTERVAL) {
diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
index cbff2e946c..93ed062aec 100644
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
@@ -182,6 +182,7 @@ $limit = $rowNum
 $offset = $limit / 2
 sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(prev) limit $limit offset $offset
 if $rows != $limit then
+  print expect $limit, actual: $rows
   return -1
 endi
 

From c90b556f9dd6ec2e015373ed81a624d26164cc76 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 19:15:49 +0800
Subject: [PATCH 35/64] [td-225] update script

---
 tests/script/general/parser/limit2_query.sim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
index 93ed062aec..ed41a9b5c4 100644
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
@@ -133,6 +133,7 @@ $limit = $rowNum
 $offset = $limit / 2
 sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(value, -1, -2) limit $limit offset $offset
 if $rows != $limit then
+  print expect $limit, actual $rows
   return -1
 endi
 if $data01 != 0 then

From b91c70485b6aefee1e10cf18fde1ae3cad3149f9 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Tue, 2 Jun 2020 19:17:43 +0800
Subject: [PATCH 36/64] [td-225] update script

---
 tests/script/general/parser/limit2_query.sim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/script/general/parser/limit2_query.sim b/tests/script/general/parser/limit2_query.sim
index ed41a9b5c4..1dbd0f32bd 100644
--- a/tests/script/general/parser/limit2_query.sim
+++ b/tests/script/general/parser/limit2_query.sim
@@ -148,6 +148,7 @@ $limit = $rowNum
 $offset = $limit / 2
 sql select max(c1), min(c2), sum(c3), avg(c4), stddev(c5), spread(c6), first(c7), last(c8), first(c9) from $tb where ts >= $ts0 and ts <= $tsu interval(5m) fill(linear) limit $limit offset $offset
 if $rows != $limit then
+  print expect $limit, actual $rows
   return -1
 endi
 if $data01 != 0 then

From 8a5fa81b71abc4bedf96175808a4bae4fd4be944 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 02:15:34 +0000
Subject: [PATCH 37/64] TD-90

---
 src/inc/tsdb.h            |  1 +
 src/tsdb/src/tsdbMain.c   | 10 ++++++++--
 src/vnode/src/vnodeMain.c |  2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index a2b5b44878..3f3ad8dc9a 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -45,6 +45,7 @@ typedef struct {
   int (*eventCallBack)(void *);
   void *(*cqCreateFunc)(void *handle, int sid, char *sqlStr, STSchema *pSchema);
   void (*cqDropFunc)(void *handle);
+  void *(*configFunc)(int32_t vgId, int32_t sid);
 } STsdbAppH;
 
 // --------- TSDB REPOSITORY CONFIGURATION DEFINITION
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index abce4e9a62..15a6ca2403 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -425,8 +425,14 @@ int tsdbUpdateTagValue(TsdbRepoT *repo, SUpdateTableTagValMsg *pMsg) {
     return TSDB_CODE_INVALID_TABLE_TYPE;
   }
 
-  if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) > tversion) {
-    // TODO: Need to update
+  if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) < tversion) {
+    tsdbTrace("vgId:%d server tag version %d is older than client tag version %d, try to config", pRepo->config.tsdbId,
+              schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)), tversion);
+    void *msg = (*pRepo->appH.configFunc)(pRepo->config.tsdbId, htonl(pMsg->tid));
+    // Deal with error her
+    STableCfg *pTableCfg = tsdbCreateTableCfgFromMsg(msg);
+
+    ASSERT(pTableCfg != NULL);
   }
 
   if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) > tversion) {
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 87ee5c2c1c..c2831c3bd5 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -224,6 +224,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   appH.cqH = pVnode->cq;
   appH.cqCreateFunc = cqCreate;
   appH.cqDropFunc = cqDrop;
+  appH.configFunc = dnodeSendCfgTableToRecv;
   sprintf(temp, "%s/tsdb", rootDir);
   pVnode->tsdb = tsdbOpenRepo(temp, &appH);
   if (pVnode->tsdb == NULL) {
@@ -473,6 +474,7 @@ static void vnodeNotifyFileSynced(void *ahandle, uint64_t fversion) {
   appH.cqH = pVnode->cq;
   appH.cqCreateFunc = cqCreate;
   appH.cqDropFunc = cqDrop;
+  appH.configFunc = dnodeSendCfgTableToRecv;
   pVnode->tsdb = tsdbOpenRepo(rootDir, &appH);
 }
 

From 46138ef49256de45bc263e825bfc0ade5ca19211 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 3 Jun 2020 02:37:16 +0000
Subject: [PATCH 38/64] errr while config table

---
 src/mnode/src/mnodeTable.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index 84a1f659d5..c37dd8d382 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1352,11 +1352,13 @@ static void *mnodeBuildCreateChildTableMsg(SCMCreateTableMsg *pMsg, SChildTableO
   int32_t tagDataLen = 0;
   int32_t totalCols = 0;
   int32_t contLen = 0;
-  if (pTable->info.type == TSDB_CHILD_TABLE && pMsg != NULL) {
-    pTagData = (STagData*)pMsg->schema;
-    tagDataLen = ntohl(pTagData->dataLen);
+  if (pTable->info.type == TSDB_CHILD_TABLE) {
     totalCols = pTable->superTable->numOfColumns + pTable->superTable->numOfTags;
     contLen = sizeof(SMDCreateTableMsg) + totalCols * sizeof(SSchema) + tagDataLen + pTable->sqlLen;
+    if (pMsg != NULL) {
+      pTagData = (STagData *)pMsg->schema;
+      tagDataLen = ntohl(pTagData->dataLen);
+    }
   } else {
     totalCols = pTable->numOfColumns;
     contLen = sizeof(SMDCreateTableMsg) + totalCols * sizeof(SSchema) + pTable->sqlLen;
@@ -1406,11 +1408,11 @@ static void *mnodeBuildCreateChildTableMsg(SCMCreateTableMsg *pMsg, SChildTableO
     pSchema++;
   }
 
-  if (pTable->info.type == TSDB_CHILD_TABLE && pMsg != NULL) {
+  if (pTable->info.type == TSDB_CHILD_TABLE && pTagData != NULL) {
     memcpy(pCreate->data + totalCols * sizeof(SSchema), pTagData->data, tagDataLen);
   }
 
-  if (pTable->info.type == TSDB_STREAM_TABLE && pMsg != NULL) {
+  if (pTable->info.type == TSDB_STREAM_TABLE) {
     memcpy(pCreate->data + totalCols * sizeof(SSchema), pTable->sql, pTable->sqlLen);
   }
 

From fc0cfd875b09d32f5700370aad4e21804913d90f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 03:03:28 +0000
Subject: [PATCH 39/64] TD-90

---
 src/tsdb/inc/tsdbMain.h |  1 +
 src/tsdb/src/tsdbMain.c | 27 ++++++++++++++++++++-------
 src/tsdb/src/tsdbMeta.c |  4 ++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index ded5f6eb36..c4e929e3cd 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -506,6 +506,7 @@ int     tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks);
 void    tsdbAdjustCacheBlocks(STsdbCache *pCache);
 int32_t tsdbGetMetaFileName(char *rootDir, char *fname);
 int     tsdbUpdateFileHeader(SFile *pFile, uint32_t version);
+int     tsdbUpdateTable(STable *pTable, STableCfg *pCfg);
 
 #ifdef __cplusplus
 }
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 15a6ca2403..ee927d0ccd 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -429,10 +429,20 @@ int tsdbUpdateTagValue(TsdbRepoT *repo, SUpdateTableTagValMsg *pMsg) {
     tsdbTrace("vgId:%d server tag version %d is older than client tag version %d, try to config", pRepo->config.tsdbId,
               schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)), tversion);
     void *msg = (*pRepo->appH.configFunc)(pRepo->config.tsdbId, htonl(pMsg->tid));
+    if (msg == NULL) {
+      return terrno;
+    }
     // Deal with error her
     STableCfg *pTableCfg = tsdbCreateTableCfgFromMsg(msg);
+    STable *super = tsdbGetTableByUid(pMeta, pTableCfg->superUid);
+    ASSERT(super != NULL);
 
-    ASSERT(pTableCfg != NULL);
+    int32_t code = tsdbUpdateTable(super, pTableCfg);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+    tsdbClearTableCfg(pTableCfg);
+    rpcFreeCont(msg);
   }
 
   if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) > tversion) {
@@ -595,12 +605,15 @@ int tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup) {
 }
 
 void tsdbClearTableCfg(STableCfg *config) {
-  if (config->schema) tdFreeSchema(config->schema);
-  if (config->tagSchema) tdFreeSchema(config->tagSchema);
-  if (config->tagValues) kvRowFree(config->tagValues);
-  tfree(config->name);
-  tfree(config->sname);
-  tfree(config->sql);
+  if (config) {
+    if (config->schema) tdFreeSchema(config->schema);
+    if (config->tagSchema) tdFreeSchema(config->tagSchema);
+    if (config->tagValues) kvRowFree(config->tagValues);
+    tfree(config->name);
+    tfree(config->sname);
+    tfree(config->sql);
+    free(config);
+  }
 }
 
 int tsdbInitSubmitBlkIter(SSubmitBlk *pBlock, SSubmitBlkIter *pIter) {
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 3ea22f2b91..dcea9ac46b 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -370,7 +370,7 @@ static int tsdbUpdateTableTagSchema(STable *pTable, STSchema *newSchema) {
   return TSDB_CODE_SUCCESS;
 }
 
-static int tsdbCheckAndUpdateTable(STable *pTable, STableCfg *pCfg) {
+int tsdbUpdateTable(STable *pTable, STableCfg *pCfg) {
   ASSERT(pTable->type != TSDB_CHILD_TABLE);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
@@ -411,7 +411,7 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) {
     } else {
       if (super->type != TSDB_SUPER_TABLE) return -1;
       if (super->tableId.uid != pCfg->superUid) return -1;
-      tsdbCheckAndUpdateTable(super, pCfg);
+      tsdbUpdateTable(super, pCfg);
     }
   }
 

From 9915d130adec26b9b263035b603b67bab81521f2 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 03:12:04 +0000
Subject: [PATCH 40/64] TD-90

---
 src/tsdb/inc/tsdbMain.h |  2 +-
 src/tsdb/src/tsdbMain.c |  2 +-
 src/tsdb/src/tsdbMeta.c | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index c4e929e3cd..453fbdc86b 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -506,7 +506,7 @@ int     tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks);
 void    tsdbAdjustCacheBlocks(STsdbCache *pCache);
 int32_t tsdbGetMetaFileName(char *rootDir, char *fname);
 int     tsdbUpdateFileHeader(SFile *pFile, uint32_t version);
-int     tsdbUpdateTable(STable *pTable, STableCfg *pCfg);
+int     tsdbUpdateTable(STsdbMeta *pMeta, STable *pTable, STableCfg *pCfg);
 
 #ifdef __cplusplus
 }
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index ee927d0ccd..8f58e5fe06 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -437,7 +437,7 @@ int tsdbUpdateTagValue(TsdbRepoT *repo, SUpdateTableTagValMsg *pMsg) {
     STable *super = tsdbGetTableByUid(pMeta, pTableCfg->superUid);
     ASSERT(super != NULL);
 
-    int32_t code = tsdbUpdateTable(super, pTableCfg);
+    int32_t code = tsdbUpdateTable(pMeta, super, pTableCfg);
     if (code != TSDB_CODE_SUCCESS) {
       return code;
     }
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index dcea9ac46b..16e034c228 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -370,19 +370,29 @@ static int tsdbUpdateTableTagSchema(STable *pTable, STSchema *newSchema) {
   return TSDB_CODE_SUCCESS;
 }
 
-int tsdbUpdateTable(STable *pTable, STableCfg *pCfg) {
+int tsdbUpdateTable(STsdbMeta *pMeta, STable *pTable, STableCfg *pCfg) {
   ASSERT(pTable->type != TSDB_CHILD_TABLE);
+  bool isChanged = false;
 
   if (pTable->type == TSDB_SUPER_TABLE) {
     if (schemaVersion(pTable->tagSchema) < schemaVersion(pCfg->tagSchema)) {
       int32_t code = tsdbUpdateTableTagSchema(pTable, pCfg->tagSchema);
       if (code != TSDB_CODE_SUCCESS) return code;
     }
+    isChanged = true;
   }
 
   {
     // TODO: try to update the data schema
   }
+  if (isChanged) {
+    char *buf = malloc(1024 * 1024);
+    int bufLen = 0;
+    tsdbEncodeTable(pTable, buf, &bufLen);
+    tsdbInsertMetaRecord(pMeta->mfh, pTable->tableId.uid, buf, bufLen);
+    free(buf);
+  }
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -411,7 +421,7 @@ int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg) {
     } else {
       if (super->type != TSDB_SUPER_TABLE) return -1;
       if (super->tableId.uid != pCfg->superUid) return -1;
-      tsdbUpdateTable(super, pCfg);
+      tsdbUpdateTable(pMeta, super, pCfg);
     }
   }
 

From a7e7b8e21e6733d4b0acc0d4c6ab7288378d65ec Mon Sep 17 00:00:00 2001
From: chang <sqchang@taosdata.com>
Date: Wed, 3 Jun 2020 11:17:31 +0800
Subject: [PATCH 41/64] test: importOneRow

---
 tests/test/c/importOneRow.c | 45 ++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 6 deletions(-)

diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c
index 902cf46c3a..0690d89837 100644
--- a/tests/test/c/importOneRow.c
+++ b/tests/test/c/importOneRow.c
@@ -122,10 +122,26 @@ void* taos_execute(void *param) {
   int64_t timestamp = 1530374400000L;
 
   sprintf(sql, "insert into db.t%d values(%ld, %d, %d, %d)", pThread->index, timestamp, 0, 0, 0);
-  int code = taos_query(taos, sql);
-  if (code != 0) printf("error code:%d, sql:%s\n", code, sql);
+  TAOS_RES *pSql = taos_query(taos, sql);
+  int code = taos_errno(pSql);
+  if (code != 0) 
+  {
+    printf("error code:%d, sql:%s\n", code, sql);
+    taos_free_result(pSql);
+    taos_close(taos);
+    return NULL;
+  }
   int affectrows = taos_affected_rows(taos);
-  if (affectrows != 1) printf("affect rows:%d, sql:%s\n", affectrows, sql);
+  if (affectrows != 1) 
+  {
+    printf("affect rows:%d, sql:%s\n", affectrows, sql);
+    taos_free_result(pSql);
+    taos_close(taos);
+    return NULL;
+  }
+  taos_free_result(pSql);
+  pSql = NULL;
+
 
   timestamp -= 1000;
 
@@ -133,17 +149,34 @@ void* taos_execute(void *param) {
 
   for (int i = 1; i < rowNum; ++i) {
     sprintf(sql, "import into db.t%d values(%ld, %d, %d, %d)", pThread->index, timestamp, i, i, i);
-    code = taos_query(taos, sql);
-    if (code != 0) printf("error code:%d, sql:%s\n", code, sql);
+
+    pSql = taos_query(taos, sql);
+    code = taos_errno(pSql);
+    if (code != 0) 
+    {
+      printf("error code:%d, sql:%s\n", code, sql);
+      taos_free_result(pSql);
+      pSql = NULL;
+      taos_close(taos);
+      return NULL;
+    }
     int affectrows = taos_affected_rows(taos);
-    if (affectrows != 1) printf("affect rows:%d, sql:%s\n", affectrows, sql);
+    if (affectrows != 1) {
+      printf("affect rows:%d, sql:%s\n", affectrows, sql);
+      taos_free_result(pSql);
+      pSql = NULL;
+      taos_close(taos);
+    }
 
     total_affect_rows += affectrows;
+    taos_free_result(pSql);
+    pSql = NULL;
 
     timestamp -= 1000;
   }
 
   printf("thread:%d run finished total_affect_rows:%d\n", pThread->index, total_affect_rows);
+  taos_close(taos);
 
   return NULL;
 }

From ff292f2243615f96dc7fd4a71dbf463fc5008851 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 04:03:28 +0000
Subject: [PATCH 42/64] TD-90

---
 src/mnode/src/mnodeTable.c | 2 +-
 src/vnode/src/vnodeWrite.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index c37dd8d382..edb9585cb9 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1408,7 +1408,7 @@ static void *mnodeBuildCreateChildTableMsg(SCMCreateTableMsg *pMsg, SChildTableO
     pSchema++;
   }
 
-  if (pTable->info.type == TSDB_CHILD_TABLE && pTagData != NULL) {
+  if (pTable->info.type == TSDB_CHILD_TABLE && pMsg != NULL) {
     memcpy(pCreate->data + totalCols * sizeof(SSchema), pTagData->data, tagDataLen);
   }
 
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index a605d20cac..4dfe492932 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -112,7 +112,6 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
   int32_t code = tsdbCreateTable(pVnode->tsdb, pCfg);
 
   tsdbClearTableCfg(pCfg);
-  free(pCfg);
   return code;
 }
 
@@ -136,7 +135,6 @@ static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
   if (pCfg == NULL) return terrno;
   int32_t code = tsdbAlterTable(pVnode->tsdb, pCfg);
   tsdbClearTableCfg(pCfg);
-  free(pCfg);
   return code;
 }
 

From cdf64f19576bc54cf5922b15add82e212193da94 Mon Sep 17 00:00:00 2001
From: Tao Liu <tliu@taosdata.com>
Date: Wed, 3 Jun 2020 05:44:32 +0000
Subject: [PATCH 43/64] [TD-314] modify python connector to adapt the taos API
 change

---
 .../python/linux/python3/taos/cinterface.py   | 37 ++++++------
 .../python/linux/python3/taos/connection.py   |  4 +-
 .../python/linux/python3/taos/cursor.py       | 16 +++---
 src/kit/taosdemo/taosdemo.c                   | 17 +++---
 src/kit/taosdump/taosdump.c                   | 57 ++++++++++---------
 tests/examples/c/demo.c                       | 15 ++---
 tests/test/c/importOneRow.c                   | 12 ++--
 7 files changed, 76 insertions(+), 82 deletions(-)

diff --git a/src/connector/python/linux/python3/taos/cinterface.py b/src/connector/python/linux/python3/taos/cinterface.py
index d516aad5a7..b953aa1192 100644
--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
@@ -142,12 +142,13 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
 
     def __init__(self, config=None):
         '''
@@ -249,12 +250,12 @@ class CTaosInterface(object):
             raise AttributeError("sql is expected as a string")
         # finally:
         #     CTaosInterface.libtaos.close(connection)
-
+      
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -292,18 +293,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -337,8 +337,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -386,29 +386,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection).decode('utf-8')
+        return CTaosInterface.libtaos.taos_errstr(result).decode('utf-8')
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeresult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/linux/python3/taos/connection.py b/src/connector/python/linux/python3/taos/connection.py
index 04fbbdec04..552250f116 100644
--- a/src/connector/python/linux/python3/taos/connection.py
+++ b/src/connector/python/linux/python3/taos/connection.py
@@ -78,9 +78,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/linux/python3/taos/cursor.py b/src/connector/python/linux/python3/taos/cursor.py
index dc038a72ba..724cfe2163 100644
--- a/src/connector/python/linux/python3/taos/cursor.py
+++ b/src/connector/python/linux/python3/taos/cursor.py
@@ -122,26 +122,26 @@ class TDengineCursor(object):
         # querySeqNum += 1
         # localSeqNum = querySeqNum # avoid raice condition
         # print("   >> Exec Query ({}): {}".format(localSeqNum, str(stmt)))
-        res = CTaosInterface.query(self._connection._conn, stmt)
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
         # print("   << Query ({}) Exec Done".format(localSeqNum))
 
         if (self._logfile):
             with open(self._logfile, "a") as logfile:
                 logfile.write("%s;\n" % operation)
 
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
+        if self._result is not None:
+            if CTaosInterface.fieldsCount(self._result) == 0:
                 self._affected_rows += CTaosInterface.affectedRows(
-                    self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+                    self._result )
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(
-                    self._connection._conn)
+                self._fields = CTaosInterface.useResult(
+                    self._result)
                 return self._handle_result()
         else:
             raise ProgrammingError(
                 CTaosInterface.errStr(
-                    self._connection._conn))
+                    self._result ))
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index cf84ecad43..d96644e997 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -708,13 +708,14 @@ void *readTable(void *sarg) {
       sprintf(command, "select %s from %s%d where ts>= %" PRId64, aggreFunc[j], tb_prefix, i, sTime);
 
       double t = getCurrentTime();
+/*
       if (taos_query(taos, command) != 0) {
         fprintf(stderr, "Failed to query\n");
         taos_close(taos);
         exit(EXIT_FAILURE);
       }
-
-      TAOS_RES *result = taos_use_result(taos);
+*/
+      TAOS_RES *result = taos_query(taos, command) ;
       if (result == NULL) {
         fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
         taos_close(taos);
@@ -779,13 +780,13 @@ void *readMetric(void *sarg) {
       fprintf(fp, "%s\n", command);
 
       double t = getCurrentTime();
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "Failed to query\n");
-        taos_close(taos);
-        exit(EXIT_FAILURE);
-      }
+//      if (taos_query(taos, command) != 0) {
+//       fprintf(stderr, "Failed to query\n");
+//        taos_close(taos);
+//        exit(EXIT_FAILURE);
+//      }
 
-      TAOS_RES *result = taos_use_result(taos);
+      TAOS_RES *result = taos_query(taos,command);
       if (result == NULL) {
         fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
         taos_close(taos);
diff --git a/src/kit/taosdump/taosdump.c b/src/kit/taosdump/taosdump.c
index 9886a91f48..6c0e3b66e8 100644
--- a/src/kit/taosdump/taosdump.c
+++ b/src/kit/taosdump/taosdump.c
@@ -372,12 +372,13 @@ int taosGetTableRecordInfo(char *table, STableRecordInfo *pTableRecordInfo) {
   memset(pTableRecordInfo, 0, sizeof(STableRecordInfo));
 
   sprintf(command, "show tables like %s", table);
+  /*
   if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command %s\n", command);
     return -1;
   }
-
-  result = taos_use_result(taos);
+*/
+  result = taos_query(taos, command) ;
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     return -1;
@@ -400,12 +401,12 @@ int taosGetTableRecordInfo(char *table, STableRecordInfo *pTableRecordInfo) {
   if (isSet) return 0;
 
   sprintf(command, "show stables like %s", table);
-  if (taos_query(taos, command) != 0) {
+/*  if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command %s\n", command);
     return -1;
   }
-
-  result = taos_use_result(taos);
+*/
+  result = taos_query(taos, command);
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     return -1;
@@ -467,12 +468,12 @@ int taosDumpOut(SDumpArguments *arguments) {
   taosDumpCharset(fp);
 
   sprintf(command, "show databases");
-  if (taos_query(taos, command) != 0) {
+  /*if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command: %s, reason: %s\n", command, taos_errstr(taos));
     goto _exit_failure;
-  }
+  }*/
 
-  result = taos_use_result(taos);
+  result = taos_query(taos, command);
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     goto _exit_failure;
@@ -551,7 +552,7 @@ int taosDumpOut(SDumpArguments *arguments) {
       taosDumpCreateDbClause(dbInfos[0], arguments->with_property, fp);
 
       sprintf(command, "use %s", dbInfos[0]->name);
-      if (taos_query(taos, command) != 0) {
+      if (taos_query(taos, command) == NULL ) {
         fprintf(stderr, "invalid database %s\n", dbInfos[0]->name);
         goto _exit_failure;
       }
@@ -612,7 +613,7 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) {
   taosDumpCreateDbClause(dbInfo, arguments->with_property, fp);
 
   sprintf(command, "use %s", dbInfo->name);
-  if (taos_query(taos, command) != 0) {
+  if (taos_query(taos, command) == NULL) {
     fprintf(stderr, "invalid database %s\n", dbInfo->name);
     return -1;
   }
@@ -620,12 +621,12 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) {
   fprintf(fp, "USE %s\n\n", dbInfo->name);
 
   sprintf(command, "show tables");
-  if (taos_query(taos, command) != 0) {
+ /* if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command %s\n", command);
     return -1;
-  }
+  }*/
 
-  result = taos_use_result(taos);
+  result = taos_query(taos, command);
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     return -1;
@@ -725,12 +726,12 @@ void taosDumpCreateMTableClause(STableDef *tableDes, char *metric, int numOfCols
     TAOS_ROW row = NULL;
 
     sprintf(command, "select %s from %s limit 1", tableDes->cols[counter].field, tableDes->name);
-    if (taos_query(taos, command) != 0) {
+    /*if (taos_query(taos, command) != 0) {
       fprintf(stderr, "failed to run command %s\n", command);
       return;
-    }
+    }*/
 
-    result = taos_use_result(taos);
+    result = taos_query(taos, command);
     if (result == NULL) {
       fprintf(stderr, "failed to use result\n");
       return;
@@ -806,12 +807,12 @@ int taosGetTableDes(char *table, STableDef *tableDes) {
   int count = 0;
 
   sprintf(command, "describe %s", table);
-  if (taos_query(taos, command) != 0) {
+  /*if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command %s\n", command);
     return -1;
-  }
+  }*/
 
-  result = taos_use_result(taos);
+  result = taos_query(taos, command);
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     return -1;
@@ -889,12 +890,12 @@ int32_t taosDumpMetric(char *metric, SDumpArguments *arguments, FILE *fp) {
   strcpy(tableRecord.metric, metric);
 
   sprintf(command, "select tbname from %s", metric);
-  if (taos_query(taos, command) != 0) {
+  /*if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command %s\n", command);
     return -1;
-  }
+  }*/
 
-  result = taos_use_result(taos);
+  result = taos_query(taos, command);
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     return -1;
@@ -942,12 +943,12 @@ int taosDumpTableData(FILE *fp, char *tbname, SDumpArguments *arguments) {
 
   sprintf(command, "select * from %s where _c0 >= %" PRId64 " and _c0 <= %" PRId64 " order by _c0 asc", tbname, arguments->start_time,
           arguments->end_time);
-  if (taos_query(taos, command) != 0) {
+  /*if (taos_query(taos, command) != 0) {
     fprintf(stderr, "failed to run command %s, reason: %s\n", command, taos_errstr(taos));
     return -1;
-  }
+  }*/
 
-  result = taos_use_result(taos);
+  result = taos_query(taos, command);
   if (result == NULL) {
     fprintf(stderr, "failed to use result\n");
     return -1;
@@ -1194,7 +1195,7 @@ int taosDumpIn(SDumpArguments *arguments) {
           tcommand = command;
         }
         taosReplaceCtrlChar(tcommand);
-        if (taos_query(taos, tcommand) != 0)
+        if (taos_query(taos, tcommand) == NULL)
           fprintf(stderr, "linenu: %" PRId64 " failed to run command %s reason:%s \ncontinue...\n", linenu, command,
                   taos_errstr(taos));
 
@@ -1242,7 +1243,7 @@ int taosDumpIn(SDumpArguments *arguments) {
         tcommand = command;
       }
       taosReplaceCtrlChar(tcommand);
-      if (taos_query(taos, tcommand) != 0)
+      if (taos_query(taos, tcommand) == NULL)
         fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason: %s \ncontinue...\n", linenu, command,
                 taos_errstr(taos));
     }
@@ -1265,7 +1266,7 @@ int taosDumpIn(SDumpArguments *arguments) {
       tcommand = command;
     }
     taosReplaceCtrlChar(lcommand);
-    if (taos_query(taos, tcommand) != 0)
+    if (taos_query(taos, tcommand) == NULL)
       fprintf(stderr, "linenu:%" PRId64 " failed to run command %s reason:%s \ncontinue...\n", linenu, command,
               taos_errstr(taos));
   }
diff --git a/tests/examples/c/demo.c b/tests/examples/c/demo.c
index e27c73891f..d8efc513f4 100644
--- a/tests/examples/c/demo.c
+++ b/tests/examples/c/demo.c
@@ -26,13 +26,13 @@
 void taosMsleep(int mseconds);
 
 static int32_t doQuery(TAOS* taos, const char* sql) {
-  int32_t code = taos_query(taos, sql);
-  if (code != 0) {
+   TAOS_RES* res = taos_query(taos, sql);
+  if (res == NULL) {
     printf("failed to execute query, reason:%s\n", taos_errstr(taos));
     return -1;
   }
   
-  TAOS_RES* res = taos_use_result(taos);
+  //TAOS_RES* res = taos_use_result(taos);
   TAOS_ROW row = NULL;
   char buf[512] = {0};
   
@@ -167,15 +167,8 @@ int main(int argc, char *argv[]) {
   
   // query the records
   sprintf(qstr, "SELECT * FROM m1");
-  if (taos_query(taos, qstr) != 0) {
-    printf("failed to select, reason:%s\n", taos_errstr(taos));
-    exit(1);
-  }
-  
-  
-  result = taos_use_result(taos);
-  
   
+  result = taos_query(taos, qstr);
   if (result == NULL) {
     printf("failed to get result, reason:%s\n", taos_errstr(taos));
     exit(1);
diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c
index 902cf46c3a..cc4f5715fc 100644
--- a/tests/test/c/importOneRow.c
+++ b/tests/test/c/importOneRow.c
@@ -122,9 +122,9 @@ void* taos_execute(void *param) {
   int64_t timestamp = 1530374400000L;
 
   sprintf(sql, "insert into db.t%d values(%ld, %d, %d, %d)", pThread->index, timestamp, 0, 0, 0);
-  int code = taos_query(taos, sql);
-  if (code != 0) printf("error code:%d, sql:%s\n", code, sql);
-  int affectrows = taos_affected_rows(taos);
+  void *result = taos_query(taos, sql);
+  if (result == NULL) printf("error , sql:%s\n",  sql);
+  int affectrows = taos_affected_rows(result);
   if (affectrows != 1) printf("affect rows:%d, sql:%s\n", affectrows, sql);
 
   timestamp -= 1000;
@@ -133,9 +133,9 @@ void* taos_execute(void *param) {
 
   for (int i = 1; i < rowNum; ++i) {
     sprintf(sql, "import into db.t%d values(%ld, %d, %d, %d)", pThread->index, timestamp, i, i, i);
-    code = taos_query(taos, sql);
-    if (code != 0) printf("error code:%d, sql:%s\n", code, sql);
-    int affectrows = taos_affected_rows(taos);
+    void * result = taos_query(taos, sql);
+    if (result == NULL) printf("error , sql:%s\n", sql);
+    int affectrows = taos_affected_rows(result);
     if (affectrows != 1) printf("affect rows:%d, sql:%s\n", affectrows, sql);
 
     total_affect_rows += affectrows;

From 5a712d028c38f8730ffb9f70d2295f62d25d0376 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 05:52:45 +0000
Subject: [PATCH 44/64] fix invalid write

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

diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index edb9585cb9..196056b474 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -1358,6 +1358,7 @@ static void *mnodeBuildCreateChildTableMsg(SCMCreateTableMsg *pMsg, SChildTableO
     if (pMsg != NULL) {
       pTagData = (STagData *)pMsg->schema;
       tagDataLen = ntohl(pTagData->dataLen);
+      contLen += tagDataLen;
     }
   } else {
     totalCols = pTable->numOfColumns;

From 0e3d3ddbc08b9fe2a5beafad8554c3fd81d3ab59 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 3 Jun 2020 13:55:50 +0800
Subject: [PATCH 45/64] [td-225] add query cost statistics.

---
 src/client/src/tscProfile.c |  4 +--
 src/query/inc/qExecutor.h   | 13 +++----
 src/query/src/qExecutor.c   | 69 +++++++++++++++++--------------------
 3 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/src/client/src/tscProfile.c b/src/client/src/tscProfile.c
index 161591959b..e6d9aad6e2 100644
--- a/src/client/src/tscProfile.c
+++ b/src/client/src/tscProfile.c
@@ -100,7 +100,7 @@ void tscSaveSlowQuery(SSqlObj *pSql) {
   
   char *sql = malloc(sqlSize);
   if (sql == NULL) {
-    tscError("%p failed to allocate memory to sent slow to dnode", pSql);
+    tscError("%p failed to allocate memory to sent slow query to dnode", pSql);
     return;
   }
   
@@ -112,8 +112,8 @@ void tscSaveSlowQuery(SSqlObj *pSql) {
   } else {
     sqlLen += len;
   }
+  
   strcpy(sql + sqlLen, "')");
-
   taosTmrStart(tscSaveSlowQueryFp, 200, sql, tscTmr);
 }
 
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 722a625526..7ea272b8e8 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -116,11 +116,14 @@ typedef struct SQueryCostInfo {
   uint64_t loadDataInCacheSize;
   
   uint64_t loadDataTime;
-  uint64_t dataInRows;
-  uint64_t checkRows;
-  uint32_t dataBlocks;
+  uint64_t totalRows;
+  uint64_t totalCheckedRows;
+  uint32_t totalBlocks;
+  uint32_t loadBlocks;
   uint32_t loadBlockStatis;
   uint32_t discardBlocks;
+  uint64_t elapsedTime;
+  uint64_t computTime;
 } SQueryCostInfo;
 
 typedef struct SGroupItem {
@@ -168,7 +171,7 @@ typedef struct SQueryRuntimeEnv {
   SWindowResInfo       windowResInfo;
   STSBuf*              pTSBuf;
   STSCursor            cur;
-  SQueryCostInfo    summary;
+  SQueryCostInfo       summary;
   bool                 stableQuery;  // super table query or not
   void*                pQueryHandle;
   void*                pSecQueryHandle;  // another thread for
@@ -177,8 +180,6 @@ typedef struct SQueryRuntimeEnv {
 
 typedef struct SQInfo {
   void*   signature;
-  TSKEY   startTime;
-  TSKEY   elapsedTime;
   int32_t pointsInterpo;
   int32_t code;  // error code to returned to client
   sem_t   dataReady;
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 2e9069bbf1..a7c9574d14 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1183,6 +1183,7 @@ static int32_t tableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SDataBl
   
   STableQueryInfo* pTableQInfo = pQuery->current;
   SWindowResInfo*  pWindowResInfo = &pRuntimeEnv->windowResInfo;
+  pQuery->pos = QUERY_IS_ASC_QUERY(pQuery)? 0 : pDataBlockInfo->rows - 1;
   
   if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL || isGroupbyNormalCol(pQuery->pGroupbyExpr)) {
     rowwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, pDataBlock);
@@ -1190,10 +1191,10 @@ static int32_t tableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SDataBl
     blockwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, searchFn, pDataBlock);
   }
 
+  // update the lastkey of current table
   TSKEY lastKey = QUERY_IS_ASC_QUERY(pQuery) ? pDataBlockInfo->window.ekey : pDataBlockInfo->window.skey;
   pTableQInfo->lastKey = lastKey + GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
 
-
   // interval query with limit applied
   int32_t numOfRes = 0;
   
@@ -2013,7 +2014,7 @@ SArray *loadDataBlockOnDemand(SQueryRuntimeEnv *pRuntimeEnv, void* pQueryHandle,
   
     if (*pStatis == NULL) { // data block statistics does not exist, load data block
       pDataBlock = tsdbRetrieveDataBlock(pQueryHandle, NULL);
-      pRuntimeEnv->summary.checkRows += pBlockInfo->rows;
+      pRuntimeEnv->summary.totalCheckedRows += pBlockInfo->rows;
     }
   } else {
     assert(r == BLK_DATA_ALL_NEEDED);
@@ -2032,7 +2033,7 @@ SArray *loadDataBlockOnDemand(SQueryRuntimeEnv *pRuntimeEnv, void* pQueryHandle,
       //        return DISK_DATA_DISCARDED;
     }
   
-    pRuntimeEnv->summary.checkRows += pBlockInfo->rows;
+    pRuntimeEnv->summary.totalCheckedRows += pBlockInfo->rows;
     pDataBlock = tsdbRetrieveDataBlock(pQueryHandle, NULL);
   }
 
@@ -2149,7 +2150,7 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
 
   TsdbQueryHandleT pQueryHandle = IS_MASTER_SCAN(pRuntimeEnv)? pRuntimeEnv->pQueryHandle : pRuntimeEnv->pSecQueryHandle;
   while (tsdbNextDataBlock(pQueryHandle)) {
-    pRuntimeEnv->summary.dataBlocks += 1;
+    pRuntimeEnv->summary.totalBlocks += 1;
     if (isQueryKilled(GET_QINFO_ADDR(pRuntimeEnv))) {
       return 0;
     }
@@ -2185,12 +2186,10 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
     ensureOutputBuffer(pRuntimeEnv, &blockInfo);
 
     SDataStatis *pStatis = NULL;
-    pQuery->pos = QUERY_IS_ASC_QUERY(pQuery)? 0 : blockInfo.rows - 1;
-    
     SArray *pDataBlock = loadDataBlockOnDemand(pRuntimeEnv, pQueryHandle, &blockInfo, &pStatis);
     int32_t numOfRes = tableApplyFunctionsOnBlock(pRuntimeEnv, &blockInfo, pStatis, binarySearchForKey, pDataBlock);
 
-    pRuntimeEnv->summary.dataInRows += blockInfo.rows;
+    pRuntimeEnv->summary.totalRows += blockInfo.rows;
     qTrace("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, numOfRes:%d, lastKey:%"PRId64, GET_QINFO_ADDR(pRuntimeEnv),
            blockInfo.window.skey, blockInfo.window.ekey, blockInfo.rows, numOfRes, pQuery->current->lastKey);
 
@@ -3247,7 +3246,7 @@ void destroyTableQueryInfo(STableQueryInfo *pTableQueryInfo, int32_t numOfCols)
   free(pTableQueryInfo);
 }
 
-void restoreIntervalQueryRange(SQueryRuntimeEnv *pRuntimeEnv, STableQueryInfo *pTableQueryInfo) {
+void setCurrentQueryTable(SQueryRuntimeEnv *pRuntimeEnv, STableQueryInfo *pTableQueryInfo) {
   SQuery *pQuery = pRuntimeEnv->pQuery;
   pQuery->current = pTableQueryInfo;
   
@@ -3316,7 +3315,7 @@ static void setWindowResOutputBuf(SQueryRuntimeEnv *pRuntimeEnv, SWindowResult *
 
 int32_t setAdditionalInfo(SQInfo *pQInfo, STableId* pTableId, STableQueryInfo *pTableQueryInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
-  assert(pTableQueryInfo->lastKey >= 0);
+  assert(pTableQueryInfo->lastKey >= TSKEY_INITIAL_VAL);
 
   setTagVal(pRuntimeEnv, pTableId, pQInfo->tsdb);
 
@@ -3528,10 +3527,11 @@ static void updateWindowResNumOfRes(SQueryRuntimeEnv *pRuntimeEnv, STableQueryIn
   }
 }
 
-void stableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, STableQueryInfo *pTableQueryInfo,
-                                 SDataBlockInfo *pDataBlockInfo, SDataStatis *pStatis, SArray *pDataBlock,
-                                 __block_search_fn_t searchFn) {
+void stableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, SDataBlockInfo *pDataBlockInfo, SDataStatis *pStatis,
+    SArray *pDataBlock, __block_search_fn_t searchFn) {
   SQuery *         pQuery = pRuntimeEnv->pQuery;
+  STableQueryInfo* pTableQueryInfo = pQuery->current;
+  
   SWindowResInfo * pWindowResInfo = &pTableQueryInfo->windowResInfo;
   pQuery->pos = QUERY_IS_ASC_QUERY(pQuery)? 0 : pDataBlockInfo->rows - 1;
 
@@ -3685,8 +3685,9 @@ static void queryCostStatis(SQInfo *pQInfo) {
 //      pQInfo, pSummary->readDiskBlocks, pSummary->totalBlockSize, pSummary->loadBlocksUs / 1000.0,
 //      pSummary->skippedFileBlocks, pSummary->totalGenData);
   
-  qTrace("QInfo:%p cost: check blocks:%d, statis:%d, rows:%"PRId64", check rows:%"PRId64, pQInfo, pSummary->dataBlocks,
-         pSummary->loadBlockStatis, pSummary->dataInRows, pSummary->checkRows);
+  qTrace("QInfo:%p :cost summary: elpased time:%"PRId64" us, total blocks:%d, use block statis:%d, use block data:%d, "
+         "total rows:%"PRId64 ", check rows:%"PRId64, pQInfo, pSummary->elapsedTime, pSummary->totalBlocks,
+         pSummary->loadBlockStatis, pSummary->loadBlocks, pSummary->totalRows, pSummary->totalCheckedRows);
 
 //  qTrace("QInfo:%p cost: temp file:%d Bytes", pQInfo, pSummary->tmpBufferInDisk);
 //
@@ -4082,12 +4083,13 @@ static void enableExecutionForNextTable(SQueryRuntimeEnv *pRuntimeEnv) {
 static int64_t queryOnDataBlocks(SQInfo *pQInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *          pQuery = pRuntimeEnv->pQuery;
-
+  SQueryCostInfo* summary  = &pRuntimeEnv->summary;
+  
   int64_t st = taosGetTimestampMs();
 
   TsdbQueryHandleT pQueryHandle = IS_MASTER_SCAN(pRuntimeEnv)? pRuntimeEnv->pQueryHandle : pRuntimeEnv->pSecQueryHandle;
-  
   while (tsdbNextDataBlock(pQueryHandle)) {
+    summary->totalBlocks += 1;
     if (isQueryKilled(pQInfo)) {
       break;
     }
@@ -4119,11 +4121,9 @@ static int64_t queryOnDataBlocks(SQInfo *pQInfo) {
     }
   
     assert(pTableQueryInfo != NULL);
-    restoreIntervalQueryRange(pRuntimeEnv, pTableQueryInfo);
-    printf("table:%d, groupIndex:%d, rows:%d\n", pTableQueryInfo->id.tid, pTableQueryInfo->groupIndex, blockInfo.tid);
+    setCurrentQueryTable(pRuntimeEnv, pTableQueryInfo);
 
     SDataStatis *pStatis = NULL;
-    
     SArray *pDataBlock = loadDataBlockOnDemand(pRuntimeEnv, pQueryHandle, &blockInfo, &pStatis);
 
     if (!isIntervalQuery(pQuery)) {
@@ -4132,15 +4132,14 @@ static int64_t queryOnDataBlocks(SQInfo *pQInfo) {
     } else {  // interval query
       TSKEY nextKey = blockInfo.window.skey;
       setIntervalQueryRange(pQInfo, nextKey);
-      int32_t ret = setAdditionalInfo(pQInfo, &pTableQueryInfo->id, pTableQueryInfo);
-
-      if (ret != TSDB_CODE_SUCCESS) {
-        pQInfo->code = ret;
-        return taosGetTimestampMs() - st;
-      }
+      /*int32_t ret = */setAdditionalInfo(pQInfo, &pTableQueryInfo->id, pTableQueryInfo);
     }
 
-    stableApplyFunctionsOnBlock(pRuntimeEnv, pTableQueryInfo, &blockInfo, pStatis, pDataBlock, binarySearchForKey);
+    summary->totalRows += blockInfo.rows;
+    stableApplyFunctionsOnBlock(pRuntimeEnv, &blockInfo, pStatis, pDataBlock, binarySearchForKey);
+  
+    qTrace("QInfo:%p check data block, brange:%" PRId64 "-%" PRId64 ", numOfRows:%d, lastKey:%"PRId64, GET_QINFO_ADDR(pRuntimeEnv),
+           blockInfo.window.skey, blockInfo.window.ekey, blockInfo.rows, pQuery->current->lastKey);
   }
 
   int64_t et = taosGetTimestampMs();
@@ -4502,10 +4501,6 @@ static void multiTableQueryProcess(SQInfo *pQInfo) {
       copyFromWindowResToSData(pQInfo, pRuntimeEnv->windowResInfo.pResult);
     }
 
-    if (pQuery->rec.rows == 0) {
-      //      queryCostStatis(pSupporter);
-    }
-
     qTrace("QInfo:%p current:%lld, total:%lld", pQInfo, pQuery->rec.rows, pQuery->rec.total);
     return;
   }
@@ -4810,7 +4805,7 @@ static void tableQueryImpl(SQInfo *pQInfo) {
   }
 
   // record the total elapsed time
-  pQInfo->elapsedTime += (taosGetTimestampUs() - st);
+  pRuntimeEnv->summary.elapsedTime += (taosGetTimestampUs() - st);
   assert(pQInfo->groupInfo.numOfTables == 1);
 
   /* check if query is killed or not */
@@ -4840,13 +4835,10 @@ static void stableQueryImpl(SQInfo *pQInfo) {
   }
 
   // record the total elapsed time
-  pQInfo->elapsedTime += (taosGetTimestampUs() - st);
-  //  taosFillSetStartInfo(&pQInfo->runtimeEnv.pFillInfo, pQuery->size, pQInfo->query.fillType);
-
+  pQInfo->runtimeEnv.summary.elapsedTime += (taosGetTimestampUs() - st);
+  
   if (pQuery->rec.rows == 0) {
-    qTrace("QInfo:%p over, %d tables queried, %d points are returned", pQInfo, pQInfo->groupInfo.numOfTables,
-           pQuery->rec.total);
-    //    queryCostStatis(pSupporter);
+    qTrace("QInfo:%p over, %d tables queried, %d rows are returned", pQInfo, pQInfo->groupInfo.numOfTables, pQuery->rec.total);
   }
 }
 
@@ -5949,6 +5941,7 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
     return TSDB_CODE_INVALID_QHANDLE;
   }
 
+  SQueryRuntimeEnv* pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
   size_t  size = getResultSize(pQInfo, &pQuery->rec.rows);
   size += sizeof(int32_t);
@@ -5962,7 +5955,7 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
   int32_t code = pQInfo->code;
   if (code == TSDB_CODE_SUCCESS) {
     (*pRsp)->offset = htobe64(pQuery->limit.offset);
-    (*pRsp)->useconds = htobe64(pQInfo->elapsedTime);
+    (*pRsp)->useconds = htobe64(pRuntimeEnv->summary.elapsedTime);
   } else {
     (*pRsp)->offset = 0;
     (*pRsp)->useconds = 0;

From 195f2b39dee2a38aba3548e620f35a570cf21858 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 06:24:24 +0000
Subject: [PATCH 46/64] TD-90

---
 src/client/src/tscUtil.c     |  1 +
 src/common/inc/tdataformat.h | 20 +++++++++++---------
 src/common/src/tdataformat.c |  5 ++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/client/src/tscUtil.c b/src/client/src/tscUtil.c
index b8fd195aa6..79c580e1a2 100644
--- a/src/client/src/tscUtil.c
+++ b/src/client/src/tscUtil.c
@@ -651,6 +651,7 @@ static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock) {
   for (int32_t i = 0; i < numOfRows; ++i) {
     SDataRow trow = (SDataRow)pDataBlock;
     dataRowSetLen(trow, TD_DATA_ROW_HEAD_SIZE + flen);
+    dataRowSetVersion(trow, pTableMeta->sversion);
 
     int toffset = 0;
     for (int32_t j = 0; j < tinfo.numOfColumns; j++) {
diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index f71f52edc5..3ee29f47dd 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -119,22 +119,24 @@ STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
 // ----------------- Data row structure
 
 /* A data row, the format is like below:
- * |<------------------------------------- len ---------------------------------->|
- * |<--Head ->|<---------   flen -------------->|                                 |
- * +----------+---------------------------------+---------------------------------+
- * | int32_t  |                                 |                                 |
- * +----------+---------------------------------+---------------------------------+
- * |   len    |           First part            |             Second part         |
- * +----------+---------------------------------+---------------------------------+
+ * |<--------------------+--------------------------- len ---------------------------------->|
+ * |<--     Head      -->|<---------   flen -------------->|                                 |
+ * +---------------------+---------------------------------+---------------------------------+
+ * | int16_t  |  int16_t |                                 |                                 |
+ * +----------+----------+---------------------------------+---------------------------------+
+ * |   len    | sversion |           First part            |             Second part         |
+ * +----------+----------+---------------------------------+---------------------------------+
  */
 typedef void *SDataRow;
 
-#define TD_DATA_ROW_HEAD_SIZE sizeof(int32_t)
+#define TD_DATA_ROW_HEAD_SIZE sizeof(int16_t)*2
 
-#define dataRowLen(r) (*(int32_t *)(r))
+#define dataRowLen(r) (*(int16_t *)(r))
+#define dataRowVersion(r) *(int16_t *)POINTER_SHIFT(r, sizeof(int16_t))
 #define dataRowTuple(r) POINTER_SHIFT(r, TD_DATA_ROW_HEAD_SIZE)
 #define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))
 #define dataRowSetLen(r, l) (dataRowLen(r) = (l))
+#define dataRowSetVersion(r, v) (dataRowVersion(r) = (v))
 #define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r))
 #define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE)
 
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 9816f0472f..2427c5d3d0 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -159,7 +159,10 @@ STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder) {
 /**
  * Initialize a data row
  */
-void tdInitDataRow(SDataRow row, STSchema *pSchema) { dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + schemaFLen(pSchema)); }
+void tdInitDataRow(SDataRow row, STSchema *pSchema) {
+  dataRowSetLen(row, TD_DATA_ROW_HEAD_SIZE + schemaFLen(pSchema));
+  dataRowSetVersion(row, schemaVersion(pSchema));
+}
 
 SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
   int32_t size = dataRowMaxBytesFromSchema(pSchema);

From 1273abc299c0faf6796b206a9ffee81ab00cd053 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 3 Jun 2020 14:29:45 +0800
Subject: [PATCH 47/64] [td-90]

---
 src/query/src/qExecutor.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index 63be743ef4..efa320f544 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -6055,9 +6055,17 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
           
           char* dst = pQuery->sdata[j]->data + i * pExprInfo[j].bytes;
           if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-            memcpy(dst, data, varDataTLen(data));
+            if (data == NULL) {
+              setVardataNull(dst, type);
+            } else {
+              memcpy(dst, data, varDataTLen(data));
+            }
           } else {
-            memcpy(dst, data, bytes);
+            if (data == NULL) {
+              setNull(dst, type, bytes);
+            } else {
+              memcpy(dst, data, pExprInfo[j].bytes);
+            }
           }
         }
       }

From f81120e35252a7608f1226615957f9936b30fe7b Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 07:29:55 +0000
Subject: [PATCH 48/64] TD-90

---
 src/tsdb/inc/tsdbMain.h |  4 ++-
 src/tsdb/src/tsdbMeta.c | 70 ++++++++++++++++++++++++++++-------------
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index 453fbdc86b..db1dcbd35d 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -69,11 +69,13 @@ typedef struct {
 } SMemTable;
 
 // ---------- TSDB TABLE DEFINITION
+#define TSDB_MAX_TABLE_SCHEMAS 16
 typedef struct STable {
   int8_t         type;
   STableId       tableId;
   uint64_t       superUid;  // Super table UID
-  STSchema *     schema;
+  int16_t        numOfSchemas;
+  STSchema **    schema;
   STSchema *     tagSchema;
   SKVRow         tagVal;
   SMemTable *    mem;
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 16e034c228..6aaece59eb 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -37,18 +37,24 @@ void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) {
   ptr = (char *)ptr + sizeof(int);
   memcpy(ptr, varDataVal(pTable->name), varDataLen(pTable->name));
   ptr = (char *)ptr + varDataLen(pTable->name);
-  
+
   T_APPEND_MEMBER(ptr, &(pTable->tableId), STableId, uid);
   T_APPEND_MEMBER(ptr, &(pTable->tableId), STableId, tid);
   T_APPEND_MEMBER(ptr, pTable, STable, superUid);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
-    ptr = tdEncodeSchema(ptr, pTable->schema);
+    T_APPEND_MEMBER(ptr, pTable, STable, numOfSchemas);
+    for (int i = 0; i < pTable->numOfSchemas; i++) {
+      ptr = tdEncodeSchema(ptr, pTable->schema[i]);
+    }
     ptr = tdEncodeSchema(ptr, pTable->tagSchema);
   } else if (pTable->type == TSDB_CHILD_TABLE) {
     ptr = tdEncodeKVRow(ptr, pTable->tagVal);
   } else {
-    ptr = tdEncodeSchema(ptr, pTable->schema);
+    T_APPEND_MEMBER(ptr, pTable, STable, numOfSchemas);
+    for (int i = 0; i < pTable->numOfSchemas; i++) {
+      ptr = tdEncodeSchema(ptr, pTable->schema[i]);
+    }
   }
 
   if (pTable->type == TSDB_STREAM_TABLE) {
@@ -71,6 +77,11 @@ void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) {
 STable *tsdbDecodeTable(void *cont, int contLen) {
   STable *pTable = (STable *)calloc(1, sizeof(STable));
   if (pTable == NULL) return NULL;
+  pTable->schema = (STSchema **)malloc(sizeof(STSchema *) * TSDB_MAX_TABLE_SCHEMAS);
+  if (pTable->schema == NULL) {
+    free(pTable);
+    return NULL;
+  }
 
   void *ptr = cont;
   T_READ_MEMBER(ptr, int8_t, pTable->type);
@@ -78,28 +89,34 @@ STable *tsdbDecodeTable(void *cont, int contLen) {
   ptr = (char *)ptr + sizeof(int);
   pTable->name = calloc(1, len + VARSTR_HEADER_SIZE + 1);
   if (pTable->name == NULL) return NULL;
-  
+
   varDataSetLen(pTable->name, len);
   memcpy(pTable->name->data, ptr, len);
-  
+
   ptr = (char *)ptr + len;
   T_READ_MEMBER(ptr, uint64_t, pTable->tableId.uid);
   T_READ_MEMBER(ptr, int32_t, pTable->tableId.tid);
   T_READ_MEMBER(ptr, uint64_t, pTable->superUid);
 
   if (pTable->type == TSDB_SUPER_TABLE) {
-    pTable->schema = tdDecodeSchema(&ptr);
+    T_READ_MEMBER(ptr, int16_t, pTable->numOfSchemas);
+    for (int i = 0; i < pTable->numOfSchemas; i++) {
+      pTable->schema[i] = tdDecodeSchema(&ptr);
+    }
     pTable->tagSchema = tdDecodeSchema(&ptr);
   } else if (pTable->type == TSDB_CHILD_TABLE) {
     ptr = tdDecodeKVRow(ptr, &pTable->tagVal);
   } else {
-    pTable->schema = tdDecodeSchema(&ptr);
+    T_READ_MEMBER(ptr, int16_t, pTable->numOfSchemas);
+    for (int i = 0; i < pTable->numOfSchemas; i++) {
+      pTable->schema[i] = tdDecodeSchema(&ptr);
+    }
   }
 
   if (pTable->type == TSDB_STREAM_TABLE) {
     ptr = taosDecodeString(ptr, &(pTable->sql));
   }
-  
+
   pTable->lastKey = TSKEY_INITIAL_VAL;
   return pTable;
 }
@@ -221,13 +238,14 @@ int32_t tsdbFreeMeta(STsdbMeta *pMeta) {
   return 0;
 }
 
+// Get the newest table schema
 STSchema *tsdbGetTableSchema(STsdbMeta *pMeta, STable *pTable) {
   if (pTable->type == TSDB_NORMAL_TABLE || pTable->type == TSDB_SUPER_TABLE || pTable->type == TSDB_STREAM_TABLE) {
-    return pTable->schema;
+    return pTable->schema[pTable->numOfSchemas - 1];
   } else if (pTable->type == TSDB_CHILD_TABLE) {
     STable *pSuper = tsdbGetTableByUid(pMeta, pTable->superUid);
     if (pSuper == NULL) return NULL;
-    return pSuper->schema;
+    return pSuper->schema[pSuper->numOfSchemas-1];
   } else {
     return NULL;
   }
@@ -299,13 +317,16 @@ static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) {
   }
 
   pTable->type = pCfg->type;
+  pTable->numOfSchemas = 0;
 
   if (isSuper) {
     pTable->type = TSDB_SUPER_TABLE;
     pTable->tableId.uid = pCfg->superUid;
     pTable->tableId.tid = -1;
     pTable->superUid = TSDB_INVALID_SUPER_TABLE_ID;
-    pTable->schema = tdDupSchema(pCfg->schema);
+    pTable->schema = (STSchema **)malloc(sizeof(STSchema *) * TSDB_MAX_TABLE_SCHEMAS);
+    pTable->numOfSchemas = 1;
+    pTable->schema[0] = tdDupSchema(pCfg->schema);
     pTable->tagSchema = tdDupSchema(pCfg->tagSchema);
 
     tsize = strnlen(pCfg->sname, TSDB_TABLE_NAME_LEN);
@@ -340,14 +361,18 @@ static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) {
     if (pCfg->type == TSDB_CHILD_TABLE) {
       pTable->superUid = pCfg->superUid;
       pTable->tagVal = tdKVRowDup(pCfg->tagValues);
-    } else if (pCfg->type == TSDB_NORMAL_TABLE) {
-      pTable->superUid = -1;
-      pTable->schema = tdDupSchema(pCfg->schema);
     } else {
-      ASSERT(pCfg->type == TSDB_STREAM_TABLE);
-      pTable->superUid = -1;
-      pTable->schema = tdDupSchema(pCfg->schema);
-      pTable->sql = strdup(pCfg->sql);
+      pTable->schema = (STSchema **)malloc(sizeof(STSchema *) * TSDB_MAX_TABLE_SCHEMAS);
+      pTable->numOfSchemas = 1;
+      pTable->schema[0] = tdDupSchema(pCfg->schema);
+
+      if (pCfg->type == TSDB_NORMAL_TABLE) {
+        pTable->superUid = -1;
+      } else {
+        ASSERT(pCfg->type == TSDB_STREAM_TABLE);
+        pTable->superUid = -1;
+        pTable->sql = strdup(pCfg->sql);
+      }
     }
   }
 
@@ -580,7 +605,7 @@ static int tsdbFreeTable(STable *pTable) {
   if (pTable->type == TSDB_CHILD_TABLE) {
     kvRowFree(pTable->tagVal);
   } else {
-    tdFreeSchema(pTable->schema);
+    for (int i = 0; i < pTable->numOfSchemas; i++) tdFreeSchema(pTable->schema[i]);
   }
 
   if (pTable->type == TSDB_STREAM_TABLE) {
@@ -642,9 +667,10 @@ static int tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx) {
   }
 
   // Update the pMeta->maxCols and pMeta->maxRowBytes
-  if (pTable->type == TSDB_SUPER_TABLE || pTable->type == TSDB_NORMAL_TABLE) {
-    if (schemaNCols(pTable->schema) > pMeta->maxCols) pMeta->maxCols = schemaNCols(pTable->schema);
-    int bytes = dataRowMaxBytesFromSchema(pTable->schema);
+  if (pTable->type == TSDB_SUPER_TABLE || pTable->type == TSDB_NORMAL_TABLE || pTable->type == TSDB_STREAM_TABLE) {
+    if (schemaNCols(pTable->schema[pTable->numOfSchemas - 1]) > pMeta->maxCols)
+      pMeta->maxCols = schemaNCols(pTable->schema[pTable->numOfSchemas - 1]);
+    int bytes = dataRowMaxBytesFromSchema(pTable->schema[pTable->numOfSchemas - 1]);
     if (bytes > pMeta->maxRowBytes) pMeta->maxRowBytes = bytes;
   }
 

From e016a975f0f4bb1933d4f4c4e7ed7df0704d213b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 3 Jun 2020 15:37:01 +0800
Subject: [PATCH 49/64] [td-90]

---
 src/common/src/ttypes.c   |  2 +-
 src/inc/tsdb.h            |  4 +-
 src/query/src/qExecutor.c | 81 +++++++++++++++++++++++++--------------
 src/tsdb/src/tsdbMeta.c   | 28 ++++----------
 4 files changed, 63 insertions(+), 52 deletions(-)

diff --git a/src/common/src/ttypes.c b/src/common/src/ttypes.c
index a2c16a705f..4aee027c0b 100644
--- a/src/common/src/ttypes.c
+++ b/src/common/src/ttypes.c
@@ -364,7 +364,7 @@ char tTokenTypeSwitcher[13] = {
 };
 
 bool isValidDataType(int32_t type, int32_t length) {
-  if (type < TSDB_DATA_TYPE_BOOL || type > TSDB_DATA_TYPE_NCHAR) {
+  if (type < TSDB_DATA_TYPE_NULL || type > TSDB_DATA_TYPE_NCHAR) {
     return false;
   }
 
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 3f3ad8dc9a..e8b083ed6b 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -109,8 +109,8 @@ int  tsdbTableSetSName(STableCfg *config, char *sname, bool dup);
 int  tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup);
 void tsdbClearTableCfg(STableCfg *config);
 
-int32_t    tsdbGetTableTagVal(TsdbRepoT *repo, STableId *id, int32_t colId, int16_t *type, int16_t *bytes, char **val);
-char *     tsdbGetTableName(TsdbRepoT *repo, const STableId *id, int16_t *bytes);
+void* tsdbGetTableTagVal(TsdbRepoT* repo, const STableId* id, int32_t colId, int16_t type, int16_t bytes);
+char* tsdbGetTableName(TsdbRepoT *repo, const STableId *id);
 STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg);
 
 int   tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg);
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index efa320f544..2c22a28d34 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -2224,24 +2224,26 @@ static int64_t doScanAllDataBlocks(SQueryRuntimeEnv *pRuntimeEnv) {
  * set tag value in SQLFunctionCtx
  * e.g.,tag information into input buffer
  */
-static void doSetTagValueInParam(void *tsdb, STableId* pTableId, int32_t tagColId, tVariant *param) {
-  tVariantDestroy(param);
-
-  char *  val = NULL;
-  int16_t bytes = 0;
-  int16_t type = 0;
+static void doSetTagValueInParam(void *tsdb, STableId* pTableId, int32_t tagColId, tVariant *tag, int16_t type,
+    int16_t bytes) {
+  tVariantDestroy(tag);
 
   if (tagColId == TSDB_TBNAME_COLUMN_INDEX) {
-    val = tsdbGetTableName(tsdb, pTableId, &bytes);
-    type = TSDB_DATA_TYPE_BINARY;
-    tVariantCreateFromBinary(param, varDataVal(val), varDataLen(val), type);
+    char* val = tsdbGetTableName(tsdb, pTableId);
+    assert(val != NULL);
+    
+    tVariantCreateFromBinary(tag, varDataVal(val), varDataLen(val), TSDB_DATA_TYPE_BINARY);
   } else {
-    tsdbGetTableTagVal(tsdb, pTableId, tagColId, &type, &bytes, &val);
+    char* val = tsdbGetTableTagVal(tsdb, pTableId, tagColId, type, bytes);
+    if (val == NULL) {
+      tag->nType = TSDB_DATA_TYPE_NULL;
+      return;
+    }
     
     if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
-      tVariantCreateFromBinary(param, varDataVal(val), varDataLen(val), type);
+      tVariantCreateFromBinary(tag, varDataVal(val), varDataLen(val), type);
     } else {
-      tVariantCreateFromBinary(param, val, bytes, type);
+      tVariantCreateFromBinary(tag, val, bytes, type);
     }
   }
 }
@@ -2249,25 +2251,29 @@ static void doSetTagValueInParam(void *tsdb, STableId* pTableId, int32_t tagColI
 void setTagVal(SQueryRuntimeEnv *pRuntimeEnv, STableId* pTableId, void *tsdb) {
   SQuery *pQuery = pRuntimeEnv->pQuery;
 
-  SSqlFuncMsg *pFuncMsg = &pQuery->pSelectExpr[0].base;
-  if (pQuery->numOfOutput == 1 && pFuncMsg->functionId == TSDB_FUNC_TS_COMP) {
-    assert(pFuncMsg->numOfParams == 1);
-    doSetTagValueInParam(tsdb, pTableId, pFuncMsg->arg->argValue.i64, &pRuntimeEnv->pCtx[0].tag);
+  SExprInfo *pExprInfo = &pQuery->pSelectExpr[0];
+  if (pQuery->numOfOutput == 1 && pExprInfo->base.functionId == TSDB_FUNC_TS_COMP) {
+  
+    assert(pExprInfo->base.numOfParams == 1);
+    doSetTagValueInParam(tsdb, pTableId, pExprInfo->base.arg->argValue.i64, &pRuntimeEnv->pCtx[0].tag,
+                         pExprInfo->type, pExprInfo->bytes);
   } else {
     // set tag value, by which the results are aggregated.
     for (int32_t idx = 0; idx < pQuery->numOfOutput; ++idx) {
-      SColIndex *pCol = &pQuery->pSelectExpr[idx].base.colInfo;
-
+      SExprInfo* pExprInfo = &pQuery->pSelectExpr[idx];
+  
       // ts_comp column required the tag value for join filter
-      if (!TSDB_COL_IS_TAG(pCol->flag)) {
+      if (!TSDB_COL_IS_TAG(pExprInfo->base.colInfo.flag)) {
         continue;
       }
 
       // todo use tag column index to optimize performance
-      doSetTagValueInParam(tsdb, pTableId, pCol->colId, &pRuntimeEnv->pCtx[idx].tag);
+      doSetTagValueInParam(tsdb, pTableId, pExprInfo->base.colInfo.colId, &pRuntimeEnv->pCtx[idx].tag,
+          pExprInfo->type, pExprInfo->bytes);
     }
 
     // set the join tag for first column
+    SSqlFuncMsg *pFuncMsg = &pExprInfo->base;
     if (pFuncMsg->functionId == TSDB_FUNC_TS && pFuncMsg->colInfo.colIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX &&
         pRuntimeEnv->pTSBuf != NULL) {
       assert(pFuncMsg->numOfParams == 1);
@@ -6005,7 +6011,7 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
   num = taosArrayGetSize(pa);
 
   assert(num == pQInfo->groupInfo.numOfTables);
-  int16_t type, bytes;
+//  int16_t type, bytes;
 
   int32_t functionId = pQuery->pSelectExpr[0].base.functionId;
   if (functionId == TSDB_FUNC_TID_TAG) { // return the tags & table Id
@@ -6013,7 +6019,6 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
     SExprInfo* pExprInfo = &pQuery->pSelectExpr[0];
 
     int32_t rsize = pExprInfo->bytes;
-    char* data = NULL;
 
     for(int32_t i = 0; i < num; ++i) {
       SGroupItem* item = taosArrayGet(pa, i);
@@ -6031,8 +6036,25 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
       *(int32_t*) output = pQInfo->vgId;
       output += sizeof(pQInfo->vgId);
 
-      tsdbGetTableTagVal(pQInfo->tsdb, &item->id, pExprInfo->base.colInfo.colId, &type, &bytes, &data);
-      memcpy(output, data, bytes);
+      int16_t bytes = pExprInfo->bytes;
+      int16_t type = pExprInfo->type;
+      
+      char* val = tsdbGetTableTagVal(pQInfo->tsdb, &item->id, pExprInfo->base.colInfo.colId, type, bytes);
+      
+      // todo refactor
+      if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
+        if (val == NULL) {
+          setVardataNull(output, type);
+        } else {
+          memcpy(output, val, varDataTLen(val));
+        }
+      } else {
+        if (val == NULL) {
+          setNull(output, type, bytes);
+        } else {
+          memcpy(output, val, bytes);
+        }
+      }
     }
 
     qTrace("QInfo:%p create (tableId, tag) info completed, rows:%d", pQInfo, num);
@@ -6041,17 +6063,18 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
       SExprInfo* pExprInfo = pQuery->pSelectExpr;
       SGroupItem* item = taosArrayGet(pa, i);
 
-      char* data = NULL;
       for(int32_t j = 0; j < pQuery->numOfOutput; ++j) {
         // todo check the return value, refactor codes
         if (pExprInfo[j].base.colInfo.colId == TSDB_TBNAME_COLUMN_INDEX) {
-          data = tsdbGetTableName(pQInfo->tsdb, &item->id, &bytes);
+          char* data = tsdbGetTableName(pQInfo->tsdb, &item->id);
           
           char* dst = pQuery->sdata[j]->data + i * (TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE);
           memcpy(dst, data, varDataTLen(data));
-        } else {// todo refactor, return the true length of binary|nchar data
-          tsdbGetTableTagVal(pQInfo->tsdb, &item->id, pExprInfo[j].base.colInfo.colId, &type, &bytes, &data);
-          assert(bytes <= pExprInfo[j].bytes && type == pExprInfo[j].type);
+        } else {// todo refactor
+          int16_t type = pExprInfo[j].type;
+          int16_t bytes = pExprInfo[j].bytes;
+          
+          char* data = tsdbGetTableTagVal(pQInfo->tsdb, &item->id, pExprInfo[j].base.colInfo.colId, type, bytes);
           
           char* dst = pQuery->sdata[j]->data + i * pExprInfo[j].bytes;
           if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 16e034c228..494809c278 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -245,45 +245,33 @@ STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable) {
   }
 }
 
-int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId* id, int32_t colId, int16_t* type, int16_t* bytes, char** val) {
+void* tsdbGetTableTagVal(TsdbRepoT* repo, const STableId* id, int32_t colId, int16_t type, int16_t bytes) {
   STsdbMeta* pMeta = tsdbGetMeta(repo);
   STable* pTable = tsdbGetTableByUid(pMeta, id->uid);
 
   STSchema *pSchema = tsdbGetTableTagSchema(pMeta, pTable);
   STColumn *pCol = tdGetColOfID(pSchema, colId);
   if (pCol == NULL) {
-    return -1; // No matched tag volumn
+    return NULL;  // No matched tag volumn
   }
   
-  *val = tdGetKVRowValOfCol(pTable->tagVal, colId);
-  *type = pCol->type;
+  char* val = tdGetKVRowValOfCol(pTable->tagVal, colId);
+  assert(type == pCol->type && bytes == pCol->bytes);
   
-  if (*val != NULL) {
-    if (IS_VAR_DATA_TYPE(*type)) {
-      *bytes = varDataLen(*val);
-    } else {
-      *bytes = TYPE_BYTES[*type];
-    }
+  if (val != NULL && IS_VAR_DATA_TYPE(type)) {
+    assert(varDataLen(val) < pCol->bytes);
   }
   
-  return TSDB_CODE_SUCCESS;
+  return val;
 }
 
-char* tsdbGetTableName(TsdbRepoT *repo, const STableId* id, int16_t* bytes) {
+char* tsdbGetTableName(TsdbRepoT *repo, const STableId* id) {
   STsdbMeta* pMeta = tsdbGetMeta(repo);
   STable* pTable = tsdbGetTableByUid(pMeta, id->uid);
   
   if (pTable == NULL) {
-    if (bytes != NULL) {
-      *bytes = 0;
-    }
-    
     return NULL;
   } else {
-    if (bytes != NULL) {
-      *bytes = varDataLen(pTable->name);
-    }
-    
     return (char*) pTable->name;
   }
 }

From 26c291aba4f916d10c743f637d48abe98b351b17 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 08:30:06 +0000
Subject: [PATCH 50/64] TD-90

---
 src/tsdb/inc/tsdbMain.h |  4 ++++
 src/tsdb/src/tsdbMain.c | 11 ++++++++++-
 src/tsdb/src/tsdbMeta.c |  7 ++-----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index db1dcbd35d..3d7a672ee6 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -509,6 +509,10 @@ void    tsdbAdjustCacheBlocks(STsdbCache *pCache);
 int32_t tsdbGetMetaFileName(char *rootDir, char *fname);
 int     tsdbUpdateFileHeader(SFile *pFile, uint32_t version);
 int     tsdbUpdateTable(STsdbMeta *pMeta, STable *pTable, STableCfg *pCfg);
+int     tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable);
+int     tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable);
+
+#define DEFAULT_TAG_INDEX_COLUMN 0  // skip list built based on the first column of tags
 
 #ifdef __cplusplus
 }
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 8f58e5fe06..5c420d6f56 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -445,14 +445,23 @@ int tsdbUpdateTagValue(TsdbRepoT *repo, SUpdateTableTagValMsg *pMsg) {
     rpcFreeCont(msg);
   }
 
-  if (schemaVersion(tsdbGetTableTagSchema(pMeta, pTable)) > tversion) {
+  STSchema *pTagSchema = tsdbGetTableTagSchema(pMeta, pTable);
+
+  if (schemaVersion(pTagSchema) > tversion) {
     tsdbError(
         "vgId:%d failed to update tag value of table %s since version out of date, client tag version:%d server tag "
         "version:%d",
         pRepo->config.tsdbId, varDataVal(pTable->name), tversion, schemaVersion(pTable->tagSchema));
     return TSDB_CODE_TAG_VER_OUT_OF_DATE;
   }
+  if (schemaColAt(pTagSchema, DEFAULT_TAG_INDEX_COLUMN)->colId == htons(pMsg->colId)) {
+    tsdbRemoveTableFromIndex(pMeta, pTable);
+  }
+  // TODO: remove table from index if it is the first column of tag
   tdSetKVRowDataOfCol(&pTable->tagVal, htons(pMsg->colId), htons(pMsg->type), pMsg->data);
+  if (schemaColAt(pTagSchema, DEFAULT_TAG_INDEX_COLUMN)->colId == htons(pMsg->colId)) {
+    tsdbAddTableIntoIndex(pMeta, pTable);
+  }
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 6aaece59eb..5e8412a1ec 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -8,13 +8,10 @@
 #define TSDB_SUPER_TABLE_SL_LEVEL 5 // TODO: may change here
 // #define TSDB_META_FILE_NAME "META"
 
-const int32_t DEFAULT_TAG_INDEX_COLUMN = 0;   // skip list built based on the first column of tags
 
 static int     tsdbFreeTable(STable *pTable);
 static int32_t tsdbCheckTableCfg(STableCfg *pCfg);
 static int     tsdbAddTableToMeta(STsdbMeta *pMeta, STable *pTable, bool addIdx);
-static int     tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable);
-static int     tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable);
 static int     tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable, bool rmFromIdx);
 
 /**
@@ -719,7 +716,7 @@ static int tsdbRemoveTableFromMeta(STsdbMeta *pMeta, STable *pTable, bool rmFrom
   return 0;
 }
 
-static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable) {
+int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable) {
   assert(pTable->type == TSDB_CHILD_TABLE && pTable != NULL);
   STable* pSTable = tsdbGetTableByUid(pMeta, pTable->superUid);
   assert(pSTable != NULL);
@@ -744,7 +741,7 @@ static int tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable) {
   return 0;
 }
 
-static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) {
+int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) {
   assert(pTable->type == TSDB_CHILD_TABLE && pTable != NULL);
   
   STable* pSTable = tsdbGetTableByUid(pMeta, pTable->superUid);

From 6084f5a78faa95b9ffbd20c2a2a4fa5d185a8be5 Mon Sep 17 00:00:00 2001
From: Tao Liu <tliu@taosdata.com>
Date: Wed, 3 Jun 2020 08:44:45 +0000
Subject: [PATCH 51/64] [TD-314] modify python connector to adapt C API

---
 .../python/linux/python2/taos/cinterface.py   | 37 ++++++++++---------
 .../python/linux/python2/taos/connection.py   |  4 +-
 .../python/linux/python2/taos/constants.py    |  2 +-
 .../python/linux/python2/taos/cursor.py       | 22 ++++++-----
 .../python/windows/python2/taos/cinterface.py | 35 +++++++++---------
 .../python/windows/python2/taos/connection.py |  4 +-
 .../python/windows/python2/taos/cursor.py     | 14 +++----
 .../python/windows/python3/taos/cinterface.py | 35 +++++++++---------
 .../python/windows/python3/taos/connection.py |  4 +-
 .../python/windows/python3/taos/cursor.py     | 14 +++----
 src/kit/taosdemo/taosdemo.c                   | 13 -------
 11 files changed, 86 insertions(+), 98 deletions(-)

diff --git a/src/connector/python/linux/python2/taos/cinterface.py b/src/connector/python/linux/python2/taos/cinterface.py
index 76c0a4be9d..758244b6d8 100644
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
@@ -142,12 +142,13 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
 
     def __init__(self, config=None):
         '''
@@ -249,12 +250,12 @@ class CTaosInterface(object):
             raise AttributeError("sql is expected as a string")
         # finally:
         #     CTaosInterface.libtaos.close(connection)
-
+      
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -292,18 +293,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -337,8 +337,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -386,29 +386,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection)
+        return CTaosInterface.libtaos.taos_errstr(result)
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeresult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/linux/python2/taos/connection.py b/src/connector/python/linux/python2/taos/connection.py
index 04fbbdec04..552250f116 100644
--- a/src/connector/python/linux/python2/taos/connection.py
+++ b/src/connector/python/linux/python2/taos/connection.py
@@ -78,9 +78,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/linux/python2/taos/constants.py b/src/connector/python/linux/python2/taos/constants.py
index a994bceaf6..feb7050a40 100644
--- a/src/connector/python/linux/python2/taos/constants.py
+++ b/src/connector/python/linux/python2/taos/constants.py
@@ -28,6 +28,6 @@ class FieldType(object):
     C_FLOAT_NULL = float('nan')
     C_DOUBLE_NULL = float('nan')
     C_BINARY_NULL = bytearray([int('0xff', 16)])
-    # Time precision definition
+    # Timestamp precision definition
     C_TIMESTAMP_MILLI = 0
     C_TIMESTAMP_MICRO = 1
diff --git a/src/connector/python/linux/python2/taos/cursor.py b/src/connector/python/linux/python2/taos/cursor.py
index 7ea52aa5ad..6bf8236ac9 100644
--- a/src/connector/python/linux/python2/taos/cursor.py
+++ b/src/connector/python/linux/python2/taos/cursor.py
@@ -116,25 +116,29 @@ class TDengineCursor(object):
         if params is not None:
             pass
 
-        res = CTaosInterface.query(self._connection._conn, stmt)
-
+        # global querySeqNum
+        # querySeqNum += 1
+        # localSeqNum = querySeqNum # avoid raice condition
+        # print("   >> Exec Query ({}): {}".format(localSeqNum, str(stmt)))
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        # print("   << Query ({}) Exec Done".format(localSeqNum))
         if (self._logfile):
             with open(self._logfile, "a") as logfile:
                 logfile.write("%s;\n" % operation)
 
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
+        if self._result is not None:
+            if CTaosInterface.fieldsCount(self._result) == 0:
                 self._affected_rows += CTaosInterface.affectedRows(
-                    self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+                    self._result )
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(
-                    self._connection._conn)
+                self._fields = CTaosInterface.useResult(
+                    self._result)
                 return self._handle_result()
         else:
             raise ProgrammingError(
                 CTaosInterface.errStr(
-                    self._connection._conn))
+                    self._result ))
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
diff --git a/src/connector/python/windows/python2/taos/cinterface.py b/src/connector/python/windows/python2/taos/cinterface.py
index c4b8fa8328..e58ebbc8da 100644
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
@@ -142,12 +142,13 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
 
     def __init__(self, config=None):
         '''
@@ -251,10 +252,10 @@ class CTaosInterface(object):
         #     CTaosInterface.libtaos.close(connection)
 
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -292,18 +293,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -337,8 +337,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -386,29 +386,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection)
+        return CTaosInterface.libtaos.taos_errstr(result)
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeresult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/windows/python2/taos/connection.py b/src/connector/python/windows/python2/taos/connection.py
index e2783975d9..d9576a553b 100644
--- a/src/connector/python/windows/python2/taos/connection.py
+++ b/src/connector/python/windows/python2/taos/connection.py
@@ -79,9 +79,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/windows/python2/taos/cursor.py b/src/connector/python/windows/python2/taos/cursor.py
index 976ec06707..0d7c882baf 100644
--- a/src/connector/python/windows/python2/taos/cursor.py
+++ b/src/connector/python/windows/python2/taos/cursor.py
@@ -109,16 +109,16 @@ class TDengineCursor(object):
         if params is not None:
             pass
         
-        res = CTaosInterface.query(self._connection._conn, stmt)
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        if self._result is not None:
+            if CTaosInterface.fieldsCount(self._result) == 0:
+                self._affected_rows += CTaosInterface.affectedRows(self._result)
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(self._connection._conn)
+                self._fields = CTaosInterface.useResult(self._result)
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._connection._conn))
+            raise ProgrammingError(CTaosInterface.errStr(self._result))
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
diff --git a/src/connector/python/windows/python3/taos/cinterface.py b/src/connector/python/windows/python3/taos/cinterface.py
index d8c45f1171..2217ad5c58 100644
--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
@@ -142,12 +142,13 @@ class CTaosInterface(object):
     libtaos.taos_fetch_fields.restype = ctypes.POINTER(TaosField)
     libtaos.taos_init.restype = None
     libtaos.taos_connect.restype = ctypes.c_void_p
-    libtaos.taos_use_result.restype = ctypes.c_void_p
+    #libtaos.taos_use_result.restype = ctypes.c_void_p
     libtaos.taos_fetch_row.restype = ctypes.POINTER(ctypes.c_void_p)
     libtaos.taos_errstr.restype = ctypes.c_char_p
     libtaos.taos_subscribe.restype = ctypes.c_void_p
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
+    libtaos.taos_free_result.restype = None
 
     def __init__(self, config=None):
         '''
@@ -251,10 +252,10 @@ class CTaosInterface(object):
         #     CTaosInterface.libtaos.close(connection)
 
     @staticmethod
-    def affectedRows(connection):
+    def affectedRows(result):
         """The affected rows after runing query
         """
-        return CTaosInterface.libtaos.taos_affected_rows(connection)
+        return CTaosInterface.libtaos.taos_affected_rows(result)
 
     @staticmethod
     def subscribe(connection, restart, topic, sql, interval):
@@ -292,18 +293,17 @@ class CTaosInterface(object):
         CTaosInterface.libtaos.taos_unsubscribe(sub, 1 if keepProgress else 0)
 
     @staticmethod
-    def useResult(connection):
+    def useResult(result):
         '''Use result after calling self.query
         '''
-        result = ctypes.c_void_p(CTaosInterface.libtaos.taos_use_result(connection))
         fields = []
         pfields = CTaosInterface.fetchFields(result)
-        for i in range(CTaosInterface.fieldsCount(connection)):
+        for i in range(CTaosInterface.fieldsCount(result)):
             fields.append({'name': pfields[i].name.decode('utf-8'),
                            'bytes': pfields[i].bytes,
                            'type': ord(pfields[i].type)})
 
-        return result, fields
+        return fields
 
     @staticmethod
     def fetchBlock(result, fields):
@@ -337,8 +337,8 @@ class CTaosInterface(object):
         result.value = None
 
     @staticmethod
-    def fieldsCount(connection):
-        return CTaosInterface.libtaos.taos_field_count(connection)
+    def fieldsCount(result):
+        return CTaosInterface.libtaos.taos_field_count(result)
 
     @staticmethod
     def fetchFields(result):
@@ -386,29 +386,30 @@ class CTaosInterface(object):
     #         return (ctypes.cast(data,  ctypes.c_char_p).value).rstrip('\x00')
 
     @staticmethod
-    def errno(connection):
+    def errno(result):
         """Return the error number.
         """
-        return CTaosInterface.libtaos.taos_errno(connection)
+        return CTaosInterface.libtaos.taos_errno(result)
 
     @staticmethod
-    def errStr(connection):
+    def errStr(result):
         """Return the error styring
         """
-        return CTaosInterface.libtaos.taos_errstr(connection).decode('utf-8')
+        return CTaosInterface.libtaos.taos_errstr(result).decode('utf-8')
 
 
 if __name__ == '__main__':
     cinter = CTaosInterface()
     conn = cinter.connect()
+    result = cinter.query(conn, 'show databases')
 
-    print('Query return value: {}'.format(cinter.query(conn, 'show databases')))
-    print('Affected rows: {}'.format(cinter.affectedRows(conn)))
+    print('Query Affected rows: {}'.format(cinter.affectedRows(result)))
 
-    result, des = CTaosInterface.useResult(conn)
+    fields = CTaosInterface.useResult(result)
 
-    data, num_of_rows = CTaosInterface.fetchBlock(result, des)
+    data, num_of_rows = CTaosInterface.fetchBlock(result, fields)
 
     print(data)
 
+    cinter.freeresult(result)
     cinter.close(conn)
\ No newline at end of file
diff --git a/src/connector/python/windows/python3/taos/connection.py b/src/connector/python/windows/python3/taos/connection.py
index e2783975d9..d9576a553b 100644
--- a/src/connector/python/windows/python3/taos/connection.py
+++ b/src/connector/python/windows/python3/taos/connection.py
@@ -79,9 +79,7 @@ class TDengineConnection(object):
     def clear_result_set(self):
         """Clear unused result set on this connection.
         """
-        result = self._chandle.useResult(self._conn)[0]
-        if result:
-            self._chandle.freeResult(result)
+        pass
 
 if __name__ == "__main__":
     conn = TDengineConnection(host='192.168.1.107')
diff --git a/src/connector/python/windows/python3/taos/cursor.py b/src/connector/python/windows/python3/taos/cursor.py
index c7f3400642..ebc549ec98 100644
--- a/src/connector/python/windows/python3/taos/cursor.py
+++ b/src/connector/python/windows/python3/taos/cursor.py
@@ -109,16 +109,16 @@ class TDengineCursor(object):
         if params is not None:
             pass
         
-        res = CTaosInterface.query(self._connection._conn, stmt)
-        if res == 0:
-            if CTaosInterface.fieldsCount(self._connection._conn) == 0:
-                self._affected_rows += CTaosInterface.affectedRows(self._connection._conn)
-                return CTaosInterface.affectedRows(self._connection._conn)
+        self._result = CTaosInterface.query(self._connection._conn, stmt)
+        if self._result is not None:
+            if CTaosInterface.fieldsCount(self._result) == 0:
+                self._affected_rows += CTaosInterface.affectedRows(self._result )
+                return CTaosInterface.affectedRows(self._result )
             else:
-                self._result, self._fields = CTaosInterface.useResult(self._connection._conn)
+                self._fields = CTaosInterface.useResult(self._result )
                 return self._handle_result()
         else:
-            raise ProgrammingError(CTaosInterface.errStr(self._connection._conn))
+            raise ProgrammingError(CTaosInterface.errStr(self._result ))
 
     def executemany(self, operation, seq_of_parameters):
         """Prepare a database operation (query or command) and then execute it against all parameter sequences or mappings found in the sequence seq_of_parameters.
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index b3d54f8245..1cdff80faa 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -708,25 +708,12 @@ void *readTable(void *sarg) {
       sprintf(command, "select %s from %s%d where ts>= %" PRId64, aggreFunc[j], tb_prefix, i, sTime);
 
       double t = getCurrentTime();
-<<<<<<< HEAD
-/*
-      if (taos_query(taos, command) != 0) {
-        fprintf(stderr, "Failed to query\n");
-        taos_close(taos);
-        exit(EXIT_FAILURE);
-      }
-*/
-      TAOS_RES *result = taos_query(taos, command) ;
-      if (result == NULL) {
-        fprintf(stderr, "Failed to retreive results:%s\n", taos_errstr(taos));
-=======
       TAOS_RES *pSql = taos_query(taos, command);
       int32_t code = taos_errno(pSql);
 
       if (code != 0) {
         fprintf(stderr, "Failed to query:%s\n", taos_errstr(taos));
         taos_free_result(pSql);
->>>>>>> 2f976c4f62b7a68626350e3ac15eddff20035b59
         taos_close(taos);
         exit(EXIT_FAILURE);
       }

From 8da1ff02744148fe4d8a9ee4278354faacc6e033 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Wed, 3 Jun 2020 10:18:25 +0000
Subject: [PATCH 52/64] fix coverity scan bugs

---
 src/rpc/src/rpcMain.c   | 9 +++++----
 src/rpc/src/rpcTcp.c    | 4 ++++
 src/rpc/test/rclient.c  | 3 ++-
 src/rpc/test/rsclient.c | 3 ++-
 src/rpc/test/rserver.c  | 1 +
 src/util/inc/tutil.h    | 5 +++++
 src/wal/test/waltest.c  | 3 ++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 978fc5b8ec..e7861201d3 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -218,9 +218,9 @@ void *rpcOpen(const SRpcInit *pInit) {
   pRpc->localPort = pInit->localPort;
   pRpc->afp = pInit->afp;
   pRpc->sessions = pInit->sessions+1;
-  if (pInit->user) strcpy(pRpc->user, pInit->user);
-  if (pInit->secret) strcpy(pRpc->secret, pInit->secret);
-  if (pInit->ckey) strcpy(pRpc->ckey, pInit->ckey);
+  if (pInit->user) tstrncpy(pRpc->user, pInit->user, sizeof(pRpc->user));
+  if (pInit->secret) memcpy(pRpc->secret, pInit->secret, sizeof(pRpc->secret));
+  if (pInit->ckey) tstrncpy(pRpc->ckey, pInit->ckey, sizeof(pRpc->ckey));
   pRpc->spi = pInit->spi;
   pRpc->cfp = pInit->cfp;
   pRpc->afp = pInit->afp;
@@ -434,7 +434,8 @@ void rpcSendResponse(const SRpcMsg *pRsp) {
 }
 
 void rpcSendRedirectRsp(void *thandle, const SRpcIpSet *pIpSet) {
-  SRpcMsg  rpcMsg;
+  SRpcMsg  rpcMsg; 
+  memset(&rpcMsg, 0, sizeof(rpcMsg));
   
   rpcMsg.contLen = sizeof(SRpcIpSet);
   rpcMsg.pCont = rpcMallocCont(rpcMsg.contLen);
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index defd277db1..5dd5e4015e 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -253,12 +253,14 @@ void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int num, void *
 
   if (pthread_mutex_init(&(pThreadObj->mutex), NULL) < 0) {
     tError("%s failed to init TCP client mutex(%s)", label, strerror(errno));
+    free(pThreadObj);
     return NULL;
   }
 
   pThreadObj->pollFd = epoll_create(10);  // size does not matter
   if (pThreadObj->pollFd < 0) {
     tError("%s failed to create TCP client epoll", label);
+    free(pThreadObj);
     return NULL;
   }
 
@@ -269,6 +271,8 @@ void *taosInitTcpClient(uint32_t ip, uint16_t port, char *label, int num, void *
   int code = pthread_create(&(pThreadObj->thread), &thattr, taosProcessTcpData, (void *)(pThreadObj));
   pthread_attr_destroy(&thattr);
   if (code != 0) {
+    close(pThreadObj->pollFd);
+    free(pThreadObj);
     tError("%s failed to create TCP read data thread(%s)", label, strerror(errno));
     return NULL;
   }
diff --git a/src/rpc/test/rclient.c b/src/rpc/test/rclient.c
index ea1ebb5974..857b39dd82 100644
--- a/src/rpc/test/rclient.c
+++ b/src/rpc/test/rclient.c
@@ -14,6 +14,7 @@
  */
 
 #include "os.h"
+#include "tutil.h"
 #include "tglobal.h"
 #include "rpcLog.h"
 #include "trpc.h"
@@ -105,7 +106,7 @@ int main(int argc, char *argv[]) {
     if (strcmp(argv[i], "-p")==0 && i < argc-1) {
       ipSet.port[0] = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-i") ==0 && i < argc-1) {
-      strcpy(ipSet.fqdn[0], argv[++i]); 
+      tstrncpy(ipSet.fqdn[0], argv[++i], sizeof(ipSet.fqdn)); 
     } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
       rpcInit.numOfThreads = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
diff --git a/src/rpc/test/rsclient.c b/src/rpc/test/rsclient.c
index 3b19d7a9ea..6f367bc19b 100644
--- a/src/rpc/test/rsclient.c
+++ b/src/rpc/test/rsclient.c
@@ -15,6 +15,7 @@
 
 
 #include "os.h"
+#include "tutil.h"
 #include "tglobal.h"
 #include "rpcLog.h"
 #include "trpc.h"
@@ -106,7 +107,7 @@ int main(int argc, char *argv[]) {
     if (strcmp(argv[i], "-p")==0 && i < argc-1) {
       ipSet.port[0] = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-i") ==0 && i < argc-1) {
-      strcpy(ipSet.fqdn[0], argv[++i]); 
+      tstrncpy(ipSet.fqdn[0], argv[++i], sizeof(ipSet.fqdn)); 
     } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
       rpcInit.numOfThreads = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
diff --git a/src/rpc/test/rserver.c b/src/rpc/test/rserver.c
index 4ce6a0a8cf..71e7c62b9e 100644
--- a/src/rpc/test/rserver.c
+++ b/src/rpc/test/rserver.c
@@ -69,6 +69,7 @@ void processShellMsg() {
       taosGetQitem(qall, &type, (void **)&pRpcMsg);
       rpcFreeCont(pRpcMsg->pCont);
 
+      memset(&rpcMsg, 0, sizeof(rpcMsg));
       rpcMsg.pCont = rpcMallocCont(msgSize);
       rpcMsg.contLen = msgSize;
       rpcMsg.handle = pRpcMsg->handle;
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index 984df23879..1960dc2a2a 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -42,6 +42,11 @@ extern "C" {
     }            \
   }
 
+#define tstrncpy(dst, src, size) do { \
+    strncpy((dst), (src), (size)); \
+    (dst)[(size) - 1] = 0; \
+} while (0);
+
 #define tclose(x) taosCloseSocket(x)
 
 // Pointer p drift right by b bytes
diff --git a/src/wal/test/waltest.c b/src/wal/test/waltest.c
index cf9bf9542e..073dbf72af 100644
--- a/src/wal/test/waltest.c
+++ b/src/wal/test/waltest.c
@@ -15,6 +15,7 @@
 
 //#define _DEFAULT_SOURCE
 #include "os.h"
+#include "tutil.h"
 #include "tglobal.h"
 #include "tlog.h"
 #include "twal.h"
@@ -45,7 +46,7 @@ int main(int argc, char *argv[]) {
 
   for (int i=1; i<argc; ++i) {
     if (strcmp(argv[i], "-p")==0 && i < argc-1) {
-      strcpy(path, argv[++i]);
+      tstrncpy(path, argv[++i], sizeof(path));
     } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {
       max = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-l")==0 && i < argc-1) {

From b3a0c4291e5ff41e138836d21caacada06f98a62 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 10:59:05 +0000
Subject: [PATCH 53/64] TD-90

---
 src/common/inc/tdataformat.h |  2 +-
 src/common/src/tdataformat.c | 68 ++++++++++++++++++++++++------------
 src/tsdb/inc/tsdbMain.h      | 19 +++++-----
 src/tsdb/src/tsdbMain.c      | 15 ++++++--
 src/tsdb/src/tsdbMeta.c      | 42 ++++++++++++++++++++--
 5 files changed, 108 insertions(+), 38 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index bb1ce94974..cb39b990e5 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -248,7 +248,7 @@ void       tdResetDataCols(SDataCols *pCols);
 void       tdInitDataCols(SDataCols *pCols, STSchema *pSchema);
 SDataCols *tdDupDataCols(SDataCols *pCols, bool keepData);
 void       tdFreeDataCols(SDataCols *pCols);
-void       tdAppendDataRowToDataCol(SDataRow row, SDataCols *pCols);
+void       tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols);
 void       tdPopDataColsPoints(SDataCols *pCols, int pointsToPop);  //!!!!
 int        tdMergeDataCols(SDataCols *target, SDataCols *src, int rowsToMerge);
 void       tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCols *src2, int *iter2, int tRows);
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index f3fd91fc8d..1a444d6b90 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -265,25 +265,29 @@ bool isNEleNull(SDataCol *pCol, int nEle) {
   }
 }
 
-void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints) {
-  char *ptr = NULL;
-  switch (pCol->type) {
-    case TSDB_DATA_TYPE_BINARY:
-    case TSDB_DATA_TYPE_NCHAR:
-      pCol->len = 0;
-      for (int i = 0; i < nEle; i++) {
-        pCol->dataOff[i] = pCol->len;
-        ptr = (char *)pCol->pData + pCol->len;
-        varDataLen(ptr) = (pCol->type == TSDB_DATA_TYPE_BINARY) ? sizeof(char) : TSDB_NCHAR_SIZE;
-        setNull(ptr + sizeof(VarDataLenT), pCol->type, pCol->bytes);
-        pCol->len += varDataTLen(ptr);
-      }
+void dataColSetNullAt(SDataCol *pCol, int index) {
+  if (IS_VAR_DATA_TYPE(pCol->type)) {
+    pCol->dataOff[index] = pCol->len;
+    char *ptr = POINTER_SHIFT(pCol->pData, pCol->len);
+    varDataLen(ptr) = (pCol->type == TSDB_DATA_TYPE_BINARY) ? sizeof(char) : TSDB_NCHAR_SIZE;
+    setNull(varDataVal(ptr), pCol->type, pCol->bytes);
+    pCol->len += varDataTLen(ptr);
+  } else {
+    setNull(POINTER_SHIFT(pCol->pData, TYPE_BYTES[pCol->type] * index), pCol->type, pCol->bytes);
+    pCol->len += TYPE_BYTES[pCol->type];
+  }
+}
 
-      break;
-    default:
-      setNullN(pCol->pData, pCol->type, pCol->bytes, nEle);
-      pCol->len = TYPE_BYTES[pCol->type] * nEle;
-      break;
+void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints) {
+
+  if (IS_VAR_DATA_TYPE(pCol->type)) {
+    pCol->len = 0;
+    for (int i = 0; i < nEle; i++) {
+      dataColSetNullAt(pCol, i);
+    }
+  } else {
+    setNullN(pCol->pData, pCol->type, pCol->bytes, nEle);
+    pCol->len = TYPE_BYTES[pCol->type] * nEle;
   }
 }
 
@@ -380,14 +384,32 @@ void tdResetDataCols(SDataCols *pCols) {
   }
 }
 
-void tdAppendDataRowToDataCol(SDataRow row, SDataCols *pCols) {
+void tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols) {
   ASSERT(dataColsKeyLast(pCols) < dataRowKey(row));
 
-  for (int i = 0; i < pCols->numOfCols; i++) {
-    SDataCol *pCol = pCols->cols + i;
-    void *    value = tdGetRowDataOfCol(row, pCol->type, pCol->offset);
+  int rcol = 0;
+  int dcol = 0;
 
-    dataColAppendVal(pCol, value, pCols->numOfRows, pCols->maxPoints);
+  while (dcol < pCols->numOfCols) {
+    SDataCol *pDataCol = &(pCols->cols[dcol]);
+    if (rcol >= schemaNCols(pSchema)) {
+      dataColSetNullAt(pDataCol, pCols->numOfRows);
+      dcol++;
+      continue;
+    }
+
+    STColumn *pRowCol = schemaColAt(pSchema, rcol);
+    if (pRowCol->colId == pDataCol->colId) {
+      dataColAppendVal(pDataCol, tdGetRowDataOfCol(row, pRowCol->type, pRowCol->offset), pCols->numOfRows,
+                       pCols->maxPoints);
+      dcol++;
+      rcol++;
+    } else if (pRowCol->colId < pDataCol->colId) {
+      rcol++;
+    } else {
+      dataColSetNullAt(pDataCol, pCols->numOfRows);
+      dcol++;
+    }
   }
   pCols->numOfRows++;
 }
diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index 3d7a672ee6..5f9191c6d4 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -123,7 +123,6 @@ typedef struct STableIndexElem {
 
 STsdbMeta *tsdbInitMeta(char *rootDir, int32_t maxTables, void *pRepo);
 int32_t    tsdbFreeMeta(STsdbMeta *pMeta);
-STSchema * tsdbGetTableSchema(STsdbMeta *pMeta, STable *pTable);
 STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable);
 
 // ---- Operation on STable
@@ -503,14 +502,16 @@ int tsdbWriteCompInfo(SRWHelper *pHelper);
 int tsdbWriteCompIdx(SRWHelper *pHelper);
 
 // --------- Other functions need to further organize
-void    tsdbFitRetention(STsdbRepo *pRepo);
-int     tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks);
-void    tsdbAdjustCacheBlocks(STsdbCache *pCache);
-int32_t tsdbGetMetaFileName(char *rootDir, char *fname);
-int     tsdbUpdateFileHeader(SFile *pFile, uint32_t version);
-int     tsdbUpdateTable(STsdbMeta *pMeta, STable *pTable, STableCfg *pCfg);
-int     tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable);
-int     tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable);
+void      tsdbFitRetention(STsdbRepo *pRepo);
+int       tsdbAlterCacheTotalBlocks(STsdbRepo *pRepo, int totalBlocks);
+void      tsdbAdjustCacheBlocks(STsdbCache *pCache);
+int32_t   tsdbGetMetaFileName(char *rootDir, char *fname);
+int       tsdbUpdateFileHeader(SFile *pFile, uint32_t version);
+int       tsdbUpdateTable(STsdbMeta *pMeta, STable *pTable, STableCfg *pCfg);
+int       tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable);
+int       tsdbAddTableIntoIndex(STsdbMeta *pMeta, STable *pTable);
+STSchema *tsdbGetTableSchemaByVersion(STsdbMeta *pMeta, STable *pTable, int16_t version);
+STSchema *tsdbGetTableSchema(STsdbMeta *pMeta, STable *pTable);
 
 #define DEFAULT_TAG_INDEX_COLUMN 0  // skip list built based on the first column of tags
 
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 5c420d6f56..e76cc5313f 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -974,9 +974,10 @@ static int32_t tsdbInsertDataToTable(TsdbRepoT *repo, SSubmitBlk *pBlock, TSKEY
   return TSDB_CODE_SUCCESS;
 }
 
-static int tsdbReadRowsFromCache(SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead, SDataCols *pCols) {
+static int tsdbReadRowsFromCache(STsdbMeta *pMeta, STable *pTable, SSkipListIterator *pIter, TSKEY maxKey, int maxRowsToRead, SDataCols *pCols) {
   ASSERT(maxRowsToRead > 0);
   if (pIter == NULL) return 0;
+  STSchema *pSchema = NULL;
 
   int numOfRows = 0;
 
@@ -989,7 +990,15 @@ static int tsdbReadRowsFromCache(SSkipListIterator *pIter, TSKEY maxKey, int max
     SDataRow row = SL_GET_NODE_DATA(node);
     if (dataRowKey(row) > maxKey) break;
 
-    tdAppendDataRowToDataCol(row, pCols);
+    if (pSchema == NULL || schemaVersion(pSchema) != dataRowVersion(row)) {
+      pSchema = tsdbGetTableSchemaByVersion(pMeta, pTable, dataRowVersion(row));
+      if (pSchema == NULL) {
+        // TODO: deal with the error here
+        ASSERT(false);
+      }
+    }
+
+    tdAppendDataRowToDataCol(row, pSchema, pCols);
     numOfRows++;
   } while (tSkipListIterNext(pIter));
 
@@ -1139,7 +1148,7 @@ static int tsdbCommitToFile(STsdbRepo *pRepo, int fid, SSkipListIterator **iters
     int maxRowsToRead = pCfg->maxRowsPerFileBlock * 4 / 5;
     int nLoop = 0;
     while (true) {
-      int rowsRead = tsdbReadRowsFromCache(pIter, maxKey, maxRowsToRead, pDataCols);
+      int rowsRead = tsdbReadRowsFromCache(pMeta, pTable, pIter, maxKey, maxRowsToRead, pDataCols);
       assert(rowsRead >= 0);
       if (pDataCols->numOfRows == 0) break;
       nLoop++;
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 0a7f811511..cf22c033ef 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -248,6 +248,32 @@ STSchema *tsdbGetTableSchema(STsdbMeta *pMeta, STable *pTable) {
   }
 }
 
+static int tsdbCompareSchemaVersion(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 < (*(STSchema **)key2)->version) {
+    return -1;
+  } else if (*(int16_t *)key1 > (*(STSchema **)key2)->version) {
+    return 1;
+  } else {
+    return 0;
+  }
+}
+
+STSchema *tsdbGetTableSchemaByVersion(STsdbMeta *pMeta, STable *pTable, int16_t version) {
+  STable *pSearchTable = NULL;
+  if (pTable->type == TSDB_CHILD_TABLE) {
+    pSearchTable = tsdbGetTableByUid(pMeta, pTable->superUid);
+  } else {
+    pSearchTable = pTable;
+  }
+  ASSERT(pSearchTable != NULL);
+
+  void *ptr = taosbsearch(&version, pSearchTable->schema, pSearchTable->numOfSchemas, sizeof(STSchema *),
+                          tsdbCompareSchemaVersion, TD_EQ);
+  if (ptr == NULL) return NULL;
+
+  return (STSchema *)ptr;
+}
+
 STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable) {
   if (pTable->type == TSDB_SUPER_TABLE) {
     return pTable->tagSchema;
@@ -392,9 +418,21 @@ int tsdbUpdateTable(STsdbMeta *pMeta, STable *pTable, STableCfg *pCfg) {
     isChanged = true;
   }
 
-  {
-    // TODO: try to update the data schema
+  STSchema *pTSchema = tsdbGetTableSchema(pMeta, pTable);
+  if (schemaVersion(pTSchema) < schemaVersion(pCfg->schema)) {
+    if (pTable->numOfSchemas < TSDB_MAX_TABLE_SCHEMAS) {
+      pTable->schema[pTable->numOfSchemas++] = tdDupSchema(pCfg->schema);
+    } else {
+      ASSERT(pTable->numOfSchemas == TSDB_MAX_TABLE_SCHEMAS);
+      STSchema *tSchema = tdDupSchema(pCfg->schema);
+      tdFreeSchema(pTable->schema[0]);
+      memmove(pTable->schema, pTable->schema+1, sizeof(STSchema *) * (TSDB_MAX_TABLE_SCHEMAS - 1));
+      pTable->schema[pTable->numOfSchemas-1] = tSchema;
+    }
+
+    isChanged = true;
   }
+
   if (isChanged) {
     char *buf = malloc(1024 * 1024);
     int bufLen = 0;

From 98fc3df8a0f6161f0b4f1783842b0b5d6b3d3f6e Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 14:37:29 +0000
Subject: [PATCH 54/64] TD-90

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

diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index cf22c033ef..9f1e507d54 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -271,7 +271,7 @@ STSchema *tsdbGetTableSchemaByVersion(STsdbMeta *pMeta, STable *pTable, int16_t
                           tsdbCompareSchemaVersion, TD_EQ);
   if (ptr == NULL) return NULL;
 
-  return (STSchema *)ptr;
+  return *(STSchema **)ptr;
 }
 
 STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable) {

From 4c3b3c81a62cc8960ba02e759e877e727f3cdd40 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 3 Jun 2020 14:45:31 +0000
Subject: [PATCH 55/64] TD-90

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

diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 1a444d6b90..5cd3b79aa1 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -400,8 +400,8 @@ void tdAppendDataRowToDataCol(SDataRow row, STSchema *pSchema, SDataCols *pCols)
 
     STColumn *pRowCol = schemaColAt(pSchema, rcol);
     if (pRowCol->colId == pDataCol->colId) {
-      dataColAppendVal(pDataCol, tdGetRowDataOfCol(row, pRowCol->type, pRowCol->offset), pCols->numOfRows,
-                       pCols->maxPoints);
+      void *value = tdGetRowDataOfCol(row, pRowCol->type, pRowCol->offset+TD_DATA_ROW_HEAD_SIZE);
+      dataColAppendVal(pDataCol, value, pCols->numOfRows, pCols->maxPoints);
       dcol++;
       rcol++;
     } else if (pRowCol->colId < pDataCol->colId) {

From aff5a70eb63d46989f67538afd183b8d84f465b2 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Wed, 3 Jun 2020 23:26:38 +0000
Subject: [PATCH 56/64] fix coverity scan bugs

---
 src/rpc/src/rpcTcp.c  | 2 +-
 src/rpc/src/rpcUdp.c  | 2 +-
 src/util/src/tqueue.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index 5dd5e4015e..42940e80c1 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -296,7 +296,7 @@ void *taosOpenTcpClientConnection(void *shandle, void *thandle, uint32_t ip, uin
   SThreadObj *    pThreadObj = shandle;
 
   int fd = taosOpenTcpClientSocket(ip, port, pThreadObj->ip);
-  if (fd <= 0) return NULL;
+  if (fd < 0) return NULL;
 
   SFdObj *pFdObj = taosMallocFdObj(pThreadObj, fd);
   
diff --git a/src/rpc/src/rpcUdp.c b/src/rpc/src/rpcUdp.c
index 6f6014b678..9723080cda 100644
--- a/src/rpc/src/rpcUdp.c
+++ b/src/rpc/src/rpcUdp.c
@@ -192,7 +192,7 @@ static void *taosRecvUdpData(void *param) {
 
     char *tmsg = malloc(dataLen + tsRpcOverhead);
     if (NULL == tmsg) {
-      tError("%s failed to allocate memory, size:%d", pConn->label, dataLen);
+      tError("%s failed to allocate memory, size:%ld", pConn->label, dataLen);
       continue;
     }
 
diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c
index 428c40ef7a..4cf7eb3164 100644
--- a/src/util/src/tqueue.c
+++ b/src/util/src/tqueue.c
@@ -145,7 +145,7 @@ int taosReadQitem(taos_queue param, int *type, void **pitem) {
       queue->numOfItems--;
       if (queue->qset) atomic_sub_fetch_32(&queue->qset->numOfItems, 1);
       code = 1;
-      uTrace("item:%p is read out from queue:%p, type:%d items:%d", *pitem, *type, queue->numOfItems);
+      uTrace("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, *type, queue->numOfItems);
   } 
 
   pthread_mutex_unlock(&queue->mutex);

From 32922be19e2fd9a2c553b88211102a8187f1725f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 4 Jun 2020 02:17:45 +0000
Subject: [PATCH 57/64] TD-90

---
 src/inc/taoserror.h     |  1 +
 src/tsdb/src/tsdbMain.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index 474eeb4f86..a23db65656 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -173,6 +173,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_FILE_FORMAT,        0, 0x0500, "invalid file
 // TSDB
 TAOS_DEFINE_ERROR(TSDB_CODE_INVALID_CONFIG,             0, 0x0580, "invalid TSDB configuration")
 TAOS_DEFINE_ERROR(TSDB_CODE_TAG_VER_OUT_OF_DATE,        0, 0x0581, "tag version is out of date")
+TAOS_DEFINE_ERROR(TSDB_CODE_TABLE_SCHEMA_VERSION,       0, 0x0582, "invalid table schema version from client")
 
 
 #ifdef TAOS_ERROR_C
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index e76cc5313f..2c3a1d00a7 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -941,6 +941,7 @@ static int32_t tdInsertRowToTable(STsdbRepo *pRepo, SDataRow row, STable *pTable
 
 static int32_t tsdbInsertDataToTable(TsdbRepoT *repo, SSubmitBlk *pBlock, TSKEY now, int32_t *affectedrows) {
   STsdbRepo *pRepo = (STsdbRepo *)repo;
+  STsdbMeta *pMeta = pRepo->tsdbMeta;
 
   STableId tableId = {.uid = pBlock->uid, .tid = pBlock->tid};
   STable *pTable = tsdbIsValidTableToInsert(pRepo->tsdbMeta, tableId);
@@ -950,6 +951,39 @@ static int32_t tsdbInsertDataToTable(TsdbRepoT *repo, SSubmitBlk *pBlock, TSKEY
     return TSDB_CODE_INVALID_TABLE_ID;
   }
 
+  // Check schema version
+  int32_t tversion = pBlock->sversion;
+  int16_t nversion = schemaVersion(tsdbGetTableSchema(pMeta, pTable));
+  if (tversion > nversion) {
+    tsdbTrace("vgId:%d table:%s tid:%d server schema version %d is older than clien version %d, try to config.",
+              pRepo->config.tsdbId, varDataVal(pTable->name), pTable->tableId.tid, nversion, tversion);
+    void *msg = (*pRepo->appH.configFunc)(pRepo->config.tsdbId, pTable->tableId.tid);
+    if (msg == NULL) {
+      return terrno;
+    }
+    // Deal with error her
+    STableCfg *pTableCfg = tsdbCreateTableCfgFromMsg(msg);
+    STable *pTableUpdate = NULL;
+    if (pTable->type == TSDB_CHILD_TABLE) {
+      pTableUpdate = tsdbGetTableByUid(pMeta, pTableCfg->superUid);
+    } else {
+      pTableUpdate = pTable;
+    }
+
+    int32_t code = tsdbUpdateTable(pMeta, pTableUpdate, pTableCfg);
+    if (code != TSDB_CODE_SUCCESS) {
+      return code;
+    }
+    tsdbClearTableCfg(pTableCfg);
+    rpcFreeCont(msg);
+  } else {
+    if (tsdbGetTableSchemaByVersion(pMeta, pTable, tversion) == NULL) {
+      tsdbError("vgId:%d table:%s tid:%d invalid schema version %d from client", pRepo->config.tsdbId,
+                varDataVal(pTable->name), pTable->tableId.tid, tversion);
+      return TSDB_CODE_TABLE_SCHEMA_VERSION;
+    }
+  }
+
   SSubmitBlkIter blkIter = {0};
   SDataRow row = NULL;
 

From bc7e5187084611f09a48a0d4264b23efd16c9837 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Thu, 4 Jun 2020 10:36:31 +0800
Subject: [PATCH 58/64] fix variable issie.

---
 .../random-test-multi-threading.py            | 23 ++++++++++++-------
 tests/pytest/random-test/random-test.py       |  2 ++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/tests/pytest/random-test/random-test-multi-threading.py b/tests/pytest/random-test/random-test-multi-threading.py
index ecea53ed9d..d887b714ba 100644
--- a/tests/pytest/random-test/random-test-multi-threading.py
+++ b/tests/pytest/random-test/random-test-multi-threading.py
@@ -44,11 +44,15 @@ class Test (threading.Thread):
             return
         else:
             tdLog.info("will create table %s" % current_tb)
-            tdSql.execute(
-                'create table %s (ts timestamp, speed int)' %
-                current_tb)
-            last_tb = current_tb
-            written = 0
+
+            try:
+                tdSql.execute(
+                    'create table %s (ts timestamp, speed int)' %
+                    current_tb)
+                last_tb = current_tb
+                written = 0
+            except Exception as e:
+                tdLog.info(repr(e))
 
     def insert_data(self):
         tdLog.info("insert_data")
@@ -85,6 +89,7 @@ class Test (threading.Thread):
         global last_tb
         global last_stb
         global written
+
         current_stb = "stb%d" % int(round(time.time() * 1000))
 
         if (current_stb == last_stb):
@@ -104,7 +109,7 @@ class Test (threading.Thread):
             tdSql.execute(
                 "insert into %s values (now, 27, '我是nchar字符串')" %
                 last_tb)
-            self.written = self.written + 1
+            written = written + 1
 
 
     def drop_stable(self):
@@ -135,7 +140,7 @@ class Test (threading.Thread):
 
         tdDnodes.forcestop(1)
         tdDnodes.start(1)
-        tdLog.sleep(5)
+        tdLog.sleep(10)
 
     def drop_table(self):
         tdLog.info("drop_table")
@@ -148,7 +153,6 @@ class Test (threading.Thread):
                 tdSql.execute("drop table %s" % last_tb)
                 last_tb = ""
                 written = 0
-            tdLog.sleep(self.sleepTime)
 
 
     def query_data_from_stable(self):
@@ -175,11 +179,13 @@ class Test (threading.Thread):
     def reset_database(self):
         tdLog.info("reset_database")
         global last_tb
+        global last_stb
         global written
 
         tdDnodes.forcestop(1)
         tdDnodes.deploy(1)
         last_tb = ""
+        last_stb = ""
         written = 0
         tdDnodes.start(1)
         tdSql.prepare()
@@ -197,6 +203,7 @@ class Test (threading.Thread):
         last_tb = ""
         written = 0
         tdDnodes.start(1)
+        tdLog.sleep(10)
         tdSql.prepare()
 
     def run(self):
diff --git a/tests/pytest/random-test/random-test.py b/tests/pytest/random-test/random-test.py
index b3041fe3c3..a8ff4d81d1 100644
--- a/tests/pytest/random-test/random-test.py
+++ b/tests/pytest/random-test/random-test.py
@@ -168,8 +168,10 @@ class Test:
         os.system(deleteCmd)
 
         self.last_tb = ""
+        self.last_stb = ""
         self.written = 0
         tdDnodes.start(1)
+        tdLog.sleep(10)
         tdSql.prepare()
 
 

From d27ebba527078d0e2ec30771e001cac78a24bb7f Mon Sep 17 00:00:00 2001
From: Hui Li <huili@taosdata.com>
Date: Thu, 4 Jun 2020 11:22:49 +0800
Subject: [PATCH 59/64] [add sim case]

---
 .../arbitrator/dn2_mn1_cache_file_sync.sim    | 200 ++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim

diff --git a/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
new file mode 100644
index 0000000000..ee41335110
--- /dev/null
+++ b/tests/script/unique/arbitrator/dn2_mn1_cache_file_sync.sim
@@ -0,0 +1,200 @@
+# Test case describe: dnode1 is only mnode, dnode2/dnode3 are only vnode
+# step 1: start dnode1
+# step 2: start dnode2 and dnode3, and all added into cluster (Suppose dnode2 is master-vnode)
+# step 3: create db, table, insert data, and Falling disc into file (control only one file, e.g. 1841)
+# step 4: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc 
+# step 5: stop dnode2, so date rows falling disc, generate two new files 1840, 1842 in dnode2
+# step 6: insert two data rows: now-16d, now+16d
+# step 7: restart dnode2, waiting sync end
+# expect: in dnode2, the files 1840 and 1842 will be removed
+
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+
+system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
+system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
+
+system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode2 -c walLevel -v 2
+system sh/cfg.sh -n dnode3 -c walLevel -v 2
+system sh/cfg.sh -n dnode4 -c walLevel -v 2
+
+system sh/cfg.sh -n dnode1 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode2 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode3 -c balanceInterval -v 10
+system sh/cfg.sh -n dnode4 -c balanceInterval -v 10
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c alternativeRole -v 1
+system sh/cfg.sh -n dnode2 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode3 -c alternativeRole -v 2
+system sh/cfg.sh -n dnode4 -c alternativeRole -v 2
+
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
+system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
+
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode2 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode3 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode4 -c maxtablesPerVnode -v 4
+system sh/cfg.sh -n dnode5 -c maxtablesPerVnode -v 4
+
+system sh/cfg.sh -n dnode1 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode2 -c arbitrator -v $arbitrator
+system sh/cfg.sh -n dnode3 -c arbitrator -v $arbitrator
+
+print ============== step0: start tarbitrator
+system sh/exec_tarbitrator.sh -s start
+
+print ============== step1: start dnode1, only deploy mnode
+system sh/exec.sh -n dnode1 -s start
+sleep 3000
+sql connect
+
+print ============== step2: start dnode2/dnode3 and add into cluster , then create database with replica 2, and create table, insert data
+system sh/exec.sh -n dnode2 -s start
+#system sh/exec.sh -n dnode3 -s start
+sql create dnode $hostname2
+#sql create dnode $hostname3
+sleep 3000
+
+$totalTableNum = 1
+$sleepTimer = 3000
+
+$db = db
+sql create database $db replica 1 cache 1
+sql use $db
+
+# create table , insert data
+$stb = stb
+sql create table $stb (ts timestamp, c1 double) tags(t1 int)
+$rowNum = 130000
+$tblNum = $totalTableNum
+$totalRows = 0
+#$tsStart = 1420041600000
+
+# insert over 2M data in order to falling disc, generate one file
+$i = 0
+while $i < $tblNum
+  $tb = tb . $i
+  sql create table $tb using $stb tags( $i )
+ 
+  $x = 0
+  while $x < $rowNum
+#    $ts = $tsStart + $x
+    sql insert into $tb values ( now + 0s , $x ) ( now + 1s , $x ) ( now + 2s , $x ) ( now + 3s , $x ) ( now + 4s , $x ) ( now + 5s , $x ) ( now + 6s , $x ) ( now + 7s , $x ) ( now + 8s , $x ) ( now + 9s , $x )
+    $x = $x + 10
+  endw 
+  $totalRows = $totalRows + $x
+  print       info: inserted $x rows into $tb and totalRows: $totalRows
+  $i = $i + 1
+endw 
+
+sql select count(*) from $stb
+sleep 1000
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step3: insert old data(now-15d) and new data(now+15d), control data rows  in order to save in cache, not falling disc
+sql insert into $tb values ( now - 15d , -15 )
+sql insert into $tb values ( now + 15d ,  15 )
+$totalRows = $totalRows + 2
+
+print ============== step4: stop dnode2, so date rows falling disc, generate two new files in dnode2
+system sh/exec.sh -n dnode2 -s stop
+sleep $sleepTimer
+
+wait_dnode2_offline:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != offline then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+if $dnode3Status != ready then
+  sleep 2000
+  goto wait_dnode2_offline
+endi
+
+sleep $sleepTimer   # waitting for move master vnode of dnode2 to dnode3
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step5: insert two data rows: now-16d, now+16d, 
+sql insert into $tb values ( now - 16d , -16 )
+sql insert into $tb values ( now + 16d ,  16 )
+$totalRows = $totalRows + 2
+
+return 1
+
+
+
+print ============== step5: restart dnode2, waiting sync end
+system sh/exec.sh -n dnode2 -s start
+sleep 3000
+
+wait_dnode2_ready:
+sql show dnodes
+if $rows != 3 then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+print $data0_1  $data1_1  $data2_1  $data3_1  $data4_1
+print $data0_2  $data1_2  $data2_2  $data3_2  $data4_2
+print $data0_3  $data1_3  $data2_3  $data3_3  $data4_3
+#print $data0_4  $data1_4  $data2_4  $data3_4  $data4_4
+#print $data0_5  $data1_5  $data2_5  $data3_5  $data4_5
+#print $data0_6  $data1_6  $data2_6  $data3_6  $data4_6
+#$dnode1Status = $data4_1  
+$dnode2Status = $data4_2
+$dnode3Status = $data4_3  
+#$dnode4Status = $data4_4 
+#$dnode5Status = $data4_5
+
+if $dnode2Status != ready then
+  sleep 2000
+  goto wait_dnode2_ready
+endi
+
+sleep $sleepTimer
+# check using select
+sql select count(*) from $stb
+print data00 $data00
+if $data00 != $totalRows then
+	return -1
+endi
+
+print ============== step6: in dnode2, the files 1840 and 1842 will be removed
+# how check in script ???
\ No newline at end of file

From 851c53137169c1689584a7afdb2cc43b283f9d3d Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Thu, 4 Jun 2020 03:36:02 +0000
Subject: [PATCH 60/64] fix compile error

---
 src/rpc/test/rsclient.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/test/rsclient.c b/src/rpc/test/rsclient.c
index 6f367bc19b..659a79216f 100644
--- a/src/rpc/test/rsclient.c
+++ b/src/rpc/test/rsclient.c
@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) {
     if (strcmp(argv[i], "-p")==0 && i < argc-1) {
       ipSet.port[0] = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-i") ==0 && i < argc-1) {
-      tstrncpy(ipSet.fqdn[0], argv[++i], sizeof(ipSet.fqdn)); 
+      tstrncpy(ipSet.fqdn[0], argv[++i], sizeof(ipSet.fqdn[0])); 
     } else if (strcmp(argv[i], "-t")==0 && i < argc-1) {
       rpcInit.numOfThreads = atoi(argv[++i]);
     } else if (strcmp(argv[i], "-m")==0 && i < argc-1) {

From 51965cdf342946dd48bee3ab446041af37e0fc6c Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Thu, 4 Jun 2020 11:55:48 +0800
Subject: [PATCH 61/64] add 3 threads case.

---
 .../random-test-multi-threading-3.py          | 281 ++++++++++++++++++
 1 file changed, 281 insertions(+)
 create mode 100644 tests/pytest/random-test/random-test-multi-threading-3.py

diff --git a/tests/pytest/random-test/random-test-multi-threading-3.py b/tests/pytest/random-test/random-test-multi-threading-3.py
new file mode 100644
index 0000000000..c7b39ca1a1
--- /dev/null
+++ b/tests/pytest/random-test/random-test-multi-threading-3.py
@@ -0,0 +1,281 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import random
+import threading
+
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+
+last_tb = ""
+last_stb = ""
+written = 0
+
+
+class Test (threading.Thread):
+    def __init__(self, threadId, name):
+        threading.Thread.__init__(self)
+        self.threadId = threadId
+        self.name = name
+
+        self.threadLock = threading.Lock()
+
+    def create_table(self):
+        tdLog.info("create_table")
+        global last_tb
+        global written
+
+        current_tb = "tb%d" % int(round(time.time() * 1000))
+
+        if (current_tb == last_tb):
+            return
+        else:
+            tdLog.info("will create table %s" % current_tb)
+
+            try:
+                tdSql.execute(
+                    'create table %s (ts timestamp, speed int)' %
+                    current_tb)
+                last_tb = current_tb
+                written = 0
+            except Exception as e:
+                tdLog.info(repr(e))
+
+    def insert_data(self):
+        tdLog.info("insert_data")
+        global last_tb
+        global written
+
+        if (last_tb == ""):
+            tdLog.info("no table, create first")
+            self.create_table()
+
+        tdLog.info("will insert data to table")
+        for i in range(0, 10):
+            insertRows = 1000
+            tdLog.info("insert %d rows to %s" % (insertRows, last_tb))
+
+            for j in range(0, insertRows):
+                ret = tdSql.execute(
+                    'insert into %s values (now + %dm, %d)' %
+                    (last_tb, j, j))
+                written = written + 1
+
+    def query_data(self):
+        tdLog.info("query_data")
+        global last_tb
+        global written
+
+        if (written > 0):
+            tdLog.info("query data from table")
+            tdSql.query("select * from %s" % last_tb)
+            tdSql.checkRows(written)
+
+    def create_stable(self):
+        tdLog.info("create_stable")
+        global last_tb
+        global last_stb
+        global written
+
+        current_stb = "stb%d" % int(round(time.time() * 1000))
+
+        if (current_stb == last_stb):
+            return
+        else:
+            tdLog.info("will create stable %s" % current_stb)
+            tdSql.execute(
+                'create table %s(ts timestamp, c1 int, c2 nchar(10)) tags (t1 int, t2 nchar(10))' %
+                current_stb)
+            last_stb = current_stb
+
+            current_tb = "tb%d" % int(round(time.time() * 1000))
+            tdSql.execute(
+                "create table %s using %s tags (1, '表1')" %
+                (current_tb, last_stb))
+            last_tb = current_tb
+            tdSql.execute(
+                "insert into %s values (now, 27, '我是nchar字符串')" %
+                last_tb)
+            written = written + 1
+
+
+    def drop_stable(self):
+        tdLog.info("drop_stable")
+        global last_stb
+
+        if (last_stb == ""):
+            tdLog.info("no super table")
+            return
+        else:
+            tdLog.info("will drop last super table")
+            tdSql.execute('drop table %s' % last_stb)
+            last_stb = ""
+
+    def restart_database(self):
+        tdLog.info("restart_database")
+        global last_tb
+        global written
+
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+
+    def force_restart_database(self):
+        tdLog.info("force_restart_database")
+        global last_tb
+        global written
+
+        tdDnodes.forcestop(1)
+        tdDnodes.start(1)
+
+    def drop_table(self):
+        tdLog.info("drop_table")
+        global last_tb
+        global written
+
+        for i in range(0, 10):
+            if (last_tb != ""):
+                tdLog.info("drop last_tb %s" % last_tb)
+                tdSql.execute("drop table %s" % last_tb)
+                last_tb = ""
+                written = 0
+
+
+    def query_data_from_stable(self):
+        tdLog.info("query_data_from_stable")
+        global last_stb
+
+        if (last_stb == ""):
+            tdLog.info("no super table")
+            return
+        else:
+            tdLog.info("will query data from super table")
+            tdSql.execute('select * from %s' % last_stb)
+
+
+    def reset_query_cache(self):
+        tdLog.info("reset_query_cache")
+        global last_tb
+        global written
+
+        tdLog.info("reset query cache")
+        tdSql.execute("reset query cache")
+        tdLog.sleep(1)
+
+    def reset_database(self):
+        tdLog.info("reset_database")
+        global last_tb
+        global last_stb
+        global written
+
+        tdDnodes.forcestop(1)
+        tdDnodes.deploy(1)
+        last_tb = ""
+        last_stb = ""
+        written = 0
+        tdDnodes.start(1)
+        tdSql.prepare()
+
+    def delete_datafiles(self):
+        tdLog.info("delete_data_files")
+        global last_tb
+        global written
+
+        dnodesDir = tdDnodes.getDnodesRootDir()
+        dataDir = dnodesDir + '/dnode1/*'
+        deleteCmd = 'rm -rf %s' % dataDir
+        os.system(deleteCmd)
+
+        last_tb = ""
+        written = 0
+        tdDnodes.start(1)
+        tdSql.prepare()
+
+    def run(self):
+        dataOp = {
+            1: self.insert_data,
+            2: self.query_data,
+            3: self.query_data_from_stable,
+        }
+
+        dbOp = {
+            1: self.create_table,
+            2: self.create_stable,
+            3: self.restart_database,
+            4: self.force_restart_database,
+            5: self.drop_table,
+            6: self.reset_query_cache,
+            7: self.reset_database,
+            8: self.delete_datafiles,
+            9: self.drop_stable,
+        }
+
+        queryOp = {
+            1: self.query_data,
+            2: self.query_data_from_stable,
+        }
+
+        if (self.threadId == 1):
+            while True:
+                self.threadLock.acquire()
+                tdLog.notice("first thread")
+                randDataOp = random.randint(1, 3)
+                dataOp.get(randDataOp , lambda: "ERROR")()
+                self.threadLock.release()
+
+        elif (self.threadId == 2):
+            while True:
+                tdLog.notice("second thread")
+                self.threadLock.acquire()
+                randDbOp = random.randint(1, 9)
+                dbOp.get(randDbOp, lambda: "ERROR")()
+                self.threadLock.release()
+        elif (self.threadId == 3):
+            while True:
+                tdLog.notice("third thread")
+                self.threadLock.acquire()
+                randQueryOp = random.randint(1, 9)
+                queryOp.get(randQueryOp, lambda: "ERROR")()
+                self.threadLock.release()
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        test1 = Test(1, "data operation")
+        test2 = Test(2, "db operation")
+        test2 = Test(3, "query operation")
+
+        test1.start()
+        test2.start()
+        test3.start()
+        test1.join()
+        test2.join()
+        test3.join()
+
+        tdLog.info("end of test")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

From 123d432772f03b908f9877464036a6e60e0bbafc Mon Sep 17 00:00:00 2001
From: Shuaiqiang Chang <sqchang@taosdata.com>
Date: Thu, 4 Jun 2020 13:56:24 +0800
Subject: [PATCH 62/64] fix: jdbc resultset

---
 .../jni/com_taosdata_jdbc_TSDBJNIConnector.h  |  2 +-
 src/client/src/TSDBJNIConnector.c             | 15 +++++--
 .../jdbc/DatabaseMetaDataResultSet.java       | 10 ++++-
 .../com/taosdata/jdbc/TSDBJNIConnector.java   | 41 +++++++++++--------
 .../java/com/taosdata/jdbc/TSDBStatement.java | 14 ++++---
 src/connector/python/linux/python3/test.py    | 21 ++++++++++
 src/kit/taosdemo/taosdemo.c                   |  3 +-
 7 files changed, 75 insertions(+), 31 deletions(-)
 create mode 100644 src/connector/python/linux/python3/test.py

diff --git a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
index b37301cdad..3782d1693d 100644
--- a/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
+++ b/src/client/jni/com_taosdata_jdbc_TSDBJNIConnector.h
@@ -71,7 +71,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp
-  (JNIEnv *, jobject, jlong);
+  (JNIEnv *, jobject, jlong, jlong);
 
 /*
  * Class:     com_taosdata_jdbc_TSDBJNIConnector
diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c
index 7012307771..2a5f7f441e 100644
--- a/src/client/src/TSDBJNIConnector.c
+++ b/src/client/src/TSDBJNIConnector.c
@@ -305,14 +305,21 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_executeQueryImp(
   return (jlong)pSql;
 }
 
-JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con) {
+JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrCodeImp(JNIEnv *env, jobject jobj, jlong con, jlong tres) {
   TAOS *tscon = (TAOS *)con;
   if (tscon == NULL) {
     jniError("jobj:%p, connection is closed", jobj);
-    return (jint)-TSDB_CODE_INVALID_CONNECTION;
+    return (jint)TSDB_CODE_INVALID_CONNECTION;
   }
 
-  return (jint)-taos_errno(tscon);
+  if ((void *)tres == NULL) {
+    jniError("jobj:%p, conn:%p, resultset is null", jobj, tscon);
+    return JNI_RESULT_SET_NULL;
+  }
+
+  TAOS_RES *pSql = (TAOS_RES *)tres;
+
+  return (jint)taos_errno(pSql);
 }
 
 JNIEXPORT jstring JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_getErrMsgImp(JNIEnv *env, jobject jobj, jlong tres) {
@@ -464,7 +471,7 @@ JNIEXPORT jint JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_fetchRowImp(JNIEn
 
   TAOS_ROW row = taos_fetch_row(result);
   if (row == NULL) {
-    int tserrno = taos_errno(tscon);
+    int tserrno = taos_errno(result);
     if (tserrno == 0) {
       jniTrace("jobj:%p, conn:%p, resultset:%p, fields size is %d, fetch row to the end", jobj, tscon, res, num_fields);
       return JNI_FETCH_END;
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
index 027d2197a3..cbd3523b34 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/DatabaseMetaDataResultSet.java
@@ -18,8 +18,8 @@ import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
 import java.net.URL;
-import java.sql.*;
 import java.sql.Date;
+import java.sql.*;
 import java.util.*;
 
 /*
@@ -102,41 +102,49 @@ public class DatabaseMetaDataResultSet implements ResultSet {
 
     @Override
     public byte getByte(int columnIndex) throws SQLException {
+        columnIndex--;
         return (byte) rowCursor.getInt(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public short getShort(int columnIndex) throws SQLException {
+        columnIndex--;
         return (short) rowCursor.getInt(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public int getInt(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getInt(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public long getLong(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getLong(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public float getFloat(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getFloat(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public double getDouble(int columnIndex) throws SQLException {
+        columnIndex--;
         return rowCursor.getDouble(columnIndex, columnMetaDataList.get(columnIndex).getColType());
     }
 
     @Override
     public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
+        columnIndex--;
         return new BigDecimal(rowCursor.getDouble(columnIndex, columnMetaDataList.get(columnIndex).getColType()));
     }
 
     @Override
     public byte[] getBytes(int columnIndex) throws SQLException {
+        columnIndex--;
         return (rowCursor.getString(columnIndex, columnMetaDataList.get(columnIndex).getColType())).getBytes();
     }
 
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 3adb601822..6fa9e7bc48 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -99,7 +99,7 @@ public class TSDBJNIConnector {
 
         this.taos = this.connectImp(host, port, dbName, user, password);
         if (this.taos == TSDBConstants.JNI_NULL_POINTER) {
-            throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg()), "", this.getErrCode());
+            throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(null)), "", this.getErrCode(null));
         }
 
         return true;
@@ -117,52 +117,57 @@ public class TSDBJNIConnector {
             freeResultSet(taosResultSetPointer);
         }
 
-        int code;
+        long pSql = 0l;
         try {
-            code = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
+            pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
         } catch (Exception e) {
             e.printStackTrace();
+            this.freeResultSet(pSql);
             throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
         }
+        int code = this.getErrCode(pSql);
+
         affectedRows = code;
         if (code < 0) {
             affectedRows = -1;
             if (code == TSDBConstants.JNI_TDENGINE_ERROR) {
-                throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg()), "", this.getErrCode());
+                this.freeResultSet(pSql);
+                throw new SQLException(TSDBConstants.WrapErrMsg(this.getErrMsg(pSql)), "", this.getErrCode(pSql));
             } else {
-                throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode());
+                this.freeResultSet(pSql);
+                throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(pSql));
             }
         }
 
         // Try retrieving result set for the executed SQL using the current connection pointer. If the executed
         // SQL is a DML/DDL which doesn't return a result set, then taosResultSetPointer should be 0L. Otherwise,
         // taosResultSetPointer should be a non-zero value.
-        taosResultSetPointer = this.getResultSetImp(this.taos);
+        taosResultSetPointer = this.getResultSetImp(this.taos, pSql);
         if (taosResultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
             isResultsetClosed = false;
         }
         return code;
     }
 
-    private native int executeQueryImp(byte[] sqlBytes, long connection);
+    private native long executeQueryImp(byte[] sqlBytes, long connection);
 
     /**
      * Get recent error code by connection
      */
-    public int getErrCode() {
-        return Math.abs(this.getErrCodeImp(this.taos));
+    public int getErrCode(Long pSql) {
+        return Math.abs(this.getErrCodeImp(this.taos, pSql));
     }
 
-    private native int getErrCodeImp(long connection);
+    private native int getErrCodeImp(long connection, Long pSql);
 
     /**
      * Get recent error message by connection
      */
-    public String getErrMsg() {
-        return this.getErrMsgImp(this.taos);
+    public String getErrMsg(Long pSql) {
+        return this.getErrMsgImp(this.taos, pSql);
     }
 
-    private native String getErrMsgImp(long connection);
+    private native String getErrMsgImp(long connection, Long pSql);
 
     /**
      * Get resultset pointer
@@ -172,7 +177,7 @@ public class TSDBJNIConnector {
         return taosResultSetPointer;
     }
 
-    private native long getResultSetImp(long connection);
+    private native long getResultSetImp(long connection, long pSql);
 
     /**
      * Free resultset operation from C to release resultset pointer by JNI
@@ -212,15 +217,15 @@ public class TSDBJNIConnector {
     /**
      * Get affected rows count
      */
-    public int getAffectedRows() {
+    public int getAffectedRows(Long pSql) {
         int affectedRows = this.affectedRows;
         if (affectedRows < 0) {
-            affectedRows = this.getAffectedRowsImp(this.taos);
+            affectedRows = this.getAffectedRowsImp(this.taos, pSql);
         }
         return affectedRows;
     }
 
-    private native int getAffectedRowsImp(long connection);
+    private native int getAffectedRowsImp(long connection, Long pSql);
 
     /**
      * Get schema metadata
@@ -248,7 +253,7 @@ public class TSDBJNIConnector {
     public void closeConnection() throws SQLException {
         int code = this.closeConnectionImp(this.taos);
         if (code < 0) {
-            throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode());
+            throw new SQLException(TSDBConstants.FixErrMsg(code), "", this.getErrCode(null));
         } else if (code == 0) {
             this.taos = TSDBConstants.JNI_NULL_POINTER;
         } else {
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
index 455b73bb92..dbe1e41e6b 100644
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBStatement.java
@@ -27,6 +27,8 @@ public class TSDBStatement implements Statement {
 	/** Timeout for a query */
 	protected int queryTimeout = 0;
 
+	private Long pSql = 0l;
+
     /**
      * Status of current statement
      */
@@ -66,21 +68,23 @@ public class TSDBStatement implements Statement {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		int res = this.connecter.executeQuery(sql);
+		long res = this.connecter.executeQuery(sql);
 		long resultSetPointer = this.connecter.getResultSet();
 
 		if (resultSetPointer == TSDBConstants.JNI_CONNECTION_NULL) {
+			this.connecter.freeResultSet(res);
 			throw new SQLException(TSDBConstants.FixErrMsg(TSDBConstants.JNI_CONNECTION_NULL));
 		} else if (resultSetPointer != TSDBConstants.JNI_NULL_POINTER) {
 			this.connecter.freeResultSet();
 			throw new SQLException("The executed SQL is not a DML or a DDL");
 		} else {
-			return res;
+			int num = this.connecter.getAffectedRows(res);
+			return num;
 		}
 	}
 
-	public String getErrorMsg() {
-		return this.connecter.getErrMsg();
+	public String getErrorMsg(long pSql) {
+		return this.connecter.getErrMsg(pSql);
 	}
 
 	public void close() throws SQLException {
@@ -170,7 +174,7 @@ public class TSDBStatement implements Statement {
         if (isClosed) {
             throw new SQLException("Invalid method call on a closed statement.");
         }
-		return this.connecter.getAffectedRows();
+		return this.connecter.getAffectedRows(this.pSql);
 	}
 
 	public boolean getMoreResults() throws SQLException {
diff --git a/src/connector/python/linux/python3/test.py b/src/connector/python/linux/python3/test.py
new file mode 100644
index 0000000000..b11b2c76a0
--- /dev/null
+++ b/src/connector/python/linux/python3/test.py
@@ -0,0 +1,21 @@
+from taos.cinterface import CTaosInterface
+from taos.error import *
+from taos.subscription import TDengineSubscription
+from taos.connection import TDengineConnection
+
+
+if __name__ == '__main__':
+    conn = TDengineConnection(
+        host="127.0.0.1", user="root", password="taosdata", database="test")
+
+    # Generate a cursor object to run SQL commands
+    sub = conn.subscribe(False, "test", "select * from log0601;", 1000)
+
+    for i in range(100):
+        print(i)
+        data = sub.consume()
+        for d in data:
+            print(d)
+
+    sub.close()
+    conn.close()
diff --git a/src/kit/taosdemo/taosdemo.c b/src/kit/taosdemo/taosdemo.c
index 1cdff80faa..81426b683a 100644
--- a/src/kit/taosdemo/taosdemo.c
+++ b/src/kit/taosdemo/taosdemo.c
@@ -461,8 +461,7 @@ int main(int argc, char *argv[]) {
   taos_init();
   TAOS *taos = taos_connect(ip_addr, user, pass, NULL, port);
   if (taos == NULL) {
-    fprintf(stderr, "Failed to connect to TDengine, reason:%s\n", taos_errstr(taos));
-    taos_close(taos);
+    fprintf(stderr, "Failed to connect to TDengine, reason:%s\n", taos_errstr(NULL));
     return 1;
   }
   char command[BUFFER_SIZE] = "\0";

From 57b8617fa4d957c0cba69ec901f1af7b523d32a5 Mon Sep 17 00:00:00 2001
From: dengyihao <luomoxyz@126.com>
Date: Thu, 4 Jun 2020 06:07:53 +0000
Subject: [PATCH 63/64] fix crash caused by double free when fail to initQInfo

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

diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index cf63c3a078..f6c7863b84 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -5870,7 +5870,7 @@ _over:
   taosArrayDestroy(pTableIdList);
 
   if (code != TSDB_CODE_SUCCESS) {
-    tfree(*pQInfo);
+    //pQInfo already freed in initQInfo, but *pQInfo may not pointer to null; 
     *pQInfo = NULL;
   }
 

From f9a9a7bc54ef318118b7ad3d7ad396110b2db0e6 Mon Sep 17 00:00:00 2001
From: Tao Liu <tliu@taosdata.com>
Date: Thu, 4 Jun 2020 08:05:45 +0000
Subject: [PATCH 64/64] [TD-519] fix execute sql return

---
 src/connector/python/linux/python2/taos/cinterface.py   | 1 +
 src/connector/python/linux/python2/taos/cursor.py       | 3 ++-
 src/connector/python/linux/python3/taos/cinterface.py   | 1 +
 src/connector/python/linux/python3/taos/cursor.py       | 4 ++--
 src/connector/python/windows/python2/taos/cinterface.py | 1 +
 src/connector/python/windows/python2/taos/cursor.py     | 3 ++-
 src/connector/python/windows/python3/taos/cinterface.py | 1 +
 src/connector/python/windows/python3/taos/cursor.py     | 3 ++-
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/connector/python/linux/python2/taos/cinterface.py b/src/connector/python/linux/python2/taos/cinterface.py
index 758244b6d8..1b17bf72b0 100644
--- a/src/connector/python/linux/python2/taos/cinterface.py
+++ b/src/connector/python/linux/python2/taos/cinterface.py
@@ -149,6 +149,7 @@ class CTaosInterface(object):
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
     libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
 
     def __init__(self, config=None):
         '''
diff --git a/src/connector/python/linux/python2/taos/cursor.py b/src/connector/python/linux/python2/taos/cursor.py
index 6bf8236ac9..75aa7f69d8 100644
--- a/src/connector/python/linux/python2/taos/cursor.py
+++ b/src/connector/python/linux/python2/taos/cursor.py
@@ -126,7 +126,8 @@ class TDengineCursor(object):
             with open(self._logfile, "a") as logfile:
                 logfile.write("%s;\n" % operation)
 
-        if self._result is not None:
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
             if CTaosInterface.fieldsCount(self._result) == 0:
                 self._affected_rows += CTaosInterface.affectedRows(
                     self._result )
diff --git a/src/connector/python/linux/python3/taos/cinterface.py b/src/connector/python/linux/python3/taos/cinterface.py
index b953aa1192..87540bf326 100644
--- a/src/connector/python/linux/python3/taos/cinterface.py
+++ b/src/connector/python/linux/python3/taos/cinterface.py
@@ -149,6 +149,7 @@ class CTaosInterface(object):
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
     libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
 
     def __init__(self, config=None):
         '''
diff --git a/src/connector/python/linux/python3/taos/cursor.py b/src/connector/python/linux/python3/taos/cursor.py
index 724cfe2163..3baca89462 100644
--- a/src/connector/python/linux/python3/taos/cursor.py
+++ b/src/connector/python/linux/python3/taos/cursor.py
@@ -124,12 +124,12 @@ class TDengineCursor(object):
         # print("   >> Exec Query ({}): {}".format(localSeqNum, str(stmt)))
         self._result = CTaosInterface.query(self._connection._conn, stmt)
         # print("   << Query ({}) Exec Done".format(localSeqNum))
-
         if (self._logfile):
             with open(self._logfile, "a") as logfile:
                 logfile.write("%s;\n" % operation)
 
-        if self._result is not None:
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
             if CTaosInterface.fieldsCount(self._result) == 0:
                 self._affected_rows += CTaosInterface.affectedRows(
                     self._result )
diff --git a/src/connector/python/windows/python2/taos/cinterface.py b/src/connector/python/windows/python2/taos/cinterface.py
index e58ebbc8da..9fb7d4ec09 100644
--- a/src/connector/python/windows/python2/taos/cinterface.py
+++ b/src/connector/python/windows/python2/taos/cinterface.py
@@ -149,6 +149,7 @@ class CTaosInterface(object):
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
     libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
 
     def __init__(self, config=None):
         '''
diff --git a/src/connector/python/windows/python2/taos/cursor.py b/src/connector/python/windows/python2/taos/cursor.py
index 0d7c882baf..6af82e72de 100644
--- a/src/connector/python/windows/python2/taos/cursor.py
+++ b/src/connector/python/windows/python2/taos/cursor.py
@@ -110,7 +110,8 @@ class TDengineCursor(object):
             pass
         
         self._result = CTaosInterface.query(self._connection._conn, stmt)
-        if self._result is not None:
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
             if CTaosInterface.fieldsCount(self._result) == 0:
                 self._affected_rows += CTaosInterface.affectedRows(self._result)
                 return CTaosInterface.affectedRows(self._result )
diff --git a/src/connector/python/windows/python3/taos/cinterface.py b/src/connector/python/windows/python3/taos/cinterface.py
index 2217ad5c58..0dbb2ce3a1 100644
--- a/src/connector/python/windows/python3/taos/cinterface.py
+++ b/src/connector/python/windows/python3/taos/cinterface.py
@@ -149,6 +149,7 @@ class CTaosInterface(object):
     libtaos.taos_consume.restype = ctypes.c_void_p
     libtaos.taos_fetch_lengths.restype = ctypes.c_void_p
     libtaos.taos_free_result.restype = None
+    libtaos.taos_errno.restype = ctypes.c_int
 
     def __init__(self, config=None):
         '''
diff --git a/src/connector/python/windows/python3/taos/cursor.py b/src/connector/python/windows/python3/taos/cursor.py
index ebc549ec98..0ee8af4ed0 100644
--- a/src/connector/python/windows/python3/taos/cursor.py
+++ b/src/connector/python/windows/python3/taos/cursor.py
@@ -110,7 +110,8 @@ class TDengineCursor(object):
             pass
         
         self._result = CTaosInterface.query(self._connection._conn, stmt)
-        if self._result is not None:
+        errno = CTaosInterface.libtaos.taos_errno(self._result)
+        if errno == 0:
             if CTaosInterface.fieldsCount(self._result) == 0:
                 self._affected_rows += CTaosInterface.affectedRows(self._result )
                 return CTaosInterface.affectedRows(self._result )