From 88c413822a190806df85fd753489cd13433dd877 Mon Sep 17 00:00:00 2001 From: kailixu Date: Sun, 5 Mar 2023 10:33:28 +0800 Subject: [PATCH] chore: use assign sver --- src/mnode/src/mnodeTable.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c index 32f98201c3..5194b779c5 100644 --- a/src/mnode/src/mnodeTable.c +++ b/src/mnode/src/mnodeTable.c @@ -68,6 +68,7 @@ static int32_t tsSuperTableUpdateSize; typedef struct { int32_t vgId; int32_t tid; + int32_t sversion; uint64_t uid; uint64_t suid; } SMetaInfo; @@ -2262,7 +2263,7 @@ static int32_t mnodeDoCreateChildTable(SMnodeMsg *pMsg, SMetaInfo *pInf) { } } - pTable->sversion = 0; + pTable->sversion = htonl(pInf->sversion); pTable->numOfColumns = htons(pCreate->numOfColumns); pTable->sqlLen = htons(pCreate->sqlLen); @@ -2325,7 +2326,7 @@ static int32_t mnodeProcessMetaSyncCreateChildTableMsg(SMnodeMsg *pMsg, SMetaInf SCreateTableMsg *pCreate = (SCreateTableMsg *)((char *)pMsg->rpcMsg.pCont + sizeof(SCMCreateTableMsg)); int32_t code = 0; - // 0.db0._taos_meta_sync_cret_mndtb_taos_vgId.suid.uid.tid.tbName + // 0.db0._taos_meta_sync_cret_mndtb_taos_vgId.suid.uid.tid.sversion.tbName if (strstr(pCreate->tableName, META_SYNC_CRET_MNDTB)) { code = TSDB_CODE_MND_INVALID_FORMAT; char realName[TSDB_TABLE_FNAME_LEN] = {0}; @@ -2342,9 +2343,12 @@ static int32_t mnodeProcessMetaSyncCreateChildTableMsg(SMnodeMsg *pMsg, SMetaInf if ((pTbName = strchr(pTbName, '.'))) { pInf->tid = atoi(++pTbName); if ((pTbName = strchr(pTbName, '.'))) { - int32_t len = strlen(realName); - strncpy(realName + len, pTbName + 1, TSDB_TABLE_FNAME_LEN - len - 1); - code = 0; + pInf->sversion = atoi(++pTbName); + if ((pTbName = strchr(pTbName, '.'))) { + int32_t len = strlen(realName); + strncpy(realName + len, pTbName + 1, TSDB_TABLE_FNAME_LEN - len - 1); + code = 0; + } } } } -- GitLab