Merge branch '3.0' of https://github.com/taosdata/TDengine into feat/stream_compression

packaging/tools/install.sh

@@ -569,7 +569,7 @@ function install_examples() {
 
 function install_web() {
   if [ -d "${script_dir}/share" ]; then
-    ${csudo}cp -rf ${binary_dir}/share/* ${install_main_dir}/share
+    ${csudo}cp -rf ${script_dir}/share/* ${install_main_dir}/share
   fi
 }
 

source/common/src/tglobal.c

@@ -85,8 +85,7 @@ uint16_t tsTelemPort = 80;
 char tsSmlTagName[TSDB_COL_NAME_LEN] = "_tag_null";
 char tsSmlChildTableName[TSDB_TABLE_NAME_LEN] = "";  // user defined child table name can be specified in tag value.
                                                      // If set to empty system will generate table name using MD5 hash.
-bool tsSmlDataFormat =
+bool tsSmlDataFormat = false;  // true means that the name and order of cols in each line are the same(only for influx protocol)
-    true;  // true means that the name and order of cols in each line are the same(only for influx protocol)
 
 // query
 int32_t tsQueryPolicy = 1;

source/dnode/mgmt/mgmt_vnode/src/vmFile.c

@@ -135,6 +135,7 @@ _OVER:
   if (content != NULL) taosMemoryFree(content);
   if (root != NULL) cJSON_Delete(root);
   if (pFile != NULL) taosCloseFile(&pFile);
+  if (*ppCfgs == NULL && pCfgs != NULL) taosMemoryFree(pCfgs);
 
   terrno = code;
   return code;

source/dnode/mgmt/mgmt_vnode/src/vmHandle.c

@@ -175,7 +175,7 @@ static void vmGenerateVnodeCfg(SCreateVnodeReq *pCreate, SVnodeCfg *pCfg) {
   pCfg->hashSuffix = pCreate->hashSuffix;
   pCfg->tsdbPageSize = pCreate->tsdbPageSize * 1024;
 
-  pCfg->standby = pCfg->standby;
+  pCfg->standby = 0;
   pCfg->syncCfg.myIndex = pCreate->selfIndex;
   pCfg->syncCfg.replicaNum = pCreate->replica;
   memset(&pCfg->syncCfg.nodeInfo, 0, sizeof(pCfg->syncCfg.nodeInfo));

source/dnode/mgmt/mgmt_vnode/src/vmInt.c

@@ -58,11 +58,14 @@ int32_t vmOpenVnode(SVnodeMgmt *pMgmt, SWrapperCfg *pCfg, SVnode *pImpl) {
 
   if (pVnode->path == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
+    taosMemoryFree(pVnode);
     return -1;
   }
 
   if (vmAllocQueue(pMgmt, pVnode) != 0) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
+    taosMemoryFree(pVnode->path);
+    taosMemoryFree(pVnode);
     return -1;
   }
 
@@ -221,6 +224,7 @@ static void vmCloseVnodes(SVnodeMgmt *pMgmt) {
   SVnodeObj **ppVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes);
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
+    if (ppVnodes == NULL || ppVnodes[i] == NULL) continue;
     vmCloseVnode(pMgmt, ppVnodes[i]);
   }
 
@@ -380,7 +384,9 @@ static int32_t vmStartVnodes(SVnodeMgmt *pMgmt) {
   for (int32_t v = 0; v < numOfVnodes; ++v) {
     int32_t       t = v % threadNum;
     SVnodeThread *pThread = &threads[t];
-    pThread->ppVnodes[pThread->vnodeNum++] = ppVnodes[v];
+    if (pThread->ppVnodes != NULL) {
+      pThread->ppVnodes[pThread->vnodeNum++] = ppVnodes[v];
+    }
   }
 
   pMgmt->state.openVnodes = 0;
@@ -411,8 +417,8 @@ static int32_t vmStartVnodes(SVnodeMgmt *pMgmt) {
   taosMemoryFree(threads);
 
   for (int32_t i = 0; i < numOfVnodes; ++i) {
-    SVnodeObj *pVnode = ppVnodes[i];
+    if (ppVnodes == NULL || ppVnodes[i] == NULL) continue;
-    vmReleaseVnode(pMgmt, pVnode);
+    vmReleaseVnode(pMgmt, ppVnodes[i]);
   }
 
   if (ppVnodes != NULL) {

source/dnode/mnode/sdb/src/sdbFile.c

@@ -514,7 +514,7 @@ static void sdbCloseIter(SSdbIter *pIter) {
   }
 
   if (pIter->name != NULL) {
-    taosRemoveFile(pIter->name);
+    (void)taosRemoveFile(pIter->name);
     taosMemoryFree(pIter->name);
     pIter->name = NULL;
   }
@@ -606,6 +606,7 @@ int32_t sdbStartWrite(SSdb *pSdb, SSdbIter **ppIter) {
   if (pIter->file == NULL) {
     terrno = TAOS_SYSTEM_ERROR(errno);
     mError("failed to open %s since %s", pIter->name, terrstr());
+    sdbCloseIter(pIter);
     return -1;
   }
 
@@ -636,9 +637,9 @@ int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, i
     return -1;
   }
 
-  sdbCloseIter(pIter);
   if (sdbReadFile(pSdb) != 0) {
     mError("sdbiter:%p, failed to read from %s since %s", pIter, datafile, terrstr());
+    sdbCloseIter(pIter);
     return -1;
   }
 
@@ -656,6 +657,7 @@ int32_t sdbStopWrite(SSdb *pSdb, SSdbIter *pIter, bool isApply, int64_t index, i
   }
 
   mInfo("sdbiter:%p, success applyed to sdb", pIter);
+  sdbCloseIter(pIter);
   return 0;
 }
 

tests/system-test/7-tmq/subscribeDb3.py

@@ -295,7 +295,7 @@ class TDTestCase:
         ifManualCommit = 1
         keyList      = 'group.id:cgrp1,\
                         enable.auto.commit:true,\
-                        auto.commit.interval.ms:1000,\
+                        auto.commit.interval.ms:200,\
                         auto.offset.reset:earliest'
         self.insertConsumerInfo(consumerId, expectrowcnt,topicList,keyList,ifcheckdata,ifManualCommit)