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

Merge pull request #20401 from taosdata/fix/main_bugfix_wxy 

fix: error in last cache handle deleted data
This commit is contained in:
Shengliang Guan 2023-03-11 15:43:55 +08:00 committed by GitHub
parent 300801a68e 38a6d02ca9
commit 584f213739
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/vnode/src/tsdb/tsdbCache.c
View File

@ -506,6 +506,11 @@ static int32_t getTableDelData(STbData *pMem, STbData *pIMem, SDelFReader *pDelR
SArray *aDelData) { SArray *aDelData) {
int32_t code = 0; int32_t code = 0;
if (pDelIdx) {
code = getTableDelDataFromDelIdx(pDelReader, pDelIdx, aDelData);
if (code) goto _err;
}
if (pMem) { if (pMem) {
code = getTableDelDataFromTbData(pMem, aDelData); code = getTableDelDataFromTbData(pMem, aDelData);
if (code) goto _err; if (code) goto _err;
@ -516,11 +521,6 @@ static int32_t getTableDelData(STbData *pMem, STbData *pIMem, SDelFReader *pDelR
if (code) goto _err; if (code) goto _err;
} }
if (pDelIdx) {
code = getTableDelDataFromDelIdx(pDelReader, pDelIdx, aDelData);
if (code) goto _err;
}
_err: _err:
return code; return code;
} }