From e061343664dcd46e856f7d0c8e9de18d2f6f9fda Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Mon, 4 May 2020 22:45:18 -0600
Subject: [PATCH 01/43] [Dnode] Table driven method to init and cleanup dnode
 components.

This patch refactors the initialization and cleanup path of dnode
with a table driven method. This fixes the following issues:

1. Before the patch, if dnodeInitRead() fails, the cleanup path
also runs dnodeCleanupWrite(), which will free wWorkerPool.writeWorker that's
never allocated. (The code before this patch will not crash though, because
wWorkerPool is zero-initialized global variable and therefore the
accidental free will be a nop).
2. In general the order of calling cleanup function should be reverse
to the order of calling init function, but this is not the case prior
to this patch (see dnodeCleanupMnode() and dnodeCleanupMgmt()).

* Bonus fix
This patch also fixes a missing free for readPool.readWorker.

* Testing
I plan to run the test script ./test-all.sh, but was not able to do so.
Is there a reference somewhere I can look up?
---
 src/dnode/inc/dnodeModule.h |  2 +-
 src/dnode/src/dnodeMain.c   | 66 ++++++++++++++++++++++++-------------
 src/dnode/src/dnodeModule.c |  2 +-
 src/dnode/src/dnodeRead.c   | 14 ++++----
 4 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/src/dnode/inc/dnodeModule.h b/src/dnode/inc/dnodeModule.h
index b6b57be3d1..8618de3244 100644
--- a/src/dnode/inc/dnodeModule.h
+++ b/src/dnode/inc/dnodeModule.h
@@ -22,7 +22,7 @@ extern "C" {
 
 int32_t dnodeInitModules();
 void    dnodeStartModules();
-void    dnodeCleanUpModules();
+void    dnodeCleanupModules();
 void    dnodeProcessModuleStatus(uint32_t moduleStatus);
 
 #ifdef __cplusplus
diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 940b884927..6a9299902c 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -41,6 +41,25 @@ static void dnodeSetRunStatus(SDnodeRunStatus status);
 static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context);
 static void dnodeCheckDataDirOpenned(char *dir);
 static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED;
+static int32_t dnodeInitSteps();
+static void dnodeCleanupSteps(int32_t stepId);
+
+typedef struct {
+  const char *const name;
+  int               (*init)();
+  void              (*cleanup)();
+} DnodeStep;
+
+static const DnodeStep DnodeSteps[] = {
+  {"storage",       dnodeInitStorage,       dnodeCleanupStorage},
+  {"read",          dnodeInitRead,          dnodeCleanupRead},
+  {"write",         dnodeInitWrite,         dnodeCleanupWrite},
+  {"mclient",       dnodeInitMClient,       dnodeCleanupMClient},
+  {"modules",       dnodeInitModules,       dnodeCleanupModules},
+  {"mnode",         dnodeInitMnode,         dnodeCleanupMnode},
+  {"mgmt",          dnodeInitMgmt,          dnodeCleanupMgmt},
+  {"shell",         dnodeInitShell,         dnodeCleanupShell},
+};
 
 int32_t main(int32_t argc, char *argv[]) {
   // Set global configuration file
@@ -53,11 +72,11 @@ int32_t main(int32_t argc, char *argv[]) {
         exit(EXIT_FAILURE);
       }
     } else if (strcmp(argv[i], "-V") == 0) {
-#ifdef _SYNC      
+#ifdef _SYNC
       char *versionStr = "enterprise";
-#else      
+#else
       char *versionStr = "community";
-#endif      
+#endif
       printf("%s version: %s compatible_version: %s\n", versionStr, version, compatible_version);
       printf("gitinfo: %s\n", gitinfo);
       printf("gitinfoI: %s\n", gitinfoOfInternal);
@@ -102,8 +121,6 @@ int32_t main(int32_t argc, char *argv[]) {
   if (dnodeInitSystem() < 0) {
     syslog(LOG_ERR, "Error initialize TDengine system");
     closelog();
-
-    dnodeCleanUpSystem();
     exit(EXIT_FAILURE);
   }
 
@@ -135,6 +152,24 @@ static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context) {
   exit(EXIT_SUCCESS);
 }
 
+static void dnodeCleanupSteps(int32_t stepId) {
+  for (int32_t i = stepId; i >= 0; i--) {
+    DnodeSteps[i].cleanup();
+  }
+}
+
+static int32_t dnodeInitSteps() {
+  int32_t code = 0;
+  for (int32_t i = 0; i < sizeof(DnodeSteps) / sizeof(DnodeSteps[0]); i++) {
+    if (DnodeSteps[i].init() != 0) {
+      dnodeCleanupSteps(i);
+      code = -1;
+      break;
+    }
+  }
+  return code;
+}
+
 static int32_t dnodeInitSystem() {
   dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_INITIALIZE);
   tscEmbedded  = 1;
@@ -164,14 +199,9 @@ static int32_t dnodeInitSystem() {
 
   dPrint("start to initialize TDengine on %s", tsLocalEp);
 
-  if (dnodeInitStorage() != 0) return -1;
-  if (dnodeInitRead() != 0) return -1;
-  if (dnodeInitWrite() != 0) return -1;
-  if (dnodeInitMClient() != 0) return -1;
-  if (dnodeInitModules() != 0) return -1;
-  if (dnodeInitMnode() != 0) return -1;
-  if (dnodeInitMgmt() != 0) return -1;
-  if (dnodeInitShell() != 0) return -1;
+  if (dnodeInitSteps() != 0) {
+    return -1;
+  }
 
   dnodeStartModules();
   dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_RUNING);
@@ -184,16 +214,8 @@ static int32_t dnodeInitSystem() {
 static void dnodeCleanUpSystem() {
   if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) {
     dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED);
-    dnodeCleanupShell();
-    dnodeCleanupMnode();
-    dnodeCleanupMgmt();
-    dnodeCleanupMClient();
-    dnodeCleanupWrite();
-    dnodeCleanupRead();
-    dnodeCleanUpModules();
+    dnodeCleanupSteps(sizeof(DnodeSteps) / sizeof(DnodeSteps[0]) - 1);
     taos_cleanup();
-    dnodeCleanupStorage();
-    taosCloseLog();
   }
 }
 
diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c
index e1aa48d477..e63781283c 100644
--- a/src/dnode/src/dnodeModule.c
+++ b/src/dnode/src/dnodeModule.c
@@ -72,7 +72,7 @@ static void dnodeAllocModules() {
   }
 }
 
