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

fix/TS-6028-check-column-name-fix-review

This commit is contained in:
dmchen 2025-02-25 10:27:32 +00:00
parent fdc60a6336
commit 26f3adcf6a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/dnode/mnode/impl/src/mndStb.c
View File

@ -1320,12 +1320,17 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
goto _OVER; goto _OVER;
} }
pHash = taosHashInit(3, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK); pHash = taosHashInit(createReq.numOfColumns + createReq.numOfTags, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY),
false, HASH_NO_LOCK);
if (pHash == NULL) {
code = TSDB_CODE_OUT_OF_MEMORY;
goto _OVER;
}
void *pIter = NULL; void *pIter = NULL;
for (int32_t i = 0; i < createReq.numOfColumns; ++i) { for (int32_t i = 0; i < createReq.numOfColumns; ++i) {
SFieldWithOptions *pField = taosArrayGet(createReq.pColumns, i); SFieldWithOptions *pField = taosArrayGet(createReq.pColumns, i);
if (taosHashPut(pHash, pField->name, sizeof(pField->name), pField->name, sizeof(pField->name)) != 0) { if (taosHashPut(pHash, pField->name, strlen(pField->name), NULL, 0) != 0) {
code = TSDB_CODE_TSC_DUP_COL_NAMES; code = TSDB_CODE_TSC_DUP_COL_NAMES;
goto _OVER; goto _OVER;
} }
@ -1333,8 +1338,10 @@ static int32_t mndProcessCreateStbReq(SRpcMsg *pReq) {
for (int32_t i = 0; i < createReq.numOfTags; ++i) { for (int32_t i = 0; i < createReq.numOfTags; ++i) {
SField *pField = taosArrayGet(createReq.pTags, i); SField *pField = taosArrayGet(createReq.pTags, i);
if (taosHashPut(pHash, pField->name, sizeof(pField->name), pField->name, sizeof(pField->name)) != 0) { if ((code = taosHashPut(pHash, pField->name, strlen(pField->name), NULL, 0)) != 0) {
code = TSDB_CODE_TSC_DUP_COL_NAMES; if (code == TSDB_CODE_DUP_KEY) {
code = TSDB_CODE_TSC_DUP_COL_NAMES;
}
goto _OVER; goto _OVER;
} }
} }