Merge remote-tracking branch 'origin/develop' into feature/crash_gen

src/connector/grafana/tdengine/package.json

 {
   "name": "TDengine",
   "private": false,
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "grafana datasource plugin for tdengine",
   "scripts": {
     "build": "./node_modules/grunt-cli/bin/grunt",

src/connector/jdbc/CMakeLists.txt

@@ -8,7 +8,7 @@ IF (TD_MVN_INSTALLED)
   ADD_CUSTOM_COMMAND(OUTPUT ${JDBC_CMD_NAME}
     POST_BUILD
     COMMAND mvn -Dmaven.test.skip=true install -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-1.0.3-dist.jar ${LIBRARY_OUTPUT_PATH}
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/target/taos-jdbcdriver-2.0.0-dist.jar ${LIBRARY_OUTPUT_PATH}
     COMMAND mvn -Dmaven.test.skip=true clean -f ${CMAKE_CURRENT_SOURCE_DIR}/pom.xml
     COMMENT "build jdbc driver")
   ADD_CUSTOM_TARGET(${JDBC_TARGET_NAME} ALL WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} DEPENDS ${JDBC_CMD_NAME})

src/connector/jdbc/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.taosdata.jdbc</groupId>
   <artifactId>taos-jdbcdriver</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0</version>
   <packaging>jar</packaging>
   <name>JDBCDriver</name>
   <url>https://github.com/taosdata/TDengine/tree/master/src/connector/jdbc</url>

src/connector/jdbc/src/test/java/TestAsyncTSDBSubscribe.java

@@ -8,7 +8,7 @@ import java.util.Properties;
 
 public class TestAsyncTSDBSubscribe {
     public static void main(String[] args) throws SQLException {
-        String usage = "java -cp taos-jdbcdriver-1.0.3_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName -topic topicName " +
+        String usage = "java -cp taos-jdbcdriver-2.0.0_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName -topic topicName " +
                 "-tname tableName -h host";
         if (args.length < 2) {
             System.err.println(usage);

src/connector/jdbc/src/test/java/TestTSDBSubscribe.java

@@ -10,7 +10,7 @@ import java.util.Properties;
 
 public class TestTSDBSubscribe {
     public static void main(String[] args) throws Exception {
-        String usage = "java -cp taos-jdbcdriver-1.0.3_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName " +
+        String usage = "java -cp taos-jdbcdriver-2.0.0_dev-dist.jar com.taosdata.jdbc.TSDBSubscribe -db dbName " +
                 "-topic topicName -tname tableName -h host";
         if (args.length < 2) {
             System.err.println(usage);

src/connector/nodejs/package.json

 {
   "name": "td-connector",
-  "version": "1.6.1",
+  "version": "2.0.0",
   "description": "A Node.js connector for TDengine.",
   "main": "tdengine.js",
   "scripts": {

src/connector/python/linux/python2/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/linux/python2/taos.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: taos
-Version: 1.4.15
+Version: 2.0.0
 Summary: TDengine python client package
 Home-page: https://github.com/pypa/sampleproject
 Author: Taosdata Inc.

src/connector/python/linux/python3/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/linux/python3/taos.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: taos
-Version: 1.4.15
+Version: 2.0.0
 Summary: TDengine python client package
 Home-page: https://github.com/pypa/sampleproject
 Author: Taosdata Inc.

src/connector/python/windows/python2/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/windows/python2/taos.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: taos
-Version: 1.4.15
+Version: 2.0.0
 Summary: TDengine python client package
 Home-page: https://github.com/pypa/sampleproject
 Author: Taosdata Inc.

src/connector/python/windows/python3/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="taos",
-    version="1.4.15",
+    version="2.0.0",
     author="Taosdata Inc.",
     author_email="support@taosdata.com",
     description="TDengine python client package",

src/connector/python/windows/python3/taos.egg-info/PKG-INFO

 Metadata-Version: 2.1
 Name: taos
-Version: 1.4.15
+Version: 2.0.0
 Summary: TDengine python client package
 Home-page: https://github.com/pypa/sampleproject
 Author: Hongze Cheng

src/dnode/src/dnodeVRead.c

@@ -131,6 +131,7 @@ void dnodeDispatchToVnodeReadQueue(SRpcMsg *pMsg) {
         .msgType = 0
     };
     rpcSendResponse(&rpcRsp);
+    rpcFreeCont(pMsg->pCont);
   }
 }
 

src/dnode/src/dnodeVWrite.c

@@ -119,6 +119,7 @@ void dnodeDispatchToVnodeWriteQueue(SRpcMsg *pMsg) {
       .msgType = 0
     };
     rpcSendResponse(&rpcRsp);
+    rpcFreeCont(pMsg->pCont);
   }
 }
 

src/query/src/qExecutor.c

@@ -5858,11 +5858,13 @@ static int32_t doDumpQueryResult(SQInfo *pQInfo, char *data) {
       int32_t s = lseek(fd, 0, SEEK_END);
       UNUSED(s);
       qTrace("QInfo:%p ts comp data return, file:%s, size:%d", pQInfo, pQuery->sdata[0]->data, s);
-      s = lseek(fd, 0, SEEK_SET);
-      if (s >= 0) {
+      if (lseek(fd, 0, SEEK_SET) >= 0) {
         size_t sz = read(fd, data, s);
         UNUSED(sz);
+      } else {
+        // todo handle error
       }
+
       close(fd);
       unlink(pQuery->sdata[0]->data);
     } else {

src/query/src/qtsbuf.c

@@ -884,7 +884,7 @@ void tsBufDisplay(STSBuf* pTSBuf) {
   
   while (tsBufNextPos(pTSBuf)) {
     STSElem elem = tsBufGetElem(pTSBuf);
-    printf("%d-%" PRId64 "-%" PRId64 "\n", elem.vnode, *(int64_t*) elem.tag, elem.ts);
+    printf("%d-%" PRId64 "-%" PRId64 "\n", elem.vnode, elem.tag, elem.ts);
   }
   
   pTSBuf->cur.order = old;

src/rpc/src/rpcMain.c

@@ -331,6 +331,7 @@ void rpcFreeCont(void *cont) {
   if ( cont ) {
     char *temp = ((char *)cont) - sizeof(SRpcHead) - sizeof(SRpcReqContext);
     free(temp);
+    // tTrace("free mem: %p", temp);
   }
 }
 
@@ -540,6 +541,7 @@ static void rpcFreeMsg(void *msg) {
   if ( msg ) {
     char *temp = (char *)msg - sizeof(SRpcReqContext);
     free(temp);
+    // tTrace("free mem: %p", temp);
   }
 }
 

src/rpc/src/rpcTcp.c

@@ -418,6 +418,8 @@ static int taosReadTcpData(SFdObj *pFdObj, SRecvInfo *pInfo) {
   if ( NULL == buffer) {
     tError("%s %p TCP malloc(size:%d) fail", pThreadObj->label, pFdObj->thandle, msgLen);
     return -1;
+  } else {
+    // tTrace("malloc mem: %p", buffer);
   }
 
   msg = buffer + tsRpcOverhead;

src/rpc/src/rpcUdp.c

@@ -211,6 +211,8 @@ static void *taosRecvUdpData(void *param) {
     if (NULL == tmsg) {
       tError("%s failed to allocate memory, size:%ld", pConn->label, dataLen);
       continue;
+    } else {
+      // tTrace("malloc mem: %p", tmsg);
     }
 
     tmsg += tsRpcOverhead;  // overhead for SRpcReqContext

src/tsdb/src/tsdbMeta.c

@@ -48,6 +48,8 @@ static int     tsdbEncodeTable(void **buf, STable *pTable);
 static void *  tsdbDecodeTable(void *buf, STable **pRTable);
 static int     tsdbGetTableEncodeSize(int8_t act, STable *pTable);
 static void *  tsdbInsertTableAct(STsdbRepo *pRepo, int8_t act, void *buf, STable *pTable);
+static int     tsdbRemoveTableFromStore(STsdbRepo *pRepo, STable *pTable);
+static int     tsdbRmTableFromMeta(STsdbRepo *pRepo, STable *pTable);
 
 // ------------------ OUTER FUNCTIONS ------------------
 int tsdbCreateTable(TSDB_REPO_T *repo, STableCfg *pCfg) {
@@ -117,7 +119,7 @@ int tsdbDropTable(TSDB_REPO_T *repo, STableId tableId) {
 
   STable *pTable = tsdbGetTableByUid(pMeta, uid);
   if (pTable == NULL) {
-    tsdbError("vgId:%d failed to drop table since table not exists! tid:%d uid %" PRId64, REPO_ID(pRepo), tableId.tid,
+    tsdbError("vgId:%d failed to drop table since table not exists! tid:%d uid %" PRIu64, REPO_ID(pRepo), tableId.tid,
               uid);
     terrno = TSDB_CODE_TDB_INVALID_TABLE_ID;
     return -1;
@@ -132,30 +134,26 @@ int tsdbDropTable(TSDB_REPO_T *repo, STableId tableId) {
     return -1;
   }
 
-  if (TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) {
-    if (pTable->cqhandle) pRepo->appH.cqDropFunc(pTable->cqhandle);
+  // Write to KV store first
+  if (tsdbRemoveTableFromStore(pRepo, pTable) < 0) {
+    tsdbError("vgId:%d failed to drop table %s since %s", REPO_ID(pRepo), tbname, tstrerror(terrno));
+    goto _err;
   }
 
-  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
-    SSkipListIterator *pIter = tSkipListCreateIter(pTable->pIndex);
-    while (tSkipListIterNext(pIter)) {
-      STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
-      ASSERT(TABLE_TYPE(tTable) == TSDB_CHILD_TABLE);
-      int   tlen = tsdbGetTableEncodeSize(TSDB_DROP_META, tTable);
-      void *buf = tsdbAllocBytes(pRepo, tlen);
-      ASSERT(buf != NULL);
-      tsdbInsertTableAct(pRepo, TSDB_DROP_META, buf, tTable);
-      tsdbRemoveTableFromMeta(pRepo, tTable, false, true);
-    }
-    tSkipListDestroyIter(pIter);
+  // Remove table from Meta
+  if (tsdbRmTableFromMeta(pRepo, pTable) < 0) {
+    tsdbError("vgId:%d failed to drop table %s since %s", REPO_ID(pRepo), tbname, tstrerror(terrno));
+    goto _err;
   }
 
-  tsdbRemoveTableFromMeta(pRepo, pTable, true, true);
-
   tsdbTrace("vgId:%d, table %s is dropped! tid:%d, uid:%" PRId64, pRepo->config.tsdbId, tbname, tid, uid);
   free(tbname);
 
   return 0;
+
+_err:
+  tfree(tbname);
+  return -1;
 }
 
 void *tsdbGetTableTagVal(const void* pTable, int32_t colId, int16_t type, int16_t bytes) {
@@ -555,15 +553,16 @@ int tsdbUnlockRepoMeta(STsdbRepo *pRepo) {
 
 void tsdbRefTable(STable *pTable) {
   int16_t ref = T_REF_INC(pTable);
-  tsdbTrace("ref table:%s, uid:%"PRIu64", tid:%d, ref:%d", TABLE_CHAR_NAME(pTable), pTable->tableId.uid, pTable->tableId.tid, ref);
+  UNUSED(ref);
+  // tsdbTrace("ref table %"PRIu64", tid:%d, refCount:%d", TABLE_UID(pTable), TABLE_TID(pTable), ref);
 }
 
 void tsdbUnRefTable(STable *pTable) {
   int16_t ref = T_REF_DEC(pTable);
-  tsdbTrace("unref table:%s, uid:%"PRIu64", tid:%d, ref:%d", TABLE_CHAR_NAME(pTable), pTable->tableId.uid, pTable->tableId.tid, ref);
+  tsdbTrace("unref table uid:%"PRIu64", tid:%d, refCount:%d", TABLE_UID(pTable), TABLE_TID(pTable), ref);
 
   if (ref == 0) {
-    tsdbTrace("destroy table:%s uid:%"PRIu64", tid:%d", TABLE_CHAR_NAME(pTable), pTable->tableId.uid, pTable->tableId.tid);
+    // tsdbTrace("destory table name:%s uid:%"PRIu64", tid:%d", TABLE_CHAR_NAME(pTable), TABLE_UID(pTable), TABLE_TID(pTable));
 
     if (TABLE_TYPE(pTable) == TSDB_CHILD_TABLE) {
       tsdbUnRefTable(pTable->pSuper);
@@ -1164,8 +1163,16 @@ static void *tsdbDecodeTable(void *buf, STable **pRTable) {
 }
 
 static int tsdbGetTableEncodeSize(int8_t act, STable *pTable) {
-  int tlen = sizeof(SListNode) + sizeof(SActObj);
-  if (act == TSDB_UPDATE_META) tlen += (sizeof(SActCont) + tsdbEncodeTable(NULL, pTable) + sizeof(TSCKSUM));
+  int tlen = 0;
+  if (act == TSDB_UPDATE_META) {
+    tlen = sizeof(SListNode) + sizeof(SActObj) + sizeof(SActCont) + tsdbEncodeTable(NULL, pTable) + sizeof(TSCKSUM);
+  } else {
+    if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+      tlen = (sizeof(SListNode) + sizeof(SActObj)) * (tSkipListGetSize(pTable->pIndex) + 1);
+    } else {
+      tlen = sizeof(SListNode) + sizeof(SActObj);
+    }
+  }
 
   return tlen;
 }
@@ -1190,4 +1197,61 @@ static void *tsdbInsertTableAct(STsdbRepo *pRepo, int8_t act, void *buf, STable
   tdListAppendNode(pRepo->mem->actList, pNode);
 
   return pBuf;
+}
+
+static int tsdbRemoveTableFromStore(STsdbRepo *pRepo, STable *pTable) {
+  int   tlen = tsdbGetTableEncodeSize(TSDB_DROP_META, pTable);
+  void *buf = tsdbAllocBytes(pRepo, tlen);
+  ASSERT(buf != NULL);
+
+  void *pBuf = buf;
+  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+    SSkipListIterator *pIter = tSkipListCreateIter(pTable->pIndex);
+    if (pIter == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+
+    while (tSkipListIterNext(pIter)) {
+      STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
+      ASSERT(TABLE_TYPE(tTable) == TSDB_CHILD_TABLE);
+      pBuf = tsdbInsertTableAct(pRepo, TSDB_DROP_META, pBuf, pTable);
+    }
+
+    tSkipListDestroyIter(pIter);
+  }
+  pBuf = tsdbInsertTableAct(pRepo, TSDB_DROP_META, pBuf, pTable);
+
+  ASSERT(POINTER_DISTANCE(pBuf, buf) == tlen);
+
+  return 0;
+}
+
+static int tsdbRmTableFromMeta(STsdbRepo *pRepo, STable *pTable) {
+  if (TABLE_TYPE(pTable) == TSDB_SUPER_TABLE) {
+    SSkipListIterator *pIter = tSkipListCreateIter(pTable->pIndex);
+    if (pIter == NULL) {
+      terrno = TSDB_CODE_TDB_OUT_OF_MEMORY;
+      return -1;
+    }
+
+    tsdbWLockRepoMeta(pRepo);
+
+    while (tSkipListIterNext(pIter)) {
+      STable *tTable = *(STable **)SL_GET_NODE_DATA(tSkipListIterGet(pIter));
+      tsdbRemoveTableFromMeta(pRepo, tTable, false, false);
+    }
+
+    tsdbRemoveTableFromMeta(pRepo, pTable, false, false);
+
+    tsdbUnlockRepoMeta(pRepo);
+
+    tSkipListDestroyIter(pIter);
+
+  } else {
+    if ((TABLE_TYPE(pTable) == TSDB_STREAM_TABLE) && pTable->cqhandle) pRepo->appH.cqDropFunc(pTable->cqhandle);
+    tsdbRemoveTableFromMeta(pRepo, pTable, true, true);
+  }
+
+  return 0;
 }
\ No newline at end of file

src/util/src/tkvstore.c

@@ -500,7 +500,7 @@ static int tdRestoreKVStore(SKVStore *pStore) {
 
     char *pBuf = tdDecodeKVRecord(tbuf, &rInfo);
     ASSERT(POINTER_DISTANCE(pBuf, tbuf) == sizeof(SKVRecord));
-    ASSERT(pStore->info.size == rInfo.offset);
+    ASSERT((rInfo.offset > 0) ? (pStore->info.size == rInfo.offset) : true);
 
     if (rInfo.offset < 0) {
       taosHashRemove(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid));