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

Merge branch 'enh/TS-5441-3.0' of https://github.com/taosdata/TDengine into enh/TS-5441-3.0

This commit is contained in:
wangmm0220 2024-10-12 16:29:41 +08:00
parent 3cb60211de 471871bff5
commit 73d6b3b065
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/client/src/clientRawBlockWrite.c
View File

@ -1984,7 +1984,7 @@ static int32_t tmqWriteRawImpl(TAOS* taos, uint16_t type, void* data, int32_t da
tbInfo info = {0}; tbInfo info = {0};
RAW_RETURN_CHECK(catalogGetTableHashVgroup(pCatalog, &conn, &pName, &info.vgInfo)); RAW_RETURN_CHECK(catalogGetTableHashVgroup(pCatalog, &conn, &pName, &info.vgInfo));
if (pCreateReqDst) { // change stable name to get meta if (pCreateReqDst && tmpInfo == NULL) { // change stable name to get meta
(void)strcpy(pName.tname, pCreateReqDst->ctb.stbName); (void)strcpy(pName.tname, pCreateReqDst->ctb.stbName);
} }
RAW_RETURN_CHECK(catalogGetTableMeta(pCatalog, &conn, &pName, &pTableMeta)); RAW_RETURN_CHECK(catalogGetTableMeta(pCatalog, &conn, &pName, &pTableMeta));
@ -2005,12 +2005,13 @@ static int32_t tmqWriteRawImpl(TAOS* taos, uint16_t type, void* data, int32_t da
pCreateReqDst->ctb.suid = pTableMeta->suid; pCreateReqDst->ctb.suid = pTableMeta->suid;
} }
code = taosHashPut(pNameHash, pName.tname, strlen(pName.tname), &info, sizeof(tbInfo)); RAW_RETURN_CHECK(taosHashPut(pNameHash, pName.tname, strlen(pName.tname), &info, sizeof(tbInfo)));
code = (code == TSDB_CODE_DUP_KEY) ? 0 : code; tmpInfo = (tbInfo*)taosHashGet(pNameHash, pName.tname, strlen(pName.tname));
RAW_RETURN_CHECK(code); // code = (code == TSDB_CODE_DUP_KEY) ? 0 : code;
code = taosHashPut(pVgHash, &info.vgInfo.vgId, sizeof(info.vgInfo.vgId), &info.vgInfo, sizeof(SVgroupInfo)); // RAW_RETURN_CHECK(code);
code = (code == TSDB_CODE_DUP_KEY) ? 0 : code; RAW_RETURN_CHECK(taosHashPut(pVgHash, &info.vgInfo.vgId, sizeof(info.vgInfo.vgId), &info.vgInfo, sizeof(SVgroupInfo)));
RAW_RETURN_CHECK(code); // code = (code == TSDB_CODE_DUP_KEY) ? 0 : code;
// RAW_RETURN_CHECK(code);
} }
SSchemaWrapper* pSW = (SSchemaWrapper*)taosArrayGetP(rspObj.dataRsp.blockSchema, rspObj.resIter); SSchemaWrapper* pSW = (SSchemaWrapper*)taosArrayGetP(rspObj.dataRsp.blockSchema, rspObj.resIter);