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

fix: snapshot problem

This commit is contained in:
Hongze Cheng 2023-01-30 15:38:19 +08:00
parent dcd0ade349
commit 5904f967f5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/dnode/vnode/src/meta/metaQuery.c
View File

@ -706,9 +706,8 @@ int32_t metaGetTbTSchemaEx(SMeta *pMeta, tb_uid_t suid, tb_uid_t uid, int32_t sv
} }
} }
if (sver <= 0) { if (taosAssertDebug(sver > 0, __FILE__, __LINE__, "failed to get table schema version: %d", sver) < 0) {
metaError("meta/query: incorrect sver: %" PRId32 ".", sver); code = TSDB_CODE_NOT_FOUND;
code = TSDB_CODE_FAILED;
goto _exit; goto _exit;
} }

2
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
View File

@ -732,6 +732,8 @@ static int32_t tsdbSnapReadTimeSeriesData(STsdbSnapReader* pReader, uint8_t** pp
} }
if (pReader->bData.nRow > 0) { if (pReader->bData.nRow > 0) {
ASSERT(pReader->bData.suid || pReader->bData.uid);
code = tsdbSnapCmprData(pReader, ppData); code = tsdbSnapCmprData(pReader, ppData);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
} }

1
source/dnode/vnode/src/tsdb/tsdbUtil.c
View File

@ -1133,6 +1133,7 @@ _exit:
void tBlockDataReset(SBlockData *pBlockData) { void tBlockDataReset(SBlockData *pBlockData) {
pBlockData->suid = 0; pBlockData->suid = 0;
pBlockData->uid = 0; pBlockData->uid = 0;
pBlockData->nRow = 0;
} }
void tBlockDataClear(SBlockData *pBlockData) { void tBlockDataClear(SBlockData *pBlockData) {