xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor code

This commit is contained in:
yihaoDeng 2024-11-27 09:28:01 +08:00
parent a84a849ef7
commit 221eac50ca
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/dnode/vnode/src/meta/metaTable.c
View File

@ -2023,7 +2023,6 @@ static int metaUpdateTableMultiTagVal(SMeta *pMeta, int64_t version, SVAlterTbRe
const void *pData = NULL; const void *pData = NULL;
int nData = 0; int nData = 0;
SHashObj *pTagTable = NULL; SHashObj *pTagTable = NULL;
SArray *updateTagColumnIds = NULL;
// search name index // search name index
ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal); ret = tdbTbGet(pMeta->pNameIdx, pAlterTbReq->tbName, strlen(pAlterTbReq->tbName) + 1, &pVal, &nVal);
@ -2128,12 +2127,11 @@ static int metaUpdateTableMultiTagVal(SMeta *pMeta, int64_t version, SVAlterTbRe
goto _err; goto _err;
} }
} }
int32_t nUpdateTagVal = taosHashGetSize(pTagTable);
updateTagColumnIds = taosArrayInit(nUpdateTagVal, sizeof(int32_t));
SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag; SSchemaWrapper *pTagSchema = &stbEntry.stbEntry.schemaTag;
SSchema *pColumn = NULL; SSchema *pColumn = NULL;
int32_t iCol = 0; int32_t iCol = 0;
int32_t count = 0;
for (;;) { for (;;) {
pColumn = NULL; pColumn = NULL;
@ -2141,14 +2139,11 @@ static int metaUpdateTableMultiTagVal(SMeta *pMeta, int64_t version, SVAlterTbRe
if (iCol >= pTagSchema->nCols) break; if (iCol >= pTagSchema->nCols) break;
pColumn = &pTagSchema->pSchema[iCol]; pColumn = &pTagSchema->pSchema[iCol];
if (taosHashGet(pTagTable, pColumn->name, strlen(pColumn->name)) != NULL) { if (taosHashGet(pTagTable, pColumn->name, strlen(pColumn->name)) != NULL) {
if (taosArrayPush(updateTagColumnIds, &iCol) == NULL) { count++;
terrno = TSDB_CODE_OUT_OF_MEMORY;
goto _err;
}
} }
iCol++; iCol++;
} }
if (taosArrayGetSize(updateTagColumnIds) != nUpdateTagVal) { if (count != taosHashGetSize(pTagTable)) {
terrno = TSDB_CODE_VND_COL_NOT_EXISTS; terrno = TSDB_CODE_VND_COL_NOT_EXISTS;
goto _err; goto _err;
} }
@ -2253,7 +2248,6 @@ static int metaUpdateTableMultiTagVal(SMeta *pMeta, int64_t version, SVAlterTbRe
tdbTbcClose(pTbDbc); tdbTbcClose(pTbDbc);
tdbTbcClose(pUidIdxc); tdbTbcClose(pUidIdxc);
taosHashCleanup(pTagTable); taosHashCleanup(pTagTable);
taosArrayDestroy(updateTagColumnIds);
return 0; return 0;
_err: _err:
@ -2264,7 +2258,6 @@ _err:
tdbTbcClose(pTbDbc); tdbTbcClose(pTbDbc);
tdbTbcClose(pUidIdxc); tdbTbcClose(pUidIdxc);
taosHashCleanup(pTagTable); taosHashCleanup(pTagTable);
taosArrayDestroy(updateTagColumnIds);
return -1; return -1;
} }
static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) { static int metaUpdateTableTagVal(SMeta *pMeta, int64_t version, SVAlterTbReq *pAlterTbReq) {