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

meta/tbc: key cannot be null

This commit is contained in:
Minglei Jin 2023-06-01 10:41:01 +08:00
parent fb2f367aac
commit 9b9bf2de68
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,11 +866,11 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
return code; return code;
} }
void *pData = NULL; void *pData = NULL, *pKey = NULL;
int nData = 0; int nData = 0, nKey = 0;
while (1) { while (1) {
int32_t ret = tdbTbcNext(pCur, NULL, NULL, &pData, &nData); int32_t ret = tdbTbcNext(pCur, &pKey, &nKey, &pData, &nData);
if (ret < 0) { if (ret < 0) {
break; break;
} }
@ -879,7 +879,7 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
SDecoder dc = {0}; SDecoder dc = {0};
tDecoderInit(&dc, pData, nData); tDecoderInit(&dc, pData, nData);
metaDecodeEntry(&dc, &me); metaDecodeEntry(&dc, &me);
if (me.type == TSDB_CHILD_TABLE) { if (me.type != TSDB_SUPER_TABLE) {
int32_t ret = vnodeValidateTableHash(pMeta->pVnode, me.name); int32_t ret = vnodeValidateTableHash(pMeta->pVnode, me.name);
if (TSDB_CODE_VND_HASH_MISMATCH == ret) { if (TSDB_CODE_VND_HASH_MISMATCH == ret) {
taosArrayPush(uidList, &me.uid); taosArrayPush(uidList, &me.uid);
@ -888,6 +888,7 @@ static int32_t metaFilterTableByHash(SMeta *pMeta, SArray *uidList) {
tDecoderClear(&dc); tDecoderClear(&dc);
} }
tdbFree(pData); tdbFree(pData);
tdbFree(pKey);
tdbTbcClose(pCur); tdbTbcClose(pCur);
return 0; return 0;