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

more code

This commit is contained in:
Hongze Cheng 2022-12-29 16:34:41 +08:00
parent 01f6823bc1
commit 3aa1f8ca90
1 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/dnode/vnode/src/tsdb/tsdbCompact.c
View File

@ -519,16 +519,7 @@ static int32_t tsdbCompactNextRow(STsdbCompactor *pCompactor) {
if (pCompactor->pIter) { if (pCompactor->pIter) {
SRowInfo *pRowInfo = &pCompactor->pIter->rowInfo; SRowInfo *pRowInfo = &pCompactor->pIter->rowInfo;
// Table exists if (pRowInfo->uid != pCompactor->tbSkm.uid) {
if (pRowInfo->uid == pCompactor->tbSkm.uid) {
if (pCompactor->aTSDBKEY) {
// TODO: check if the row is deleted. if deleted, continue, else break
ASSERT(0);
} else {
break;
}
}
SMetaInfo info; SMetaInfo info;
if (pRowInfo->suid) { // child table if (pRowInfo->suid) { // child table
@ -596,13 +587,20 @@ static int32_t tsdbCompactNextRow(STsdbCompactor *pCompactor) {
pCompactor->aSkyLine); pCompactor->aSkyLine);
TSDB_CHECK_CODE(code, lino, _exit); TSDB_CHECK_CODE(code, lino, _exit);
pCompactor->aTSDBKEY = (TSDBKEY *)TARRAY_DATA(pCompactor->aDelData); pCompactor->aTSDBKEY = (TSDBKEY *)TARRAY_DATA(pCompactor->aSkyLine);
} else { } else {
pCompactor->aTSDBKEY = NULL; pCompactor->aTSDBKEY = NULL;
} }
} }
}
ASSERT(pRowInfo->uid == pCompactor->tbSkm.uid);
if (pCompactor->aTSDBKEY && 0 /* TODO: the row is deleted */) {
continue;
} else {
break; break;
}
} else { } else {
// iter end, just break out // iter end, just break out
break; break;