chore: meta sync

src/common/src/tglobal.c

@@ -232,7 +232,7 @@ int32_t tsKeepTimeOffset = 0;
 
 int32_t tsDiskCfgNum = 0;
 int32_t tsTopicBianryLen = 16000;
-int32_t tsMetaSyncOption = 0;
+int32_t tsMetaSyncOption = 1;
 
 #ifndef _STORAGE
 SDiskCfg tsDiskCfg[1];

src/inc/taoserror.h

@@ -222,6 +222,8 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_MND_INVALID_TOPIC_PARTITONS   TAOS_DEF_ERROR_CODE(0, 0x0394)  //"Invalid topic partitons num, valid range: [1, 1000])
 #define TSDB_CODE_MND_TOPIC_ALREADY_EXIST       TAOS_DEF_ERROR_CODE(0, 0x0395)  //"Topic already exists)
 
+#define TSDB_CODE_MND_INVALID_FORMAT            TAOS_DEF_ERROR_CODE(0, 0x0396)  //"Invalid format)
+
 // dnode
 #define TSDB_CODE_DND_MSG_NOT_PROCESSED         TAOS_DEF_ERROR_CODE(0, 0x0400)  //"Message not processed"
 #define TSDB_CODE_DND_OUT_OF_MEMORY             TAOS_DEF_ERROR_CODE(0, 0x0401)  //"Dnode out of memory"

src/mnode/src/mnodeVgroup.c

@@ -459,16 +459,23 @@ int32_t mnodeGetAvailableVgroup(SMnodeMsg *pMsg, SVgObj **ppVgroup, int32_t *pSi
         continue;
       }
 
-      int32_t sid = taosAllocateId(pVgroup->idPool);
-      if (sid <= 0) {
-        int curMaxId = taosIdPoolMaxSize(pVgroup->idPool);
-        if ((taosUpdateIdPool(pVgroup->idPool, curMaxId + 1) < 0) || ((sid = taosAllocateId(pVgroup->idPool)) <= 0)) {
-          mError("msg:%p, app:%p db:%s, no enough sid in vgId:%d", pMsg, pMsg->rpcMsg.ahandle, pDb->name,
-                 pVgroup->vgId);
-          pthread_mutex_unlock(&pDb->mutex);
-          return TSDB_CODE_MND_APP_ERROR;
+      int32_t sid = 0;
+      if (*pSid <= 0) {
+        sid = taosAllocateId(pVgroup->idPool);
+        if (sid <= 0) {
+          int curMaxId = taosIdPoolMaxSize(pVgroup->idPool);
+          if ((taosUpdateIdPool(pVgroup->idPool, curMaxId + 1) < 0) || ((sid = taosAllocateId(pVgroup->idPool)) <= 0)) {
+            mError("msg:%p, app:%p db:%s, no enough sid in vgId:%d", pMsg, pMsg->rpcMsg.ahandle, pDb->name,
+                   pVgroup->vgId);
+            pthread_mutex_unlock(&pDb->mutex);
+            return TSDB_CODE_MND_APP_ERROR;
+          }
         }
+      } else {
+        
+
       }
+
       mDebug("vgId:%d, alloc tid:%d", pVgroup->vgId, sid);
 
       *pSid = sid;

src/tsdb/src/tsdbMeta.c

@@ -219,10 +219,10 @@ int tsdbDumpTables(STsdbRepo *pRepo, uint64_t qId) {
   for (int32_t i = 0; i < pMeta->maxTables; ++i) {
     if (pMeta->tables[i] != NULL) {
       STable *pTable = pMeta->tables[i];
-      // keep the output format 
-      tsdbInfo("vgId:%d QID:%" PRIu64 " stb:%s %s:%s tid:%d uid:%" PRIu64, REPO_ID(pRepo), qId,
-               pTable->pSuper ? pTable->pSuper->name->data : "", "msynctbn", pTable->name->data, pTable->tableId.tid,
-               pTable->tableId.uid);
+      // keep the output format
+      tsdbInfo("vgId:%d, type:%d stb:%s suid:%" PRIu64 " %s:%s tid:%d uid:%" PRIu64, REPO_ID(pRepo), pTable->type,
+               pTable->pSuper ? pTable->pSuper->name->data : "", pTable->suid, "msynctbn", pTable->name->data,
+               pTable->tableId.tid, pTable->tableId.uid);
     }
   }
   if (tsdbUnlockRepoMeta(pRepo) < 0) return -1;
@@ -1486,7 +1486,7 @@ static void *tsdbDecodeTable(void *buf, STable **pRTable) {
           tsdbFreeTable(pTable);
           return NULL;
         }
-	taosHashSetFreeFp(pTable->jsonKeyMap, taosArrayDestroyForHash);
+        taosHashSetFreeFp(pTable->jsonKeyMap, taosArrayDestroyForHash);
       }else{
         pTable->pIndex = tSkipListCreate(TSDB_SUPER_TABLE_SL_LEVEL, colType(pCol), (uint8_t)(colBytes(pCol)), NULL,
                                        SL_ALLOW_DUP_KEY, getTagIndexKey);

src/util/src/terror.c

@@ -229,6 +229,8 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TOPIC_OPTION,     "Invalid topic option"
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_TOPIC_PARTITONS,  "Invalid topic partitons num, valid range: [1, 1000]")
 TAOS_DEFINE_ERROR(TSDB_CODE_MND_TOPIC_ALREADY_EXIST,      "Topic already exists")
 
+TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_FORMAT,           "Invalid format")
+
 // dnode
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_MSG_NOT_PROCESSED,        "Message not processed")
 TAOS_DEFINE_ERROR(TSDB_CODE_DND_OUT_OF_MEMORY,            "Dnode out of memory")