提交 3aa1f8ca 编写于 作者: H Hongze Cheng

more code

上级 01f6823b
...@@ -519,16 +519,7 @@ static int32_t tsdbCompactNextRow(STsdbCompactor *pCompactor) { ...@@ -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) { ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册