-void dnodeCleanUpModules() {
+void dnodeCleanupModules() {
   for (int32_t module = 1; module < TSDB_MOD_MAX; ++module) {
     if (tsModule[module].enable && tsModule[module].stopFp) {
       (*tsModule[module].stopFp)();
diff --git a/src/dnode/src/dnodeRead.c b/src/dnode/src/dnodeRead.c
index e52b59d20a..c2beb28e64 100644
--- a/src/dnode/src/dnodeRead.c
+++ b/src/dnode/src/dnodeRead.c
@@ -34,7 +34,7 @@ typedef struct {
 } SReadMsg;
 
 typedef struct {
-  pthread_t  thread;    // thread 
+  pthread_t  thread;    // thread
   int32_t    workerId;  // worker ID
 } SReadWorker;
 
@@ -74,10 +74,10 @@ void dnodeCleanupRead() {
 
   for (int i=0; i < readPool.max; ++i) {
     SReadWorker *pWorker = readPool.readWorker + i;
-    if (pWorker->thread) 
+    if (pWorker->thread)
       pthread_join(pWorker->thread, NULL);
   }
-
+  free(readPool.readWorker);
   taosCloseQset(readQset);
   dPrint("dnode read is closed");
 }
@@ -86,7 +86,7 @@ void dnodeRead(SRpcMsg *pMsg) {
   int32_t     queuedMsgNum = 0;
   int32_t     leftLen      = pMsg->contLen;
   char        *pCont       = (char *) pMsg->pCont;
-  void        *pVnode;  
+  void        *pVnode;
 
   dTrace("dnode %s msg incoming, thandle:%p", taosMsg[pMsg->msgType], pMsg->handle);
 
@@ -159,7 +159,7 @@ void *dnodeAllocateRqueue(void *pVnode) {
     } while (readPool.num < readPool.min);
   }
 
-  dTrace("pVnode:%p, read queue:%p is allocated", pVnode, queue); 
+  dTrace("pVnode:%p, read queue:%p is allocated", pVnode, queue);
 
   return queue;
 }
@@ -170,13 +170,13 @@ void dnodeFreeRqueue(void *rqueue) {
   // dynamically adjust the number of threads
 }
 
-static void dnodeContinueExecuteQuery(void* pVnode, void* qhandle, SReadMsg *pMsg) {  
+static void dnodeContinueExecuteQuery(void* pVnode, void* qhandle, SReadMsg *pMsg) {
   SReadMsg *pRead = (SReadMsg *)taosAllocateQitem(sizeof(SReadMsg));
   pRead->rpcMsg      = pMsg->rpcMsg;
   pRead->pCont       = qhandle;
   pRead->contLen     = 0;
   pRead->rpcMsg.msgType = TSDB_MSG_TYPE_QUERY;
-  
+
   taos_queue queue = vnodeGetRqueue(pVnode);
   taosWriteQitem(queue, TAOS_QTYPE_RPC, pRead);
 }

From 577962ed83e4249faefedafafda5e24ec9299ffb Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Mon, 4 May 2020 23:25:08 -0600
Subject: [PATCH 02/43] [Dnode / Vnode] More error handling.

This patch adds more error handling code:
1. In dnodeAllocateWqueue(), if the allocation of pWorker fails, any
allocated memory should be unwound and returns a NULL queue. This is
a better function contract where either all allocation succeeds or none
succeeds.
2. In vnodeOpen(), handle allocation failure for pVnode.
---
 src/dnode/src/dnodeModule.c |  2 +-
 src/dnode/src/dnodeWrite.c  | 25 ++++++++++++++++++-------
 src/vnode/src/vnodeMain.c   | 27 +++++++++++++++------------
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/src/dnode/src/dnodeModule.c b/src/dnode/src/dnodeModule.c
index e1aa48d477..f3f5314146 100644
--- a/src/dnode/src/dnodeModule.c
+++ b/src/dnode/src/dnodeModule.c
@@ -73,7 +73,7 @@ static void dnodeAllocModules() {
 }
 
 void dnodeCleanUpModules() {
-  for (int32_t module = 1; module < TSDB_MOD_MAX; ++module) {
+  for (EModuleType module = 1; module < TSDB_MOD_MAX; ++module) {
     if (tsModule[module].enable && tsModule[module].stopFp) {
       (*tsModule[module].stopFp)();
     }
diff --git a/src/dnode/src/dnodeWrite.c b/src/dnode/src/dnodeWrite.c
index 39757c690f..1e877108ca 100644
--- a/src/dnode/src/dnodeWrite.c
+++ b/src/dnode/src/dnodeWrite.c
@@ -31,9 +31,9 @@
 typedef struct {
   taos_qall  qall;
   taos_qset  qset;      // queue set
-  pthread_t  thread;    // thread 
+  pthread_t  thread;    // thread
   int32_t    workerId;  // worker ID
-} SWriteWorker;  
+} SWriteWorker;
 
 typedef struct {
   SRspRet  rspRet;
@@ -67,7 +67,7 @@ int32_t dnodeInitWrite() {
 }
 
 void dnodeCleanupWrite() {
-  
+
   for (int32_t i = 0; i < wWorkerPool.max; ++i) {
     SWriteWorker *pWorker =  wWorkerPool.writeWorker + i;
     if (pWorker->thread) {
@@ -120,10 +120,18 @@ void *dnodeAllocateWqueue(void *pVnode) {
 
   if (pWorker->qset == NULL) {
     pWorker->qset = taosOpenQset();
-    if (pWorker->qset == NULL) return NULL;
+    if (pWorker->qset == NULL) {
+      taosCloseQueue(queue);
+      return NULL;
+    }
 
     taosAddIntoQset(pWorker->qset, queue, pVnode);
     pWorker->qall = taosAllocateQall();
+    if (pWorker->qall == NULL) {
+      taosCloseQset(pWorker->qset);
+      taosCloseQueue(queue);
+      return NULL;
+    }
     wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
 
     pthread_attr_t thAttr;
@@ -132,7 +140,10 @@ void *dnodeAllocateWqueue(void *pVnode) {
 
     if (pthread_create(&pWorker->thread, &thAttr, dnodeProcessWriteQueue, pWorker) != 0) {
       dError("failed to create thread to process read queue, reason:%s", strerror(errno));
+      taosFreeQall(pWorker->qall);
       taosCloseQset(pWorker->qset);
+      taosCloseQueue(queue);
+      queue = NULL;
     } else {
       dTrace("write worker:%d is launched", pWorker->workerId);
     }
@@ -183,7 +194,7 @@ static void *dnodeProcessWriteQueue(void *param) {
 
   while (1) {
     numOfMsgs = taosReadAllQitemsFromQset(pWorker->qset, pWorker->qall, &pVnode);
-    if (numOfMsgs <=0) { 
+    if (numOfMsgs <=0) {
       dnodeHandleIdleWorker(pWorker);  // thread exit if no queues anymore
       continue;
     }
@@ -213,7 +224,7 @@ static void *dnodeProcessWriteQueue(void *param) {
       taosGetQitem(pWorker->qall, &type, &item);
       if (type == TAOS_QTYPE_RPC) {
         pWrite = (SWriteMsg *)item;
-        dnodeSendRpcWriteRsp(pVnode, item, pWrite->rpcMsg.code); 
+        dnodeSendRpcWriteRsp(pVnode, item, pWrite->rpcMsg.code);
       } else {
         taosFreeQitem(item);
         vnodeRelease(pVnode);
@@ -229,7 +240,7 @@ static void dnodeHandleIdleWorker(SWriteWorker *pWorker) {
 
   if (num > 0) {
      usleep(30000);
-     sched_yield(); 
+     sched_yield();
   } else {
      taosFreeQall(pWorker->qall);
      taosCloseQset(pWorker->qset);
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 2a7d133039..e8676fc8ba 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -108,7 +108,7 @@ int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) {
   tsdbCfg.maxRowsPerFileBlock = pVnodeCfg->cfg.maxRowsPerFileBlock;
   tsdbCfg.precision           = pVnodeCfg->cfg.precision;
   tsdbCfg.compression         = pVnodeCfg->cfg.compression;;
-  
+
   char tsdbDir[TSDB_FILENAME_LEN] = {0};
   sprintf(tsdbDir, "%s/vnode%d/tsdb", tsVnodeDir, pVnodeCfg->cfg.vgId);
   code = tsdbCreateRepo(tsdbDir, &tsdbCfg, NULL);
@@ -134,7 +134,7 @@ int32_t vnodeDrop(int32_t vgId) {
   dTrace("pVnode:%p vgId:%d, vnode will be dropped", pVnode, pVnode->vgId);
   pVnode->status = TAOS_VN_STATUS_DELETING;
   vnodeCleanUp(pVnode);
- 
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -176,10 +176,13 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   pthread_once(&vnodeModuleInit, vnodeInit);
 
   SVnodeObj *pVnode = calloc(sizeof(SVnodeObj), 1);
+  if (pVnode == NULL) {
+    return TSDB_CODE_NO_RESOURCE;
+  }
   pVnode->vgId     = vnode;
   pVnode->status   = TAOS_VN_STATUS_INIT;
   pVnode->refCount = 1;
-  pVnode->version  = 0;  
+  pVnode->version  = 0;
   taosAddIntHash(tsDnodeVnodesHash, pVnode->vgId, (char *)(&pVnode));
 
   int32_t code = vnodeReadCfg(pVnode);
@@ -190,7 +193,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   }
 
   vnodeReadVersion(pVnode);
-  
+
   pVnode->wqueue = dnodeAllocateWqueue(pVnode);
   pVnode->rqueue = dnodeAllocateRqueue(pVnode);
 
@@ -227,12 +230,12 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   syncInfo.getWalInfo = vnodeGetWalInfo;
   syncInfo.getFileInfo = vnodeGetFileInfo;
   syncInfo.writeToCache = vnodeWriteToQueue;
-  syncInfo.confirmForward = dnodeSendRpcWriteRsp; 
+  syncInfo.confirmForward = dnodeSendRpcWriteRsp;
   syncInfo.notifyRole = vnodeNotifyRole;
   pVnode->sync = syncStart(&syncInfo);
 
   // start continuous query
-  if (pVnode->role == TAOS_SYNC_ROLE_MASTER) 
+  if (pVnode->role == TAOS_SYNC_ROLE_MASTER)
     cqStart(pVnode->cq);
 
   pVnode->events = NULL;
@@ -316,7 +319,7 @@ void *vnodeAccquireVnode(int32_t vgId) {
 }
 
 void *vnodeGetRqueue(void *pVnode) {
-  return ((SVnodeObj *)pVnode)->rqueue; 
+  return ((SVnodeObj *)pVnode)->rqueue;
 }
 
 void *vnodeGetWqueue(int32_t vgId) {
@@ -326,7 +329,7 @@ void *vnodeGetWqueue(int32_t vgId) {
 }
 
 void *vnodeGetWal(void *pVnode) {
-  return ((SVnodeObj *)pVnode)->wal; 
+  return ((SVnodeObj *)pVnode)->wal;
 }
 
 void vnodeBuildStatusMsg(void *param) {
@@ -394,9 +397,9 @@ static void vnodeNotifyRole(void *ahandle, int8_t role) {
   SVnodeObj *pVnode = ahandle;
   pVnode->role = role;
 
-  if (pVnode->role == TAOS_SYNC_ROLE_MASTER) 
+  if (pVnode->role == TAOS_SYNC_ROLE_MASTER)
     cqStart(pVnode->cq);
-  else 
+  else
     cqStop(pVnode->cq);
 }
 
@@ -426,14 +429,14 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
   len += snprintf(content + len, maxLen - len, "  \"daysToKeep2\": %d,\n", pVnodeCfg->cfg.daysToKeep2);
   len += snprintf(content + len, maxLen - len, "  \"minRowsPerFileBlock\": %d,\n", pVnodeCfg->cfg.minRowsPerFileBlock);
   len += snprintf(content + len, maxLen - len, "  \"maxRowsPerFileBlock\": %d,\n", pVnodeCfg->cfg.maxRowsPerFileBlock);
-  len += snprintf(content + len, maxLen - len, "  \"commitTime\": %d,\n", pVnodeCfg->cfg.commitTime);  
+  len += snprintf(content + len, maxLen - len, "  \"commitTime\": %d,\n", pVnodeCfg->cfg.commitTime);
   len += snprintf(content + len, maxLen - len, "  \"precision\": %d,\n", pVnodeCfg->cfg.precision);
   len += snprintf(content + len, maxLen - len, "  \"compression\": %d,\n", pVnodeCfg->cfg.compression);
   len += snprintf(content + len, maxLen - len, "  \"commitLog\": %d,\n", pVnodeCfg->cfg.commitLog);
   len += snprintf(content + len, maxLen - len, "  \"replica\": %d,\n", pVnodeCfg->cfg.replications);
   len += snprintf(content + len, maxLen - len, "  \"wals\": %d,\n", pVnodeCfg->cfg.wals);
   len += snprintf(content + len, maxLen - len, "  \"quorum\": %d,\n", pVnodeCfg->cfg.quorum);
-  
+
   len += snprintf(content + len, maxLen - len, "  \"nodeInfos\": [{\n");
   for (int32_t i = 0; i < pVnodeCfg->cfg.replications; i++) {
     len += snprintf(content + len, maxLen - len, "    \"nodeId\": %d,\n", pVnodeCfg->nodes[i].nodeId);

From 745bb66251a12747f89c45ff0e8095443f34b129 Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Tue, 5 May 2020 00:02:56 -0600
Subject: [PATCH 03/43] Only increment wWorkerPool.nextId when
 wWorkerPool.nextId is launched

Only increment wWorkerPool.nextId when wWorkerPool.nextId is launched
---
 src/dnode/src/dnodeWrite.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/dnode/src/dnodeWrite.c b/src/dnode/src/dnodeWrite.c
index 1e877108ca..c02ca950a7 100644
--- a/src/dnode/src/dnodeWrite.c
+++ b/src/dnode/src/dnodeWrite.c
@@ -132,8 +132,6 @@ void *dnodeAllocateWqueue(void *pVnode) {
       taosCloseQueue(queue);
       return NULL;
     }
-    wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
-
     pthread_attr_t thAttr;
     pthread_attr_init(&thAttr);
     pthread_attr_setdetachstate(&thAttr, PTHREAD_CREATE_JOINABLE);
@@ -146,6 +144,7 @@ void *dnodeAllocateWqueue(void *pVnode) {
       queue = NULL;
     } else {
       dTrace("write worker:%d is launched", pWorker->workerId);
+      wWorkerPool.nextId = (wWorkerPool.nextId + 1) % wWorkerPool.max;
     }
 
     pthread_attr_destroy(&thAttr);

From 86cbe53fb1fbdfc1feb1720d7ea85a23b14e2249 Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Tue, 5 May 2020 20:31:38 -0600
Subject: [PATCH 04/43] Rename dnode initialization path.

Per reviews from Jeff, rename dnode initialization path as he suggested.
---
 src/dnode/src/dnodeMain.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 6a9299902c..782b0d1fa9 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -41,16 +41,16 @@ static void dnodeSetRunStatus(SDnodeRunStatus status);
 static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context);
 static void dnodeCheckDataDirOpenned(char *dir);
 static SDnodeRunStatus tsDnodeRunStatus = TSDB_DNODE_RUN_STATUS_STOPPED;
-static int32_t dnodeInitSteps();
-static void dnodeCleanupSteps(int32_t stepId);
+static int32_t dnodeInitComponents();
+static void dnodeCleanupComponents(int32_t stepId);
 
 typedef struct {
   const char *const name;
   int               (*init)();
   void              (*cleanup)();
-} DnodeStep;
+} SDnodeComponent;
 
-static const DnodeStep DnodeSteps[] = {
+static const SDnodeComponent SDnodeComponents[] = {
   {"storage",       dnodeInitStorage,       dnodeCleanupStorage},
   {"read",          dnodeInitRead,          dnodeCleanupRead},
   {"write",         dnodeInitWrite,         dnodeCleanupWrite},
@@ -152,17 +152,17 @@ static void signal_handler(int32_t signum, siginfo_t *sigInfo, void *context) {
   exit(EXIT_SUCCESS);
 }
 
-static void dnodeCleanupSteps(int32_t stepId) {
+static void dnodeCleanupComponents(int32_t stepId) {
   for (int32_t i = stepId; i >= 0; i--) {
-    DnodeSteps[i].cleanup();
+    SDnodeComponents[i].cleanup();
   }
 }
 
-static int32_t dnodeInitSteps() {
+static int32_t dnodeInitComponents() {
   int32_t code = 0;
-  for (int32_t i = 0; i < sizeof(DnodeSteps) / sizeof(DnodeSteps[0]); i++) {
-    if (DnodeSteps[i].init() != 0) {
-      dnodeCleanupSteps(i);
+  for (int32_t i = 0; i < sizeof(SDnodeComponents) / sizeof(SDnodeComponents[0]); i++) {
+    if (SDnodeComponents[i].init() != 0) {
+      dnodeCleanupComponents(i);
       code = -1;
       break;
     }
@@ -199,7 +199,7 @@ static int32_t dnodeInitSystem() {
 
   dPrint("start to initialize TDengine on %s", tsLocalEp);
 
-  if (dnodeInitSteps() != 0) {
+  if (dnodeInitComponents() != 0) {
     return -1;
   }
 
@@ -214,7 +214,7 @@ static int32_t dnodeInitSystem() {
 static void dnodeCleanUpSystem() {
   if (dnodeGetRunStatus() != TSDB_DNODE_RUN_STATUS_STOPPED) {
     dnodeSetRunStatus(TSDB_DNODE_RUN_STATUS_STOPPED);
-    dnodeCleanupSteps(sizeof(DnodeSteps) / sizeof(DnodeSteps[0]) - 1);
+    dnodeCleanupComponents(sizeof(SDnodeComponents) / sizeof(SDnodeComponents[0]) - 1);
     taos_cleanup();
   }
 }

From 7002d9635e1facc247c773fb0aef901baadf3671 Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Tue, 5 May 2020 21:21:27 -0600
Subject: [PATCH 05/43] [vnode] Make vnode versioning more robust.

This patch changes version read/write path such that it does not
allocate heap memory while dealing with versioning. Instead, because
version data is short, it uses stack allcocated array to hold the versioning
data. This eliminate one potential failure in read/write version, which is
used to guarantee data consistency.

* Bonus fix
The patch also fixes a bunch of failure handling in the path of vnode
write.
---
 src/vnode/src/vnodeMain.c | 111 ++++++++++++++++++++++++++------------
 1 file changed, 76 insertions(+), 35 deletions(-)

diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index f9904f7fa8..9cb47d367b 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -33,6 +33,8 @@
 #include "tcq.h"
 //#include "tsync.h"
 
+#define TSDB_VNODE_VERSION_CONTENT_LEN 31
+
 static int32_t  tsOpennedVnodes;
 static void    *tsDnodeVnodesHash;
 static void     vnodeCleanUp(SVnodeObj *pVnode);
@@ -41,7 +43,7 @@ static int      vnodeWalCallback(void *arg);
 static int32_t  vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg);
 static int32_t  vnodeReadCfg(SVnodeObj *pVnode);
 static int32_t  vnodeSaveVersion(SVnodeObj *pVnode);
-static bool     vnodeReadVersion(SVnodeObj *pVnode);
+static int32_t  vnodeReadVersion(SVnodeObj *pVnode);
 static int      vnodeWalCallback(void *arg);
 static uint32_t vnodeGetFileInfo(void *ahandle, char *name, uint32_t *index, int32_t *size);
 static int      vnodeGetWalInfo(void *ahandle, char *name, uint32_t *index);
@@ -108,7 +110,7 @@ int32_t vnodeCreate(SMDCreateVnodeMsg *pVnodeCfg) {
   tsdbCfg.maxRowsPerFileBlock = pVnodeCfg->cfg.maxRowsPerFileBlock;
   tsdbCfg.precision           = pVnodeCfg->cfg.precision;
   tsdbCfg.compression         = pVnodeCfg->cfg.compression;;
-  
+
   char tsdbDir[TSDB_FILENAME_LEN] = {0};
   sprintf(tsdbDir, "%s/vnode%d/tsdb", tsVnodeDir, pVnodeCfg->cfg.vgId);
   code = tsdbCreateRepo(tsdbDir, &tsdbCfg, NULL);
@@ -134,7 +136,7 @@ int32_t vnodeDrop(int32_t vgId) {
   dTrace("pVnode:%p vgId:%d, vnode will be dropped", pVnode, pVnode->vgId);
   pVnode->status = TAOS_VN_STATUS_DELETING;
   vnodeCleanUp(pVnode);
- 
+
   return TSDB_CODE_SUCCESS;
 }
 
@@ -177,26 +179,46 @@ int32_t vnodeAlter(void *param, SMDCreateVnodeMsg *pVnodeCfg) {
 
 int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   char temp[TSDB_FILENAME_LEN];
+  int32_t code;
   pthread_once(&vnodeModuleInit, vnodeInit);
 
   SVnodeObj *pVnode = calloc(sizeof(SVnodeObj), 1);
+  if (pVnode == NULL) {
+    code = TSDB_CODE_NO_RESOURCE;
+    goto vnodeOpenError;
+  }
+
   pVnode->vgId     = vnode;
   pVnode->status   = TAOS_VN_STATUS_INIT;
   pVnode->refCount = 1;
-  pVnode->version  = 0;  
+  pVnode->version  = 0;
   taosAddIntHash(tsDnodeVnodesHash, pVnode->vgId, (char *)(&pVnode));
-  
-  int32_t code = vnodeReadCfg(pVnode);
+
+  code = vnodeReadCfg(pVnode);
   if (code != TSDB_CODE_SUCCESS) {
     dError("pVnode:%p vgId:%d, failed to read cfg file", pVnode, pVnode->vgId);
-    taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
-    return code;
+    goto vnodeOpenError;
+  }
+
+  code = vnodeReadVersion(pVnode);
+  if (code != TSDB_CODE_SUCCESS) {
+    dError("pVnode:%p vgId:%d, failed to read version file", pVnode, pVnode->vgId);
+    goto vnodeOpenError;
   }
 
-  vnodeReadVersion(pVnode);
-  
   pVnode->wqueue = dnodeAllocateWqueue(pVnode);
+  if (pVnode->wqueue == NULL) {
+    dError("pVnode:%p vgId:%d, failed to allocate Wqueue", pVnode, pVnode->vgId);
+    code = TSDB_CODE_NO_RESOURCE;
+    goto vnodeOpenError;
+  }
+
   pVnode->rqueue = dnodeAllocateRqueue(pVnode);
+  if (pVnode->wqueue == NULL) {
+    dError("pVnode:%p vgId:%d, failed to allocate Rqueue", pVnode, pVnode->vgId);
+    code = TSDB_CODE_NO_RESOURCE;
+    goto vnodeOpenError;
+  }
 
   SCqCfg cqCfg = {0};
   sprintf(cqCfg.user, "root");
@@ -214,8 +236,8 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   pVnode->tsdb = tsdbOpenRepo(temp, &appH);
   if (pVnode->tsdb == NULL) {
     dError("pVnode:%p vgId:%d, failed to open tsdb at %s(%s)", pVnode, pVnode->vgId, temp, tstrerror(terrno));
-    taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
-    return terrno;
+    code = TSDB_CODE_VG_INIT_FAILED;
+    goto vnodeOpenError;
   }
 
   sprintf(temp, "%s/wal", rootDir);
@@ -231,12 +253,12 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   syncInfo.getWalInfo = vnodeGetWalInfo;
   syncInfo.getFileInfo = vnodeGetFileInfo;
   syncInfo.writeToCache = vnodeWriteToQueue;
-  syncInfo.confirmForward = dnodeSendRpcWriteRsp; 
+  syncInfo.confirmForward = dnodeSendRpcWriteRsp;
   syncInfo.notifyRole = vnodeNotifyRole;
   pVnode->sync = syncStart(&syncInfo);
 
   // start continuous query
-  if (pVnode->role == TAOS_SYNC_ROLE_MASTER) 
+  if (pVnode->role == TAOS_SYNC_ROLE_MASTER)
     cqStart(pVnode->cq);
 
   pVnode->events = NULL;
@@ -246,6 +268,18 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
 
   atomic_add_fetch_32(&tsOpennedVnodes, 1);
   return TSDB_CODE_SUCCESS;
+
+vnodeOpenError:
+  if (pVnode != NULL && pVnode->wqueue != NULL) {
+    dnodeFreeWqueue(pVnode->wqueue);
+  }
+  if (pVnode != NULL && pVnode->rqueue != NULL) {
+    dnodeFreeRqueue(pVnode->rqueue);
+  }
+  if (pVnode != NULL) {
+    taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
+  }
+  return code;
 }
 
 int32_t vnodeClose(int32_t vgId) {
@@ -320,7 +354,7 @@ void *vnodeAccquireVnode(int32_t vgId) {
 }
 
 void *vnodeGetRqueue(void *pVnode) {
-  return ((SVnodeObj *)pVnode)->rqueue; 
+  return ((SVnodeObj *)pVnode)->rqueue;
 }
 
 void *vnodeGetWqueue(int32_t vgId) {
@@ -330,7 +364,7 @@ void *vnodeGetWqueue(int32_t vgId) {
 }
 
 void *vnodeGetWal(void *pVnode) {
-  return ((SVnodeObj *)pVnode)->wal; 
+  return ((SVnodeObj *)pVnode)->wal;
 }
 
 void vnodeBuildStatusMsg(void *param) {
@@ -398,9 +432,9 @@ static void vnodeNotifyRole(void *ahandle, int8_t role) {
   SVnodeObj *pVnode = ahandle;
   pVnode->role = role;
 
-  if (pVnode->role == TAOS_SYNC_ROLE_MASTER) 
+  if (pVnode->role == TAOS_SYNC_ROLE_MASTER)
     cqStart(pVnode->cq);
-  else 
+  else
     cqStop(pVnode->cq);
 }
 
@@ -411,12 +445,16 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
   if (!fp) {
     dError("vgId:%d, failed to open vnode cfg file for write, file:%s error:%s", pVnodeCfg->cfg.vgId, cfgFile,
            strerror(errno));
-    return errno;
+    return TSDB_CODE_OTHERS;
   }
 
   int32_t len = 0;
   int32_t maxLen = 1000;
   char *  content = calloc(1, maxLen + 1);
+  if (content == NULL) {
+    fclose(fp);
+    return TSDB_CODE_NO_RESOURCE;
+  }
 
   len += snprintf(content + len, maxLen - len, "{\n");
 
@@ -430,14 +468,14 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
   len += snprintf(content + len, maxLen - len, "  \"daysToKeep2\": %d,\n", pVnodeCfg->cfg.daysToKeep2);
   len += snprintf(content + len, maxLen - len, "  \"minRowsPerFileBlock\": %d,\n", pVnodeCfg->cfg.minRowsPerFileBlock);
   len += snprintf(content + len, maxLen - len, "  \"maxRowsPerFileBlock\": %d,\n", pVnodeCfg->cfg.maxRowsPerFileBlock);
-  len += snprintf(content + len, maxLen - len, "  \"commitTime\": %d,\n", pVnodeCfg->cfg.commitTime);  
+  len += snprintf(content + len, maxLen - len, "  \"commitTime\": %d,\n", pVnodeCfg->cfg.commitTime);
   len += snprintf(content + len, maxLen - len, "  \"precision\": %d,\n", pVnodeCfg->cfg.precision);
   len += snprintf(content + len, maxLen - len, "  \"compression\": %d,\n", pVnodeCfg->cfg.compression);
   len += snprintf(content + len, maxLen - len, "  \"commitLog\": %d,\n", pVnodeCfg->cfg.commitLog);
   len += snprintf(content + len, maxLen - len, "  \"replica\": %d,\n", pVnodeCfg->cfg.replications);
   len += snprintf(content + len, maxLen - len, "  \"wals\": %d,\n", pVnodeCfg->cfg.wals);
   len += snprintf(content + len, maxLen - len, "  \"quorum\": %d,\n", pVnodeCfg->cfg.quorum);
-  
+
   len += snprintf(content + len, maxLen - len, "  \"nodeInfos\": [{\n");
   for (int32_t i = 0; i < pVnodeCfg->cfg.replications; i++) {
     len += snprintf(content + len, maxLen - len, "    \"nodeId\": %d,\n", pVnodeCfg->nodes[i].nodeId);
@@ -457,7 +495,7 @@ static int32_t vnodeSaveCfg(SMDCreateVnodeMsg *pVnodeCfg) {
 
   dPrint("vgId:%d, save vnode cfg successed", pVnodeCfg->cfg.vgId);
 
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
 static int32_t vnodeReadCfg(SVnodeObj *pVnode) {
@@ -467,12 +505,17 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) {
   if (!fp) {
     dError("pVnode:%p vgId:%d, failed to open vnode cfg file for read, file:%s, error:%s", pVnode, pVnode->vgId,
            cfgFile, strerror(errno));
-    return errno;
+    return TSDB_CODE_OTHERS;
   }
 
   int   ret = TSDB_CODE_OTHERS;
   int   maxLen = 1000;
   char *content = calloc(1, maxLen + 1);
+  if (content == NULL) {
+    fclose(fp);
+    return TSDB_CODE_NO_RESOURCE;
+  }
+
   int   len = fread(content, 1, maxLen, fp);
   if (len <= 0) {
     free(content);
@@ -640,7 +683,7 @@ static int32_t vnodeReadCfg(SVnodeObj *pVnode) {
     pVnode->syncCfg.nodeInfo[i].nodePort += TSDB_PORT_SYNC;
   }
 
-  ret = 0;
+  ret = TSDB_CODE_SUCCESS;
 
   dPrint("pVnode:%p vgId:%d, read vnode cfg successed, replcia:%d", pVnode, pVnode->vgId, pVnode->syncCfg.replica);
   for (int32_t i = 0; i < pVnode->syncCfg.replica; i++) {
@@ -662,12 +705,12 @@ static int32_t vnodeSaveVersion(SVnodeObj *pVnode) {
   if (!fp) {
     dError("pVnode:%p vgId:%d, failed to open vnode version file for write, file:%s error:%s", pVnode, pVnode->vgId,
            versionFile, strerror(errno));
-    return errno;
+    return TSDB_CODE_OTHERS;
   }
 
   int32_t len = 0;
   int32_t maxLen = 30;
-  char *  content = calloc(1, maxLen + 1);
+  char content[TSDB_VNODE_VERSION_CONTENT_LEN] = {0};
 
   len += snprintf(content + len, maxLen - len, "{\n");
   len += snprintf(content + len, maxLen - len, "  \"version\": %" PRId64 "\n", pVnode->version);
@@ -675,32 +718,31 @@ static int32_t vnodeSaveVersion(SVnodeObj *pVnode) {
 
   fwrite(content, 1, len, fp);
   fclose(fp);
-  free(content);
 
   dPrint("pVnode:%p vgId:%d, save vnode version:%" PRId64 " successed", pVnode, pVnode->vgId, pVnode->version);
 
-  return 0;
+  return TSDB_CODE_SUCCESS;
 }
 
-static bool vnodeReadVersion(SVnodeObj *pVnode) {
+static int32_t vnodeReadVersion(SVnodeObj *pVnode) {
   char versionFile[TSDB_FILENAME_LEN + 30] = {0};
   sprintf(versionFile, "%s/vnode%d/version.json", tsVnodeDir, pVnode->vgId);
   FILE *fp = fopen(versionFile, "r");
   if (!fp) {
     dTrace("pVnode:%p vgId:%d, failed to open version file:%s error:%s", pVnode, pVnode->vgId,
            versionFile, strerror(errno));
-    return false;
+    return TSDB_CODE_OTHERS;
   }
 
   bool  ret = false;
   int   maxLen = 100;
-  char *content = calloc(1, maxLen + 1);
+  char content[TSDB_VNODE_VERSION_CONTENT_LEN] = {0};
+
   int   len = fread(content, 1, maxLen, fp);
   if (len <= 0) {
-    free(content);
     fclose(fp);
     dPrint("pVnode:%p vgId:%d, failed to read vnode version, content is null", pVnode, pVnode->vgId);
-    return false;
+    return TSDB_CODE_OTHERS;
   }
 
   cJSON *root = cJSON_Parse(content);
@@ -716,12 +758,11 @@ static bool vnodeReadVersion(SVnodeObj *pVnode) {
   }
   pVnode->version = version->valueint;
 
-  ret = true;
+  ret = TSDB_CODE_SUCCESS;
 
   dPrint("pVnode:%p vgId:%d, read vnode version successed, version:%%" PRId64, pVnode, pVnode->vgId, pVnode->version);
 
 PARSE_OVER:
-  free(content);
   cJSON_Delete(root);
   fclose(fp);
   return ret;

From 4f4c4368b39961fc56615e49954dd1d9ba19c383 Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Tue, 5 May 2020 22:51:46 -0600
Subject: [PATCH 06/43] [vnode] Handle failure of adding to hash in
 vnodeOpen().

This patch adds error handling for call to vnodeOpen() in vnodeOpen.
Previously the error is not handled, which could cause the allocated
pVnode not registered anywhere, and this could cause memory leak.

This patch also adds a missing deallocation of pVnode on failure.
taosDeleteIntHash() only removes the pVnode from hash table, but
pVnode needs to be deallocated explicitly.
---
 src/vnode/src/vnodeMain.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index 9cb47d367b..5cb1298757 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -192,7 +192,12 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   pVnode->status   = TAOS_VN_STATUS_INIT;
   pVnode->refCount = 1;
   pVnode->version  = 0;
-  taosAddIntHash(tsDnodeVnodesHash, pVnode->vgId, (char *)(&pVnode));
+  void *pData = taosAddIntHash(tsDnodeVnodesHash, pVnode->vgId, (char *)(&pVnode));
+  if (pData == NULL) {
+    dError("pVnode:%p vgId:%d, failed to add to hash", pVnode, pVnode->vgId);
+    code = TSDB_CODE_VG_INIT_FAILED;
+    goto vnodeOpenError;
+  }
 
   code = vnodeReadCfg(pVnode);
   if (code != TSDB_CODE_SUCCESS) {
@@ -278,6 +283,7 @@ vnodeOpenError:
   }
   if (pVnode != NULL) {
     taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
+    free(pVnode);
   }
   return code;
 }

From f38f691796a92204da5ea41e519bfb1d2dabe612 Mon Sep 17 00:00:00 2001
From: yifan hao <hyifan@vmware.com>
Date: Wed, 6 May 2020 22:06:17 -0600
Subject: [PATCH 07/43] [vnode] Fix a few error handling as well as memory leak

1. Fix error handling in vnodeProcessQueryMsg() where qCreateQueryInfo()
fails.
2. Inside qCreateQueryInfo(), cleanup pQInfo upon failure, also add a
missing goto statement.
---
 src/query/src/queryExecutor.c | 282 +++++++++++++++++-----------------
 src/vnode/src/vnodeRead.c     |  27 ++--
 2 files changed, 159 insertions(+), 150 deletions(-)

diff --git a/src/query/src/queryExecutor.c b/src/query/src/queryExecutor.c
index e8abe9d819..ef0211485c 100644
--- a/src/query/src/queryExecutor.c
+++ b/src/query/src/queryExecutor.c
@@ -232,7 +232,7 @@ bool getNeighborPoints(SQInfo *pQInfo, void *pMeterObj, SPointInterpoSupporter *
 bool doFilterData(SQuery *pQuery, int32_t elemPos) {
   for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
     SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
-    
+
     char *pElem = pFilterInfo->pData + pFilterInfo->info.bytes * elemPos;
     if (isNull(pElem, pFilterInfo->info.type)) {
       return false;
@@ -241,7 +241,7 @@ bool doFilterData(SQuery *pQuery, int32_t elemPos) {
     bool qualified = false;
     for (int32_t j = 0; j < pFilterInfo->numOfFilters; ++j) {
       SColumnFilterElem *pFilterElem = &pFilterInfo->pFilters[j];
-      
+
       if (pFilterElem->fp(pFilterElem, pElem, pElem)) {
         qualified = true;
         break;
@@ -824,7 +824,7 @@ char *getDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, SArithmeticSupport *sas, int3
                     SArray *pDataBlock) {
   char *dataBlock = NULL;
   SQuery *pQuery = pRuntimeEnv->pQuery;
-  
+
   SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
 
   int32_t functionId = pQuery->pSelectExpr[col].base.functionId;
@@ -837,18 +837,18 @@ char *getDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, SArithmeticSupport *sas, int3
     } else {
       pCtx->startOffset = pQuery->pos - (size - 1);
     }
-  
+
     sas->offset  = 0;
     sas->colList = pQuery->colList;
     sas->numOfCols = pQuery->numOfCols;
     sas->data    = calloc(pQuery->numOfCols, POINTER_BYTES);
-    
+
     // here the pQuery->colList and sas->colList are identical
     for (int32_t i = 0; i < pQuery->numOfCols; ++i) {
       SColumnInfo *pColMsg = &pQuery->colList[i];
-  
+
       int32_t numOfCols = taosArrayGetSize(pDataBlock);
-      
+
       dataBlock = NULL;
       for (int32_t k = 0; k < numOfCols; ++k) {  //todo refactor
         SColumnInfoData *p = taosArrayGet(pDataBlock, k);
@@ -857,7 +857,7 @@ char *getDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, SArithmeticSupport *sas, int3
           break;
         }
       }
-      
+
       assert(dataBlock != NULL);
       sas->data[i] = dataBlock + pCtx->startOffset * pQuery->colList[i].bytes;  // start from the offset
     }
@@ -873,7 +873,7 @@ char *getDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, SArithmeticSupport *sas, int3
        * column in cache with the corresponding meter schema is reinforced.
        */
       int32_t numOfCols = taosArrayGetSize(pDataBlock);
-      
+
       for (int32_t i = 0; i < numOfCols; ++i) {
         SColumnInfoData *p = taosArrayGet(pDataBlock, i);
         if (pCol->colId == p->info.colId) {
@@ -912,7 +912,7 @@ static void blockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *
   }
 
   SArithmeticSupport *sasArray = calloc((size_t)pQuery->numOfOutput, sizeof(SArithmeticSupport));
-  
+
   for (int32_t k = 0; k < pQuery->numOfOutput; ++k) {
     int32_t functionId = pQuery->pSelectExpr[k].base.functionId;
 
@@ -982,10 +982,10 @@ static void blockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *
     if (pQuery->pSelectExpr[i].base.functionId != TSDB_FUNC_ARITHM) {
       continue;
     }
-    
+
     tfree(sasArray[i].data);
   }
-  
+
   tfree(sasArray);
 }
 
@@ -1045,7 +1045,7 @@ static char *getGroupbyColumnData(SQuery *pQuery, int16_t *type, int16_t *bytes,
      * column in cache with the corresponding meter schema is reinforced.
      */
     int32_t numOfCols = taosArrayGetSize(pDataBlock);
-  
+
     for (int32_t i = 0; i < numOfCols; ++i) {
       SColumnInfoData *p = taosArrayGet(pDataBlock, i);
       if (pColIndex->colId == p->info.colId) {
@@ -1053,7 +1053,7 @@ static char *getGroupbyColumnData(SQuery *pQuery, int16_t *type, int16_t *bytes,
       }
     }
   }
-  
+
   return NULL;
 }
 
@@ -1113,7 +1113,7 @@ static bool functionNeedToExecute(SQueryRuntimeEnv *pRuntimeEnv, SQLFunctionCtx
 static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pStatis, SDataBlockInfo *pDataBlockInfo,
     SWindowResInfo *pWindowResInfo, SArray *pDataBlock) {
   SQLFunctionCtx *pCtx = pRuntimeEnv->pCtx;
-  
+
   SQuery *pQuery = pRuntimeEnv->pQuery;
   TSKEY  *primaryKeyCol = (TSKEY*) ((SColumnInfoData *)taosArrayGet(pDataBlock, 0))->pData;
 
@@ -1253,18 +1253,18 @@ static void rowwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *pS
       }
     }
   }
-  
+
   pQuery->lastKey = lastKey + step;
-  
+
   // todo refactor: extract method
   for(int32_t i = 0; i < pQuery->numOfOutput; ++i) {
     if (pQuery->pSelectExpr[i].base.functionId != TSDB_FUNC_ARITHM) {
       continue;
     }
-    
+
     tfree(sasArray[i].data);
   }
-  
+
   free(sasArray);
 }
 
@@ -1423,7 +1423,7 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int16_t order
 
     SQLFunctionCtx *pCtx = &pRuntimeEnv->pCtx[i];
     SColIndex* pIndex = &pSqlFuncMsg->colInfo;
-    
+
     int32_t index = pSqlFuncMsg->colInfo.colIndex;
     if (TSDB_COL_IS_TAG(pIndex->flag)) {
       if (pIndex->colId == TSDB_TBNAME_COLUMN_INDEX) {
@@ -1437,7 +1437,7 @@ static int32_t setupQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv, int16_t order
       pCtx->inputBytes = pQuery->colList[index].bytes;
       pCtx->inputType = pQuery->colList[index].type;
     }
-    
+
     pCtx->ptsOutputBuf = NULL;
 
     pCtx->outputBytes = pQuery->pSelectExpr[i].bytes;
@@ -1502,7 +1502,7 @@ static void teardownQueryRuntimeEnv(SQueryRuntimeEnv *pRuntimeEnv) {
 
   SQuery *pQuery = pRuntimeEnv->pQuery;
   SQInfo* pQInfo = (SQInfo*) GET_QINFO_ADDR(pRuntimeEnv);
-  
+
   qTrace("QInfo:%p teardown runtime env", pQInfo);
   cleanupTimeWindowInfo(&pRuntimeEnv->windowResInfo, pQuery->numOfOutput);
 
@@ -1552,7 +1552,7 @@ static bool isQueryKilled(SQInfo *pQInfo) {
     pQInfo->killed = 1;
     return true;
   }
-  
+
   return (pQInfo->killed == 1);
 #endif
 }
@@ -1657,7 +1657,7 @@ static bool onlyQueryTags(SQuery* pQuery) {
       return false;
     }
   }
-  
+
   return true;
 }
 
@@ -1703,7 +1703,7 @@ static UNUSED_FUNC bool doGetQueryPos(TSKEY key, SQInfo *pQInfo, SPointInterpoSu
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *          pQuery = pRuntimeEnv->pQuery;
   SMeterObj *       pMeterObj = pRuntimeEnv->pTabObj;
-  
+
   /* key in query range. If not, no qualified in disk file */
   if (key != -1 && key <= pQuery->window.ekey) {
     if (isPointInterpoQuery(pQuery)) { /* no qualified data in this query range */
@@ -2164,10 +2164,10 @@ static UNUSED_FUNC void allocMemForInterpo(SQInfo *pQInfo, SQuery *pQuery, void
 #if 0
   if (pQuery->interpoType != TSDB_INTERPO_NONE) {
     assert(isIntervalQuery(pQuery) || (pQuery->intervalTime == 0 && isPointInterpoQuery(pQuery)));
-    
+
     if (isIntervalQuery(pQuery)) {
       pQInfo->runtimeEnv.pInterpoBuf = malloc(POINTER_BYTES * pQuery->numOfOutput);
-      
+
       for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
         pQInfo->runtimeEnv.pInterpoBuf[i] =
             calloc(1, sizeof(tFilePage) + pQuery->pSelectExpr[i].bytes * pMeterObj->pointsPerFileBlock);
@@ -2243,14 +2243,14 @@ UNUSED_FUNC void vnodeDecMeterRefcnt(SQInfo *pQInfo) {
     for (int32_t i = 0; i < pQInfo->groupInfo.numOfTables; ++i) {
       SMeterObj *pMeter = getMeterObj(pQInfo->groupInfo, pQInfo->pSidSet->pTableIdList[i]->sid);
       atomic_fetch_sub_32(&(pMeter->numOfQueries), 1);
-      
+
       if (pMeter->numOfQueries > 0) {
         qTrace("QInfo:%p vid:%d sid:%d meterId:%s, query is over, numOfQueries:%d", pQInfo, pMeter->vnode, pMeter->sid,
                pMeter->meterId, pMeter->numOfQueries);
         num++;
       }
     }
-    
+
     /*
      * in order to reduce log output, for all meters of which numOfQueries count are 0,
      * we do not output corresponding information
@@ -2272,26 +2272,26 @@ static bool needToLoadDataBlock(SQuery *pQuery, SDataStatis *pDataStatis, SQLFun
   for (int32_t k = 0; k < pQuery->numOfFilterCols; ++k) {
     SSingleColumnFilterInfo *pFilterInfo = &pQuery->pFilterInfo[k];
     int32_t                  colIndex = pFilterInfo->info.colIndex;
-    
+
     // this column not valid in current data block
     if (colIndex < 0 || pDataStatis[colIndex].colId != pFilterInfo->info.data.colId) {
       continue;
     }
-    
+
     // not support pre-filter operation on binary/nchar data type
     if (!vnodeSupportPrefilter(pFilterInfo->info.data.type)) {
       continue;
     }
-    
+
     // all points in current column are NULL, no need to check its boundary value
     if (pDataStatis[colIndex].numOfNull == numOfTotalPoints) {
       continue;
     }
-    
+
     if (pFilterInfo->info.info.type == TSDB_DATA_TYPE_FLOAT) {
       float minval = *(double *)(&pDataStatis[colIndex].min);
       float maxval = *(double *)(&pDataStatis[colIndex].max);
-      
+
       for (int32_t i = 0; i < pFilterInfo->numOfFilters; ++i) {
         if (pFilterInfo->pFilters[i].fp(&pFilterInfo->pFilters[i], (char *)&minval, (char *)&maxval)) {
           return true;
@@ -2306,7 +2306,7 @@ static bool needToLoadDataBlock(SQuery *pQuery, SDataStatis *pDataStatis, SQLFun
       }
     }
   }
-  
+
   // todo disable this opt code block temporarily
   //  for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
   //    int32_t functId = pQuery->pSelectExpr[i].base.functionId;
@@ -2561,9 +2561,9 @@ static void doSetTagValueInParam(void *tsdb, STableId* pTableId, int32_t tagColI
   } else {
     tsdbGetTableTagVal(tsdb, pTableId, tagColId, &type, &bytes, &val);
   }
-  
+
   tVariantCreateFromBinary(param, val, bytes, type);
-  
+
   if (tagColId == TSDB_TBNAME_COLUMN_INDEX) {
     tfree(val);
   }
@@ -2711,17 +2711,17 @@ void UNUSED_FUNC displayInterResult(SData **pdata, SQuery *pQuery, int32_t numOf
 #if 0
   int32_t numOfCols = pQuery->numOfOutput;
   printf("super table query intermediate result, total:%d\n", numOfRows);
-  
+
   SQInfo *   pQInfo = (SQInfo *)(GET_QINFO_ADDR(pQuery));
   SMeterObj *pMeterObj = pQInfo->pObj;
-  
+
   for (int32_t j = 0; j < numOfRows; ++j) {
     for (int32_t i = 0; i < numOfCols; ++i) {
       switch (pQuery->pSelectExpr[i].type) {
         case TSDB_DATA_TYPE_BINARY: {
           int32_t colIndex = pQuery->pSelectExpr[i].base.colInfo.colIndex;
           int32_t type = 0;
-          
+
           if (TSDB_COL_IS_TAG(pQuery->pSelectExpr[i].base.colInfo.flag)) {
             type = pQuery->pSelectExpr[i].type;
           } else {
@@ -3261,7 +3261,7 @@ void skipResults(SQueryRuntimeEnv *pRuntimeEnv) {
     for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
       int32_t functionId = pQuery->pSelectExpr[i].base.functionId;
       int32_t bytes = pRuntimeEnv->pCtx[i].outputBytes;
-      
+
       memmove(pQuery->sdata[i]->data, pQuery->sdata[i]->data + bytes * numOfSkip, pQuery->rec.rows * bytes);
       pRuntimeEnv->pCtx[i].aOutputBuf += bytes * numOfSkip;
 
@@ -3847,7 +3847,7 @@ void stableApplyFunctionsOnBlock(SQueryRuntimeEnv *pRuntimeEnv, STableQueryInfo
   SQuery *         pQuery = pRuntimeEnv->pQuery;
   SWindowResInfo * pWindowResInfo = &pTableQueryInfo->windowResInfo;
   pQuery->pos = QUERY_IS_ASC_QUERY(pQuery)? 0 : pDataBlockInfo->rows - 1;
-  
+
   if (pQuery->numOfFilterCols > 0 || pRuntimeEnv->pTSBuf != NULL) {
     rowwiseApplyFunctions(pRuntimeEnv, pStatis, pDataBlockInfo, pWindowResInfo, pDataBlock);
   } else {
@@ -3903,31 +3903,31 @@ static UNUSED_FUNC int32_t resultInterpolate(SQInfo *pQInfo, tFilePage **data, t
 #if 0
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *pQuery = &pRuntimeEnv->pQuery;
-  
+
   assert(pRuntimeEnv->pCtx[0].outputBytes == TSDB_KEYSIZE);
-  
+
   // build support structure for performing interpolation
   SSchema *pSchema = calloc(1, sizeof(SSchema) * pQuery->numOfOutput);
   for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
     pSchema[i].bytes = pRuntimeEnv->pCtx[i].outputBytes;
     pSchema[i].type = pQuery->pSelectExpr[i].type;
   }
-  
+
 //  SColumnModel *pModel = createColumnModel(pSchema, pQuery->numOfOutput, pQuery->pointsToRead);
-  
+
   char *  srcData[TSDB_MAX_COLUMNS] = {0};
   int32_t functions[TSDB_MAX_COLUMNS] = {0};
-  
+
   for (int32_t i = 0; i < pQuery->numOfOutput; ++i) {
     srcData[i] = pDataSrc[i]->data;
     functions[i] = pQuery->pSelectExpr[i].base.functionId;
   }
-  
+
   assert(0);
 //  int32_t numOfRes = taosDoInterpoResult(&pRuntimeEnv->interpoInfo, pQuery->interpoType, data, numOfRows, outputRows,
 //                                         pQuery->intervalTime, (int64_t *)pDataSrc[0]->data, pModel, srcData,
 //                                         pQuery->defaultVal, functions, pRuntimeEnv->pTabObj->pointsPerFileBlock);
-  
+
   destroyColumnModel(pModel);
   free(pSchema);
 #endif
@@ -3956,20 +3956,20 @@ int32_t vnodeQueryResultInterpolate(SQInfo *pQInfo, tFilePage **pDst, tFilePage
 #if 0
   while (1) {
     numOfRows = taosNumOfRemainPoints(&pRuntimeEnv->interpoInfo);
-    
+
     TSKEY   ekey = taosGetRevisedEndKey(pQuery->window.skey, pQuery->order.order, pQuery->intervalTime,
                                         pQuery->slidingTimeUnit, pQuery->precision);
     int32_t numOfFinalRows = taosGetNumOfResultWithInterpo(&pRuntimeEnv->interpoInfo, (TSKEY *)pDataSrc[0]->data,
                                                            numOfRows, pQuery->intervalTime, ekey, pQuery->pointsToRead);
-    
+
     int32_t ret = resultInterpolate(pQInfo, pDst, pDataSrc, numOfRows, numOfFinalRows);
     assert(ret == numOfFinalRows);
-    
+
     /* reached the start position of according to offset value, return immediately */
     if (pQuery->limit.offset == 0) {
       return ret;
     }
-    
+
     if (pQuery->limit.offset < ret) {
       ret -= pQuery->limit.offset;
       // todo !!!!there exactly number of interpo is not valid.
@@ -3984,7 +3984,7 @@ int32_t vnodeQueryResultInterpolate(SQInfo *pQInfo, tFilePage **pDst, tFilePage
       pQuery->limit.offset -= ret;
       ret = 0;
     }
-    
+
     if (!vnodeHasRemainResults(pQInfo)) {
       return ret;
     }
@@ -4006,31 +4006,31 @@ void vnodePrintQueryStatistics(SQInfo *pQInfo) {
   } else {
     pSummary->tmpBufferInDisk = getResBufSize(pRuntimeEnv->pResultBuf);
   }
-  
+
   qTrace("QInfo:%p statis: comp blocks:%d, size:%d Bytes, elapsed time:%.2f ms", pQInfo, pSummary->readCompInfo,
          pSummary->totalCompInfoSize, pSummary->loadCompInfoUs / 1000.0);
-  
+
   qTrace("QInfo:%p statis: field info: %d, size:%d Bytes, avg size:%.2f Bytes, elapsed time:%.2f ms", pQInfo,
          pSummary->readField, pSummary->totalFieldSize, (double)pSummary->totalFieldSize / pSummary->readField,
          pSummary->loadFieldUs / 1000.0);
-  
+
   qTrace(
       "QInfo:%p statis: file blocks:%d, size:%d Bytes, elapsed time:%.2f ms, skipped:%d, in-memory gen null:%d Bytes",
       pQInfo, pSummary->readDiskBlocks, pSummary->totalBlockSize, pSummary->loadBlocksUs / 1000.0,
       pSummary->skippedFileBlocks, pSummary->totalGenData);
-  
+
   qTrace("QInfo:%p statis: cache blocks:%d", pQInfo, pSummary->blocksInCache, 0);
   qTrace("QInfo:%p statis: temp file:%d Bytes", pQInfo, pSummary->tmpBufferInDisk);
-  
+
   qTrace("QInfo:%p statis: file:%d, table:%d", pQInfo, pSummary->numOfFiles, pSummary->numOfTables);
   qTrace("QInfo:%p statis: seek ops:%d", pQInfo, pSummary->numOfSeek);
-  
+
   double total = pSummary->fileTimeUs + pSummary->cacheTimeUs;
   double io = pSummary->loadCompInfoUs + pSummary->loadBlocksUs + pSummary->loadFieldUs;
-  
+
   // todo add the intermediate result save cost!!
   double computing = total - io;
-  
+
   qTrace(
       "QInfo:%p statis: total elapsed time:%.2f ms, file:%.2f ms(%.2f%), cache:%.2f ms(%.2f%). io:%.2f ms(%.2f%),"
       "comput:%.2fms(%.2f%)",
@@ -4230,15 +4230,15 @@ int32_t doInitQInfo(SQInfo *pQInfo, void *param, void *tsdb, int32_t vgId, bool
       .colList = pQuery->colList,
       .numOfCols = pQuery->numOfCols,
   };
-  
-  
+
+
   // normal query setup the queryhandle here
   if (isFirstLastRowQuery(pQuery) && !isSTableQuery) {  // in case of last_row query, invoke a different API.
     pRuntimeEnv->pQueryHandle = tsdbQueryLastRow(tsdb, &cond, &pQInfo->tableIdGroupInfo);
   } else if (!isSTableQuery || isIntervalQuery(pQuery) || isFixedOutputQuery(pQuery)) {
     pRuntimeEnv->pQueryHandle = tsdbQueryTables(tsdb, &cond, &pQInfo->tableIdGroupInfo);
   }
-  
+
   pQInfo->tsdb = tsdb;
   pQInfo->vgId = vgId;
 
@@ -4388,11 +4388,11 @@ static int64_t queryOnDataBlocks(SQInfo *pQInfo) {
         if (pInfo->id.tid == blockInfo.tid) {
           assert(pInfo->id.uid == blockInfo.uid);
           pTableQueryInfo = item->info;
-          
+
           break;
         }
       }
-      
+
       if (pTableQueryInfo != NULL) {
         break;
       }
@@ -4456,11 +4456,11 @@ static bool multiTableMultioutputHelper(SQInfo *pQInfo, int32_t index) {
     tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
     pRuntimeEnv->pQueryHandle = NULL;
   }
-  
+
   pRuntimeEnv->pQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &gp);
   taosArrayDestroy(tx);
   taosArrayDestroy(g1);
-  
+
   if (pRuntimeEnv->pTSBuf != NULL) {
     if (pRuntimeEnv->cur.vgroupIndex == -1) {
       int64_t tag = pRuntimeEnv->pCtx[0].tag.i64Key;
@@ -4538,41 +4538,41 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
       if (isFirstLastRowQuery(pQuery)) {
         qTrace("QInfo:%p last_row query on group:%d, total group:%d, current group:%d", pQInfo, pQInfo->groupIndex,
                numOfGroups);
-  
+
         STsdbQueryCond cond = {
             .twindow = pQuery->window,
             .colList = pQuery->colList,
             .order   = pQuery->order.order,
             .numOfCols = pQuery->numOfCols,
         };
-  
+
         SArray *g1 = taosArrayInit(1, POINTER_BYTES);
         SArray *tx = taosArrayClone(group);
         taosArrayPush(g1, &tx);
-        
+
         STableGroupInfo gp = {.numOfTables = taosArrayGetSize(tx), .pGroupList = g1};
-  
+
         // include only current table
         if (pRuntimeEnv->pQueryHandle != NULL) {
           tsdbCleanupQueryHandle(pRuntimeEnv->pQueryHandle);
           pRuntimeEnv->pQueryHandle = NULL;
         }
-        
+
         pRuntimeEnv->pQueryHandle = tsdbQueryLastRow(pQInfo->tsdb, &cond, &gp);
-        
+
         initCtxOutputBuf(pRuntimeEnv);
         setTagVal(pRuntimeEnv, (STableId*) taosArrayGet(tx, 0), pQInfo->tsdb);
         scanAllDataBlocks(pRuntimeEnv);
-        
+
         int64_t numOfRes = getNumOfResult(pRuntimeEnv);
         if (numOfRes > 0) {
           pQuery->rec.rows += numOfRes;
           forwardCtxOutputBuf(pRuntimeEnv, numOfRes);
         }
-        
+
         skipResults(pRuntimeEnv);
         pQInfo->groupIndex += 1;
-  
+
         // enable execution for next table, when handling the projection query
         enableExecutionForNextTable(pRuntimeEnv);
       }
@@ -4612,7 +4612,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
       }
 
       SGroupItem *item = taosArrayGet(group, pQInfo->tableIndex);
-      
+
       STableQueryInfo *pInfo = item->info;
       if (pInfo->lastKey > 0) {
         pQuery->window.skey = pInfo->lastKey;
@@ -4750,7 +4750,7 @@ static void createTableQueryInfo(SQInfo *pQInfo) {
       STableQueryInfo* pInfo = createTableQueryInfoImpl(&pQInfo->runtimeEnv, item->id, pQuery->window);
       pInfo->groupIdx = i;
       pInfo->tableIndex = index;
-      
+
       item->info = pInfo;
       index += 1;
     }
@@ -5179,22 +5179,22 @@ static void stableQueryImpl(SQInfo *pQInfo) {
 
 static int32_t getColumnIndexInSource(SQueryTableMsg *pQueryMsg, SSqlFuncMsg *pExprMsg, SColumnInfo* pTagCols) {
   int32_t j = 0;
-  
+
   if (TSDB_COL_IS_TAG(pExprMsg->colInfo.flag)) {
     while(j < pQueryMsg->numOfTags) {
       if (pExprMsg->colInfo.colId == pTagCols[j].colId) {
         return j;
       }
-      
+
       j += 1;
     }
-    
+
   } else {
     while (j < pQueryMsg->numOfCols) {
       if (pExprMsg->colInfo.colId == pQueryMsg->colList[j].colId) {
         return j;
       }
-    
+
       j += 1;
     }
   }
@@ -5243,7 +5243,7 @@ static bool validateQuerySourceCols(SQueryTableMsg *pQueryMsg, SSqlFuncMsg** pEx
       }
     }
   }
-  
+
   return true;
 }
 
@@ -5395,10 +5395,10 @@ static int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SArray **pTableIdList,
 
     pExprMsg = (SSqlFuncMsg *)pMsg;
   }
-  
+
   if (!validateQuerySourceCols(pQueryMsg, *pExpr)) {
     tfree(*pExpr);
-    
+
     return TSDB_CODE_INVALID_QUERY_MSG;
   }
 
@@ -5441,12 +5441,12 @@ static int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SArray **pTableIdList,
     (*tagCols) = calloc(1, sizeof(SColumnInfo) * pQueryMsg->numOfTags);
     for (int32_t i = 0; i < pQueryMsg->numOfTags; ++i) {
       SColumnInfo* pTagCol = (SColumnInfo*) pMsg;
-      
+
       pTagCol->colId = htons(pTagCol->colId);
       pTagCol->bytes = htons(pTagCol->bytes);
       pTagCol->type  = htons(pTagCol->type);
       pTagCol->numOfFilters = 0;
-      
+
       (*tagCols)[i] = *pTagCol;
       pMsg += sizeof(SColumnInfo);
     }
@@ -5458,14 +5458,14 @@ static int32_t convertQueryMsg(SQueryTableMsg *pQueryMsg, SArray **pTableIdList,
     memcpy(*tagCond, pMsg, pQueryMsg->tagCondLen);
     pMsg += pQueryMsg->tagCondLen;
   }
-  
+
   if (*pMsg != 0) {
     size_t len = strlen(pMsg) + 1;
     *tbnameCond = malloc(len);
     strcpy(*tbnameCond, pMsg);
     pMsg += len;
   }
-  
+
   qTrace("qmsg:%p query %d tables, qrange:%" PRId64 "-%" PRId64 ", numOfGroupbyTagCols:%d, order:%d, "
          "outputCols:%d, numOfCols:%d, interval:%" PRId64 ", fillType:%d, comptsLen:%d, limit:%" PRId64 ", offset:%" PRId64,
          pQueryMsg, pQueryMsg->numOfTables, pQueryMsg->window.skey, pQueryMsg->window.ekey, pQueryMsg->numOfGroupCols,
@@ -5490,7 +5490,7 @@ static int32_t buildAirthmeticExprFromMsg(SExprInfo *pArithExprInfo, SQueryTable
     qError("qmsg:%p failed to create arithmetic expression string from:%s", pQueryMsg, pArithExprInfo->base.arg[0].argValue.pz);
     return TSDB_CODE_APP_ERROR;
   }
-  
+
   pArithExprInfo->pExpr = pExprNode;
   return TSDB_CODE_SUCCESS;
 }
@@ -5557,7 +5557,7 @@ static int32_t createSqlFunctionExprFromMsg(SQueryTableMsg *pQueryMsg, SExprInfo
   for (int32_t i = 0; i < pQueryMsg->numOfOutput; ++i) {
     pExprs[i].base = *pExprMsg[i];
     int16_t functId = pExprs[i].base.functionId;
-    
+
     if (functId == TSDB_FUNC_TOP || functId == TSDB_FUNC_BOTTOM) {
       int32_t j = getColumnIndexInSource(pQueryMsg, &pExprs[i].base, pTagCols);
       assert(j < pQueryMsg->numOfCols);
@@ -5597,7 +5597,7 @@ static SSqlGroupbyExpr *createGroupbyExprFromMsg(SQueryTableMsg *pQueryMsg, SCol
   for(int32_t i = 0; i < pQueryMsg->numOfGroupCols; ++i) {
     taosArrayPush(pGroupbyExpr->columnInfo, &pColIndex[i]);
   }
-  
+
   return pGroupbyExpr;
 }
 
@@ -5620,7 +5620,7 @@ static int32_t createFilterInfo(void *pQInfo, SQuery *pQuery) {
 
       memcpy(&pFilterInfo->info, &pQuery->colList[i], sizeof(SColumnInfoData));
       pFilterInfo->info = pQuery->colList[i];
-      
+
       pFilterInfo->numOfFilters = pQuery->colList[i].numOfFilters;
       pFilterInfo->pFilters = calloc(pFilterInfo->numOfFilters, sizeof(SColumnFilterElem));
 
@@ -5753,9 +5753,9 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGrou
     SColumnInfo *pColInfo = &pQuery->colList[i];
     pColInfo->filters = tscFilterInfoClone(pQueryMsg->colList[i].filters, pColInfo->numOfFilters);
   }
-  
+
   pQuery->tagColList = pTagCols;
-  
+
   // calculate the result row size
   for (int16_t col = 0; col < numOfOutput; ++col) {
     assert(pExprs[col].bytes > 0);
@@ -5802,24 +5802,24 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SSqlGroupbyExpr *pGrou
 
   // to make sure third party won't overwrite this structure
   pQInfo->signature = pQInfo;
-  
+
   pQInfo->tableIdGroupInfo = *groupInfo;
   size_t numOfGroups = taosArrayGetSize(groupInfo->pGroupList);
-  
+
   pQInfo->groupInfo.pGroupList = taosArrayInit(numOfGroups, POINTER_BYTES);
   pQInfo->groupInfo.numOfTables = groupInfo->numOfTables;
-  
+
   for(int32_t i = 0; i < numOfGroups; ++i) {
     SArray* pa = taosArrayGetP(groupInfo->pGroupList, i);
     size_t s = taosArrayGetSize(pa);
-    
+
     SArray* p1 = taosArrayInit(s, sizeof(SGroupItem));
-    
+
     for(int32_t j = 0; j < s; ++j) {
       SGroupItem item = { .id = *(STableId*) taosArrayGet(pa, j), .info = NULL, };
       taosArrayPush(p1, &item);
     }
-    
+
     taosArrayPush(pQInfo->groupInfo.pGroupList, &p1);
   }
 
@@ -5957,7 +5957,7 @@ static void freeQInfo(SQInfo *pQInfo) {
   int32_t numOfGroups = taosArrayGetSize(pQInfo->groupInfo.pGroupList);
   for (int32_t i = 0; i < numOfGroups; ++i) {
     SArray *p = taosArrayGetP(pQInfo->groupInfo.pGroupList, i);
-    
+
     size_t num = taosArrayGetSize(p);
     for(int32_t j = 0; j < num; ++j) {
       SGroupItem* item = taosArrayGet(p, j);
@@ -5965,31 +5965,31 @@ static void freeQInfo(SQInfo *pQInfo) {
         destroyTableQueryInfo(item->info, pQuery->numOfOutput);
       }
     }
-    
+
     taosArrayDestroy(p);
   }
-  
+
   taosArrayDestroy(pQInfo->groupInfo.pGroupList);
-  
+
   for(int32_t i = 0; i < numOfGroups; ++i) {
     SArray* p = taosArrayGetP(pQInfo->tableIdGroupInfo.pGroupList, i);
     taosArrayDestroy(p);
   }
-  
+
   taosArrayDestroy(pQInfo->tableIdGroupInfo.pGroupList);
-  
+
   if (pQuery->pGroupbyExpr != NULL) {
     taosArrayDestroy(pQuery->pGroupbyExpr->columnInfo);
     tfree(pQuery->pGroupbyExpr);
   }
-  
+
   tfree(pQuery->tagColList);
   tfree(pQuery->pFilterInfo);
   tfree(pQuery->colList);
   tfree(pQuery->sdata);
-  
+
   tfree(pQuery);
-  
+
   qTrace("QInfo:%p QInfo is freed", pQInfo);
 
   // destroy signature, in order to avoid the query process pass the object safety check
@@ -6042,7 +6042,7 @@ static int32_t doDumpQueryResult(SQInfo *pQInfo, char *data) {
       qError("QInfo:%p failed to open tmp file to send ts-comp data to client, path:%s, reason:%s", pQInfo,
              pQuery->sdata[0]->data, strerror(errno));
     }
-  
+
     // all data returned, set query over
     if (Q_STATUS_EQUAL(pQuery->status, QUERY_COMPLETED)) {
       setQueryStatus(pQuery, QUERY_OVER);
@@ -6099,10 +6099,10 @@ int32_t qCreateQueryInfo(void *tsdb, int32_t vgId, SQueryTableMsg *pQueryMsg, qi
 
   bool isSTableQuery = false;
   STableGroupInfo groupInfo = {0};
-  
+
   if (TSDB_QUERY_HAS_TYPE(pQueryMsg->queryType, TSDB_QUERY_TYPE_MULTITABLE_QUERY|TSDB_QUERY_TYPE_TABLE_QUERY)) {
     isSTableQuery = TSDB_QUERY_HAS_TYPE(pQueryMsg->queryType, TSDB_QUERY_TYPE_MULTITABLE_QUERY);
-    
+
     STableId *id = taosArrayGet(pTableIdList, 0);
     if ((code = tsdbGetOneTableGroup(tsdb, id->uid, &groupInfo)) != TSDB_CODE_SUCCESS) {
       goto _query_over;
@@ -6110,13 +6110,13 @@ int32_t qCreateQueryInfo(void *tsdb, int32_t vgId, SQueryTableMsg *pQueryMsg, qi
   } else if (TSDB_QUERY_HAS_TYPE(pQueryMsg->queryType, TSDB_QUERY_TYPE_STABLE_QUERY)) {
     isSTableQuery = true;
     STableId *id = taosArrayGet(pTableIdList, 0);
-    
+
     // group by normal column, do not pass the group by condition to tsdb to group table into different group
     int32_t numOfGroupByCols = pQueryMsg->numOfGroupCols;
     if (pQueryMsg->numOfGroupCols == 1 && !TSDB_COL_IS_TAG(pGroupColIndex->flag)) {
       numOfGroupByCols = 0;
     }
-    
+
     // todo handle the error
     /*int32_t ret =*/tsdbQuerySTableByTagCond(tsdb, id->uid, tagCond, pQueryMsg->tagCondLen, pQueryMsg->tagNameRelType, tbnameCond, &groupInfo, pGroupColIndex,
                                          numOfGroupByCols);
@@ -6131,6 +6131,7 @@ int32_t qCreateQueryInfo(void *tsdb, int32_t vgId, SQueryTableMsg *pQueryMsg, qi
   (*pQInfo) = createQInfoImpl(pQueryMsg, pGroupbyExpr, pExprs, &groupInfo, pTagColumnInfo);
   if ((*pQInfo) == NULL) {
     code = TSDB_CODE_SERV_OUT_OF_MEMORY;
+    goto _query_over;
   }
 
   code = initQInfo(pQueryMsg, tsdb, vgId, *pQInfo, isSTableQuery);
@@ -6139,7 +6140,12 @@ _query_over:
   tfree(tagCond);
   tfree(tbnameCond);
   taosArrayDestroy(pTableIdList);
-  
+
+  if (code != TSDB_CODE_SUCCESS) {
+    tfree(*pQInfo);
+    *pQInfo = NULL;
+  }
+
   // if failed to add ref for all meters in this query, abort current query
   //  atomic_fetch_add_32(&vnodeSelectReqNum, 1);
   return code;
@@ -6164,7 +6170,7 @@ void qTableQuery(qinfo_t qinfo) {
   }
 
   qTrace("QInfo:%p query task is launched", pQInfo);
-  
+
   if (onlyQueryTags(pQInfo->runtimeEnv.pQuery)) {
     buildTagQueryResult(pQInfo);   // todo support the limit/offset
   } else if (pQInfo->runtimeEnv.stableQuery) {
@@ -6172,7 +6178,7 @@ void qTableQuery(qinfo_t qinfo) {
   } else {
     tableQueryImpl(pQInfo);
   }
-  
+
   sem_post(&pQInfo->dataReady);
   //  vnodeDecRefCount(pQInfo);
 }
@@ -6263,61 +6269,61 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
 static void buildTagQueryResult(SQInfo* pQInfo) {
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
   SQuery *          pQuery = pRuntimeEnv->pQuery;
-  
+
   size_t num = taosArrayGetSize(pQInfo->groupInfo.pGroupList);
   assert(num == 1);   // only one group
-  
+
   SArray* pa = taosArrayGetP(pQInfo->groupInfo.pGroupList, 0);
   num = taosArrayGetSize(pa);
-  
+
   assert(num == pQInfo->groupInfo.numOfTables);
   int16_t type, bytes;
-  
+
   int32_t functionId = pQuery->pSelectExpr[0].base.functionId;
   if (functionId == TSDB_FUNC_TID_TAG) { // return the tags & table Id
     assert(pQuery->numOfOutput == 1);
     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);
-    
+
       char* output = pQuery->sdata[0]->data + i * rsize;
       *(int64_t*) output = item->id.uid;  // memory align problem
       output += sizeof(item->id.uid);
-      
+
       *(int32_t*) output = item->id.tid;
       output += sizeof(item->id.tid);
-      
+
       *(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);
     }
-  
+
     qTrace("QInfo:%p create (tableId, tag) info completed, rows:%d", pQInfo, num);
   } else {  // return only the tags|table name etc.
     for(int32_t i = 0; i < num; ++i) {
       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) {
           tsdbGetTableName(pQInfo->tsdb, &item->id, &data);
-          
+
           char* dst = pQuery->sdata[j]->data + i * (TSDB_TABLE_NAME_LEN + VARSTR_HEADER_SIZE);
           STR_WITH_MAXSIZE_TO_VARSTR(dst, data, TSDB_TABLE_NAME_LEN);
           tfree(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);
-          
+
           char* dst = pQuery->sdata[j]->data + i * bytes;
           if (type == TSDB_DATA_TYPE_BINARY || type == TSDB_DATA_TYPE_NCHAR) {
             memcpy(dst, data, varDataTLen(data));
@@ -6325,13 +6331,13 @@ static void buildTagQueryResult(SQInfo* pQInfo) {
             memcpy(dst, data, bytes);
           }
         }
-      
+
       }
     }
-  
+
     qTrace("QInfo:%p create tag values results completed, rows:%d", pQInfo, num);
   }
-  
+
   pQuery->rec.rows = num;
   setQueryStatus(pQuery, QUERY_COMPLETED);
 }
diff --git a/src/vnode/src/vnodeRead.c b/src/vnode/src/vnodeRead.c
index b111f56e39..283490907c 100644
--- a/src/vnode/src/vnodeRead.c
+++ b/src/vnode/src/vnodeRead.c
@@ -39,11 +39,11 @@ void vnodeInitReadFp(void) {
 int32_t vnodeProcessRead(void *param, int msgType, void *pCont, int32_t contLen, SRspRet *ret) {
   SVnodeObj *pVnode = (SVnodeObj *)param;
 
-  if (vnodeProcessReadMsgFp[msgType] == NULL) 
-    return TSDB_CODE_MSG_NOT_PROCESSED; 
+  if (vnodeProcessReadMsgFp[msgType] == NULL)
+    return TSDB_CODE_MSG_NOT_PROCESSED;
 
-  if (pVnode->status == TAOS_VN_STATUS_DELETING || pVnode->status == TAOS_VN_STATUS_CLOSING) 
-    return TSDB_CODE_NOT_ACTIVE_VNODE; 
+  if (pVnode->status == TAOS_VN_STATUS_DELETING || pVnode->status == TAOS_VN_STATUS_CLOSING)
+    return TSDB_CODE_NOT_ACTIVE_VNODE;
 
   return (*vnodeProcessReadMsgFp[msgType])(pVnode, pCont, contLen, ret);
 }
@@ -53,26 +53,29 @@ static int32_t vnodeProcessQueryMsg(SVnodeObj *pVnode, void *pCont, int32_t cont
   memset(pRet, 0, sizeof(SRspRet));
 
   int32_t code = TSDB_CODE_SUCCESS;
-  
+
   qinfo_t pQInfo = NULL;
   if (contLen != 0) {
     pRet->code = qCreateQueryInfo(pVnode->tsdb, pVnode->vgId, pQueryTableMsg, &pQInfo);
-  
+
     SQueryTableRsp *pRsp = (SQueryTableRsp *) rpcMallocCont(sizeof(SQueryTableRsp));
     pRsp->qhandle = htobe64((uint64_t) (pQInfo));
     pRsp->code = pRet->code;
-     
+
     pRet->len = sizeof(SQueryTableRsp);
     pRet->rsp = pRsp;
-    
+
     dTrace("pVnode:%p vgId:%d QInfo:%p, dnode query msg disposed", pVnode, pVnode->vgId, pQInfo);
   } else {
+    assert(pCont != NULL);
     pQInfo = pCont;
     code = TSDB_CODE_ACTION_IN_PROGRESS;
   }
 
-  qTableQuery(pQInfo); // do execute query
-  
+  if (pQInfo != NULL) {
+    qTableQuery(pQInfo); // do execute query
+  }
+
   return code;
 }
 
@@ -84,7 +87,7 @@ static int32_t vnodeProcessRetrieveMsg(SVnodeObj *pVnode, void *pCont, int32_t c
   int32_t code = TSDB_CODE_SUCCESS;
 
   dTrace("pVnode:%p vgId:%d QInfo:%p, retrieve msg is received", pVnode, pVnode->vgId, pQInfo);
-  
+
   pRet->code = qRetrieveQueryResultInfo(pQInfo);
   if (pRet->code != TSDB_CODE_SUCCESS) {
     //TODO
@@ -103,7 +106,7 @@ static int32_t vnodeProcessRetrieveMsg(SVnodeObj *pVnode, void *pCont, int32_t c
       vnodeRelease(pVnode);
     }
   }
-  
+
   dTrace("pVnode:%p vgId:%d QInfo:%p, retrieve msg is disposed", pVnode, pVnode->vgId, pQInfo);
   return code;
 }

From 8aa89525c8349778320a74eb48e49f370ece30c4 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 29 May 2020 10:56:45 +0000
Subject: [PATCH 08/43] add signed value codig functions

---
 src/tsdb/src/tsdbFile.c        |   2 +-
 src/tsdb/src/tsdbRWHelper.c    |  54 ++++----
 src/util/inc/tcoding.h         | 232 +++++++++++++++++++++++----------
 src/util/tests/codingTests.cpp |  24 ++--
 4 files changed, 203 insertions(+), 109 deletions(-)

diff --git a/src/tsdb/src/tsdbFile.c b/src/tsdb/src/tsdbFile.c
index bd5c20bd7a..e885d9a919 100644
--- a/src/tsdb/src/tsdbFile.c
+++ b/src/tsdb/src/tsdbFile.c
@@ -94,7 +94,7 @@ static int tsdbInitFile(char *dataDir, int fid, const char *suffix, SFile *pFile
   if (!taosCheckChecksumWhole((uint8_t *)buf, TSDB_FILE_HEAD_SIZE)) return -1;
 
   void *pBuf = buf;
-  pBuf = taosDecodeFixed32(pBuf, &version);
+  pBuf = taosDecodeFixedU32(pBuf, &version);
   pBuf = tsdbDecodeSFileInfo(pBuf, &(pFile->info));
 
   tsdbCloseFile(pFile);
diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index eebe0b6b46..38e6b8f2f6 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -443,7 +443,7 @@ int tsdbWriteCompIdx(SRWHelper *pHelper) {
   for (uint32_t i = 0; i < pHelper->config.maxTables; i++) {
     SCompIdx *pCompIdx = pHelper->pCompIdx + i;
     if (pCompIdx->offset > 0) {
-      buf = taosEncodeVariant32(buf, i);
+      buf = taosEncodeVariantU32(buf, i);
       buf = tsdbEncodeSCompIdx(buf, pCompIdx);
     }
   }
@@ -480,7 +480,7 @@ int tsdbLoadCompIdx(SRWHelper *pHelper, void *target) {
       void *ptr = pHelper->pBuffer;
       while (((char *)ptr - (char *)pHelper->pBuffer) < (pFile->info.len - sizeof(TSCKSUM))) {
         uint32_t tid = 0;
-        if ((ptr = taosDecodeVariant32(ptr, &tid)) == NULL) return -1;
+        if ((ptr = taosDecodeVariantU32(ptr, &tid)) == NULL) return -1;
         ASSERT(tid > 0 && tid < pHelper->config.maxTables);
 
         if ((ptr = tsdbDecodeSCompIdx(ptr, pHelper->pCompIdx + tid)) == NULL) return -1;
@@ -1242,12 +1242,12 @@ static int tsdbGetRowsInRange(SDataCols *pDataCols, TSKEY minKey, TSKEY maxKey)
 }
 
 void *tsdbEncodeSCompIdx(void *buf, SCompIdx *pIdx) {
-  buf = taosEncodeVariant32(buf, pIdx->len);
-  buf = taosEncodeVariant32(buf, pIdx->offset);
-  buf = taosEncodeFixed8(buf, pIdx->hasLast);
-  buf = taosEncodeVariant32(buf, pIdx->numOfBlocks);
-  buf = taosEncodeFixed64(buf, pIdx->uid);
-  buf = taosEncodeFixed64(buf, pIdx->maxKey);
+  buf = taosEncodeVariantU32(buf, pIdx->len);
+  buf = taosEncodeVariantU32(buf, pIdx->offset);
+  buf = taosEncodeFixedU8(buf, pIdx->hasLast);
+  buf = taosEncodeVariantU32(buf, pIdx->numOfBlocks);
+  buf = taosEncodeFixedU64(buf, pIdx->uid);
+  buf = taosEncodeFixedU64(buf, pIdx->maxKey);
 
   return buf;
 }
@@ -1257,15 +1257,15 @@ void *tsdbDecodeSCompIdx(void *buf, SCompIdx *pIdx) {
   uint32_t numOfBlocks = 0;
   uint64_t value = 0;
 
-  if ((buf = taosDecodeVariant32(buf, &(pIdx->len))) == NULL) return NULL;
-  if ((buf = taosDecodeVariant32(buf, &(pIdx->offset))) == NULL) return NULL;
-  if ((buf = taosDecodeFixed8(buf, &(hasLast))) == NULL) return NULL;
+  if ((buf = taosDecodeVariantU32(buf, &(pIdx->len))) == NULL) return NULL;
+  if ((buf = taosDecodeVariantU32(buf, &(pIdx->offset))) == NULL) return NULL;
+  if ((buf = taosDecodeFixedU8(buf, &(hasLast))) == NULL) return NULL;
   pIdx->hasLast = hasLast;
-  if ((buf = taosDecodeVariant32(buf, &(numOfBlocks))) == NULL) return NULL;
+  if ((buf = taosDecodeVariantU32(buf, &(numOfBlocks))) == NULL) return NULL;
   pIdx->numOfBlocks = numOfBlocks;
-  if ((buf = taosDecodeFixed64(buf, &value)) == NULL) return NULL;
+  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
   pIdx->uid = (int64_t)value;
-  if ((buf = taosDecodeFixed64(buf, &value)) == NULL) return NULL;
+  if ((buf = taosDecodeFixedU64(buf, &value)) == NULL) return NULL;
   pIdx->maxKey = (TSKEY)value;
 
   return buf;
@@ -1275,7 +1275,7 @@ int tsdbUpdateFileHeader(SFile *pFile, uint32_t version) {
   char buf[TSDB_FILE_HEAD_SIZE] = "\0";
 
   void *pBuf = (void *)buf;
-  pBuf = taosEncodeFixed32(pBuf, version);
+  pBuf = taosEncodeFixedU32(pBuf, version);
   pBuf = tsdbEncodeSFileInfo(pBuf, &(pFile->info));
 
   taosCalcChecksumAppend(0, (uint8_t *)buf, TSDB_FILE_HEAD_SIZE);
@@ -1289,23 +1289,23 @@ int tsdbUpdateFileHeader(SFile *pFile, uint32_t version) {
 
 
 void *tsdbEncodeSFileInfo(void *buf, const STsdbFileInfo *pInfo) {
-  buf = taosEncodeFixed32(buf, pInfo->offset);
-  buf = taosEncodeFixed32(buf, pInfo->len);
-  buf = taosEncodeFixed64(buf, pInfo->size);
-  buf = taosEncodeFixed64(buf, pInfo->tombSize);
-  buf = taosEncodeFixed32(buf, pInfo->totalBlocks);
-  buf = taosEncodeFixed32(buf, pInfo->totalSubBlocks);
+  buf = taosEncodeFixedU32(buf, pInfo->offset);
+  buf = taosEncodeFixedU32(buf, pInfo->len);
+  buf = taosEncodeFixedU64(buf, pInfo->size);
+  buf = taosEncodeFixedU64(buf, pInfo->tombSize);
+  buf = taosEncodeFixedU32(buf, pInfo->totalBlocks);
+  buf = taosEncodeFixedU32(buf, pInfo->totalSubBlocks);
 
   return buf;
 }
 
 void *tsdbDecodeSFileInfo(void *buf, STsdbFileInfo *pInfo) {
-  buf = taosDecodeFixed32(buf, &(pInfo->offset));
-  buf = taosDecodeFixed32(buf, &(pInfo->len));
-  buf = taosDecodeFixed64(buf, &(pInfo->size));
-  buf = taosDecodeFixed64(buf, &(pInfo->tombSize));
-  buf = taosDecodeFixed32(buf, &(pInfo->totalBlocks));
-  buf = taosDecodeFixed32(buf, &(pInfo->totalSubBlocks));
+  buf = taosDecodeFixedU32(buf, &(pInfo->offset));
+  buf = taosDecodeFixedU32(buf, &(pInfo->len));
+  buf = taosDecodeFixedU64(buf, &(pInfo->size));
+  buf = taosDecodeFixedU64(buf, &(pInfo->tombSize));
+  buf = taosDecodeFixedU32(buf, &(pInfo->totalBlocks));
+  buf = taosDecodeFixedU32(buf, &(pInfo->totalSubBlocks));
 
   return buf;
 }
\ No newline at end of file
diff --git a/src/util/inc/tcoding.h b/src/util/inc/tcoding.h
index cc9caf71d0..e22c959a56 100644
--- a/src/util/inc/tcoding.h
+++ b/src/util/inc/tcoding.h
@@ -29,12 +29,33 @@ extern "C" {
 static const int32_t TNUMBER = 1;
 #define IS_LITTLE_ENDIAN() (*(uint8_t *)(&TNUMBER) != 0)
 
-static FORCE_INLINE void *taosEncodeFixed8(void *buf, uint8_t value) {
+#define ZIGZAGE(T, v) ((u##T)((v) >> (sizeof(T) * 8 - 1))) ^ (((u##T)(v)) << 1)  // zigzag encode
+#define ZIGZAGD(T, v) ((v) >> 1) ^ -((T)((v)&1))                                 // zigzag decode
+
+// ---- Fixed U8
+static FORCE_INLINE void *taosEncodeFixedU8(void *buf, uint8_t value) {
   ((uint8_t *)buf)[0] = value;
   return POINTER_SHIFT(buf, sizeof(value));
 }
 
-static FORCE_INLINE void *taosEncodeFixed16(void *buf, uint16_t value) {
+static FORCE_INLINE void *taosDecodeFixedU8(void *buf, uint8_t *value) {
+  *value = ((uint8_t *)buf)[0];
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I8
+static FORCE_INLINE void *taosEncodeFixedI8(void *buf, int8_t value) {
+  ((int8_t *)buf)[0] = value;
+  return POINTER_SHIFT(buf, sizeof(value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI8(void *buf, int8_t *value) {
+  *value = ((int8_t *)buf)[0];
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed U16
+static FORCE_INLINE void *taosEncodeFixedU16(void *buf, uint16_t value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(buf, &value, sizeof(value));
   } else {
@@ -45,7 +66,31 @@ static FORCE_INLINE void *taosEncodeFixed16(void *buf, uint16_t value) {
   return POINTER_SHIFT(buf, sizeof(value));
 }
 
-static FORCE_INLINE void *taosEncodeFixed32(void *buf, uint32_t value) {
+static FORCE_INLINE void *taosDecodeFixedU16(void *buf, uint16_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[1];
+  }
+
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I16
+static FORCE_INLINE void *taosEncodeFixedI16(void *buf, int16_t value) {
+  return taosEncodeFixedU16(buf, ZIGZAGE(int16_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI16(void *buf, int16_t *value) {
+  uint16_t tvalue = 0;
+  void *   ret = taosDecodeFixedU16(buf, &tvalue);
+  *value = ZIGZAGD(int16_t, tvalue);
+  return ret;
+}
+
+// ---- Fixed U32
+static FORCE_INLINE void *taosEncodeFixedU32(void *buf, uint32_t value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(buf, &value, sizeof(value));
   } else {
@@ -58,7 +103,33 @@ static FORCE_INLINE void *taosEncodeFixed32(void *buf, uint32_t value) {
   return POINTER_SHIFT(buf, sizeof(value));
 }
 
-static FORCE_INLINE void *taosEncodeFixed64(void *buf, uint64_t value) {
+static FORCE_INLINE void *taosDecodeFixedU32(void *buf, uint32_t *value) {
+  if (IS_LITTLE_ENDIAN()) {
+    memcpy(value, buf, sizeof(*value));
+  } else {
+    ((uint8_t *)value)[3] = ((uint8_t *)buf)[0];
+    ((uint8_t *)value)[2] = ((uint8_t *)buf)[1];
+    ((uint8_t *)value)[1] = ((uint8_t *)buf)[2];
+    ((uint8_t *)value)[0] = ((uint8_t *)buf)[3];
+  }
+
+  return POINTER_SHIFT(buf, sizeof(*value));
+}
+
+// ---- Fixed I32
+static FORCE_INLINE void *taosEncodeFixedI32(void *buf, int32_t value) {
+  return taosEncodeFixedU32(buf, ZIGZAGE(int32_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI32(void *buf, int32_t *value) {
+  uint32_t tvalue = 0;
+  void *   ret = taosDecodeFixedU32(buf, &tvalue);
+  *value = ZIGZAGD(int32_t, tvalue);
+  return ret;
+}
+
+// ---- Fixed U64
+static FORCE_INLINE void *taosEncodeFixedU64(void *buf, uint64_t value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(buf, &value, sizeof(value));
   } else {
@@ -75,36 +146,7 @@ static FORCE_INLINE void *taosEncodeFixed64(void *buf, uint64_t value) {
   return POINTER_SHIFT(buf, sizeof(value));
 }
 
-static FORCE_INLINE void *taosDecodeFixed8(void *buf, uint8_t *value) {
-  *value = ((uint8_t *)buf)[0];
-  return POINTER_SHIFT(buf, sizeof(*value));
-}
-
-static FORCE_INLINE void *taosDecodeFixed16(void *buf, uint16_t *value) {
-  if (IS_LITTLE_ENDIAN()) {
-    memcpy(value, buf, sizeof(*value));
-  } else {
-    ((uint8_t *)value)[1] = ((uint8_t *)buf)[0];
-    ((uint8_t *)value)[0] = ((uint8_t *)buf)[1];
-  }
-
-  return POINTER_SHIFT(buf, sizeof(*value));
-}
-
-static FORCE_INLINE void *taosDecodeFixed32(void *buf, uint32_t *value) {
-  if (IS_LITTLE_ENDIAN()) {
-    memcpy(value, buf, sizeof(*value));
-  } else {
-    ((uint8_t *)value)[3] = ((uint8_t *)buf)[0];
-    ((uint8_t *)value)[2] = ((uint8_t *)buf)[1];
-    ((uint8_t *)value)[1] = ((uint8_t *)buf)[2];
-    ((uint8_t *)value)[0] = ((uint8_t *)buf)[3];
-  }
-
-  return POINTER_SHIFT(buf, sizeof(*value));
-}
-
-static FORCE_INLINE void *taosDecodeFixed64(void *buf, uint64_t *value) {
+static FORCE_INLINE void *taosDecodeFixedU64(void *buf, uint64_t *value) {
   if (IS_LITTLE_ENDIAN()) {
     memcpy(value, buf, sizeof(*value));
   } else {
@@ -121,7 +163,20 @@ static FORCE_INLINE void *taosDecodeFixed64(void *buf, uint64_t *value) {
   return POINTER_SHIFT(buf, sizeof(*value));
 }
 
-static FORCE_INLINE void *taosEncodeVariant16(void *buf, uint16_t value) {
+// ---- Fixed I64
+static FORCE_INLINE void *taosEncodeFixedI64(void *buf, int64_t value) {
+  return taosEncodeFixedU64(buf, ZIGZAGE(int64_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeFixedI64(void *buf, int64_t *value) {
+  uint64_t tvalue = 0;
+  void *   ret = taosDecodeFixedU64(buf, &tvalue);
+  *value = ZIGZAGD(int64_t, tvalue);
+  return ret;
+}
+
+// ---- Variant U16
+static FORCE_INLINE void *taosEncodeVariantU16(void *buf, uint16_t value) {
   int i = 0;
   while (value >= ENCODE_LIMIT) {
     ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
@@ -132,39 +187,11 @@ static FORCE_INLINE void *taosEncodeVariant16(void *buf, uint16_t value) {
 
   ((uint8_t *)buf)[i] = value;
 
-  return POINTER_SHIFT(buf, i+1);
-}
-
-static FORCE_INLINE void *taosEncodeVariant32(void *buf, uint32_t value) {
-  int i = 0;
-  while (value >= ENCODE_LIMIT) {
-    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
-    value >>= 7;
-    i++;
-    ASSERT(i < 5);
-  }
-
-  ((uint8_t *)buf)[i] = value;
-
   return POINTER_SHIFT(buf, i + 1);
 }
 
-static FORCE_INLINE void *taosEncodeVariant64(void *buf, uint64_t value) {
-  int i = 0;
-  while (value >= ENCODE_LIMIT) {
-    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
-    value >>= 7;
-    i++;
-    ASSERT(i < 10);
-  }
-
-  ((uint8_t *)buf)[i] = value;
-
-  return POINTER_SHIFT(buf, i + 1);
-}
-
-static FORCE_INLINE void *taosDecodeVariant16(void *buf, uint16_t *value) {
-  int i = 0;
+static FORCE_INLINE void *taosDecodeVariantU16(void *buf, uint16_t *value) {
+  int      i = 0;
   uint16_t tval = 0;
   *value = 0;
   while (i < 3) {
@@ -181,8 +208,35 @@ static FORCE_INLINE void *taosDecodeVariant16(void *buf, uint16_t *value) {
   return NULL;  // error happened
 }
 
-static FORCE_INLINE void *taosDecodeVariant32(void *buf, uint32_t *value) {
+// ---- Variant I16
+static FORCE_INLINE void *taosEncodeVariantI16(void *buf, int16_t value) {
+  return taosEncodeVariantU16(buf, ZIGZAGE(int16_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeVariantI16(void *buf, int16_t *value) {
+  uint16_t tvalue = 0;
+  void *   ret = taosDecodeVariantU16(buf, &tvalue);
+  *value = ZIGZAGD(int16_t, tvalue);
+  return ret;
+}
+
+// ---- Variant U32
+static FORCE_INLINE void *taosEncodeVariantU32(void *buf, uint32_t value) {
   int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 5);
+  }
+
+  ((uint8_t *)buf)[i] = value;
+
+  return POINTER_SHIFT(buf, i + 1);
+}
+
+static FORCE_INLINE void *taosDecodeVariantU32(void *buf, uint32_t *value) {
+  int      i = 0;
   uint32_t tval = 0;
   *value = 0;
   while (i < 5) {
@@ -199,8 +253,35 @@ static FORCE_INLINE void *taosDecodeVariant32(void *buf, uint32_t *value) {
   return NULL;  // error happened
 }
 
-static FORCE_INLINE void *taosDecodeVariant64(void *buf, uint64_t *value) {
+// ---- Variant I32
+static FORCE_INLINE void *taosEncodeVariantI32(void *buf, int32_t value) {
+  return taosEncodeVariantU32(buf, ZIGZAGE(int32_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeVariantI32(void *buf, int32_t *value) {
+  uint32_t tvalue = 0;
+  void *   ret = taosDecodeVariantU32(buf, &tvalue);
+  *value = ZIGZAGD(int32_t, tvalue);
+  return ret;
+}
+
+// ---- Variant U64
+static FORCE_INLINE void *taosEncodeVariantU64(void *buf, uint64_t value) {
   int i = 0;
+  while (value >= ENCODE_LIMIT) {
+    ((uint8_t *)buf)[i] = (value | ENCODE_LIMIT);
+    value >>= 7;
+    i++;
+    ASSERT(i < 10);
+  }
+
+  ((uint8_t *)buf)[i] = value;
+
+  return POINTER_SHIFT(buf, i + 1);
+}
+
+static FORCE_INLINE void *taosDecodeVariantU64(void *buf, uint64_t *value) {
+  int      i = 0;
   uint64_t tval = 0;
   *value = 0;
   while (i < 10) {
@@ -217,10 +298,23 @@ static FORCE_INLINE void *taosDecodeVariant64(void *buf, uint64_t *value) {
   return NULL;  // error happened
 }
 
+// ---- Variant I64
+static FORCE_INLINE void *taosEncodeVariantI64(void *buf, int64_t value) {
+  return taosEncodeVariantU64(buf, ZIGZAGE(int64_t, value));
+}
+
+static FORCE_INLINE void *taosDecodeVariantI64(void *buf, int64_t *value) {
+  uint64_t tvalue = 0;
+  void *   ret = taosDecodeVariantU64(buf, &tvalue);
+  *value = ZIGZAGD(int64_t, tvalue);
+  return ret;
+}
+
+// ---- string
 static FORCE_INLINE void *taosEncodeString(void *buf, char *value) {
   size_t size = strlen(value);
 
-  buf = taosEncodeVariant64(buf, size);
+  buf = taosEncodeVariantU64(buf, size);
   memcpy(buf, value, size);
 
   return POINTER_SHIFT(buf, size);
@@ -229,7 +323,7 @@ static FORCE_INLINE void *taosEncodeString(void *buf, char *value) {
 static FORCE_INLINE void *taosDecodeString(void *buf, char **value) {
   uint64_t size = 0;
 
-  buf = taosDecodeVariant64(buf, &size);
+  buf = taosDecodeVariantU64(buf, &size);
   *value = (char *)malloc(size + 1);
   if (*value == NULL) return NULL;
   memcpy(*value, buf, size);
diff --git a/src/util/tests/codingTests.cpp b/src/util/tests/codingTests.cpp
index a72c7ef291..036ed0bf83 100644
--- a/src/util/tests/codingTests.cpp
+++ b/src/util/tests/codingTests.cpp
@@ -9,8 +9,8 @@ static bool test_fixed_uint16(uint16_t value) {
   char     buf[20] = "\0";
   uint16_t value_check = 0;
 
-  void *ptr1 = taosEncodeFixed16(static_cast<void *>(buf), value);
-  void *ptr2 = taosDecodeFixed16(static_cast<void *>(buf), &value_check);
+  void *ptr1 = taosEncodeFixedU16(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixedU16(static_cast<void *>(buf), &value_check);
 
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
@@ -19,8 +19,8 @@ static bool test_fixed_uint32(uint32_t value) {
   char     buf[20] = "\0";
   uint32_t value_check = 0;
 
-  void *ptr1 = taosEncodeFixed32(static_cast<void *>(buf), value);
-  void *ptr2 = taosDecodeFixed32(static_cast<void *>(buf), &value_check);
+  void *ptr1 = taosEncodeFixedU32(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixedU32(static_cast<void *>(buf), &value_check);
 
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
@@ -29,8 +29,8 @@ static bool test_fixed_uint64(uint64_t value) {
   char     buf[20] = "\0";
   uint64_t value_check = 0;
 
-  void *ptr1 = taosEncodeFixed64(static_cast<void *>(buf), value);
-  void *ptr2 = taosDecodeFixed64(static_cast<void *>(buf), &value_check);
+  void *ptr1 = taosEncodeFixedU64(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixedU64(static_cast<void *>(buf), &value_check);
 
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
@@ -39,8 +39,8 @@ static bool test_variant_uint16(uint16_t value) {
   char     buf[20] = "\0";
   uint16_t value_check = 0;
 
-  void *ptr1 = taosEncodeVariant16(static_cast<void *>(buf), value);
-  void *ptr2 = taosDecodeVariant16(static_cast<void *>(buf), &value_check);
+  void *ptr1 = taosEncodeVariantU16(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariantU16(static_cast<void *>(buf), &value_check);
 
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
@@ -49,8 +49,8 @@ static bool test_variant_uint32(uint32_t value) {
   char     buf[20] = "\0";
   uint32_t value_check = 0;
 
-  void *ptr1 = taosEncodeVariant32(static_cast<void *>(buf), value);
-  void *ptr2 = taosDecodeVariant32(static_cast<void *>(buf), &value_check);
+  void *ptr1 = taosEncodeVariantU32(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariantU32(static_cast<void *>(buf), &value_check);
 
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
@@ -59,8 +59,8 @@ static bool test_variant_uint64(uint64_t value) {
   char     buf[20] = "\0";
   uint64_t value_check = 0;
 
-  void *ptr1 = taosEncodeVariant64(static_cast<void *>(buf), value);
-  void *ptr2 = taosDecodeVariant64(static_cast<void *>(buf), &value_check);
+  void *ptr1 = taosEncodeVariantU64(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariantU64(static_cast<void *>(buf), &value_check);
 
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }

From cf1acba45b1cf3d3aec0adf507d8fb0ba2826373 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Fri, 29 May 2020 14:59:21 +0000
Subject: [PATCH 09/43] add more encoding tests

---
 src/util/tests/codingTests.cpp | 144 ++++++++++++++++++++++++++++++---
 1 file changed, 133 insertions(+), 11 deletions(-)

diff --git a/src/util/tests/codingTests.cpp b/src/util/tests/codingTests.cpp
index 036ed0bf83..57e21a828c 100644
--- a/src/util/tests/codingTests.cpp
+++ b/src/util/tests/codingTests.cpp
@@ -15,6 +15,16 @@ static bool test_fixed_uint16(uint16_t value) {
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
 
+static bool test_fixed_int16(int16_t value) {
+  char    buf[20] = "\0";
+  int16_t value_check = 0;
+
+  void *ptr1 = taosEncodeFixedI16(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixedI16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
 static bool test_fixed_uint32(uint32_t value) {
   char     buf[20] = "\0";
   uint32_t value_check = 0;
@@ -25,6 +35,16 @@ static bool test_fixed_uint32(uint32_t value) {
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
 
+static bool test_fixed_int32(int32_t value) {
+  char    buf[20] = "\0";
+  int32_t value_check = 0;
+
+  void *ptr1 = taosEncodeFixedI32(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixedI32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
 static bool test_fixed_uint64(uint64_t value) {
   char     buf[20] = "\0";
   uint64_t value_check = 0;
@@ -35,6 +55,16 @@ static bool test_fixed_uint64(uint64_t value) {
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
 
+static bool test_fixed_int64(int64_t value) {
+  char    buf[20] = "\0";
+  int64_t value_check = 0;
+
+  void *ptr1 = taosEncodeFixedI64(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeFixedI64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
 static bool test_variant_uint16(uint16_t value) {
   char     buf[20] = "\0";
   uint16_t value_check = 0;
@@ -45,6 +75,16 @@ static bool test_variant_uint16(uint16_t value) {
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
 
+static bool test_variant_int16(int16_t value) {
+  char    buf[20] = "\0";
+  int16_t value_check = 0;
+
+  void *ptr1 = taosEncodeVariantI16(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariantI16(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
 static bool test_variant_uint32(uint32_t value) {
   char     buf[20] = "\0";
   uint32_t value_check = 0;
@@ -55,6 +95,16 @@ static bool test_variant_uint32(uint32_t value) {
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
 
+static bool test_variant_int32(int32_t value) {
+  char    buf[20] = "\0";
+  int32_t value_check = 0;
+
+  void *ptr1 = taosEncodeVariantI32(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariantI32(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
 static bool test_variant_uint64(uint64_t value) {
   char     buf[20] = "\0";
   uint64_t value_check = 0;
@@ -65,52 +115,124 @@ static bool test_variant_uint64(uint64_t value) {
   return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
 }
 
+static bool test_variant_int64(int64_t value) {
+  char    buf[20] = "\0";
+  int64_t value_check = 0;
+
+  void *ptr1 = taosEncodeVariantI64(static_cast<void *>(buf), value);
+  void *ptr2 = taosDecodeVariantI64(static_cast<void *>(buf), &value_check);
+
+  return ((ptr2 != NULL) && (value == value_check) && (ptr1 == ptr2));
+}
+
 TEST(codingTest, fixed_encode_decode) {
   srand(time(0));
 
+  // uint16_t
   for (uint16_t value = 0; value <= UINT16_MAX; value++) {
     ASSERT_TRUE(test_fixed_uint16(value));
     if (value == UINT16_MAX) break;
   }
 
-  ASSERT_TRUE(test_fixed_uint32(0));
-  ASSERT_TRUE(test_fixed_uint32(UINT32_MAX));
-
-  for (int i = 0; i < 1000000; i++) {
-    ASSERT_TRUE(test_fixed_uint32(rand()));
+  // int16_t
+  for (int16_t value = INT16_MIN; value <= INT16_MAX; value++) {
+    ASSERT_TRUE(test_fixed_int16(value));
+    if (value == INT16_MAX) break;
   }
 
-  std::mt19937_64 gen (std::random_device{}());
+  std::mt19937 gen32(std::random_device{}());
+  // uint32_t
+  ASSERT_TRUE(test_fixed_uint32(0));
+  ASSERT_TRUE(test_fixed_uint32(UINT32_MAX));
+  std::uniform_int_distribution<uint32_t> distr1(0, UINT32_MAX);
+
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_uint32(distr1(gen32)));
+  }
+
+  // int32_t
+  ASSERT_TRUE(test_fixed_int32(INT32_MIN));
+  ASSERT_TRUE(test_fixed_int32(INT32_MAX));
+  std::uniform_int_distribution<int32_t> distr2(INT32_MIN, INT32_MAX);
+
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_int32(distr2(gen32)));
+  }
+
+  std::mt19937_64 gen64(std::random_device{}());
+  // uint64_t
+  std::uniform_int_distribution<uint64_t> distr3(0, UINT64_MAX);
 
   ASSERT_TRUE(test_fixed_uint64(0));
   ASSERT_TRUE(test_fixed_uint64(UINT64_MAX));
   for (int i = 0; i < 1000000; i++) {
-    ASSERT_TRUE(test_fixed_uint64(gen()));
+    ASSERT_TRUE(test_fixed_uint64(distr3(gen64)));
+  }
+
+  // int64_t
+  std::uniform_int_distribution<int64_t> distr4(INT64_MIN, INT64_MAX);
+
+  ASSERT_TRUE(test_fixed_int64(INT64_MIN));
+  ASSERT_TRUE(test_fixed_int64(INT64_MAX));
+  for (int i = 0; i < 1000000; i++) {
+    ASSERT_TRUE(test_fixed_int64(distr4(gen64)));
   }
 }
 
 TEST(codingTest, variant_encode_decode) {
   srand(time(0));
 
+  // uint16_t
   for (uint16_t value = 0; value <= UINT16_MAX; value++) {
     ASSERT_TRUE(test_variant_uint16(value));
     if (value == UINT16_MAX) break;
   }
 
+  // int16_t
+  for (int16_t value = INT16_MIN; value <= INT16_MAX; value++) {
+    ASSERT_TRUE(test_variant_int16(value));
+    if (value == INT16_MAX) break;
+  }
+
+  std::mt19937 gen32(std::random_device{}());
+  // uint32_t
+  std::uniform_int_distribution<uint32_t> distr1(0, UINT32_MAX);
   ASSERT_TRUE(test_variant_uint32(0));
   ASSERT_TRUE(test_variant_uint32(UINT32_MAX));
 
   for (int i = 0; i < 5000000; i++) {
-    ASSERT_TRUE(test_variant_uint32(rand()));
+    ASSERT_TRUE(test_variant_uint32(distr1(gen32)));
   }
 
-  std::mt19937_64 gen (std::random_device{}());
+  // int32_t
+  std::uniform_int_distribution<int32_t> distr2(INT32_MIN, INT32_MAX);
+  ASSERT_TRUE(test_variant_int32(INT32_MIN));
+  ASSERT_TRUE(test_variant_int32(INT32_MAX));
+
+  for (int i = 0; i < 5000000; i++) {
+    ASSERT_TRUE(test_variant_int32(distr2(gen32)));
+  }
+
+  std::mt19937_64 gen64(std::random_device{}());
+  // uint64_t
+  std::uniform_int_distribution<uint64_t> distr3(0, UINT64_MAX);
 
   ASSERT_TRUE(test_variant_uint64(0));
   ASSERT_TRUE(test_variant_uint64(UINT64_MAX));
   for (int i = 0; i < 5000000; i++) {
-    uint64_t value = gen();
+    // uint64_t value = gen();
     // printf("%ull\n", value);
-    ASSERT_TRUE(test_variant_uint64(value));
+    ASSERT_TRUE(test_variant_uint64(distr3(gen64)));
+  }
+
+  // int64_t
+  std::uniform_int_distribution<int64_t> distr4(INT64_MIN, INT64_MAX);
+
+  ASSERT_TRUE(test_variant_int64(INT64_MIN));
+  ASSERT_TRUE(test_variant_int64(INT64_MAX));
+  for (int i = 0; i < 5000000; i++) {
+    // uint64_t value = gen();
+    // printf("%ull\n", value);
+    ASSERT_TRUE(test_variant_int64(distr4(gen64)));
   }
 }
\ No newline at end of file

From 540be24bd3616767d9c617134602ad6721410c21 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sat, 30 May 2020 02:25:02 +0000
Subject: [PATCH 10/43] reformat

---
 src/common/inc/tdataformat.h | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 528e9b2825..3f33c96e96 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -243,31 +243,31 @@ pData
 //#define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE)
 
 typedef struct {
-  int16_t colId;   // column ID
-  int16_t colType;
-  uint16_t offset;  //to store value for numeric col or offset for binary/Nchar
+  int16_t  colId;  // column ID
+  int16_t  colType;
+  uint16_t offset;  // to store value for numeric col or offset for binary/Nchar
 } STagCol;
 
 typedef struct {
-  int32_t    len;    
-  void *     pData;  // Space to store the tag value   
-  uint16_t   dataLen;
-  int16_t    ncols;  // Total columns allocated
-  STagCol    tagCols[];
+  int32_t  len;
+  void *   pData;  // Space to store the tag value
+  uint16_t dataLen;
+  int16_t  ncols;  // Total columns allocated
+  STagCol  tagCols[];
 } STagRow;
 
-
 #define tagColSize(r) (sizeof(STagCol) + r.colLen)
 
-int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId);  //insert tag value and update all the information
-int tdDeleteTagCol(SDataRow row, int16_t colId);  // delete tag value and update all the information
-void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type);   //if find tag, 0, else return -1;
-int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId);  
-SDataRow tdTagRowDup(SDataRow row);
-void tdFreeTagRow(SDataRow row); 
-SDataRow tdTagRowDecode(SDataRow row);
-int tdTagRowCpy(SDataRow dst, SDataRow src);
-void * tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags);
+int       tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type,
+                      int16_t colId);                   // insert tag value and update all the information
+int       tdDeleteTagCol(SDataRow row, int16_t colId);  // delete tag value and update all the information
+void *    tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type);  // if find tag, 0, else return -1;
+int       tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId);
+SDataRow  tdTagRowDup(SDataRow row);
+void      tdFreeTagRow(SDataRow row);
+SDataRow  tdTagRowDecode(SDataRow row);
+int       tdTagRowCpy(SDataRow dst, SDataRow src);
+void *    tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags);
 STSchema *tdGetSchemaFromData(SDataRow *row);
 
 #ifdef __cplusplus

From 8c7100e89400566e164d417a56b2ae1baf1a2878 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sat, 30 May 2020 10:00:49 +0000
Subject: [PATCH 11/43] add kv data row definition

---
 src/common/inc/tdataformat.h | 49 +++++++++++++++++++++
 src/common/src/tdataformat.c | 85 ++++++++++++++++++++++++++++++++++++
 src/inc/taosdef.h            |  1 +
 src/util/inc/tutil.h         |  1 +
 4 files changed, 136 insertions(+)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 3f33c96e96..a9350769a1 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "talgo.h"
 #include "taosdef.h"
 #include "tutil.h"
 
@@ -218,6 +219,54 @@ int        tdMergeDataCols(SDataCols *target, SDataCols *src, int rowsToMerge);
 void       tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCols *src2, int *iter2, int tRows);
 
 
+// ----------------- K-V data row structure
+/*
+ * +----------+----------+---------------------------------+---------------------------------+
+ * |  int16_t |  int16_t |                                 |                                 |
+ * +----------+----------+---------------------------------+---------------------------------+
+ * |    len   |   ncols  |           cols index            |             data part           |
+ * +----------+----------+---------------------------------+---------------------------------+
+ */
+typedef void *SKVDataRow;
+
+typedef struct {
+  int16_t colId;
+  int16_t offset;
+} SColIdx;
+
+#define TD_KV_DATA_ROW_HEAD_SIZE 2*sizeof(int16_t)
+
+#define kvDataRowLen(r) (*(int16_t *)(r))
+#define kvDataRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
+#define kvDataRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_DATA_ROW_HEAD_SIZE)
+#define kvDataRowValues(r) POINTER_SHIFT(r, TD_KV_DATA_ROW_HEAD_SIZE + sizeof(SColIdx) * kvDataRowNCols(r))
+#define kvDataRowCpy(dst, r) memcpy((dst), (r), kvDataRowLen(r))
+#define kvDataRowColVal(r, colIdx) POINTER_SHIFT(kvDataRowValues(r), (colIdx)->offset)
+#define kvDataRowSetLen(r, len) kvDataRowLen(r) = (len)
+#define kvDataRowSetNCols(r, n) kvDataRowNCols(r) = (n)
+#define kvDataRowColIdxAt(r, i) (kvDataRowColIdx(r) + (i))
+
+SKVDataRow tdKVDataRowDup(SKVDataRow row);
+SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void *value);
+void *     tdEncodeKVDataRow(void *buf, SKVDataRow row);
+void *     tdDecodeKVDataRow(void *buf, SKVDataRow *row);
+
+static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
+    return 1;
+  } else if (*(int16_t *)key1 < ((SColIdx *)key2)->colId) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVDataRow row, int16_t colId) {
+  void *ret = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
+  if (ret == NULL) return NULL;
+  return kvDataRowColVal(row, (SColIdx *)ret);
+}
+
 // ----------------- Tag row structure
 
 /* A tag row, the format is like below:
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 922c8bdea0..3429970e73 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -594,4 +594,89 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol
       (*iter2)++;
     }
   }
+}
+
+SKVDataRow tdKVDataRowDup(SKVDataRow row) {
+  SKVDataRow trow = malloc(kvDataRowLen(row));
+  if (trow == NULL) return NULL;
+
+  kvDataRowCpy(trow, row);
+  return trow;
+}
+
+SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void *value) {
+  // TODO
+  return NULL;
+  // SColIdx *pColIdx = NULL;
+  // SKVDataRow rrow = row;
+  // SKVDataRow nrow = NULL;
+  // void *ptr = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(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;
+
+  //   kvDataRowSetNCols(nrow, kvDataRowNCols(row)+1);
+  //   kvDataRowSetLen(nrow, tlen);
+
+  //   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
+  //   }
+
+  //   // 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]);
+  //   }
+
+  //   // 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);
+
+  //     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;
+  //       // }
+
+  //       // kvDataRowSetLen();
+
+  //     }
+  //   } else {
+  //     memcpy(kvDataRowColVal(row, (SColIdx *)ptr), value, TYPE_BYTES[type]);
+  //   }
+  // }
+
+  // return rrow;
+}
+
+void *tdEncodeKVDataRow(void *buf, SKVDataRow row) {
+  // May change the encode purpose
+  kvDataRowCpy(buf, row);
+  return POINTER_SHIFT(buf, kvDataRowLen(row));
+}
+
+void *tdDecodeKVDataRow(void *buf, SKVDataRow *row) {
+  *row = tdKVDataRowDup(buf);
+  return POINTER_SHIFT(buf, kvDataRowLen(*row));
 }
\ No newline at end of file
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index 548a39ad42..68efcb8b81 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -52,6 +52,7 @@ typedef struct tstr {
 #define varDataCopy(dst, v) memcpy((dst), (void*) (v), varDataTLen(v))
 #define varDataLenByData(v) (*(VarDataLenT *)(((char*)(v)) - VARSTR_HEADER_SIZE))
 #define varDataSetLen(v, _len) (((VarDataLenT *)(v))[0] = (VarDataLenT) (_len))
+#define IS_VAR_DATA_TYPE(t) (((t) == TSDB_DATA_TYPE_BINARY) || ((t) == TSDB_DATA_TYPE_NCHAR))
 
 // this data type is internally used only in 'in' query to hold the values
 #define TSDB_DATA_TYPE_ARRAY      (TSDB_DATA_TYPE_NCHAR + 1)
diff --git a/src/util/inc/tutil.h b/src/util/inc/tutil.h
index 5dcb6e406f..527394d13a 100644
--- a/src/util/inc/tutil.h
+++ b/src/util/inc/tutil.h
@@ -46,6 +46,7 @@ extern "C" {
 
 // Pointer p drift right by b bytes
 #define POINTER_SHIFT(p, b) ((void *)((char *)(p) + (b)))
+#define POINTER_DISTANCE(p1, p2) ((char *)p1 - (char *)p2)
 
 #ifndef NDEBUG
 #define ASSERT(x) assert(x)

From 8a2802920af133b55544b9686d62d9ccfefa367c Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sat, 30 May 2020 10:48:09 +0000
Subject: [PATCH 12/43] add KV data row builder

---
 src/common/inc/tdataformat.h | 16 +++++++++
 src/common/src/tdataformat.c | 68 ++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index a9350769a1..74f636e3f7 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -267,6 +267,22 @@ static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVDataRow row, int16_t colId) {
   return kvDataRowColVal(row, (SColIdx *)ret);
 }
 
+// ----------------- K-V data row builder
+typedef struct {
+  int16_t  tCols;
+  int16_t  nCols;
+  SColIdx *pColIdx;
+  int16_t  alloc;
+  int16_t  size;
+  void *   buf;
+} SKVDataRowBuilder;
+
+int        tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
+void       tdDestroyKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
+void       tdResetKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
+SKVDataRow tdGetKVDataRowFromBuilder(SKVDataRowBuilder *pBuilder);
+int        tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type, void *value);
+
 // ----------------- Tag row structure
 
 /* A tag row, the format is like below:
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 3429970e73..2658d8f280 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -679,4 +679,72 @@ void *tdEncodeKVDataRow(void *buf, SKVDataRow row) {
 void *tdDecodeKVDataRow(void *buf, SKVDataRow *row) {
   *row = tdKVDataRowDup(buf);
   return POINTER_SHIFT(buf, kvDataRowLen(*row));
+}
+
+int tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
+  pBuilder->tCols = 128;
+  pBuilder->nCols = 0;
+  pBuilder->pColIdx = (SColIdx *)malloc(sizeof(SColIdx) * pBuilder->tCols);
+  if (pBuilder->pColIdx == NULL) return -1;
+  pBuilder->alloc = 1024;
+  pBuilder->size = 0;
+  pBuilder->buf = malloc(pBuilder->alloc);
+  if (pBuilder->buf == NULL) {
+    free(pBuilder->pColIdx);
+    return -1;
+  }
+  return 0;
+}
+
+void tdDestroyKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
+  tfree(pBuilder->pColIdx);
+  tfree(pBuilder->buf);
+}
+
+void tdResetKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
+  pBuilder->nCols = 0;
+  pBuilder->size = 0;
+}
+
+SKVDataRow tdGetKVDataRowFromBuilder(SKVDataRowBuilder *pBuilder) {
+  int tlen = sizeof(SColIdx) * pBuilder->nCols + pBuilder->size;
+  if (tlen == 0) return NULL;
+
+  SKVDataRow row = malloc(TD_KV_DATA_ROW_HEAD_SIZE + tlen);
+  if (row == NULL) return NULL;
+
+  kvDataRowSetNCols(row, pBuilder->nCols);
+  kvDataRowSetLen(row, TD_KV_DATA_ROW_HEAD_SIZE + tlen);
+
+  memcpy(kvDataRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
+  memcpy(kvDataRowValues(row), pBuilder->buf, pBuilder->size);
+
+  return row;
+}
+
+int tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
+  ASSERT(pBuilder->nCols == 0 || colId > pBuilder->pColIdx[pBuilder->nCols - 1].colId);
+
+  if (pBuilder->nCols >= pBuilder->tCols) {
+    pBuilder->tCols *= 2;
+    pBuilder->pColIdx = realloc(pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->tCols);
+    if (pBuilder->pColIdx == NULL) return -1;
+  }
+
+  pBuilder->pColIdx[pBuilder->nCols].colId = colId;
+  pBuilder->pColIdx[pBuilder->nCols].offset = pBuilder->size;
+  
+  pBuilder->nCols++;
+
+  int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
+  if (tlen > pBuilder->alloc - pBuilder->size) {
+    pBuilder->alloc *= 2;
+    pBuilder->buf = realloc(pBuilder->buf, pBuilder->alloc);
+    if (pBuilder->buf == NULL) return -1;
+  }
+
+  memcpy(POINTER_SHIFT(pBuilder->buf, pBuilder->size), value, tlen);
+  pBuilder->size += tlen;
+
+  return 0;
 }
\ No newline at end of file

From 760b66e5748e4e3c42b38c73c4a42d0aaefa507f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 01:57:55 +0000
Subject: [PATCH 13/43] refactor and rename

---
 src/common/inc/tdataformat.h |  92 +++++++++++------------
 src/common/src/tdataformat.c | 139 +++++++++++++++++------------------
 2 files changed, 116 insertions(+), 115 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 74f636e3f7..47a1d642e1 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -27,19 +27,24 @@
 extern "C" {
 #endif
 
-#define STR_TO_VARSTR(x, str) do {VarDataLenT __len = strlen(str); \
-  *(VarDataLenT*)(x) = __len; \
-  strncpy(varDataVal(x), (str), __len);} while(0);
+#define STR_TO_VARSTR(x, str)             \
+  do {                                    \
+    VarDataLenT __len = strlen(str);      \
+    *(VarDataLenT *)(x) = __len;          \
+    strncpy(varDataVal(x), (str), __len); \
+  } while (0);
 
-#define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs) do {\
-  char* _e = stpncpy(varDataVal(x), (str), (_maxs));\
-  varDataSetLen(x, (_e - (x) - VARSTR_HEADER_SIZE));\
-} while(0)
+#define STR_WITH_MAXSIZE_TO_VARSTR(x, str, _maxs)      \
+  do {                                                 \
+    char *_e = stpncpy(varDataVal(x), (str), (_maxs)); \
+    varDataSetLen(x, (_e - (x)-VARSTR_HEADER_SIZE));   \
+  } while (0)
 
-#define STR_WITH_SIZE_TO_VARSTR(x, str, _size) do {\
-  *(VarDataLenT*)(x) = (_size); \
-  strncpy(varDataVal(x), (str), (_size));\
-} while(0);
+#define STR_WITH_SIZE_TO_VARSTR(x, str, _size) \
+  do {                                         \
+    *(VarDataLenT *)(x) = (_size);             \
+    strncpy(varDataVal(x), (str), (_size));    \
+  } while (0);
 
 // ----------------- TSDB COLUMN DEFINITION
 typedef struct {
@@ -73,9 +78,9 @@ typedef struct {
 #define schemaTLen(s) ((s)->tlen)
 #define schemaFLen(s) ((s)->flen)
 #define schemaColAt(s, i) ((s)->columns + i)
+#define tdFreeSchema(s) tfree((s))
 
 STSchema *tdNewSchema(int32_t nCols);
-#define   tdFreeSchema(s) tfree((s))
 int       tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes);
 STSchema *tdDupSchema(STSchema *pSchema);
 int       tdGetSchemaEncodeSize(STSchema *pSchema);
@@ -189,12 +194,11 @@ static FORCE_INLINE int32_t dataColGetNEleLen(SDataCol *pDataCol, int rows) {
   }
 }
 
-
 typedef struct {
-  int      maxRowSize;
-  int      maxCols;    // max number of columns
-  int      maxPoints;  // max number of points
-  int      bufSize;
+  int maxRowSize;
+  int maxCols;    // max number of columns
+  int maxPoints;  // max number of points
+  int bufSize;
 
   int      numOfRows;
   int      numOfCols;  // Total number of cols
@@ -214,11 +218,10 @@ void       tdInitDataCols(SDataCols *pCols, STSchema *pSchema);
 SDataCols *tdDupDataCols(SDataCols *pCols, bool keepData);
 void       tdFreeDataCols(SDataCols *pCols);
 void       tdAppendDataRowToDataCol(SDataRow row, SDataCols *pCols);
-void       tdPopDataColsPoints(SDataCols *pCols, int pointsToPop); //!!!!
+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);
 
-
 // ----------------- K-V data row structure
 /*
  * +----------+----------+---------------------------------+---------------------------------+
@@ -227,29 +230,29 @@ void       tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SD
  * |    len   |   ncols  |           cols index            |             data part           |
  * +----------+----------+---------------------------------+---------------------------------+
  */
-typedef void *SKVDataRow;
+typedef void *SKVRow;
 
 typedef struct {
   int16_t colId;
   int16_t offset;
 } SColIdx;
 
-#define TD_KV_DATA_ROW_HEAD_SIZE 2*sizeof(int16_t)
+#define TD_KV_ROW_HEAD_SIZE 2 * sizeof(int16_t)
 
-#define kvDataRowLen(r) (*(int16_t *)(r))
-#define kvDataRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
-#define kvDataRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_DATA_ROW_HEAD_SIZE)
-#define kvDataRowValues(r) POINTER_SHIFT(r, TD_KV_DATA_ROW_HEAD_SIZE + sizeof(SColIdx) * kvDataRowNCols(r))
-#define kvDataRowCpy(dst, r) memcpy((dst), (r), kvDataRowLen(r))
-#define kvDataRowColVal(r, colIdx) POINTER_SHIFT(kvDataRowValues(r), (colIdx)->offset)
-#define kvDataRowSetLen(r, len) kvDataRowLen(r) = (len)
-#define kvDataRowSetNCols(r, n) kvDataRowNCols(r) = (n)
-#define kvDataRowColIdxAt(r, i) (kvDataRowColIdx(r) + (i))
+#define kvRowLen(r) (*(int16_t *)(r))
+#define kvRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
+#define kvRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE)
+#define kvRowValues(r) POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * kvRowNCols(r))
+#define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
+#define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
+#define kvRowSetLen(r, len) kvRowLen(r) = (len)
+#define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
+#define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
 
-SKVDataRow tdKVDataRowDup(SKVDataRow row);
-SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void *value);
-void *     tdEncodeKVDataRow(void *buf, SKVDataRow row);
-void *     tdDecodeKVDataRow(void *buf, SKVDataRow *row);
+SKVRow tdKVRowDup(SKVRow row);
+SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value);
+void * tdEncodeKVRow(void *buf, SKVRow row);
+void * tdDecodeKVRow(void *buf, SKVRow *row);
 
 static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
   if (*(int16_t *)key1 > ((SColIdx *)key2)->colId) {
@@ -261,10 +264,10 @@ static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
   }
 }
 
-static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVDataRow row, int16_t colId) {
-  void *ret = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
+static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVRow row, int16_t colId) {
+  void *ret = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
   if (ret == NULL) return NULL;
-  return kvDataRowColVal(row, (SColIdx *)ret);
+  return kvRowColVal(row, (SColIdx *)ret);
 }
 
 // ----------------- K-V data row builder
@@ -275,19 +278,19 @@ typedef struct {
   int16_t  alloc;
   int16_t  size;
   void *   buf;
-} SKVDataRowBuilder;
+} SKVRowBuilder;
 
-int        tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
-void       tdDestroyKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
-void       tdResetKVDataRowBuilder(SKVDataRowBuilder *pBuilder);
-SKVDataRow tdGetKVDataRowFromBuilder(SKVDataRowBuilder *pBuilder);
-int        tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type, void *value);
+int    tdInitKVRowBuilder(SKVRowBuilder *pBuilder);
+void   tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder);
+void   tdResetKVRowBuilder(SKVRowBuilder *pBuilder);
+SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder);
+int    tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value);
 
 // ----------------- Tag row structure
 
 /* A tag row, the format is like below:
 +----------+----------------------------------------------------------------+
-| STagRow  | STagCol | STagCol | STagCol | STagCol | ...| STagCol | STagCol | 
+| STagRow  | STagCol | STagCol | STagCol | STagCol | ...| STagCol | STagCol |
 +----------+----------------------------------------------------------------+
 
 pData
@@ -297,7 +300,6 @@ pData
 
  */
 
-
 #define TD_TAG_ROW_HEAD_SIZE sizeof(int16_t)
 
 #define tagRowNum(r) (*(int16_t *)(r))
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 2658d8f280..333e15058d 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -13,8 +13,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tdataformat.h"
-#include "wchar.h"
 #include "talgo.h"
+#include "wchar.h"
 
 /**
  * Create a SSchema object with nCols columns
@@ -51,13 +51,13 @@ int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes)
   if (schemaNCols(pSchema) == 0) {
     colSetOffset(pCol, 0);
   } else {
-    STColumn *pTCol = schemaColAt(pSchema, schemaNCols(pSchema)-1);
+    STColumn *pTCol = schemaColAt(pSchema, schemaNCols(pSchema) - 1);
     colSetOffset(pCol, pTCol->offset + TYPE_BYTES[pTCol->type]);
   }
   switch (type) {
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
-      colSetBytes(pCol, bytes); // Set as maximum bytes
+      colSetBytes(pCol, bytes);  // Set as maximum bytes
       pSchema->tlen += (TYPE_BYTES[type] + sizeof(VarDataLenT) + bytes);
       break;
     default:
@@ -152,17 +152,18 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
   return row;
 }
 
-int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type, int16_t colId){ //insert/update tag value and update all the information
+int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type,
+                int16_t colId) {  // insert/update tag value and update all the information
   ASSERT(((STagRow *)row)->pData != NULL);
-  //STagCol * stCol = tdQueryTagColByID()
+  // STagCol * stCol = tdQueryTagColByID()
 
   return 0;
-};  
+};
 
-int tdDeleteTagCol(SDataRow row, int16_t colId){   // delete tag value and update all the information
-  //todo
+int tdDeleteTagCol(SDataRow row, int16_t colId) {  // delete tag value and update all the information
+  // todo
   return 0;
-};  
+};
 
 static int compTagId(const void *key1, const void *key2) {
   if (((STagCol *)key1)->colId > ((STagCol *)key2)->colId) {
@@ -177,43 +178,43 @@ static int compTagId(const void *key1, const void *key2) {
 /**
  * Find tag structure by colId, if find, return tag structure, else return NULL;
  */
-STagCol * tdQueryTagColByID(SDataRow row, int16_t colId, int flags) {  //if find tag, 0, else return -1; 
+STagCol *tdQueryTagColByID(SDataRow row, int16_t colId, int flags) {  // if find tag, 0, else return -1;
   ASSERT(((STagRow *)row)->pData != NULL);
   STagCol *pBase = ((STagRow *)row)->tagCols;
-  int16_t nCols = ((STagRow *)row)->ncols;
-  STagCol key = {colId,0,0};
-  STagCol * stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, flags);
+  int16_t  nCols = ((STagRow *)row)->ncols;
+  STagCol  key = {colId, 0, 0};
+  STagCol *stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, flags);
   return stCol;
-};   
+};
 
 /**
-* Find tag value by colId, if find, return tag value, else return NULL;
-*/
-void * tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) {
+ * Find tag value by colId, if find, return tag value, else return NULL;
+ */
+void *tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) {
   ASSERT(((STagRow *)row)->pData != NULL);
   STagCol *pBase = ((STagRow *)row)->tagCols;
-  int16_t nCols = ((STagRow *)row)->ncols;
-  STagCol key = {colId,0,0};
-  STagCol * stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, TD_EQ);
+  int16_t  nCols = ((STagRow *)row)->ncols;
+  STagCol  key = {colId, 0, 0};
+  STagCol *stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, TD_EQ);
   if (NULL == stCol) {
     return NULL;
   }
-  
-  void * pData = ((STagRow *)row)->pData;
+
+  void *pData = ((STagRow *)row)->pData;
   *type = stCol->colType;
 
   return pData + stCol->offset;
-};   
+};
 
-int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId){
+int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId) {
   ASSERT(value != NULL);
-  //ASSERT(bytes-2 == varDataTLen(value));
+  // ASSERT(bytes-2 == varDataTLen(value));
   ASSERT(row != NULL);
   STagRow *pTagrow = row;
   pTagrow->tagCols[pTagrow->ncols].colId = colId;
   pTagrow->tagCols[pTagrow->ncols].colType = type;
   pTagrow->tagCols[pTagrow->ncols].offset = pTagrow->dataLen;
-  
+
   switch (type) {
     case TSDB_DATA_TYPE_BINARY:
     case TSDB_DATA_TYPE_NCHAR:
@@ -224,14 +225,14 @@ int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int
       memcpy((char *)pTagrow->pData + pTagrow->dataLen, value, TYPE_BYTES[type]);
       pTagrow->dataLen += TYPE_BYTES[type];
       break;
-  } 
-  
-  pTagrow->ncols++;   
+  }
+
+  pTagrow->ncols++;
 
   return 0;
-};  
+};
 
-void * tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags) {
+void *tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags) {
   int32_t size = sizeof(STagRow) + numofTags * sizeof(STagCol);
 
   STagRow *row = malloc(size);
@@ -245,25 +246,25 @@ void * tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags) {
   }
 
   row->len = size;
-  row->dataLen = 0; 
-  row->ncols = 0; 
-  return row;   
+  row->dataLen = 0;
+  row->ncols = 0;
+  return row;
 }
 /**
- * free tag row 
+ * free tag row
  */
- 
+
 void tdFreeTagRow(SDataRow row) {
   if (row) {
     free(((STagRow *)row)->pData);
     free(row);
-  }  
+  }
 }
 
 SDataRow tdTagRowDup(SDataRow row) {
   STagRow *trow = malloc(dataRowLen(row));
   if (trow == NULL) return NULL;
-  
+
   dataRowCpy(trow, row);
   trow->pData = malloc(trow->dataLen);
   if (NULL == trow->pData) {
@@ -277,23 +278,23 @@ SDataRow tdTagRowDup(SDataRow row) {
 SDataRow tdTagRowDecode(SDataRow row) {
   STagRow *trow = malloc(dataRowLen(row));
   if (trow == NULL) return NULL;
-  
+
   dataRowCpy(trow, row);
   trow->pData = malloc(trow->dataLen);
   if (NULL == trow->pData) {
     free(trow);
     return NULL;
   }
-  char * pData = (char *)row + dataRowLen(row);
+  char *pData = (char *)row + dataRowLen(row);
   memcpy(trow->pData, pData, trow->dataLen);
   return trow;
 }
 
 int tdTagRowCpy(SDataRow dst, SDataRow src) {
   if (src == NULL) return -1;
-  
+
   dataRowCpy(dst, src);
-  void * pData = dst + dataRowLen(src);
+  void *pData = dst + dataRowLen(src);
   memcpy(pData, ((STagRow *)src)->pData, ((STagRow *)src)->dataLen);
   return 0;
 }
@@ -330,7 +331,6 @@ void dataColInit(SDataCol *pDataCol, STColumn *pCol, void **pBuf, int maxPoints)
     pDataCol->pData = *pBuf;
     *pBuf = POINTER_SHIFT(*pBuf, pDataCol->spaceSize);
   }
-
 }
 
 void dataColAppendVal(SDataCol *pCol, void *value, int numOfRows, int maxPoints) {
@@ -414,7 +414,7 @@ void dataColSetNEleNull(SDataCol *pCol, int nEle, int maxPoints) {
 void dataColSetOffset(SDataCol *pCol, int nEle) {
   ASSERT(((pCol->type == TSDB_DATA_TYPE_BINARY) || (pCol->type == TSDB_DATA_TYPE_NCHAR)));
 
-  void * tptr = pCol->pData;
+  void *tptr = pCol->pData;
   // char *tptr = (char *)(pCol->pData);
 
   VarDataOffsetT offset = 0;
@@ -596,26 +596,25 @@ void tdMergeTwoDataCols(SDataCols *target, SDataCols *src1, int *iter1, SDataCol
   }
 }
 
-SKVDataRow tdKVDataRowDup(SKVDataRow row) {
-  SKVDataRow trow = malloc(kvDataRowLen(row));
+SKVRow tdKVRowDup(SKVRow row) {
+  SKVRow trow = malloc(kvRowLen(row));
   if (trow == NULL) return NULL;
 
-  kvDataRowCpy(trow, row);
+  kvRowCpy(trow, row);
   return trow;
 }
 
-SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void *value) {
+SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value) {
   // TODO
   return NULL;
   // SColIdx *pColIdx = NULL;
-  // SKVDataRow rrow = row;
-  // SKVDataRow nrow = NULL;
+  // SKVRow rrow = row;
+  // SKVRow nrow = NULL;
   // void *ptr = taosbsearch(&colId, kvDataRowColIdx(row), kvDataRowNCols(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 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);
@@ -670,18 +669,18 @@ SKVDataRow tdSetKVRowDataOfCol(SKVDataRow row, int16_t colId, int8_t type, void
   // return rrow;
 }
 
-void *tdEncodeKVDataRow(void *buf, SKVDataRow row) {
+void *tdEncodeKVRow(void *buf, SKVRow row) {
   // May change the encode purpose
-  kvDataRowCpy(buf, row);
-  return POINTER_SHIFT(buf, kvDataRowLen(row));
+  kvRowCpy(buf, row);
+  return POINTER_SHIFT(buf, kvRowLen(row));
 }
 
-void *tdDecodeKVDataRow(void *buf, SKVDataRow *row) {
-  *row = tdKVDataRowDup(buf);
-  return POINTER_SHIFT(buf, kvDataRowLen(*row));
+void *tdDecodeKVRow(void *buf, SKVRow *row) {
+  *row = tdKVRowDup(buf);
+  return POINTER_SHIFT(buf, kvRowLen(*row));
 }
 
-int tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
+int tdInitKVRowBuilder(SKVRowBuilder *pBuilder) {
   pBuilder->tCols = 128;
   pBuilder->nCols = 0;
   pBuilder->pColIdx = (SColIdx *)malloc(sizeof(SColIdx) * pBuilder->tCols);
@@ -696,33 +695,33 @@ int tdInitKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
   return 0;
 }
 
-void tdDestroyKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
+void tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder) {
   tfree(pBuilder->pColIdx);
   tfree(pBuilder->buf);
 }
 
-void tdResetKVDataRowBuilder(SKVDataRowBuilder *pBuilder) {
+void tdResetKVRowBuilder(SKVRowBuilder *pBuilder) {
   pBuilder->nCols = 0;
   pBuilder->size = 0;
 }
 
-SKVDataRow tdGetKVDataRowFromBuilder(SKVDataRowBuilder *pBuilder) {
+SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder) {
   int tlen = sizeof(SColIdx) * pBuilder->nCols + pBuilder->size;
   if (tlen == 0) return NULL;
 
-  SKVDataRow row = malloc(TD_KV_DATA_ROW_HEAD_SIZE + tlen);
+  SKVRow row = malloc(TD_KV_ROW_HEAD_SIZE + tlen);
   if (row == NULL) return NULL;
 
-  kvDataRowSetNCols(row, pBuilder->nCols);
-  kvDataRowSetLen(row, TD_KV_DATA_ROW_HEAD_SIZE + tlen);
+  kvRowSetNCols(row, pBuilder->nCols);
+  kvRowSetLen(row, TD_KV_ROW_HEAD_SIZE + tlen);
 
-  memcpy(kvDataRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
-  memcpy(kvDataRowValues(row), pBuilder->buf, pBuilder->size);
+  memcpy(kvRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
+  memcpy(kvRowValues(row), pBuilder->buf, pBuilder->size);
 
   return row;
 }
 
-int tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
+int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
   ASSERT(pBuilder->nCols == 0 || colId > pBuilder->pColIdx[pBuilder->nCols - 1].colId);
 
   if (pBuilder->nCols >= pBuilder->tCols) {
@@ -733,7 +732,7 @@ int tdAddColToKVDataRow(SKVDataRowBuilder *pBuilder, int16_t colId, int8_t type,
 
   pBuilder->pColIdx[pBuilder->nCols].colId = colId;
   pBuilder->pColIdx[pBuilder->nCols].offset = pBuilder->size;
-  
+
   pBuilder->nCols++;
 
   int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];

From d2b46fb968eb42bc3394a09c2f7e488e7ab4ea38 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 03:14:46 +0000
Subject: [PATCH 14/43] add fsync when close a file

---
 src/tsdb/src/tsdbRWHelper.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index 38e6b8f2f6..84a107be5a 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -237,20 +237,24 @@ int tsdbSetAndOpenHelperFile(SRWHelper *pHelper, SFileGroup *pGroup) {
 
 int tsdbCloseHelperFile(SRWHelper *pHelper, bool hasError) {
   if (pHelper->files.headF.fd > 0) {
+    fsync(pHelper->files.headF.fd);
     close(pHelper->files.headF.fd);
     pHelper->files.headF.fd = -1;
   }
   if (pHelper->files.dataF.fd > 0) {
     if (!hasError) tsdbUpdateFileHeader(&(pHelper->files.dataF), 0);
+    fsync(pHelper->files.dataF.fd);
     close(pHelper->files.dataF.fd);
     pHelper->files.dataF.fd = -1;
   }
   if (pHelper->files.lastF.fd > 0) {
+    fsync(pHelper->files.lastF.fd);
     close(pHelper->files.lastF.fd);
     pHelper->files.lastF.fd = -1;
   }
   if (pHelper->files.nHeadF.fd > 0) {
     if (!hasError) tsdbUpdateFileHeader(&(pHelper->files.nHeadF), 0);
+    fsync(pHelper->files.nHeadF.fd);
     close(pHelper->files.nHeadF.fd);
     pHelper->files.nHeadF.fd = -1;
     if (hasError) {
@@ -263,6 +267,7 @@ int tsdbCloseHelperFile(SRWHelper *pHelper, bool hasError) {
   
   if (pHelper->files.nLastF.fd > 0) {
     if (!hasError) tsdbUpdateFileHeader(&(pHelper->files.nLastF), 0);
+    fsync(pHelper->files.nLastF.fd);
     close(pHelper->files.nLastF.fd);
     pHelper->files.nLastF.fd = -1;
     if (hasError) {

From 8d5d0fd4efac0b759324c86379863ad016fd8c32 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 03:55:36 +0000
Subject: [PATCH 15/43] refactor

---
 src/common/inc/tdataformat.h |  6 +++---
 src/common/src/tdataformat.c | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 47a1d642e1..19cbbea0fb 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -241,12 +241,12 @@ typedef struct {
 
 #define kvRowLen(r) (*(int16_t *)(r))
 #define kvRowNCols(r) (*(int16_t *)POINTER_SHIFT(r, sizeof(int16_t)))
+#define kvRowSetLen(r, len) kvRowLen(r) = (len)
+#define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
 #define kvRowColIdx(r) (SColIdx *)POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE)
 #define kvRowValues(r) POINTER_SHIFT(r, TD_KV_ROW_HEAD_SIZE + sizeof(SColIdx) * kvRowNCols(r))
 #define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
 #define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
-#define kvRowSetLen(r, len) kvRowLen(r) = (len)
-#define kvRowSetNCols(r, n) kvRowNCols(r) = (n)
 #define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
 
 SKVRow tdKVRowDup(SKVRow row);
@@ -264,7 +264,7 @@ static FORCE_INLINE int comparTagId(const void *key1, const void *key2) {
   }
 }
 
-static FORCE_INLINE void *tdGetKVRowDataOfCol(SKVRow row, int16_t colId) {
+static FORCE_INLINE void *tdGetKVRowValOfCol(SKVRow row, int16_t colId) {
   void *ret = taosbsearch(&colId, kvRowColIdx(row), kvRowNCols(row), sizeof(SColIdx), comparTagId, TD_EQ);
   if (ret == NULL) return NULL;
   return kvRowColVal(row, (SColIdx *)ret);
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 333e15058d..536135010a 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -709,11 +709,13 @@ SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder) {
   int tlen = sizeof(SColIdx) * pBuilder->nCols + pBuilder->size;
   if (tlen == 0) return NULL;
 
-  SKVRow row = malloc(TD_KV_ROW_HEAD_SIZE + tlen);
+  tlen += TD_KV_ROW_HEAD_SIZE;
+
+  SKVRow row = malloc(tlen);
   if (row == NULL) return NULL;
 
   kvRowSetNCols(row, pBuilder->nCols);
-  kvRowSetLen(row, TD_KV_ROW_HEAD_SIZE + tlen);
+  kvRowSetLen(row, tlen);
 
   memcpy(kvRowColIdx(row), pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->nCols);
   memcpy(kvRowValues(row), pBuilder->buf, pBuilder->size);
@@ -737,7 +739,9 @@ int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *v
 
   int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
   if (tlen > pBuilder->alloc - pBuilder->size) {
-    pBuilder->alloc *= 2;
+    while (tlen > pBuilder->alloc - pBuilder->size) {
+      pBuilder->alloc *= 2;
+    }
     pBuilder->buf = realloc(pBuilder->buf, pBuilder->alloc);
     if (pBuilder->buf == NULL) return -1;
   }

From a0f3a9e268ec203569aa87532e279c01acb95928 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 05:14:53 +0000
Subject: [PATCH 16/43] refactor

---
 src/common/inc/tdataformat.h | 30 +++++++++++++++++++++++++++++-
 src/common/src/tdataformat.c | 29 -----------------------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 19cbbea0fb..b1dbe6b3d7 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -284,7 +284,35 @@ int    tdInitKVRowBuilder(SKVRowBuilder *pBuilder);
 void   tdDestroyKVRowBuilder(SKVRowBuilder *pBuilder);
 void   tdResetKVRowBuilder(SKVRowBuilder *pBuilder);
 SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder);
-int    tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value);
+
+static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
+  ASSERT(pBuilder->nCols == 0 || colId > pBuilder->pColIdx[pBuilder->nCols - 1].colId);
+
+  if (pBuilder->nCols >= pBuilder->tCols) {
+    pBuilder->tCols *= 2;
+    pBuilder->pColIdx = (SColIdx *)realloc((void *)(pBuilder->pColIdx), sizeof(SColIdx) * pBuilder->tCols);
+    if (pBuilder->pColIdx == NULL) return -1;
+  }
+
+  pBuilder->pColIdx[pBuilder->nCols].colId = colId;
+  pBuilder->pColIdx[pBuilder->nCols].offset = pBuilder->size;
+
+  pBuilder->nCols++;
+
+  int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
+  if (tlen > pBuilder->alloc - pBuilder->size) {
+    while (tlen > pBuilder->alloc - pBuilder->size) {
+      pBuilder->alloc *= 2;
+    }
+    pBuilder->buf = realloc(pBuilder->buf, pBuilder->alloc);
+    if (pBuilder->buf == NULL) return -1;
+  }
+
+  memcpy(POINTER_SHIFT(pBuilder->buf, pBuilder->size), value, tlen);
+  pBuilder->size += tlen;
+
+  return 0;
+}
 
 // ----------------- Tag row structure
 
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 536135010a..e4ee5cc4bc 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -721,33 +721,4 @@ SKVRow tdGetKVRowFromBuilder(SKVRowBuilder *pBuilder) {
   memcpy(kvRowValues(row), pBuilder->buf, pBuilder->size);
 
   return row;
-}
-
-int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId, int8_t type, void *value) {
-  ASSERT(pBuilder->nCols == 0 || colId > pBuilder->pColIdx[pBuilder->nCols - 1].colId);
-
-  if (pBuilder->nCols >= pBuilder->tCols) {
-    pBuilder->tCols *= 2;
-    pBuilder->pColIdx = realloc(pBuilder->pColIdx, sizeof(SColIdx) * pBuilder->tCols);
-    if (pBuilder->pColIdx == NULL) return -1;
-  }
-
-  pBuilder->pColIdx[pBuilder->nCols].colId = colId;
-  pBuilder->pColIdx[pBuilder->nCols].offset = pBuilder->size;
-
-  pBuilder->nCols++;
-
-  int tlen = IS_VAR_DATA_TYPE(type) ? varDataTLen(value) : TYPE_BYTES[type];
-  if (tlen > pBuilder->alloc - pBuilder->size) {
-    while (tlen > pBuilder->alloc - pBuilder->size) {
-      pBuilder->alloc *= 2;
-    }
-    pBuilder->buf = realloc(pBuilder->buf, pBuilder->alloc);
-    if (pBuilder->buf == NULL) return -1;
-  }
-
-  memcpy(POINTER_SHIFT(pBuilder->buf, pBuilder->size), value, tlen);
-  pBuilder->size += tlen;
-
-  return 0;
 }
\ No newline at end of file

From 7ed62985f9fe61c04eb3fb70a2b706b633ec24b7 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 1 Jun 2020 14:19:19 +0800
Subject: [PATCH 17/43] [td-225] fix variable overflow bug.

---
 src/query/inc/qpercentile.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/query/inc/qpercentile.h b/src/query/inc/qpercentile.h
index f8f09357c6..c1227dad77 100644
--- a/src/query/inc/qpercentile.h
+++ b/src/query/inc/qpercentile.h
@@ -49,7 +49,7 @@ typedef struct tMemBucket {
   int32_t nTotalBufferSize;
   int32_t maxElemsCapacity;
   
-  int16_t pageSize;
+  int32_t pageSize;
   int16_t numOfTotalPages;
   int16_t numOfAvailPages; /* remain available buffer pages */
   

From 4a1f43c983b1b5a3abfc4aad1c55933647e2b90f Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 06:20:24 +0000
Subject: [PATCH 18/43] refactor tag function

---
 src/common/inc/tdataformat.h |  52 +------------
 src/common/src/tdataformat.c | 146 -----------------------------------
 src/inc/tsdb.h               |   2 +-
 src/tsdb/inc/tsdbMain.h      |   2 +-
 src/tsdb/src/tsdbMain.c      |   6 +-
 src/tsdb/src/tsdbMeta.c      |  23 ++----
 src/tsdb/src/tsdbRead.c      |  12 +--
 src/vnode/src/vnodeWrite.c   |  10 +--
 8 files changed, 21 insertions(+), 232 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index b1dbe6b3d7..706fdeff98 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -248,6 +248,7 @@ typedef struct {
 #define kvRowCpy(dst, r) memcpy((dst), (r), kvRowLen(r))
 #define kvRowColVal(r, colIdx) POINTER_SHIFT(kvRowValues(r), (colIdx)->offset)
 #define kvRowColIdxAt(r, i) (kvRowColIdx(r) + (i))
+#define kvRowFree(r) tfree(r)
 
 SKVRow tdKVRowDup(SKVRow row);
 SKVRow tdSetKVRowDataOfCol(SKVRow row, int16_t colId, int8_t type, void *value);
@@ -314,57 +315,6 @@ static FORCE_INLINE int tdAddColToKVRow(SKVRowBuilder *pBuilder, int16_t colId,
   return 0;
 }
 
-// ----------------- Tag row structure
-
-/* A tag row, the format is like below:
-+----------+----------------------------------------------------------------+
-| STagRow  | STagCol | STagCol | STagCol | STagCol | ...| STagCol | STagCol |
-+----------+----------------------------------------------------------------+
-
-pData
-+----------+----------------------------------------------------------------+
-| value 1     | value 2 |  value 3     | value 4       | ....|value n       |
-+----------+----------------------------------------------------------------+
-
- */
-
-#define TD_TAG_ROW_HEAD_SIZE sizeof(int16_t)
-
-#define tagRowNum(r) (*(int16_t *)(r))
-#define tagRowArray(r) POINTER_SHIFT(r, TD_TAG_ROW_HEAD_SIZE)
-//#define dataRowKey(r) (*(TSKEY *)(dataRowTuple(r)))
-//#define dataRowSetLen(r, l) (dataRowLen(r) = (l))
-//#define dataRowCpy(dst, r) memcpy((dst), (r), dataRowLen(r))
-//#define dataRowMaxBytesFromSchema(s) (schemaTLen(s) + TD_DATA_ROW_HEAD_SIZE)
-
-typedef struct {
-  int16_t  colId;  // column ID
-  int16_t  colType;
-  uint16_t offset;  // to store value for numeric col or offset for binary/Nchar
-} STagCol;
-
-typedef struct {
-  int32_t  len;
-  void *   pData;  // Space to store the tag value
-  uint16_t dataLen;
-  int16_t  ncols;  // Total columns allocated
-  STagCol  tagCols[];
-} STagRow;
-
-#define tagColSize(r) (sizeof(STagCol) + r.colLen)
-
-int       tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type,
-                      int16_t colId);                   // insert tag value and update all the information
-int       tdDeleteTagCol(SDataRow row, int16_t colId);  // delete tag value and update all the information
-void *    tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type);  // if find tag, 0, else return -1;
-int       tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId);
-SDataRow  tdTagRowDup(SDataRow row);
-void      tdFreeTagRow(SDataRow row);
-SDataRow  tdTagRowDecode(SDataRow row);
-int       tdTagRowCpy(SDataRow dst, SDataRow src);
-void *    tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags);
-STSchema *tdGetSchemaFromData(SDataRow *row);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index e4ee5cc4bc..7a35d5fb69 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -152,152 +152,6 @@ SDataRow tdNewDataRowFromSchema(STSchema *pSchema) {
   return row;
 }
 
-int tdSetTagCol(SDataRow row, void *value, int16_t len, int8_t type,
-                int16_t colId) {  // insert/update tag value and update all the information
-  ASSERT(((STagRow *)row)->pData != NULL);
-  // STagCol * stCol = tdQueryTagColByID()
-
-  return 0;
-};
-
-int tdDeleteTagCol(SDataRow row, int16_t colId) {  // delete tag value and update all the information
-  // todo
-  return 0;
-};
-
-static int compTagId(const void *key1, const void *key2) {
-  if (((STagCol *)key1)->colId > ((STagCol *)key2)->colId) {
-    return 1;
-  } else if (((STagCol *)key1)->colId == ((STagCol *)key2)->colId) {
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
-/**
- * Find tag structure by colId, if find, return tag structure, else return NULL;
- */
-STagCol *tdQueryTagColByID(SDataRow row, int16_t colId, int flags) {  // if find tag, 0, else return -1;
-  ASSERT(((STagRow *)row)->pData != NULL);
-  STagCol *pBase = ((STagRow *)row)->tagCols;
-  int16_t  nCols = ((STagRow *)row)->ncols;
-  STagCol  key = {colId, 0, 0};
-  STagCol *stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, flags);
-  return stCol;
-};
-
-/**
- * Find tag value by colId, if find, return tag value, else return NULL;
- */
-void *tdQueryTagByID(SDataRow row, int16_t colId, int16_t *type) {
-  ASSERT(((STagRow *)row)->pData != NULL);
-  STagCol *pBase = ((STagRow *)row)->tagCols;
-  int16_t  nCols = ((STagRow *)row)->ncols;
-  STagCol  key = {colId, 0, 0};
-  STagCol *stCol = taosbsearch(&key, pBase, nCols, sizeof(STagCol), compTagId, TD_EQ);
-  if (NULL == stCol) {
-    return NULL;
-  }
-
-  void *pData = ((STagRow *)row)->pData;
-  *type = stCol->colType;
-
-  return pData + stCol->offset;
-};
-
-int tdAppendTagColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int16_t colId) {
-  ASSERT(value != NULL);
-  // ASSERT(bytes-2 == varDataTLen(value));
-  ASSERT(row != NULL);
-  STagRow *pTagrow = row;
-  pTagrow->tagCols[pTagrow->ncols].colId = colId;
-  pTagrow->tagCols[pTagrow->ncols].colType = type;
-  pTagrow->tagCols[pTagrow->ncols].offset = pTagrow->dataLen;
-
-  switch (type) {
-    case TSDB_DATA_TYPE_BINARY:
-    case TSDB_DATA_TYPE_NCHAR:
-      memcpy((char *)pTagrow->pData + pTagrow->dataLen, value, varDataTLen(value));
-      pTagrow->dataLen += varDataTLen(value);
-      break;
-    default:
-      memcpy((char *)pTagrow->pData + pTagrow->dataLen, value, TYPE_BYTES[type]);
-      pTagrow->dataLen += TYPE_BYTES[type];
-      break;
-  }
-
-  pTagrow->ncols++;
-
-  return 0;
-};
-
-void *tdNewTagRowFromSchema(STSchema *pSchema, int16_t numofTags) {
-  int32_t size = sizeof(STagRow) + numofTags * sizeof(STagCol);
-
-  STagRow *row = malloc(size);
-  if (row == NULL) return NULL;
-
-  int32_t datasize = pSchema->tlen;
-  row->pData = malloc(datasize);
-  if (NULL == row->pData) {
-    free(row);
-    return NULL;
-  }
-
-  row->len = size;
-  row->dataLen = 0;
-  row->ncols = 0;
-  return row;
-}
-/**
- * free tag row
- */
-
-void tdFreeTagRow(SDataRow row) {
-  if (row) {
-    free(((STagRow *)row)->pData);
-    free(row);
-  }
-}
-
-SDataRow tdTagRowDup(SDataRow row) {
-  STagRow *trow = malloc(dataRowLen(row));
-  if (trow == NULL) return NULL;
-
-  dataRowCpy(trow, row);
-  trow->pData = malloc(trow->dataLen);
-  if (NULL == trow->pData) {
-    free(trow);
-    return NULL;
-  }
-  memcpy(trow->pData, ((STagRow *)row)->pData, trow->dataLen);
-  return trow;
-}
-
-SDataRow tdTagRowDecode(SDataRow row) {
-  STagRow *trow = malloc(dataRowLen(row));
-  if (trow == NULL) return NULL;
-
-  dataRowCpy(trow, row);
-  trow->pData = malloc(trow->dataLen);
-  if (NULL == trow->pData) {
-    free(trow);
-    return NULL;
-  }
-  char *pData = (char *)row + dataRowLen(row);
-  memcpy(trow->pData, pData, trow->dataLen);
-  return trow;
-}
-
-int tdTagRowCpy(SDataRow dst, SDataRow src) {
-  if (src == NULL) return -1;
-
-  dataRowCpy(dst, src);
-  void *pData = dst + dataRowLen(src);
-  memcpy(pData, ((STagRow *)src)->pData, ((STagRow *)src)->dataLen);
-  return 0;
-}
 /**
  * Free the SDataRow object
  */
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index c758d3aea4..fcfb6c6add 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -101,7 +101,7 @@ int  tsdbInitTableCfg(STableCfg *config, ETableType type, uint64_t uid, int32_t
 int  tsdbTableSetSuperUid(STableCfg *config, uint64_t uid);
 int  tsdbTableSetSchema(STableCfg *config, STSchema *pSchema, bool dup);
 int  tsdbTableSetTagSchema(STableCfg *config, STSchema *pSchema, bool dup);
-int  tsdbTableSetTagValue(STableCfg *config, SDataRow row, bool dup);
+int  tsdbTableSetTagValue(STableCfg *config, SKVRow row, bool dup);
 int  tsdbTableSetName(STableCfg *config, char *name, bool dup);
 int  tsdbTableSetSName(STableCfg *config, char *sname, bool dup);
 int  tsdbTableSetStreamSql(STableCfg *config, char *sql, bool dup);
diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index 9dd5136c95..e1b85ae99d 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -76,7 +76,7 @@ typedef struct STable {
   int32_t        sversion;
   STSchema *     schema;
   STSchema *     tagSchema;
-  SDataRow       tagVal;
+  SKVRow         tagVal;
   SMemTable *    mem;
   SMemTable *    imem;
   void *         pIndex;         // For TSDB_SUPER_TABLE, it is the skiplist index
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 9c8e57d18a..af4b9608b6 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -506,11 +506,11 @@ int tsdbTableSetTagSchema(STableCfg *config, STSchema *pSchema, bool dup) {
   return 0;
 }
 
-int tsdbTableSetTagValue(STableCfg *config, SDataRow row, bool dup) {
+int tsdbTableSetTagValue(STableCfg *config, SKVRow row, bool dup) {
   if (config->type != TSDB_CHILD_TABLE) return -1;
 
   if (dup) {
-    config->tagValues = tdDataRowDup(row);
+    config->tagValues = tdKVRowDup(row);
   } else {
     config->tagValues = row;
   }
@@ -557,7 +557,7 @@ 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) tdFreeDataRow(config->tagValues);
+  if (config->tagValues) kvRowFree(config->tagValues);
   tfree(config->name);
   tfree(config->sname);
   tfree(config->sql);
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 0d9e6a9cf8..e1a9770df6 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -47,8 +47,7 @@ void tsdbEncodeTable(STable *pTable, char *buf, int *contLen) {
     ptr = tdEncodeSchema(ptr, pTable->schema);
     ptr = tdEncodeSchema(ptr, pTable->tagSchema);
   } else if (pTable->type == TSDB_CHILD_TABLE) {
-    tdTagRowCpy(ptr, pTable->tagVal);
-    ptr = POINTER_SHIFT(ptr, dataRowLen(pTable->tagVal) + ((STagRow *)pTable->tagVal)->dataLen);
+    ptr = tdEncodeKVRow(ptr, pTable->tagVal);
   } else {
     ptr = tdEncodeSchema(ptr, pTable->schema);
   }
@@ -94,8 +93,7 @@ STable *tsdbDecodeTable(void *cont, int contLen) {
     pTable->schema = tdDecodeSchema(&ptr);
     pTable->tagSchema = tdDecodeSchema(&ptr);
   } else if (pTable->type == TSDB_CHILD_TABLE) {
-    pTable->tagVal = tdTagRowDecode(ptr);
-    ptr = POINTER_SHIFT(ptr, dataRowLen(pTable->tagVal) + ((STagRow *)pTable->tagVal)->dataLen);
+    ptr = tdDecodeKVRow(ptr, &pTable->tagVal);
   } else {
     pTable->schema = tdDecodeSchema(&ptr);
   }
@@ -114,12 +112,9 @@ void tsdbFreeEncode(void *cont) {
 static char* getTagIndexKey(const void* pData) {
   STableIndexElem* elem = (STableIndexElem*) pData;
   
-  SDataRow row = elem->pTable->tagVal;
   STSchema* pSchema = tsdbGetTableTagSchema(elem->pMeta, elem->pTable);
   STColumn* pCol = &pSchema->columns[DEFAULT_TAG_INDEX_COLUMN];
-  int16_t type = 0;
-  void * res = tdQueryTagByID(row, pCol->colId,&type);
-  ASSERT(type == pCol->type);
+  void * res = tdGetKVRowValOfCol(elem->pTable->tagVal, pCol->colId);
   return res;
 }
 
@@ -271,9 +266,7 @@ int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId* id, int32_t colId, int16_t
     return -1;  // No matched tags. Maybe the modification of tags has not been done yet.
   }
   
-  SDataRow row = (SDataRow)pTable->tagVal;
-  int16_t tagtype = 0;
-  char* d = tdQueryTagByID(row, pCol->colId, &tagtype);
+  char* d = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
   //ASSERT((int8_t)tagtype == pCol->type)
   *val = d;
   *type  = pCol->type;
@@ -352,7 +345,7 @@ static STable *tsdbNewTable(STableCfg *pCfg, bool isSuper) {
 
     if (pCfg->type == TSDB_CHILD_TABLE) {
       pTable->superUid = pCfg->superUid;
-      pTable->tagVal = tdDataRowDup(pCfg->tagValues);
+      pTable->tagVal = tdKVRowDup(pCfg->tagValues);
     } else if (pCfg->type == TSDB_NORMAL_TABLE) {
       pTable->superUid = -1;
       pTable->schema = tdDupSchema(pCfg->schema);
@@ -487,7 +480,7 @@ static int tsdbFreeTable(STable *pTable) {
   if (pTable == NULL) return 0;
 
   if (pTable->type == TSDB_CHILD_TABLE) {
-    tdFreeTagRow(pTable->tagVal);
+    kvRowFree(pTable->tagVal);
   } else {
     tdFreeSchema(pTable->schema);
   }
@@ -636,9 +629,7 @@ static int tsdbRemoveTableFromIndex(STsdbMeta *pMeta, STable *pTable) {
   STSchema* pSchema = tsdbGetTableTagSchema(pMeta, pTable);
   STColumn* pCol = &pSchema->columns[DEFAULT_TAG_INDEX_COLUMN];
   
-  int16_t tagtype = 0;
-  char* key = tdQueryTagByID(pTable->tagVal, pCol->colId, &tagtype);
-  ASSERT(pCol->type == tagtype);
+  char* key = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
   SArray* res = tSkipListGet(pSTable->pIndex, key);
   
   size_t size = taosArrayGetSize(res);
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 2220ebfd88..88f6bb9efc 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -1753,9 +1753,8 @@ int32_t tableGroupComparFn(const void *p1, const void *p2, const void *param) {
       STColumn* pCol = schemaColAt(pTableGroupSupp->pTagSchema, colIndex);
       bytes = pCol->bytes;
       type = pCol->type;
-      int16_t tgtype1, tgtype2 = 0;
-      f1 = tdQueryTagByID(pTable1->tagVal, pCol->colId, &tgtype1);
-      f2 = tdQueryTagByID(pTable2->tagVal, pCol->colId, &tgtype2);
+      f1 = tdGetKVRowValOfCol(pTable1->tagVal, pCol->colId);
+      f2 = tdGetKVRowValOfCol(pTable2->tagVal, pCol->colId);
     }
     
     int32_t ret = doCompare(f1, f2, type, bytes);
@@ -1843,12 +1842,7 @@ bool indexedNodeFilterFp(const void* pNode, void* param) {
     val = (char*) elem->pTable->name;
     type = TSDB_DATA_TYPE_BINARY;
   } else {
-//    STSchema* pTSchema = (STSchema*) pInfo->param; // todo table schema is identical to stable schema??
-    int16_t type;
-  //  int32_t offset = pTSchema->columns[pInfo->colIndex].offset;
-  //  val = tdGetRowDataOfCol(elem->pTable->tagVal, pInfo->sch.type, TD_DATA_ROW_HEAD_SIZE + offset);
-    val = tdQueryTagByID(elem->pTable->tagVal, pInfo->sch.colId, &type);
-  //  ASSERT(pInfo->sch.type == type);    
+    val = tdGetKVRowValOfCol(elem->pTable->tagVal, pInfo->sch.colId);
   }
   //todo :the val is possible to be null, so check it out carefully
   int32_t ret = 0;
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 09cb2d3fac..1fa8abe379 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -139,16 +139,16 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
     
     char *pTagData = pTable->data + totalCols * sizeof(SSchema);
     int accumBytes = 0;
-    //dataRow = tdNewDataRowFromSchema(pDestTagSchema);
-    dataRow = tdNewTagRowFromSchema(pDestTagSchema, numOfTags);
 
+    SKVRowBuilder kvRowBuilder;
+    tdInitKVRowBuilder(&kvRowBuilder);
     for (int i = 0; i < numOfTags; i++) {
       STColumn *pTCol = schemaColAt(pDestTagSchema, i);
-//      tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset);
-      tdAppendTagColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->colId);
+      tdAddColToKVRow(&kvRowBuilder, pTCol->colId, pTCol->type, pTagData + accumBytes);
       accumBytes += htons(pSchema[i + numOfColumns].bytes);
     }
-    tsdbTableSetTagValue(&tCfg, dataRow, false);
+    tsdbTableSetTagValue(&tCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
+    tdDestroyKVRowBuilder(&kvRowBuilder);
   }
 
   // only normal has sql string

From a3f36045ab3a448721a84bfa7ef1e123a317aea5 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 06:56:47 +0000
Subject: [PATCH 19/43] resolve more conflict

---
 src/common/inc/tdataformat.h | 16 ++++++++++++++++
 src/tsdb/src/tsdbMeta.c      | 29 ++++++++++++-----------------
 src/tsdb/src/tsdbRWHelper.c  |  2 +-
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 706fdeff98..1d3319e61d 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -87,6 +87,22 @@ int       tdGetSchemaEncodeSize(STSchema *pSchema);
 void *    tdEncodeSchema(void *dst, STSchema *pSchema);
 STSchema *tdDecodeSchema(void **psrc);
 
+static FORCE_INLINE int comparColId(const void *key1, const void *key2) {
+  if (*(int16_t *)key1 > ((STColumn *)key2)->colId) {
+    return 1;
+  } else if (*(int16_t *)key1 < ((STColumn *)key2)->colId) {
+    return -1;
+  } else {
+    return 0;
+  }
+}
+
+static FORCE_INLINE STColumn *tdGetColOfID(STSchema *pSchema, int16_t colId) {
+  void *ptr = bsearch(&colId, (void *)pSchema->columns, schemaNCols(pSchema), sizeof(STColumn), comparColId);
+  if (ptr == NULL) return NULL;
+  return (STColumn *)ptr;
+}
+
 // ----------------- Data row structure
 
 /* A data row, the format is like below:
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 32ad30598b..f057dcb96e 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -250,29 +250,24 @@ STSchema * tsdbGetTableTagSchema(STsdbMeta *pMeta, STable *pTable) {
 int32_t tsdbGetTableTagVal(TsdbRepoT* repo, STableId* id, int32_t colId, int16_t* type, int16_t* bytes, char** val) {
   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
+  }
   
-  *val = tdQueryTagByID(pTable->tagVal, colId, type);
+  *val = tdGetKVRowValOfCol(pTable->tagVal, colId);
+  *type = pCol->type;
   
   if (*val != NULL) {
-    switch(*type) {
-      case TSDB_DATA_TYPE_BINARY:
-      case TSDB_DATA_TYPE_NCHAR:  *bytes = varDataLen(*val); break;
-      case TSDB_DATA_TYPE_NULL:   *bytes = 0; break;
-      default:
-        *bytes = tDataTypeDesc[*type].nSize;break;
+    if (IS_VAR_DATA_TYPE(*type)) {
+      *bytes = varDataLen(*val);
+    } else {
+      *bytes = TYPE_BYTES[*type];
     }
   }
   
-  if (pCol == NULL) {
-    return -1;  // No matched tags. Maybe the modification of tags has not been done yet.
-  }
-  
-  char* d = tdGetKVRowValOfCol(pTable->tagVal, pCol->colId);
-  //ASSERT((int8_t)tagtype == pCol->type)
-  *val = d;
-  *type  = pCol->type;
-  *bytes = pCol->bytes;
-  
   return TSDB_CODE_SUCCESS;
 }
 
diff --git a/src/tsdb/src/tsdbRWHelper.c b/src/tsdb/src/tsdbRWHelper.c
index 8c7f8309ec..5bdf37c81e 100644
--- a/src/tsdb/src/tsdbRWHelper.c
+++ b/src/tsdb/src/tsdbRWHelper.c
@@ -453,7 +453,7 @@ int tsdbWriteCompIdx(SRWHelper *pHelper) {
         pHelper->pBuffer = trealloc(pHelper->pBuffer, tsizeof(pHelper->pBuffer)*2);
       }
       buf = POINTER_SHIFT(pHelper->pBuffer, drift);
-      buf = taosEncodeVariant32(buf, i);
+      buf = taosEncodeVariantU32(buf, i);
       buf = tsdbEncodeSCompIdx(buf, pCompIdx);
     }
   }

From 61b4bdb6b3443b0c5547ee4db97f1f9d60d8b5e6 Mon Sep 17 00:00:00 2001
From: Ping Xiao <xiaopingcs@outlook.com>
Date: Mon, 1 Jun 2020 15:11:38 +0800
Subject: [PATCH 20/43] TD-457: string cannot be truncated automatically

---
 documentation/webdocs/markdowndocs/TAOS SQL-ch.md | 4 ++--
 documentation/webdocs/markdowndocs/TAOS SQL.md    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/documentation/webdocs/markdowndocs/TAOS SQL-ch.md b/documentation/webdocs/markdowndocs/TAOS SQL-ch.md
index 81fc3ffcc4..7fe396e9e5 100644
--- a/documentation/webdocs/markdowndocs/TAOS SQL-ch.md	
+++ b/documentation/webdocs/markdowndocs/TAOS SQL-ch.md	
@@ -63,11 +63,11 @@ TDengine缺省的时间戳是毫秒精度，但通过修改配置参数enableMic
 | 3    |  BIGINT   | 8      | 长整型，范围 [-2^63+1,   2^63-1], -2^63用于NULL                                 |
 | 4    |   FLOAT   | 4      | 浮点型，有效位数6-7，范围 [-3.4E38, 3.4E38]                  |
 | 5    |  DOUBLE   | 8      | 双精度浮点型，有效位数15-16，范围 [-1.7E308,   1.7E308]      |
-| 6    |  BINARY   | 自定义 | 用于记录字符串，理论上，最长可以有65526字节，但由于每行数据最多64K字节，实际上限一般小于理论值。 binary仅支持字符串输入，字符串两端使用单引号引用，否则英文全部自动转化为小写。使用时须指定大小，如binary(20)定义了最长为20个字符的字符串，每个字符占1byte的存储空间。如果用户字符串超出20字节，将被自动截断。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示， 即 **\’**。 |
+| 6    |  BINARY   | 自定义 | 用于记录字符串，理论上，最长可以有65526字节，但由于每行数据最多64K字节，实际上限一般小于理论值。 binary仅支持字符串输入，字符串两端使用单引号引用，否则英文全部自动转化为小写。使用时须指定大小，如binary(20)定义了最长为20个字符的字符串，每个字符占1byte的存储空间。如果用户字符串超出20字节将会报错。对于字符串内的单引号，可以用转义字符反斜线加单引号来表示， 即 **\’**。 |
 | 7    | SMALLINT  | 2      | 短整型， 范围 [-32767, 32767], -32768用于NULL                                |
 | 8    |  TINYINT  | 1      | 单字节整型，范围 [-127, 127], -128用于NULL                                |
 | 9    |   BOOL    | 1      | 布尔型，{true,   false}                                      |
-| 10   |   NCHAR   | 自定义 | 用于记录非ASCII字符串，如中文字符。每个nchar字符占用4bytes的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 **\’**。nchar使用时须指定字符串大小，类型为nchar(10)的列表示此列的字符串最多存储10个nchar字符，会固定占用40bytes的空间。如用户字符串长度超出声明长度，则将被自动截断。 |
+| 10   |   NCHAR   | 自定义 | 用于记录非ASCII字符串，如中文字符。每个nchar字符占用4bytes的存储空间。字符串两端使用单引号引用，字符串内的单引号需用转义字符 **\’**。nchar使用时须指定字符串大小，类型为nchar(10)的列表示此列的字符串最多存储10个nchar字符，会固定占用40bytes的空间。如用户字符串长度超出声明长度，则将会报错。 |
 
 **Tips**: TDengine对SQL语句中的英文字符不区分大小写，自动转化为小写执行。因此用户大小写敏感的字符串及密码，需要使用单引号将字符串引起来。
 
diff --git a/documentation/webdocs/markdowndocs/TAOS SQL.md b/documentation/webdocs/markdowndocs/TAOS SQL.md
index 2b9960b860..6c7f25b8f7 100644
--- a/documentation/webdocs/markdowndocs/TAOS SQL.md	
+++ b/documentation/webdocs/markdowndocs/TAOS SQL.md	
@@ -39,8 +39,8 @@ The full list of data types is listed below.  For string types of data, we will
 | 6    |   DOUBLE    |    8    | A standard nullable double float type with 15-16 significant digits and a range of [-1.7E308, 1.7E308]​ |
 | 7    |    BOOL     |    1    | A nullable boolean type, [**`true`**, **`false`**]           |
 | 8    |  TIMESTAMP  |    8    | A nullable timestamp type with the same usage as the primary column timestamp |
-| 9    | BINARY(*M*) |   *M*   | A nullable string type whose length is *M*, any exceeded chars will be automatically truncated, the maximum length of *M* is 65526, but as maximum row size is 64K bytes, the actual upper limit will generally less than 65526. This type of string only supports ASCii encoded chars. |
-| 10   | NCHAR(*M*)  | 4 * *M* | A nullable string type whose length is *M*, any exceeded chars will be truncated. The **`NCHAR`** type supports Unicode encoded chars. |
+| 9    | BINARY(*M*) |   *M*   | A nullable string type whose length is *M*, error should be threw with exceeded chars, the maximum length of *M* is 65526, but as maximum row size is 64K bytes, the actual upper limit will generally less than 65526. This type of string only supports ASCii encoded chars. |
+| 10   | NCHAR(*M*)  | 4 * *M* | A nullable string type whose length is *M*, error should be threw with exceeded chars. The **`NCHAR`** type supports Unicode encoded chars. |
 
 All the keywords in a SQL statement are case-insensitive, but strings values are case-sensitive and must be quoted by a pair of `'` or `"`. To quote a `'` or a `"` , you can use the escape character `\`.
 

From 05ccdb016681f39fc4ff0c4d89cef81e180c18cf Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 1 Jun 2020 15:33:56 +0800
Subject: [PATCH 21/43] determine if TDengine need pull and recompile

[TD-495]
---
 tests/perftest-scripts/perftest-daily.sh | 28 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/tests/perftest-scripts/perftest-daily.sh b/tests/perftest-scripts/perftest-daily.sh
index 894d9c7905..9d51438f63 100755
--- a/tests/perftest-scripts/perftest-daily.sh
+++ b/tests/perftest-scripts/perftest-daily.sh
@@ -31,12 +31,26 @@ function collectSysInfo {
 
 function buildTDengine {
 	cd /root/TDengine
-	git pull
-	cd debug
-	rm -rf *
-	cmake ..
-	make > /dev/null
-	make install
+
+	git remote update
+	REMOTE_COMMIT=`git rev-parse --short remotes/origin/develop`
+	LOCAL_COMMIT=`git rev-parse --short @`
+
+	echo " LOCAL: $LOCAL_COMMIT"
+	echo "REMOTE: $REMOTE_COMMIT"
+	if [ "$LOCAL_COMMIT" == "$REMOTE_COMMIT" ]; then
+		echo "repo up-to-date"
+	else
+		echo "repo need to pull"
+		git pull
+
+		LOCAL_COMMIT=`git rev-parse @`
+		cd debug
+		rm -rf *
+		cmake ..
+		make > /dev/null
+		make install
+	fi
 }
 
 function restartTaosd {
@@ -55,7 +69,7 @@ function sendReport {
 	receiver="sdsang@taosdata.com, sangshuduo@gmail.com"
 	mimebody="MIME-Version: 1.0\nContent-Type: text/html; charset=utf-8\n"
 
-	echo -e "to: ${receiver}\nsubject: Perf test report ${today}\n" | \
+	echo -e "to: ${receiver}\nsubject: Perf test report ${today}, commit ID: ${LOCAL_COMMIT}\n" | \
 		(cat - && uuencode perftest-1d-$today.log perftest-1d-$today.log)| \
 		(cat - && uuencode perftest-1d-report.csv perftest-1d-report-$today.csv) | \
 		(cat - && uuencode perftest-1d-report.png perftest-1d-report-$today.png) | \

From c97e4f140493d3c280a36ec28f6d19ac7c64e34e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 1 Jun 2020 15:36:49 +0800
Subject: [PATCH 22/43] fix crash while pconn is null

---
 src/plugins/mqtt/src/mqttSystem.c             | 2 +-
 src/rpc/src/rpcMain.c                         | 2 +-
 tests/script/general/http/restful_full.sim    | 2 +-
 tests/script/jenkins/basic.txt                | 4 +---
 tests/script/jenkins/general.txt              | 5 +++++
 tests/script/jenkins/{sync.txt => unique.txt} | 0
 6 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 tests/script/jenkins/general.txt
 rename tests/script/jenkins/{sync.txt => unique.txt} (100%)

diff --git a/src/plugins/mqtt/src/mqttSystem.c b/src/plugins/mqtt/src/mqttSystem.c
index 1f4e1e8a79..3266579e33 100644
--- a/src/plugins/mqtt/src/mqttSystem.c
+++ b/src/plugins/mqtt/src/mqttSystem.c
@@ -50,7 +50,7 @@ int32_t mqttInitSystem() {
   recntStatus.password = strstr(url, "@") != NULL ? strbetween(strstr(url, recntStatus.user_name), ":", "@") : NULL;
 
   if (strlen(url) == 0) {
-    mqttError("failed to initialize mqtt module, reason: url is null");
+    mqttTrace("mqtt module not init, url is null");
     return rc;
   }
 
diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 405f796a5e..bdf19bb4a0 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -680,13 +680,13 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
   } 
 
   if (pConn) {
+    pConn->tretry = 0;
     pConn->ahandle = pContext->ahandle;
     sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle);
   } else {
     tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno));
   }
 
-  pConn->tretry = 0;
   return pConn;
 }
 
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
index a5defb5914..0ae6873503 100644
--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
@@ -147,7 +147,7 @@ print ===============  step3 - db
 
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04'  -d ' select * from d1.t1;' 127.0.0.1:6020/rest/sql
 print 21-> $system_content
-if $system_content != @{"status":"error","code":1000,"desc":"invalid table name"}@ then
+if $system_content != @{"status":"error","code":1000,"desc":"invalid table id"}@ then
   return -1
 endi
 
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index b2416611cf..1a22c3e789 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -59,7 +59,6 @@ cd ../../../debug; make
 ./test.sh -f general/db/delete_writing1.sim
 ./test.sh -f general/db/delete_writing2.sim
 ./test.sh -f general/db/delete.sim
-#not test ./test.sh -f general/db/dropdnodes.sim
 ./test.sh -f general/db/len.sim
 ./test.sh -f general/db/repeat.sim
 ./test.sh -f general/db/tables.sim
@@ -121,7 +120,7 @@ cd ../../../debug; make
 # ./test.sh -f general/parser/import_file.sim
 ./test.sh -f general/parser/lastrow.sim
 ./test.sh -f general/parser/nchar.sim
-./test.sh -f general/parser/null_char.sim
+#unsupport ./test.sh -f general/parser/null_char.sim
 ./test.sh -f general/parser/single_row_in_tb.sim
 ./test.sh -f general/parser/select_from_cache_disk.sim
 ./test.sh -f general/parser/limit.sim
@@ -214,7 +213,6 @@ cd ../../../debug; make
 ./test.sh -f general/tag/tinyint.sim
 
 ./test.sh -f general/user/authority.sim
-./test.sh -f general/user/basic1.sim
 ./test.sh -f general/user/monitor.sim
 ./test.sh -f general/user/pass_alter.sim
 ./test.sh -f general/user/pass_len.sim
diff --git a/tests/script/jenkins/general.txt b/tests/script/jenkins/general.txt
new file mode 100644
index 0000000000..0c14e1c7a0
--- /dev/null
+++ b/tests/script/jenkins/general.txt
@@ -0,0 +1,5 @@
+cd ../../debug; cmake ..
+cd ../../debug; make
+
+./test.sh -f general/db/dropdnodes.sim
+./test.sh -f general/user/basic1.sim
diff --git a/tests/script/jenkins/sync.txt b/tests/script/jenkins/unique.txt
similarity index 100%
rename from tests/script/jenkins/sync.txt
rename to tests/script/jenkins/unique.txt

From 4cf7b73fb1a08eb9a06fefb44b78d686a1f7aa6e Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Mon, 1 Jun 2020 07:41:13 +0000
Subject: [PATCH 23/43] remove debug info

---
 src/rpc/test/rserver.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/rpc/test/rserver.c b/src/rpc/test/rserver.c
index 508f04fbc3..f22fa35f52 100644
--- a/src/rpc/test/rserver.c
+++ b/src/rpc/test/rserver.c
@@ -115,7 +115,7 @@ int retrieveAuthInfo(char *meterId, char *spi, char *encrypt, char *secret, char
 
 void processRequestMsg(SRpcMsg *pMsg, SRpcIpSet *pIpSet) {
   SRpcMsg *pTemp;
-
+ 
   pTemp = taosAllocateQitem(sizeof(SRpcMsg));
   memcpy(pTemp, pMsg, sizeof(SRpcMsg));
 
@@ -171,7 +171,6 @@ int main(int argc, char *argv[]) {
 
   tsAsyncLog = 0;
   rpcInit.connType = TAOS_CONN_SERVER;
-
   taosInitLog("server.log", 100000, 10);
 
   void *pRpc = rpcOpen(&rpcInit);

From 8edb2efdb1436c8e06f04589748ee5d3cfbeb400 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Mon, 1 Jun 2020 07:42:03 +0000
Subject: [PATCH 24/43] debug info

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

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 405f796a5e..43d030e7e0 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -682,11 +682,11 @@ static SRpcConn *rpcSetupConnToServer(SRpcReqContext *pContext) {
   if (pConn) {
     pConn->ahandle = pContext->ahandle;
     sprintf(pConn->info, "%s %p %p", pRpc->label, pConn, pConn->ahandle);
+    pConn->tretry = 0;
   } else {
     tError("%s %p, failed to set up connection(%s)", pRpc->label, pContext->ahandle, tstrerror(terrno));
   }
 
-  pConn->tretry = 0;
   return pConn;
 }
 

From bc1710b68822c323c03e502c62121da864a961e9 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Mon, 1 Jun 2020 15:46:56 +0800
Subject: [PATCH 25/43] remove useless log in timer

---
 src/util/src/ttimer.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index 55e7da3258..68db574d82 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -342,7 +342,6 @@ static void taosTimerLoopFunc(int signo) {
   int64_t now = taosGetTimestampMs();
 
   for (int i = 0; i < tListLen(wheels); i++) {
-    tmrTrace("begin processing wheel %d", i);
     // `expried` is a temporary expire list.
     // expired timers are first add to this list, then move
     // to expired queue as a batch to improve performance.
@@ -390,7 +389,6 @@ static void taosTimerLoopFunc(int signo) {
     }
 
     addToExpired(expired);
-    tmrTrace("end processing wheel %d", i);
   }
 }
 

From 98cdddb5cbf8f536b760c15258cb6e9fe7f4e65c Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 1 Jun 2020 16:02:27 +0800
Subject: [PATCH 26/43] modify document accordingly.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d75680cb22..c6d92d0bd2 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ sudo apt-get install maven
 Build TDengine:
 
 ```
-mkdir build && cd build
+mkdir debug && cd debug
 cmake .. && cmake --build .
 ```
 

From 2e03fd72477fb6e55858dce913d4bc482b854a3b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Mon, 1 Jun 2020 16:02:39 +0800
Subject: [PATCH 27/43] [td-225] support microsecond database options.

---
 src/common/inc/tglobal.h  |  2 +-
 src/common/src/tglobal.c  |  5 +++--
 src/inc/taosdef.h         | 13 ++++---------
 src/inc/tsdb.h            |  5 +++--
 src/query/inc/qExecutor.h |  2 +-
 src/query/src/qExecutor.c | 11 +++++++----
 src/tsdb/src/tsdbMain.c   |  8 ++++++--
 src/tsdb/src/tsdbRead.c   |  8 +++++---
 8 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index 0af8430ab1..64a99b1a16 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -49,7 +49,7 @@ extern int32_t tsTotalMemoryMB;
 extern int32_t tsVersion;
 
 extern int32_t tscEmbedded;
-extern int64_t tsMsPerDay[2];
+extern int64_t tsMsPerDay[3];
 
 extern char  tsFirst[];
 extern char  tsSecond[];
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index 2b4e59e92a..bef069fb6e 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -55,11 +55,12 @@ int32_t tsEnableCoreFile = 0;
 int32_t tscEmbedded = 0;
 
 /*
- * minmum scale for whole system, millisecond by default
+ * minimum scale for whole system, millisecond by default
  * for TSDB_TIME_PRECISION_MILLI: 86400000L
  *     TSDB_TIME_PRECISION_MICRO: 86400000000L
+ *     TSDB_TIME_PRECISION_NANO:  86400000000000L
  */
-int64_t tsMsPerDay[] = {86400000L, 86400000000L};
+int64_t tsMsPerDay[] = {86400000L, 86400000000L, 86400000000000L};
 
 char  tsFirst[TSDB_EP_LEN] = {0};  
 char  tsSecond[TSDB_EP_LEN] = {0};
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index def30ed8cb..bdf61208a3 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -91,6 +91,7 @@ extern const int32_t TYPE_BYTES[11];
 
 #define TSDB_TIME_PRECISION_MILLI 0
 #define TSDB_TIME_PRECISION_MICRO 1
+#define TSDB_TIME_PRECISION_NANO  2
 
 #define TSDB_TIME_PRECISION_MILLI_STR "ms"
 #define TSDB_TIME_PRECISION_MICRO_STR "us"
@@ -285,9 +286,9 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_MAX_COMMIT_TIME            40960
 #define TSDB_DEFAULT_COMMIT_TIME        3600
 
-#define TSDB_MIN_PRECISION              TSDB_PRECISION_MILLI
-#define TSDB_MAX_PRECISION              TSDB_PRECISION_NANO
-#define TSDB_DEFAULT_PRECISION          TSDB_PRECISION_MILLI
+#define TSDB_MIN_PRECISION              TSDB_TIME_PRECISION_MILLI
+#define TSDB_MAX_PRECISION              TSDB_TIME_PRECISION_NANO
+#define TSDB_DEFAULT_PRECISION          TSDB_TIME_PRECISION_MILLI
 
 #define TSDB_MIN_COMP_LEVEL             0
 #define TSDB_MAX_COMP_LEVEL             2
@@ -356,12 +357,6 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TAOS_QTYPE_WAL      2 
 #define TAOS_QTYPE_CQ       3
 
-typedef enum {
-  TSDB_PRECISION_MILLI,
-  TSDB_PRECISION_MICRO,
-  TSDB_PRECISION_NANO
-} EPrecisionType;
-
 typedef enum {
   TSDB_SUPER_TABLE        = 0,  // super table
   TSDB_CHILD_TABLE        = 1,  // table created from super table
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 927b3d08f6..f291da4665 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -64,13 +64,14 @@ typedef struct {
   int8_t  compression;
 } STsdbCfg;
 
+typedef void TsdbRepoT;  // use void to hide implementation details from outside
+
 void      tsdbSetDefaultCfg(STsdbCfg *pCfg);
 STsdbCfg *tsdbCreateDefaultCfg();
 void      tsdbFreeCfg(STsdbCfg *pCfg);
+STsdbCfg *tsdbGetCfg(const TsdbRepoT *repo);
 
 // --------- TSDB REPOSITORY DEFINITION
-typedef void TsdbRepoT;  // use void to hide implementation details from outside
-
 int        tsdbCreateRepo(char *rootDir, STsdbCfg *pCfg, void *limiter);
 int32_t    tsdbDropRepo(TsdbRepoT *repo);
 TsdbRepoT *tsdbOpenRepo(char *rootDir, STsdbAppH *pAppH);
diff --git a/src/query/inc/qExecutor.h b/src/query/inc/qExecutor.h
index 09ac1b6cd7..722a625526 100644
--- a/src/query/inc/qExecutor.h
+++ b/src/query/inc/qExecutor.h
@@ -136,7 +136,7 @@ typedef struct SQuery {
   int64_t          intervalTime;
   int64_t          slidingTime;      // sliding time for sliding window query
   char             slidingTimeUnit;  // interval data type, used for daytime revise
-  int8_t           precision;
+  int16_t          precision;
   int16_t          numOfOutput;
   int16_t          fillType;
   int16_t          checkBuffer;  // check if the buffer is full during scan each block
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index b487c790a9..51d166ccb4 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -3964,10 +3964,12 @@ static SFillColInfo* taosCreateFillColInfo(SQuery* pQuery) {
 }
 
 int32_t doInitQInfo(SQInfo *pQInfo, void *param, void *tsdb, int32_t vgId, bool isSTableQuery) {
+  int32_t code = TSDB_CODE_SUCCESS;
+  
   SQueryRuntimeEnv *pRuntimeEnv = &pQInfo->runtimeEnv;
 
   SQuery *pQuery = pQInfo->runtimeEnv.pQuery;
-  int32_t code = TSDB_CODE_SUCCESS;
+  pQuery->precision = tsdbGetCfg(tsdb)->precision;
 
   setScanLimitationByResultBuffer(pQuery);
   changeExecuteScanOrder(pQuery, false);
@@ -5422,7 +5424,7 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SArray* pTableIdList,
   pQuery->slidingTimeUnit = pQueryMsg->slidingTimeUnit;
   pQuery->fillType        = pQueryMsg->fillType;
   pQuery->numOfTags       = pQueryMsg->numOfTags;
-
+  
   // todo do not allocate ??
   pQuery->colList = calloc(numOfCols, sizeof(SSingleColumnFilterInfo));
   if (pQuery->colList == NULL) {
@@ -5491,7 +5493,7 @@ static SQInfo *createQInfoImpl(SQueryTableMsg *pQueryMsg, SArray* pTableIdList,
   
   int tableIndex = 0;
   STimeWindow window = pQueryMsg->window;
-  taosArraySort( pTableIdList, compareTableIdInfo );
+  taosArraySort(pTableIdList, compareTableIdInfo);
   for(int32_t i = 0; i < numOfGroups; ++i) {
     SArray* pa = taosArrayGetP(groupInfo->pGroupList, i);
     size_t s = taosArrayGetSize(pa);
@@ -5960,7 +5962,8 @@ int32_t qDumpRetrieveResult(qinfo_t qinfo, SRetrieveTableRsp **pRsp, int32_t *co
     (*pRsp)->offset = 0;
     (*pRsp)->useconds = 0;
   }
-
+  
+  (*pRsp)->precision = htons(pQuery->precision);
   if (pQuery->rec.rows > 0 && code == TSDB_CODE_SUCCESS) {
     code = doDumpQueryResult(pQInfo, (*pRsp)->data);
   } else {
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 9c8e57d18a..197718e154 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -9,8 +9,7 @@
 #include "ttime.h"
 #include <sys/stat.h>
 
-#define TSDB_DEFAULT_PRECISION TSDB_PRECISION_MILLI  // default precision
-#define IS_VALID_PRECISION(precision) (((precision) >= TSDB_PRECISION_MILLI) && ((precision) <= TSDB_PRECISION_NANO))
+#define IS_VALID_PRECISION(precision) (((precision) >= TSDB_TIME_PRECISION_MILLI) && ((precision) <= TSDB_TIME_PRECISION_NANO))
 #define TSDB_DEFAULT_COMPRESSION TWO_STAGE_COMP
 #define IS_VALID_COMPRESSION(compression) (((compression) >= NO_COMPRESSION) && ((compression) <= TWO_STAGE_COMP))
 #define TSDB_MIN_ID 0
@@ -79,6 +78,11 @@ void tsdbFreeCfg(STsdbCfg *pCfg) {
   if (pCfg != NULL) free(pCfg);
 }
 
+STsdbCfg *tsdbGetCfg(const TsdbRepoT *repo) {
+  assert(repo != NULL);
+  return &((STsdbRepo*)repo)->config;
+}
+
 /**
  * Create a new TSDB repository
  * @param rootDir the TSDB repository root directory
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 08804f6ba1..1e03794045 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -364,12 +364,13 @@ static bool hasMoreDataInCache(STsdbQueryHandle* pHandle) {
   return true;
 }
 
-static int32_t getFileIdFromKey(TSKEY key, int32_t daysPerFile) {
+static int32_t getFileIdFromKey(TSKEY key, int32_t daysPerFile, int32_t precision) {
+  assert(precision >= TSDB_TIME_PRECISION_MICRO || precision <= TSDB_TIME_PRECISION_NANO);
   if (key == TSKEY_INITIAL_VAL) {
     return INT32_MIN;
   }
   
-  int64_t fid = (int64_t)(key / (daysPerFile * tsMsPerDay[0]));  // set the starting fileId
+  int64_t fid = (int64_t)(key / (daysPerFile * tsMsPerDay[precision]));  // set the starting fileId
   if (fid < 0L && llabs(fid) > INT32_MAX) { // data value overflow for INT32
     fid = INT32_MIN;
   }
@@ -1297,7 +1298,8 @@ static bool getDataBlocksInFiles(STsdbQueryHandle* pQueryHandle) {
   // find the start data block in file
   if (!pQueryHandle->locateStart) {
     pQueryHandle->locateStart = true;
-    int32_t fid = getFileIdFromKey(pQueryHandle->window.skey, pQueryHandle->pTsdb->config.daysPerFile);
+    STsdbCfg* pCfg = &pQueryHandle->pTsdb->config;
+    int32_t fid = getFileIdFromKey(pQueryHandle->window.skey, pCfg->daysPerFile, pCfg->precision);
     
     tsdbInitFileGroupIter(pFileHandle, &pQueryHandle->fileIter, pQueryHandle->order);
     tsdbSeekFileGroupIter(&pQueryHandle->fileIter, fid);

From 30d34fd25c4ef9f960e01c58abb4cb0c114e851d Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 08:09:22 +0000
Subject: [PATCH 28/43] refactor create table

---
 src/inc/tsdb.h             |  5 ++--
 src/tsdb/src/tsdbMeta.c    | 54 ++++++++++++++++++++++++++++++++++++++
 src/vnode/src/vnodeWrite.c | 11 ++++++++
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 444f653810..4a954f7ea3 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -107,8 +107,9 @@ 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);
+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);
+STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg);
 
 int   tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg);
 int   tsdbDropTable(TsdbRepoT *pRepo, STableId tableId);
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index f057dcb96e..8d70789b67 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -438,6 +438,60 @@ STable *tsdbIsValidTableToInsert(STsdbMeta *pMeta, STableId tableId) {
   return pTable;
 }
 
+STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
+  if (pMsg == NULL) return NULL;
+  SSchema *pSchema = (SSchema *)pMsg->data;
+  int16_t  numOfCols = htons(pMsg->numOfColumns);
+  int16_t  numOfTags = htons(pMsg->numOfTags);
+
+  STableCfg *pCfg = (STableCfg *)calloc(1, sizeof(STableCfg));
+  if (pCfg == NULL) return NULL;
+
+  if (tsdbInitTableCfg(pCfg, pMsg->tableType, htobe64(pMsg->uid), htonl(pMsg->sid)) < 0) goto _err;
+  STSchema *pDSchema = tdNewSchema(numOfCols);
+  if (pDSchema == NULL) goto _err;
+  for (int i = 0; i < numOfCols; i++) {
+    tdSchemaAddCol(pDSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
+  }
+  if (tsdbTableSetSchema(pCfg, pDSchema, false) < 0) goto _err;
+  if (tsdbTableSetName(pCfg, pMsg->tableId, true) < 0) goto _err;
+
+  if (numOfTags > 0) {
+    STSchema *pTSchema = tdNewSchema(numOfTags);
+    for (int i = numOfCols; i < numOfCols + numOfTags; i++) {
+      tdSchemaAddCol(pTSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
+    }
+    if (tsdbTableSetTagSchema(pCfg, pTSchema, false) < 0) goto _err;
+    if (tsdbTableSetSName(pCfg, pMsg->superTableId, true) < 0) goto _err;
+    if (tsdbTableSetSuperUid(pCfg, htobe64(pMsg->superTableUid)) < 0) goto _err;
+
+    char *        pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
+    int           accBytes = 0;
+    SKVRowBuilder kvRowBuilder;
+
+    if (tdInitKVRowBuilder(&kvRowBuilder) < 0) goto _err;
+    for (int i = 0; i < numOfTags; i++) {
+      STColumn *pCol = schemaColAt(pTSchema, i);
+      tdAddColToKVRow(&kvRowBuilder, pCol->colId, pCol->type, pTagData + accBytes);
+      accBytes += htons(pSchema[i+numOfCols].bytes);
+    }
+    tsdbTableSetTagValue(pCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
+    tdDestroyKVRowBuilder(&kvRowBuilder);
+  }
+
+  if (pMsg->tableType == TSDB_STREAM_TABLE) {
+    char *sql = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
+    tsdbTableSetStreamSql(pCfg, sql, true);
+  }
+
+  return pCfg;
+
+_err:
+  tsdbClearTableCfg(pCfg);
+  tfree(pCfg);
+  return NULL;
+}
+
 // int32_t tsdbDropTableImpl(STsdbMeta *pMeta, STableId tableId) {
 int tsdbDropTable(TsdbRepoT *repo, STableId tableId) {
   STsdbRepo *pRepo = (STsdbRepo *)repo;
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 1fa8abe379..5a3da2447f 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -104,6 +104,16 @@ static int32_t vnodeProcessSubmitMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pR
 }
 
 static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
+
+  STableCfg *pCfg = tsdbCreateTableCfgFromMsg((SMDCreateTableMsg *)pCont);
+  if (pCfg == NULL) return terrno;
+  int32_t code = tsdbCreateTable(pVnode->tsdb, pCfg);
+
+  tsdbClearTableCfg(pCfg);
+  free(pCfg);
+  return code;
+
+  #if 0
   SMDCreateTableMsg *pTable = pCont;
   int32_t code = 0;
   
@@ -165,6 +175,7 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
 
   vTrace("vgId:%d, table:%s is created, result:%x", pVnode->vgId, pTable->tableId, code);
   return code; 
+  #endif
 }
 
 static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {

From bddcc6fa7786c756c3d070f43e0393b14c65fc8d Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 08:18:16 +0000
Subject: [PATCH 29/43] refactor code

---
 src/vnode/src/vnodeWrite.c | 64 --------------------------------------
 1 file changed, 64 deletions(-)

diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 5a3da2447f..90e2a482e9 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -112,70 +112,6 @@ static int32_t vnodeProcessCreateTableMsg(SVnodeObj *pVnode, void *pCont, SRspRe
   tsdbClearTableCfg(pCfg);
   free(pCfg);
   return code;
-
-  #if 0
-  SMDCreateTableMsg *pTable = pCont;
-  int32_t code = 0;
-  
-  vTrace("vgId:%d, table:%s, start to create", pVnode->vgId, pTable->tableId);
-  int16_t   numOfColumns = htons(pTable->numOfColumns);
-  int16_t   numOfTags = htons(pTable->numOfTags);
-  int32_t   sid = htonl(pTable->sid);
-  uint64_t  uid = htobe64(pTable->uid);
-  SSchema * pSchema = (SSchema *)pTable->data;
-  STSchema *pDestTagSchema = NULL;
-  SDataRow  dataRow = NULL;
-
-  int32_t totalCols = numOfColumns + numOfTags;
-  
-  STableCfg tCfg;
-  tsdbInitTableCfg(&tCfg, pTable->tableType, uid, sid);
-
-  STSchema *pDestSchema = tdNewSchema(numOfColumns);
-  for (int i = 0; i < numOfColumns; i++) {
-    tdSchemaAddCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
-  }
-  tsdbTableSetSchema(&tCfg, pDestSchema, false);
-  tsdbTableSetName(&tCfg, pTable->tableId, false);
-
-  if (numOfTags != 0) {
-    pDestTagSchema = tdNewSchema(numOfTags);
-    for (int i = numOfColumns; i < totalCols; i++) {
-      tdSchemaAddCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
-    }
-    tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false);
-    tsdbTableSetSName(&tCfg, pTable->superTableId, false);
-    tsdbTableSetSuperUid(&tCfg, htobe64(pTable->superTableUid));
-    
-    char *pTagData = pTable->data + totalCols * sizeof(SSchema);
-    int accumBytes = 0;
-
-    SKVRowBuilder kvRowBuilder;
-    tdInitKVRowBuilder(&kvRowBuilder);
-    for (int i = 0; i < numOfTags; i++) {
-      STColumn *pTCol = schemaColAt(pDestTagSchema, i);
-      tdAddColToKVRow(&kvRowBuilder, pTCol->colId, pTCol->type, pTagData + accumBytes);
-      accumBytes += htons(pSchema[i + numOfColumns].bytes);
-    }
-    tsdbTableSetTagValue(&tCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
-    tdDestroyKVRowBuilder(&kvRowBuilder);
-  }
-
-  // only normal has sql string
-  if (pTable->tableType == TSDB_STREAM_TABLE) {
-    char *sql = pTable->data + totalCols * sizeof(SSchema);
-    vTrace("vgId:%d, table:%s is creating, sql:%s", pVnode->vgId, pTable->tableId, sql);
-    tsdbTableSetStreamSql(&tCfg, sql, false);
-  }
-
-  code = tsdbCreateTable(pVnode->tsdb, &tCfg);
-  tdFreeDataRow(dataRow);
-  tfree(pDestTagSchema);
-  tfree(pDestSchema);
-
-  vTrace("vgId:%d, table:%s is created, result:%x", pVnode->vgId, pTable->tableId, code);
-  return code; 
-  #endif
 }
 
 static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {

From 2193cd32285d674c94c63e9a773f9f2374dbb19e Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Mon, 1 Jun 2020 08:19:19 +0000
Subject: [PATCH 30/43] make the timer longer

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

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 43d030e7e0..b871af1aef 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -833,8 +833,8 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
       terrno = rpcProcessReqHead(pConn, pHead);
       pConn->connType = pRecv->connType;
 
-      // client shall send the request within tsRpcTime again, put 20 mseconds tolerance
-      taosTmrReset(rpcProcessIdleTimer, tsRpcTimer+20, pConn, pRpc->tmrCtrl, &pConn->pIdleTimer);
+      // client shall send the request within tsRpcTime again, double it 
+      taosTmrReset(rpcProcessIdleTimer, tsRpcTimer*2, pConn, pRpc->tmrCtrl, &pConn->pIdleTimer);
     } else {
       terrno = rpcProcessRspHead(pConn, pHead);
     }

From aa5652073ee03b54ac87bc7d8c8e134a6c0501be Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 1 Jun 2020 16:24:11 +0800
Subject: [PATCH 31/43] ignore taosd in community directory of TDinternal.

---
 tests/script/sh/cfg.sh              | 2 +-
 tests/script/sh/clear.sh            | 2 +-
 tests/script/sh/deploy.sh           | 2 +-
 tests/script/sh/exec.sh             | 2 +-
 tests/script/sh/exec_tarbitrator.sh | 2 +-
 tests/script/test.sh                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/script/sh/cfg.sh b/tests/script/sh/cfg.sh
index 3bebc62d3b..0c240ca451 100755
--- a/tests/script/sh/cfg.sh
+++ b/tests/script/sh/cfg.sh
@@ -42,7 +42,7 @@ fi
 
 TAOS_DIR=`pwd`
 
-BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3`
+BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR
 
diff --git a/tests/script/sh/clear.sh b/tests/script/sh/clear.sh
index 3699d52a97..af14c61c79 100755
--- a/tests/script/sh/clear.sh
+++ b/tests/script/sh/clear.sh
@@ -45,7 +45,7 @@ fi
 
 TAOS_DIR=`pwd`
 
-BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3`
+BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR
 
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 1590fdc83a..94499a50cb 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -40,7 +40,7 @@ fi
 
 TAOS_DIR=`pwd`
 
-BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3`
+BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR
 
diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh
index 0ab8c045ca..2682cac65f 100755
--- a/tests/script/sh/exec.sh
+++ b/tests/script/sh/exec.sh
@@ -51,7 +51,7 @@ fi
 
 TAOS_DIR=`pwd`
 
-BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3`
+BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR
 
diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh
index 1aab55ddaa..cb4d86915c 100755
--- a/tests/script/sh/exec_tarbitrator.sh
+++ b/tests/script/sh/exec_tarbitrator.sh
@@ -48,7 +48,7 @@ fi
 
 TAOS_DIR=`pwd`
 
-BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3`
+BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
 
 BUILD_DIR=$TAOS_DIR/$BIN_DIR
 
diff --git a/tests/script/test.sh b/tests/script/test.sh
index 1714d3ecee..ccb9fac4c0 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -50,7 +50,7 @@ fi
 
 TOP_DIR=`pwd`
 
-BIN_DIR=`find . -name "taosd"|grep bin| cut -d '/' --fields=2,3`
+BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
 
 BUILD_DIR=$TOP_DIR/$BIN_DIR
 

From db83fdd0cbd2a7149b39704eda5c107c1b743499 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 1 Jun 2020 17:21:15 +0800
Subject: [PATCH 32/43] exclude deps and tests directories from coverage
 report.

[TD-491]
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af41d45ac0..86bbdada2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -176,7 +176,8 @@ matrix:
           sleep 1
 
           cd ${TRAVIS_BUILD_DIR}
-          lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info
+          lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info \
+            --exclude "*tests*" --exclude "*deps*"
           lcov -l --rc lcov_branch_coverage=1 coverage.info || travis_terminate $?
 
           gem install coveralls-lcov

From 7a1e2bed50dd499f009123630234ac6d6b75959b Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 09:51:40 +0000
Subject: [PATCH 33/43] add version to tsdb schema

---
 src/common/inc/tdataformat.h |  23 +++--
 src/common/src/tdataformat.c | 169 +++++++++++++++++++----------------
 src/cq/test/cqtest.c         |  12 ++-
 src/tsdb/src/tsdbMeta.c      |  41 ++++-----
 src/vnode/src/vnodeWrite.c   |  51 ++---------
 5 files changed, 147 insertions(+), 149 deletions(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 1d3319e61d..f71f52edc5 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -66,7 +66,7 @@ typedef struct {
 
 // ----------------- TSDB SCHEMA DEFINITION
 typedef struct {
-  int      totalCols;  // Total columns allocated
+  int      version;    // version
   int      numOfCols;  // Number of columns appended
   int      tlen;       // maximum length of a SDataRow without the header part
   int      flen;       // First part length in a SDataRow after the header part
@@ -74,16 +74,13 @@ typedef struct {
 } STSchema;
 
 #define schemaNCols(s) ((s)->numOfCols)
-#define schemaTotalCols(s) ((s)->totalCols)
+#define schemaVersion(s) ((s)->version)
 #define schemaTLen(s) ((s)->tlen)
 #define schemaFLen(s) ((s)->flen)
 #define schemaColAt(s, i) ((s)->columns + i)
 #define tdFreeSchema(s) tfree((s))
 
-STSchema *tdNewSchema(int32_t nCols);
-int       tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes);
 STSchema *tdDupSchema(STSchema *pSchema);
-int       tdGetSchemaEncodeSize(STSchema *pSchema);
 void *    tdEncodeSchema(void *dst, STSchema *pSchema);
 STSchema *tdDecodeSchema(void **psrc);
 
@@ -103,6 +100,22 @@ static FORCE_INLINE STColumn *tdGetColOfID(STSchema *pSchema, int16_t colId) {
   return (STColumn *)ptr;
 }
 
+// ----------------- SCHEMA BUILDER DEFINITION
+typedef struct {
+  int       tCols;
+  int       nCols;
+  int       tlen;
+  int       flen;
+  int       version;
+  STColumn *columns;
+} STSchemaBuilder;
+
+int       tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
+void      tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder);
+void      tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version);
+int       tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int32_t bytes);
+STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder);
+
 // ----------------- Data row structure
 
 /* A data row, the format is like below:
diff --git a/src/common/src/tdataformat.c b/src/common/src/tdataformat.c
index 7a35d5fb69..9816f0472f 100644
--- a/src/common/src/tdataformat.c
+++ b/src/common/src/tdataformat.c
@@ -16,93 +16,27 @@
 #include "talgo.h"
 #include "wchar.h"
 
-/**
- * Create a SSchema object with nCols columns
- * ASSUMPTIONS: VALID PARAMETERS
- *
- * @param nCols number of columns the schema has
- *
- * @return a STSchema object for success
- *         NULL for failure
- */
-STSchema *tdNewSchema(int32_t nCols) {
-  int32_t size = sizeof(STSchema) + sizeof(STColumn) * nCols;
-
-  STSchema *pSchema = (STSchema *)calloc(1, size);
-  if (pSchema == NULL) return NULL;
-
-  pSchema->numOfCols = 0;
-  pSchema->totalCols = nCols;
-  pSchema->flen = 0;
-  pSchema->tlen = 0;
-
-  return pSchema;
-}
-
-/**
- * Append a column to the schema
- */
-int tdSchemaAddCol(STSchema *pSchema, int8_t type, int16_t colId, int32_t bytes) {
-  if (!isValidDataType(type, 0) || pSchema->numOfCols >= pSchema->totalCols) return -1;
-
-  STColumn *pCol = schemaColAt(pSchema, schemaNCols(pSchema));
-  colSetType(pCol, type);
-  colSetColId(pCol, colId);
-  if (schemaNCols(pSchema) == 0) {
-    colSetOffset(pCol, 0);
-  } else {
-    STColumn *pTCol = schemaColAt(pSchema, schemaNCols(pSchema) - 1);
-    colSetOffset(pCol, pTCol->offset + TYPE_BYTES[pTCol->type]);
-  }
-  switch (type) {
-    case TSDB_DATA_TYPE_BINARY:
-    case TSDB_DATA_TYPE_NCHAR:
-      colSetBytes(pCol, bytes);  // Set as maximum bytes
-      pSchema->tlen += (TYPE_BYTES[type] + sizeof(VarDataLenT) + bytes);
-      break;
-    default:
-      colSetBytes(pCol, TYPE_BYTES[type]);
-      pSchema->tlen += TYPE_BYTES[type];
-      break;
-  }
-
-  pSchema->numOfCols++;
-  pSchema->flen += TYPE_BYTES[type];
-
-  ASSERT(pCol->offset < pSchema->flen);
-
-  return 0;
-}
-
 /**
  * Duplicate the schema and return a new object
  */
 STSchema *tdDupSchema(STSchema *pSchema) {
-  STSchema *tSchema = tdNewSchema(schemaNCols(pSchema));
+
+  int tlen = sizeof(STSchema) + sizeof(STColumn) * schemaNCols(pSchema);
+  STSchema *tSchema = (STSchema *)malloc(tlen);
   if (tSchema == NULL) return NULL;
 
-  int32_t size = sizeof(STSchema) + sizeof(STColumn) * schemaNCols(pSchema);
-  memcpy((void *)tSchema, (void *)pSchema, size);
+  memcpy((void *)tSchema, (void *)pSchema, tlen);
 
   return tSchema;
 }
 
-/**
- * Return the size of encoded schema
- */
-int tdGetSchemaEncodeSize(STSchema *pSchema) {
-  return T_MEMBER_SIZE(STSchema, totalCols) +
-         schemaNCols(pSchema) *
-             (T_MEMBER_SIZE(STColumn, type) + T_MEMBER_SIZE(STColumn, colId) + T_MEMBER_SIZE(STColumn, bytes));
-}
-
 /**
  * Encode a schema to dst, and return the next pointer
  */
 void *tdEncodeSchema(void *dst, STSchema *pSchema) {
-  ASSERT(pSchema->numOfCols == pSchema->totalCols);
 
-  T_APPEND_MEMBER(dst, pSchema, STSchema, totalCols);
+  T_APPEND_MEMBER(dst, pSchema, STSchema, version);
+  T_APPEND_MEMBER(dst, pSchema, STSchema, numOfCols);
   for (int i = 0; i < schemaNCols(pSchema); i++) {
     STColumn *pCol = schemaColAt(pSchema, i);
     T_APPEND_MEMBER(dst, pCol, STColumn, type);
@@ -118,11 +52,14 @@ void *tdEncodeSchema(void *dst, STSchema *pSchema) {
  */
 STSchema *tdDecodeSchema(void **psrc) {
   int totalCols = 0;
+  int version = 0;
+  STSchemaBuilder schemaBuilder = {0};
 
+  T_READ_MEMBER(*psrc, int, version);
   T_READ_MEMBER(*psrc, int, totalCols);
 
-  STSchema *pSchema = tdNewSchema(totalCols);
-  if (pSchema == NULL) return NULL;
+  if (tdInitTSchemaBuilder(&schemaBuilder, version) < 0) return NULL;
+
   for (int i = 0; i < totalCols; i++) {
     int8_t  type = 0;
     int16_t colId = 0;
@@ -131,9 +68,91 @@ STSchema *tdDecodeSchema(void **psrc) {
     T_READ_MEMBER(*psrc, int16_t, colId);
     T_READ_MEMBER(*psrc, int32_t, bytes);
 
-    tdSchemaAddCol(pSchema, type, colId, bytes);
+    if (tdAddColToSchema(&schemaBuilder, type, colId, bytes) < 0) {
+      tdDestroyTSchemaBuilder(&schemaBuilder);
+      return NULL;
+    }
   }
 
+  STSchema *pSchema = tdGetSchemaFromBuilder(&schemaBuilder);
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+  return pSchema;
+}
+
+int tdInitTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version) {
+  if (pBuilder == NULL) return -1;
+
+  pBuilder->tCols = 256;
+  pBuilder->columns = (STColumn *)malloc(sizeof(STColumn) * pBuilder->tCols);
+  if (pBuilder->columns == NULL) return -1;
+
+  tdResetTSchemaBuilder(pBuilder, version);
+  return 0;
+}
+
+void tdDestroyTSchemaBuilder(STSchemaBuilder *pBuilder) {
+  if (pBuilder) {
+    tfree(pBuilder->columns);
+  }
+}
+
+void tdResetTSchemaBuilder(STSchemaBuilder *pBuilder, int32_t version) {
+  pBuilder->nCols = 0;
+  pBuilder->tlen = 0;
+  pBuilder->flen = 0;
+  pBuilder->version = version;
+}
+
+int tdAddColToSchema(STSchemaBuilder *pBuilder, int8_t type, int16_t colId, int32_t bytes) {
+  if (!isValidDataType(type, 0)) return -1;
+
+  if (pBuilder->nCols >= pBuilder->tCols) {
+    pBuilder->tCols *= 2;
+    pBuilder->columns = (STColumn *)realloc(pBuilder->columns, sizeof(STColumn) * pBuilder->tCols);
+    if (pBuilder->columns == NULL) return -1;
+  }
+
+  STColumn *pCol = &(pBuilder->columns[pBuilder->nCols]);
+  colSetType(pCol, type);
+  colSetColId(pCol, colId);
+  if (pBuilder->nCols == 0) {
+    colSetOffset(pCol, 0);
+  } else {
+    STColumn *pTCol = &(pBuilder->columns[pBuilder->nCols-1]);
+    colSetOffset(pCol, pTCol->offset + TYPE_BYTES[pTCol->type]);
+  }
+
+  if (IS_VAR_DATA_TYPE(type)) {
+    colSetBytes(pCol, bytes);
+    pBuilder->tlen += (TYPE_BYTES[type] + sizeof(VarDataLenT) + bytes);
+  } else {
+    colSetBytes(pCol, TYPE_BYTES[type]);
+    pBuilder->tlen += TYPE_BYTES[type];
+  }
+
+  pBuilder->nCols++;
+  pBuilder->flen += TYPE_BYTES[type];
+
+  ASSERT(pCol->offset < pBuilder->flen);
+
+  return 0;
+}
+
+STSchema *tdGetSchemaFromBuilder(STSchemaBuilder *pBuilder) {
+  if (pBuilder->nCols <= 0) return NULL;
+
+  int tlen = sizeof(STSchema) + sizeof(STColumn) * pBuilder->nCols;
+
+  STSchema *pSchema = (STSchema *)malloc(tlen);
+  if (pSchema == NULL) return NULL;
+
+  schemaVersion(pSchema) = pBuilder->version;
+  schemaNCols(pSchema) = pBuilder->nCols;
+  schemaTLen(pSchema) = pBuilder->tlen;
+  schemaFLen(pSchema) = pBuilder->flen;
+
+  memcpy(schemaColAt(pSchema, 0), pBuilder->columns, sizeof(STColumn) * pBuilder->nCols);
+
   return pSchema;
 }
 
diff --git a/src/cq/test/cqtest.c b/src/cq/test/cqtest.c
index 3aa649ee34..fbe3c95b86 100644
--- a/src/cq/test/cqtest.c
+++ b/src/cq/test/cqtest.c
@@ -59,9 +59,15 @@ int main(int argc, char *argv[]) {
     exit(-1);
   }
 
-  STSchema *pSchema = tdNewSchema(2);
-  tdSchemaAddCol(pSchema, TSDB_DATA_TYPE_TIMESTAMP, 0, 8);
-  tdSchemaAddCol(pSchema, TSDB_DATA_TYPE_INT, 1, 4);
+  STSchemaBuilder schemaBuilder = {0};
+
+  tdInitTSchemaBuilder(&schemaBuilder, 0);
+  tdAddColToSchema(&schemaBuilder, TSDB_DATA_TYPE_TIMESTAMP, 0, 8);
+  tdAddColToSchema(&schemaBuilder, TSDB_DATA_TYPE_INT, 1, 4);
+
+  STSchema *pSchema = tdGetSchemaFromBuilder(&schemaBuilder);
+
+  tdDestroyTSchemaBuilder(&schemaBuilder);
 
   for (int sid =1; sid<10; ++sid) {
     cqCreate(pCq, sid, "select avg(speed) from demo.t1 sliding(1s) interval(5s)", pSchema);
diff --git a/src/tsdb/src/tsdbMeta.c b/src/tsdb/src/tsdbMeta.c
index 8d70789b67..fa2d47af04 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -440,41 +440,39 @@ STable *tsdbIsValidTableToInsert(STsdbMeta *pMeta, STableId tableId) {
 
 STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
   if (pMsg == NULL) return NULL;
-  SSchema *pSchema = (SSchema *)pMsg->data;
-  int16_t  numOfCols = htons(pMsg->numOfColumns);
-  int16_t  numOfTags = htons(pMsg->numOfTags);
+  SSchema *       pSchema = (SSchema *)pMsg->data;
+  int16_t         numOfCols = htons(pMsg->numOfColumns);
+  int16_t         numOfTags = htons(pMsg->numOfTags);
+  STSchemaBuilder schemaBuilder = {0};
 
   STableCfg *pCfg = (STableCfg *)calloc(1, sizeof(STableCfg));
   if (pCfg == NULL) return NULL;
 
   if (tsdbInitTableCfg(pCfg, pMsg->tableType, htobe64(pMsg->uid), htonl(pMsg->sid)) < 0) goto _err;
-  STSchema *pDSchema = tdNewSchema(numOfCols);
-  if (pDSchema == NULL) goto _err;
+  if (tdInitTSchemaBuilder(&schemaBuilder, htonl(pMsg->sversion)) < 0) goto _err;
+
   for (int i = 0; i < numOfCols; i++) {
-    tdSchemaAddCol(pDSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
+    tdAddColToSchema(&schemaBuilder, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
   }
-  if (tsdbTableSetSchema(pCfg, pDSchema, false) < 0) goto _err;
+  if (tsdbTableSetSchema(pCfg, tdGetSchemaFromBuilder(&schemaBuilder), false) < 0) goto _err;
   if (tsdbTableSetName(pCfg, pMsg->tableId, true) < 0) goto _err;
 
   if (numOfTags > 0) {
-    STSchema *pTSchema = tdNewSchema(numOfTags);
+    int   accBytes = 0;
+    char *pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
+
+    SKVRowBuilder kvRowBuilder = {0};
+    tdResetTSchemaBuilder(&schemaBuilder, htonl(pMsg->tversion));
+    if (tdInitKVRowBuilder(&kvRowBuilder) < 0) goto _err;
     for (int i = numOfCols; i < numOfCols + numOfTags; i++) {
-      tdSchemaAddCol(pTSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
+      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 + numOfCols].bytes);
     }
-    if (tsdbTableSetTagSchema(pCfg, pTSchema, false) < 0) goto _err;
+    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;
 
-    char *        pTagData = pMsg->data + (numOfCols + numOfTags) * sizeof(SSchema);
-    int           accBytes = 0;
-    SKVRowBuilder kvRowBuilder;
-
-    if (tdInitKVRowBuilder(&kvRowBuilder) < 0) goto _err;
-    for (int i = 0; i < numOfTags; i++) {
-      STColumn *pCol = schemaColAt(pTSchema, i);
-      tdAddColToKVRow(&kvRowBuilder, pCol->colId, pCol->type, pTagData + accBytes);
-      accBytes += htons(pSchema[i+numOfCols].bytes);
-    }
     tsdbTableSetTagValue(pCfg, tdGetKVRowFromBuilder(&kvRowBuilder), false);
     tdDestroyKVRowBuilder(&kvRowBuilder);
   }
@@ -484,9 +482,12 @@ STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
     tsdbTableSetStreamSql(pCfg, sql, true);
   }
 
+  tdDestroyTSchemaBuilder(&schemaBuilder);
+
   return pCfg;
 
 _err:
+  tdDestroyTSchemaBuilder(&schemaBuilder);
   tsdbClearTableCfg(pCfg);
   tfree(pCfg);
   return NULL;
diff --git a/src/vnode/src/vnodeWrite.c b/src/vnode/src/vnodeWrite.c
index 90e2a482e9..73d58527b5 100644
--- a/src/vnode/src/vnodeWrite.c
+++ b/src/vnode/src/vnodeWrite.c
@@ -130,52 +130,11 @@ static int32_t vnodeProcessDropTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet
 }
 
 static int32_t vnodeProcessAlterTableMsg(SVnodeObj *pVnode, void *pCont, SRspRet *pRet) {
-  SMDCreateTableMsg *pTable = pCont;
-  int32_t code = 0;
-
-  vTrace("vgId:%d, table:%s, start to alter", pVnode->vgId, pTable->tableId);
-  int16_t numOfColumns  = htons(pTable->numOfColumns);
-  int16_t numOfTags     = htons(pTable->numOfTags);
-  int32_t sid           = htonl(pTable->sid);
-  uint64_t uid          = htobe64(pTable->uid);
-  SSchema *pSchema = (SSchema *) pTable->data;
-
-  int32_t totalCols = numOfColumns + numOfTags;
-  
-  STableCfg tCfg;
-  tsdbInitTableCfg(&tCfg, pTable->tableType, uid, sid);
-
-  STSchema *pDestSchema = tdNewSchema(numOfColumns);
-  for (int i = 0; i < numOfColumns; i++) {
-    tdSchemaAddCol(pDestSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
-  }
-  tsdbTableSetSchema(&tCfg, pDestSchema, false);
-
-  if (numOfTags != 0) {
-    STSchema *pDestTagSchema = tdNewSchema(numOfTags);
-    for (int i = numOfColumns; i < totalCols; i++) {
-      tdSchemaAddCol(pDestTagSchema, pSchema[i].type, htons(pSchema[i].colId), htons(pSchema[i].bytes));
-    }
-    tsdbTableSetTagSchema(&tCfg, pDestTagSchema, false);
-
-    char *pTagData = pTable->data + totalCols * sizeof(SSchema);
-    int accumBytes = 0;
-    SDataRow dataRow = tdNewDataRowFromSchema(pDestTagSchema);
-
-    for (int i = 0; i < numOfTags; i++) {
-      STColumn *pTCol = schemaColAt(pDestTagSchema, i);
-      tdAppendColVal(dataRow, pTagData + accumBytes, pTCol->type, pTCol->bytes, pTCol->offset);
-      accumBytes += htons(pSchema[i + numOfColumns].bytes);
-    }
-    tsdbTableSetTagValue(&tCfg, dataRow, false);
-  }
-
-  code = tsdbAlterTable(pVnode->tsdb, &tCfg);
-
-  tfree(pDestSchema);
-
-  vTrace("vgId:%d, table:%s, alter table result:%d", pVnode->vgId, pTable->tableId, code);
-
+  STableCfg *pCfg = tsdbCreateTableCfgFromMsg((SMDCreateTableMsg *)pCont);
+  if (pCfg == NULL) return terrno;
+  int32_t code = tsdbAlterTable(pVnode->tsdb, pCfg);
+  tsdbClearTableCfg(pCfg);
+  free(pCfg);
   return code;
 }
 

From de3280f943a51e9392ceedfbacc0f489a8aac352 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Mon, 1 Jun 2020 17:57:57 +0800
Subject: [PATCH 34/43] change syntax for lcov 1.13

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86bbdada2a..f252f66a4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -176,8 +176,8 @@ matrix:
           sleep 1
 
           cd ${TRAVIS_BUILD_DIR}
-          lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info \
-            --exclude "*tests*" --exclude "*deps*"
+          lcov -d . --capture --rc lcov_branch_coverage=1 -o coverage.info
+          lcov --remove coverage.info '*tests*' '*deps*' -o coverage.info
           lcov -l --rc lcov_branch_coverage=1 coverage.info || travis_terminate $?
 
           gem install coveralls-lcov

From 1746e6a7c4ab7f633b06870707d9cb6da11976da Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 1 Jun 2020 19:44:03 +0800
Subject: [PATCH 35/43] scripts

---
 tests/script/jenkins/basic.txt | 103 ++++++++++++++++++++++++++++-----
 1 file changed, 89 insertions(+), 14 deletions(-)

diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index 1a22c3e789..c41ac43ee0 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -108,7 +108,7 @@ cd ../../../debug; make
 ./test.sh -f general/parser/col_arithmetic_operation.sim
 ./test.sh -f general/parser/columnValue.sim
 ./test.sh -f general/parser/commit.sim
-#./test.sh -f general/parser/create_db.sim   #there are bugs in this sim script
+./test.sh -f general/parser/create_db.sim
 ./test.sh -f general/parser/create_mt.sim
 ./test.sh -f general/parser/create_tb.sim
 ./test.sh -f general/parser/dbtbnameValidate.sim
@@ -117,7 +117,7 @@ cd ../../../debug; make
 ./test.sh -f general/parser/import_commit3.sim
 ./test.sh -f general/parser/insert_tb.sim
 ./test.sh -f general/parser/first_last.sim
-# ./test.sh -f general/parser/import_file.sim
+#unsupport ./test.sh -f general/parser/import_file.sim
 ./test.sh -f general/parser/lastrow.sim
 ./test.sh -f general/parser/nchar.sim
 #unsupport ./test.sh -f general/parser/null_char.sim
@@ -133,17 +133,17 @@ cd ../../../debug; make
 ./test.sh -f general/parser/tbnameIn.sim
 ./test.sh -f general/parser/binary_escapeCharacter.sim
 ./test.sh -f general/parser/projection_limit_offset.sim
-# ./test.sh -f general/parser/limit2.sim
-# ./test.sh -f general/parser/slimit.sim
-# ./test.sh -f general/parser/fill.sim
-# ./test.sh -f general/parser/fill_stb.sim
-# ./test.sh -f general/parser/interp.sim
-# ./test.sh -f general/parser/where.sim
-# ./test.sh -f general/parser/join.sim
-# ./test.sh -f general/parser/join_multivnode.sim
-# ./test.sh -f general/parser/select_with_tags.sim
-# ./test.sh -f general/parser/groupby.sim
-# ./test.sh -f general/parser/bug.sim
+./test.sh -f general/parser/limit2.sim
+./test.sh -f general/parser/slimit.sim
+./test.sh -f general/parser/fill.sim
+./test.sh -f general/parser/fill_stb.sim
+./test.sh -f general/parser/interp.sim
+./test.sh -f general/parser/where.sim
+#unsupport ./test.sh -f general/parser/join.sim
+#unsupport ./test.sh -f general/parser/join_multivnode.sim
+./test.sh -f general/parser/select_with_tags.sim
+#unsupport ./test.sh -f general/parser/groupby.sim
+#unsupport ./test.sh -f general/parser/bug.sim
 #unsupport ./test.sh -f general/parser/tags_dynamically_specifiy.sim
 #unsupport ./test.sh -f general/parser/set_tag_vals.sim
 #unsupport ./test.sh -f general/parser/repeatAlter.sim
@@ -173,7 +173,7 @@ cd ../../../debug; make
 ./test.sh -f general/table/db.table.sim
 ./test.sh -f general/table/delete_reuse1.sim
 ./test.sh -f general/table/delete_reuse2.sim
-#liao ./test.sh -f general/table/delete_writing.sim
+./test.sh -f general/table/delete_writing.sim
 ./test.sh -f general/table/describe.sim
 ./test.sh -f general/table/double.sim
 ./test.sh -f general/table/fill.sim
@@ -306,3 +306,78 @@ cd ../../../debug; make
 ./test.sh -f unique/vnode/replica3_basic.sim
 ./test.sh -f unique/vnode/replica3_repeat.sim
 ./test.sh -f unique/vnode/replica3_vgroup.sim
+
+./test.sh -f unique/account/account_create.sim
+./test.sh -f unique/account/account_delete.sim
+./test.sh -f unique/account/account_len.sim
+./test.sh -f unique/account/authority.sim
+./test.sh -f unique/account/basic.sim
+./test.sh -f unique/account/paras.sim
+./test.sh -f unique/account/pass_alter.sim
+./test.sh -f unique/account/pass_len.sim
+./test.sh -f unique/account/usage.sim
+./test.sh -f unique/account/user_create.sim
+./test.sh -f unique/account/user_len.sim
+
+./test.sh -f unique/big/balance.sim
+./test.sh -f unique/big/maxvnodes.sim
+./test.sh -f unique/big/tcp.sim
+
+./test.sh -f unique/cluster/balance1.sim
+./test.sh -f unique/cluster/balance2.sim
+./test.sh -f unique/cluster/balance3.sim
+./test.sh -f unique/cluster/cache.sim
+
+./test.sh -f unique/column/replica3.sim
+
+./test.sh -f unique/db/commit.sim
+./test.sh -f unique/db/delete.sim
+./test.sh -f unique/db/delete_part.sim
+./test.sh -f unique/db/replica_add12.sim
+./test.sh -f unique/db/replica_add13.sim
+./test.sh -f unique/db/replica_add23.sim
+./test.sh -f unique/db/replica_reduce21.sim
+./test.sh -f unique/db/replica_reduce32.sim
+./test.sh -f unique/db/replica_reduce31.sim
+./test.sh -f unique/db/replica_part.sim
+
+./test.sh -f unique/dnode/balance1.sim
+./test.sh -f unique/dnode/balance2.sim
+./test.sh -f unique/dnode/balance3.sim
+./test.sh -f unique/dnode/balancex.sim
+./test.sh -f unique/dnode/offline1.sim
+./test.sh -f unique/dnode/offline2.sim
+./test.sh -f unique/dnode/remove1.sim
+./test.sh -f unique/dnode/remove2.sim
+./test.sh -f unique/dnode/vnode_clean.sim
+
+./test.sh -f unique/http/admin.sim
+./test.sh -f unique/http/opentsdb.sim
+
+./test.sh -f unique/import/replica2.sim
+./test.sh -f unique/import/replica3.sim
+
+./test.sh -f unique/stable/balance_replica1.sim
+./test.sh -f unique/stable/dnode2_stop.sim
+./test.sh -f unique/stable/dnode2.sim
+./test.sh -f unique/stable/dnode3.sim
+./test.sh -f unique/stable/replica2_dnode4.sim
+./test.sh -f unique/stable/replica2_vnode3.sim
+./test.sh -f unique/stable/replica3_dnode6.sim
+./test.sh -f unique/stable/replica3_vnode3.sim
+
+./test.sh -f unique/mnode/mgmt22.sim
+./test.sh -f unique/mnode/mgmt23.sim
+./test.sh -f unique/mnode/mgmt24.sim
+./test.sh -f unique/mnode/mgmt25.sim
+./test.sh -f unique/mnode/mgmt26.sim
+./test.sh -f unique/mnode/mgmt33.sim
+./test.sh -f unique/mnode/mgmt34.sim
+./test.sh -f unique/mnode/mgmtr2.sim
+
+./test.sh -f unique/vnode/many.sim
+./test.sh -f unique/vnode/replica2_basic2.sim
+./test.sh -f unique/vnode/replica2_repeat.sim
+./test.sh -f unique/vnode/replica3_basic.sim
+./test.sh -f unique/vnode/replica3_repeat.sim
+./test.sh -f unique/vnode/replica3_vgroup.sim

From 2160df99a58d053125ff4d93aac846e461593470 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Mon, 1 Jun 2020 13:58:24 +0000
Subject: [PATCH 36/43] fix coredump bug

---
 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 fa2d47af04..2ea0aaca90 100644
--- a/src/tsdb/src/tsdbMeta.c
+++ b/src/tsdb/src/tsdbMeta.c
@@ -467,7 +467,7 @@ STableCfg *tsdbCreateTableCfgFromMsg(SMDCreateTableMsg *pMsg) {
     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 + numOfCols].bytes);
+      accBytes += htons(pSchema[i].bytes);
     }
     if (tsdbTableSetTagSchema(pCfg, tdGetSchemaFromBuilder(&schemaBuilder), false) < 0) goto _err;
     if (tsdbTableSetSName(pCfg, pMsg->superTableId, true) < 0) goto _err;

From 023ba18ff3544b5192976616ddbc43390136292c Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Tue, 2 Jun 2020 09:45:50 +0800
Subject: [PATCH 37/43] add --short

---
 tests/perftest-scripts/perftest-daily.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/perftest-scripts/perftest-daily.sh b/tests/perftest-scripts/perftest-daily.sh
index 9d51438f63..db9de11381 100755
--- a/tests/perftest-scripts/perftest-daily.sh
+++ b/tests/perftest-scripts/perftest-daily.sh
@@ -44,7 +44,7 @@ function buildTDengine {
 		echo "repo need to pull"
 		git pull
 
-		LOCAL_COMMIT=`git rev-parse @`
+		LOCAL_COMMIT=`git rev-parse --short @`
 		cd debug
 		rm -rf *
 		cmake ..

From 17c4afe0c47a3100a8f2d1f8199ecc35b15a7a0b Mon Sep 17 00:00:00 2001
From: Jeff Tao <jhtao@taosdata.com>
Date: Mon, 1 Jun 2020 19:11:55 -0700
Subject: [PATCH 38/43] include user name in every packet change some debug
 info trace

---
 src/rpc/src/rpcMain.c  | 8 ++++----
 src/rpc/src/rpcTcp.c   | 2 +-
 src/rpc/test/rserver.c | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rpc/src/rpcMain.c b/src/rpc/src/rpcMain.c
index 55b6be195b..978fc5b8ec 100644
--- a/src/rpc/src/rpcMain.c
+++ b/src/rpc/src/rpcMain.c
@@ -803,7 +803,7 @@ static SRpcConn *rpcProcessMsgHead(SRpcInfo *pRpc, SRecvInfo *pRecv) {
 
   pConn = rpcGetConnObj(pRpc, sid, pRecv);
   if (pConn == NULL) {
-    tError("%s %p, failed to get connection obj(%s)", pRpc->label, pHead->ahandle, tstrerror(terrno)); 
+    tTrace("%s %p, failed to get connection obj(%s)", pRpc->label, pHead->ahandle, tstrerror(terrno)); 
     return NULL;
   } else {
     if (rpcIsReq(pHead->msgType)) {
@@ -1100,7 +1100,7 @@ static void rpcSendReqToServer(SRpcInfo *pRpc, SRpcReqContext *pContext) {
   pHead->port = 0;
   pHead->linkUid = pConn->linkUid;
   pHead->ahandle = (uint64_t)pConn->ahandle;
-  if (!pConn->secured) memcpy(pHead->user, pConn->user, tListLen(pHead->user));
+  memcpy(pHead->user, pConn->user, tListLen(pHead->user));
 
   // set the connection parameters
   pConn->outType = msgType;
@@ -1399,7 +1399,7 @@ static int rpcCheckAuthentication(SRpcConn *pConn, char *msg, int msgLen) {
       code = TSDB_CODE_INVALID_TIME_STAMP;
     } else {
       if (rpcAuthenticateMsg(pHead, msgLen-TSDB_AUTH_LEN, pDigest->auth, pConn->secret) < 0) {
-        tError("%s, authentication failed, msg discarded", pConn->info);
+        tTrace("%s, authentication failed, msg discarded", pConn->info);
         code = TSDB_CODE_AUTH_FAILURE;
       } else {
         pHead->msgLen = (int32_t)htonl((uint32_t)pHead->msgLen) - sizeof(SRpcDigest);
@@ -1408,7 +1408,7 @@ static int rpcCheckAuthentication(SRpcConn *pConn, char *msg, int msgLen) {
       }
     }
   } else {
-    tError("%s, auth spi:%d not matched with received:%d", pConn->info, pConn->spi, pHead->spi);
+    tTrace("%s, auth spi:%d not matched with received:%d", pConn->info, pConn->spi, pHead->spi);
     code = pHead->spi ? TSDB_CODE_AUTH_FAILURE : TSDB_CODE_AUTH_REQUIRED;
   }
 
diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index a7312fadf1..1e9b39414e 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -380,7 +380,7 @@ static void *taosProcessTcpData(void *param) {
 
       int32_t headLen = taosReadMsg(pFdObj->fd, &rpcHead, sizeof(SRpcHead));
       if (headLen != sizeof(SRpcHead)) {
-        tError("%s %p, read error, headLen:%d", pThreadObj->label, pFdObj->thandle, headLen);
+        tTrace("%s %p, read error, headLen:%d", pThreadObj->label, pFdObj->thandle, headLen);
         taosReportBrokenLink(pFdObj);
         continue;
       }
diff --git a/src/rpc/test/rserver.c b/src/rpc/test/rserver.c
index f22fa35f52..4ce6a0a8cf 100644
--- a/src/rpc/test/rserver.c
+++ b/src/rpc/test/rserver.c
@@ -36,7 +36,7 @@ void processShellMsg() {
   while (1) {
     int numOfMsgs = taosReadAllQitems(qhandle, qall);
     if (numOfMsgs <= 0) {
-      usleep(1000);
+      usleep(100);
       continue;
     }     
 

From 861be20fdea3c4f62b8fd5d32321f78f4c16de6a Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Jun 2020 10:51:05 +0800
Subject: [PATCH 39/43] [TD-463] update show users result set

---
 src/mnode/src/mnodeUser.c   | 10 ++++++++++
 tests/script/tmp/dnode1.sim |  4 ----
 tests/script/tmp/http.sim   | 40 +++++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 4 deletions(-)
 delete mode 100644 tests/script/tmp/dnode1.sim
 create mode 100644 tests/script/tmp/http.sim

diff --git a/src/mnode/src/mnodeUser.c b/src/mnode/src/mnodeUser.c
index a1edaaa0a8..209b439275 100644
--- a/src/mnode/src/mnodeUser.c
+++ b/src/mnode/src/mnodeUser.c
@@ -280,6 +280,12 @@ static int32_t mnodeGetUserMeta(STableMetaMsg *pMeta, SShowObj *pShow, void *pCo
   pSchema[cols].bytes = htons(pShow->bytes[cols]);
   cols++;
 
+  pShow->bytes[cols] = TSDB_USER_LEN + VARSTR_HEADER_SIZE;
+  pSchema[cols].type = TSDB_DATA_TYPE_BINARY;
+  strcpy(pSchema[cols].name, "account");
+  pSchema[cols].bytes = htons(pShow->bytes[cols]);
+  cols++;
+
   pMeta->numOfColumns = htons(cols);
   strcpy(pMeta->tableId, "show users");
   pShow->numOfColumns = cols;
@@ -329,6 +335,10 @@ static int32_t mnodeRetrieveUsers(SShowObj *pShow, char *data, int32_t rows, voi
     *(int64_t *)pWrite = pUser->createdTime;
     cols++;
 
+    pWrite = data + pShow->offset[cols] * rows + pShow->bytes[cols] * numOfRows;
+    STR_WITH_MAXSIZE_TO_VARSTR(pWrite, pUser->acct, TSDB_USER_LEN);
+    cols++;
+
     numOfRows++;
     mnodeDecUserRef(pUser);
   }
diff --git a/tests/script/tmp/dnode1.sim b/tests/script/tmp/dnode1.sim
deleted file mode 100644
index 67d0dd4c12..0000000000
--- a/tests/script/tmp/dnode1.sim
+++ /dev/null
@@ -1,4 +0,0 @@
-system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -i 1
-system sh/exec.sh -n dnode1 -s start
-sql connect
\ No newline at end of file
diff --git a/tests/script/tmp/http.sim b/tests/script/tmp/http.sim
new file mode 100644
index 0000000000..c863f4b8d8
--- /dev/null
+++ b/tests/script/tmp/http.sim
@@ -0,0 +1,40 @@
+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 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 numOfMnodes -v 1
+system sh/cfg.sh -n dnode2 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode3 -c numOfMnodes -v 1
+system sh/cfg.sh -n dnode4 -c numOfMnodes -v 1
+
+system sh/cfg.sh -n dnode1 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode2 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode3 -c mnodeEqualVnodeNum -v 4
+system sh/cfg.sh -n dnode4 -c mnodeEqualVnodeNum -v 4
+
+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 http -v 1
+system sh/cfg.sh -n dnode2 -c http -v 1
+system sh/cfg.sh -n dnode3 -c http -v 1
+
+system sh/cfg.sh -n dnode1 -c monitor -v 1
+system sh/cfg.sh -n dnode2 -c monitor -v 1
+system sh/cfg.sh -n dnode3 -c monitor -v 1
+
+system sh/cfg.sh -n dnode1 -c monitorInterval -v 1
+system sh/cfg.sh -n dnode2 -c monitorInterval -v 1
+system sh/cfg.sh -n dnode3 -c monitorInterval -v 1
+
+system sh/exec.sh -n dnode1 -s start
\ No newline at end of file

From 0242d0d4ae61c69079a57712f1a35fe1dc35bf27 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Tue, 2 Jun 2020 12:04:29 +0800
Subject: [PATCH 40/43] add more TSIM cases in general/ to CI

[TD-502]
---
 tests/script/fullGeneralSuite.sim | 213 ++++++++++++++++++++++++++++++
 tests/test-all.sh                 |   6 +-
 2 files changed, 218 insertions(+), 1 deletion(-)
 create mode 100644 tests/script/fullGeneralSuite.sim

diff --git a/tests/script/fullGeneralSuite.sim b/tests/script/fullGeneralSuite.sim
new file mode 100644
index 0000000000..aa32fe4008
--- /dev/null
+++ b/tests/script/fullGeneralSuite.sim
@@ -0,0 +1,213 @@
+#unsupport run general/alter/cached_schema_after_alter.sim
+#unsupport run general/alter/count.sim
+#unsupport run general/alter/import.sim
+#unsupport run general/alter/insert1.sim
+#unsupport run general/alter/insert2.sim
+#unsupport run general/alter/metrics.sim
+#unsupport run general/alter/table.sim
+run general/cache/new_metrics.sim
+run general/cache/restart_metrics.sim
+run general/cache/restart_table.sim
+run general/connection/connection.sim  
+run general/column/commit.sim
+run general/column/metrics.sim
+run general/column/table.sim
+run general/compress/commitlog.sim
+run general/compress/compress.sim
+run general/compress/compress2.sim
+run general/compress/uncompress.sim
+run general/compute/avg.sim
+run general/compute/bottom.sim
+run general/compute/count.sim
+run general/compute/diff.sim
+run general/compute/diff2.sim
+run general/compute/first.sim
+run general/compute/interval.sim
+run general/compute/last.sim
+run general/compute/leastsquare.sim
+run general/compute/max.sim
+run general/compute/min.sim
+run general/compute/null.sim
+run general/compute/percentile.sim
+run general/compute/stddev.sim
+run general/compute/sum.sim
+run general/compute/top.sim
+run general/db/alter_option.sim
+run general/db/alter_tables_d2.sim
+run general/db/alter_tables_v1.sim
+run general/db/alter_tables_v4.sim
+run general/db/alter_vgroups.sim
+run general/db/basic.sim
+run general/db/basic1.sim
+run general/db/basic2.sim
+run general/db/basic3.sim
+run general/db/basic4.sim
+run general/db/basic5.sim
+run general/db/delete_reuse1.sim
+run general/db/delete_reuse2.sim
+run general/db/delete_reusevnode.sim
+run general/db/delete_reusevnode2.sim
+run general/db/delete_writing1.sim
+run general/db/delete_writing2.sim
+run general/db/delete.sim
+run general/db/len.sim
+run general/db/repeat.sim
+run general/db/tables.sim
+run general/db/vnodes.sim
+run general/field/2.sim
+run general/field/3.sim
+run general/field/4.sim
+run general/field/5.sim
+run general/field/6.sim
+run general/field/bigint.sim
+run general/field/binary.sim
+run general/field/bool.sim
+run general/field/single.sim
+run general/field/smallint.sim
+run general/field/tinyint.sim
+run general/http/restful.sim
+run general/http/restful_insert.sim
+run general/http/restful_limit.sim
+run general/http/restful_full.sim
+run general/http/prepare.sim
+run general/http/telegraf.sim
+run general/http/grafana_bug.sim
+run general/http/grafana.sim
+run general/import/basic.sim
+run general/import/commit.sim
+run general/import/large.sim
+run general/import/replica1.sim
+run general/insert/basic.sim
+run general/insert/insert_drop.sim
+run general/insert/query_block1_memory.sim
+run general/insert/query_block2_memory.sim
+run general/insert/query_block1_file.sim
+run general/insert/query_block2_file.sim
+run general/insert/query_file_memory.sim
+run general/insert/query_multi_file.sim
+run general/insert/tcp.sim
+#unsupport run general/parser/alter.sim
+#unsupport run general/parser/alter1.sim
+#unsupport run general/parser/alter_stable.sim
+run general/parser/auto_create_tb.sim
+run general/parser/auto_create_tb_drop_tb.sim
+run general/parser/col_arithmetic_operation.sim
+run general/parser/columnValue.sim
+run general/parser/commit.sim
+run general/parser/create_db.sim
+run general/parser/create_mt.sim
+run general/parser/create_tb.sim
+run general/parser/dbtbnameValidate.sim
+run general/parser/import_commit1.sim
+run general/parser/import_commit2.sim
+run general/parser/import_commit3.sim
+run general/parser/insert_tb.sim
+run general/parser/first_last.sim
+#unsupport run general/parser/import_file.sim
+run general/parser/lastrow.sim
+run general/parser/nchar.sim
+#unsupport run general/parser/null_char.sim
+run general/parser/single_row_in_tb.sim
+run general/parser/select_from_cache_disk.sim
+run general/parser/limit.sim
+run general/parser/limit1.sim
+run general/parser/limit1_tblocks100.sim
+run general/parser/mixed_blocks.sim
+run general/parser/selectResNum.sim
+run general/parser/select_across_vnodes.sim
+run general/parser/slimit1.sim
+run general/parser/tbnameIn.sim
+run general/parser/binary_escapeCharacter.sim
+run general/parser/projection_limit_offset.sim
+run general/parser/limit2.sim
+run general/parser/slimit.sim
+run general/parser/fill.sim
+run general/parser/fill_stb.sim
+run general/parser/interp.sim
+run general/parser/where.sim
+#unsupport run general/parser/join.sim
+#unsupport run general/parser/join_multivnode.sim
+run general/parser/select_with_tags.sim
+#unsupport run general/parser/groupby.sim
+#unsupport run general/parser/bug.sim
+#unsupport run general/parser/tags_dynamically_specifiy.sim
+#unsupport run general/parser/set_tag_vals.sim
+#unsupport run general/parser/repeatAlter.sim
+#unsupport run general/parser/slimit_alter_tags.sim
+#unsupport run general/parser/stream_on_sys.sim
+#unsupport run general/parser/stream.sim
+#unsupport run general/parser/repeatStream.sim
+run general/stable/disk.sim
+run general/stable/dnode3.sim
+run general/stable/metrics.sim
+run general/stable/values.sim
+run general/stable/vnode3.sim
+run general/table/autocreate.sim
+run general/table/basic1.sim
+run general/table/basic2.sim
+run general/table/basic3.sim
+run general/table/bigint.sim
+run general/table/binary.sim
+run general/table/bool.sim
+run general/table/column_name.sim
+run general/table/column_num.sim
+run general/table/column_value.sim
+run general/table/column2.sim
+run general/table/date.sim
+run general/table/db.table.sim
+run general/table/delete_reuse1.sim
+run general/table/delete_reuse2.sim
+run general/table/delete_writing.sim
+run general/table/describe.sim
+run general/table/double.sim
+run general/table/fill.sim
+run general/table/float.sim
+run general/table/int.sim
+run general/table/limit.sim
+run general/table/smallint.sim
+run general/table/table_len.sim
+run general/table/table.sim
+run general/table/tinyint.sim
+run general/table/vgroup.sim
+run general/tag/3.sim
+run general/tag/4.sim
+run general/tag/5.sim
+run general/tag/6.sim
+#unsupport run general/tag/add.sim
+run general/tag/bigint.sim
+run general/tag/binary_binary.sim
+run general/tag/binary.sim
+run general/tag/bool_binary.sim
+run general/tag/bool_int.sim
+run general/tag/bool.sim
+#unsupport run general/tag/change.sim
+run general/tag/column.sim
+#unsupport run general/tag/commit.sim
+run general/tag/create.sim
+#unsupport run general/tag/delete.sim
+run general/tag/double.sim
+run general/tag/filter.sim
+run general/tag/float.sim
+run general/tag/int_binary.sim
+run general/tag/int_float.sim
+run general/tag/int.sim
+#unsupport run general/tag/set.sim
+run general/tag/smallint.sim
+run general/tag/tinyint.sim
+run general/user/authority.sim
+run general/user/monitor.sim
+run general/user/pass_alter.sim
+run general/user/pass_len.sim
+run general/user/user_create.sim
+run general/user/user_len.sim
+run general/vector/metrics_field.sim
+run general/vector/metrics_mix.sim
+run general/vector/metrics_query.sim
+run general/vector/metrics_tag.sim
+run general/vector/metrics_time.sim
+run general/vector/multi.sim
+run general/vector/single.sim
+run general/vector/table_field.sim
+run general/vector/table_mix.sim
+run general/vector/table_query.sim
+run general/vector/table_time.sim
diff --git a/tests/test-all.sh b/tests/test-all.sh
index fdc607ed66..7bde4da67a 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -9,7 +9,11 @@ NC='\033[0m'
 
 echo "### run TSIM script ###"
 cd script
-./test.sh -f basicSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.log
+if [ "$1" == "cron" ]; then
+  ./test.sh -f fullGeneralSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.log
+else
+  ./test.sh -f basicSuite.sim 2>&1 | grep 'success\|failed\|fault' | grep -v 'default' | tee out.log
+fi
 
 totalSuccess=`grep 'success' out.log | wc -l`
 totalBasic=`grep success out.log | grep Suite | wc -l`

From 029a45cd0432553ebdc239a20e847fa4104e1eda Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Jun 2020 05:31:50 +0000
Subject: [PATCH 41/43] [TD-501] When the number of rows is greater than 100,
 the show result is incorrect

---
 src/mnode/src/mnodeShow.c            |  2 +-
 tests/script/general/stable/show.sim | 49 ++++++++++++++++++++++++++++
 tests/script/jenkins/basic.txt       |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 tests/script/general/stable/show.sim

diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index 20616bfbcd..dd6de9d351 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -211,7 +211,7 @@ static int32_t mnodeProcessRetrieveMsg(SMnodeMsg *pMsg) {
   pMsg->rpcRsp.rsp = pRsp;
   pMsg->rpcRsp.len = size;
 
-  if (rowsToRead == 0 || rowsRead == rowsToRead) {
+  if (rowsToRead == 0 || (rowsRead == rowsToRead && pShow->numOfRows - pShow->numOfReads == rowsToRead)) {
     pRsp->completed = 1;
     mnodeReleaseShowObj(pShow, true);
   } else {
diff --git a/tests/script/general/stable/show.sim b/tests/script/general/stable/show.sim
new file mode 100644
index 0000000000..b25418cc2a
--- /dev/null
+++ b/tests/script/general/stable/show.sim
@@ -0,0 +1,49 @@
+system sh/stop_dnodes.sh
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c walLevel -v 0
+system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
+system sh/exec.sh -n dnode1 -s start
+
+sleep 3000
+sql connect
+
+print ======================== create stable
+
+sql create database d1
+
+$x = 0
+while $x < 128
+  $tb = d1.s . $x
+  sql create table $tb (ts timestamp, i int) tags (j int)
+  $x = $x + 1
+endw 
+
+print ======================== show stables
+
+sql show d1.stables
+
+print num of stables is $rows
+if $rows != 128 then 
+  return -1
+endi
+
+print ======================== create table
+
+$x = 0
+while $x < 424
+  $tb = d1.t . $x
+  sql create table $tb using d1.s0 tags( $x )
+  $x = $x + 1
+endw 
+
+print ======================== show stables
+
+sql show d1.tables
+
+print num of tables is $rows
+if $rows != 424 then 
+  return -1
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
\ No newline at end of file
diff --git a/tests/script/jenkins/basic.txt b/tests/script/jenkins/basic.txt
index c41ac43ee0..c6f3082a88 100644
--- a/tests/script/jenkins/basic.txt
+++ b/tests/script/jenkins/basic.txt
@@ -155,6 +155,7 @@ cd ../../../debug; make
 ./test.sh -f general/stable/disk.sim
 ./test.sh -f general/stable/dnode3.sim
 ./test.sh -f general/stable/metrics.sim
+./test.sh -f general/stable/show.sim
 ./test.sh -f general/stable/values.sim
 ./test.sh -f general/stable/vnode3.sim
 

From 3c4aa087c63e9b9933c86598301f1ae7d6a2d5bf Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Tue, 2 Jun 2020 14:28:13 +0800
Subject: [PATCH 42/43] suport build from community.

---
 tests/script/sh/cfg.sh              | 9 +++++++--
 tests/script/sh/clear.sh            | 9 +++++++--
 tests/script/sh/deploy.sh           | 9 +++++++--
 tests/script/sh/exec.sh             | 9 +++++++--
 tests/script/sh/exec_tarbitrator.sh | 9 +++++++--
 tests/script/test.sh                | 9 +++++++--
 6 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/tests/script/sh/cfg.sh b/tests/script/sh/cfg.sh
index 0c240ca451..0c28a8edce 100755
--- a/tests/script/sh/cfg.sh
+++ b/tests/script/sh/cfg.sh
@@ -41,10 +41,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 
diff --git a/tests/script/sh/clear.sh b/tests/script/sh/clear.sh
index af14c61c79..d8af2dd10b 100755
--- a/tests/script/sh/clear.sh
+++ b/tests/script/sh/clear.sh
@@ -44,10 +44,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/$NODE_NAME
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 94499a50cb..5837cf5a1a 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -39,10 +39,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 
diff --git a/tests/script/sh/exec.sh b/tests/script/sh/exec.sh
index 2682cac65f..1e033071f7 100755
--- a/tests/script/sh/exec.sh
+++ b/tests/script/sh/exec.sh
@@ -50,10 +50,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/$NODE_NAME
diff --git a/tests/script/sh/exec_tarbitrator.sh b/tests/script/sh/exec_tarbitrator.sh
index cb4d86915c..496b3e4ed6 100755
--- a/tests/script/sh/exec_tarbitrator.sh
+++ b/tests/script/sh/exec_tarbitrator.sh
@@ -47,10 +47,15 @@ else
 fi
 
 TAOS_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TAOS_DIR/$BIN_DIR
+BUILD_DIR=$TAOS_DIR/$BIN_DIR/build
 
 SIM_DIR=$TAOS_DIR/sim
 NODE_DIR=$SIM_DIR/arbitrator
diff --git a/tests/script/test.sh b/tests/script/test.sh
index ccb9fac4c0..a6d57e548a 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -49,10 +49,15 @@ else
 fi
 
 TOP_DIR=`pwd`
+TAOSD_DIR=`find . -name "taosd"|grep bin|head -n1`
 
-BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+if [[ "$TAOSD_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2,3`
+else
+  BIN_DIR=`find . -name "taosd"|grep bin|head -n1|cut -d '/' --fields=2`
+fi
 
-BUILD_DIR=$TOP_DIR/$BIN_DIR
+BUILD_DIR=$TOP_DIR/$BIN_DIR/build
 
 SIM_DIR=$TOP_DIR/sim
 

From 043d759efdfd285e052b0244e2ccdf7f31ccc481 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sdsang@taosdata.com>
Date: Tue, 2 Jun 2020 15:51:40 +0800
Subject: [PATCH 43/43] fix printf format issue in rpcTcp.c

[TD-505]
---
 src/rpc/src/rpcTcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rpc/src/rpcTcp.c b/src/rpc/src/rpcTcp.c
index 1e9b39414e..defd277db1 100644
--- a/src/rpc/src/rpcTcp.c
+++ b/src/rpc/src/rpcTcp.c
@@ -211,7 +211,7 @@ static void* taosAcceptTcpConnection(void *arg) {
         tTrace("%s TCP server socket was shutdown, exiting...", pServerObj->label);
         break;
       }
-      tError("%s TCP accept failure(%s)", pServerObj->label, errno, strerror(errno));
+      tError("%s TCP accept failure(%s)", pServerObj->label, strerror(errno));
       continue;
     }