提交 0feffc68 编写于 作者: H Haojun Liao

fix(tsdb): check uid in multiple stt statistics blocks.

上级 2c357f19
...@@ -381,42 +381,50 @@ static bool existsFromSttBlkStatis(const TStatisBlkArray *pStatisBlkArray, uint6 ...@@ -381,42 +381,50 @@ static bool existsFromSttBlkStatis(const TStatisBlkArray *pStatisBlkArray, uint6
return false; return false;
} }
SStatisBlk *p = &pStatisBlkArray->data[i]; while(i < TARRAY2_SIZE(pStatisBlkArray)) {
STbStatisBlock block = {0}; SStatisBlk *p = &pStatisBlkArray->data[i];
tsdbSttFileReadStatisBlock(pReader, p, &block); if (p->minTbid.suid > suid) {
return false;
int32_t index = tarray2SearchIdx(block.suid, &suid, sizeof(int64_t), suidComparFn, TD_EQ); }
if (index == -1) {
tStatisBlockDestroy(&block); STbStatisBlock block = {0};
return false; tsdbSttFileReadStatisBlock(pReader, p, &block);
}
int32_t index = tarray2SearchIdx(block.suid, &suid, sizeof(int64_t), suidComparFn, TD_EQ);
int32_t j = index; if (index == -1) {
if (block.uid->data[j] == uid) { tStatisBlockDestroy(&block);
tStatisBlockDestroy(&block); return false;
return true; }
} else if (block.uid->data[j] > uid) {
while (j >= 0 && block.suid->data[j] == suid) { int32_t j = index;
if (block.uid->data[j] == uid) { if (block.uid->data[j] == uid) {
tStatisBlockDestroy(&block); tStatisBlockDestroy(&block);
return true; return true;
} else { } else if (block.uid->data[j] > uid) {
j -= 1; while (j >= 0 && block.suid->data[j] == suid) {
if (block.uid->data[j] == uid) {
tStatisBlockDestroy(&block);
return true;
} else {
j -= 1;
}
} }
} } else {
} else { j = index + 1;
j = index + 1; while (j < block.suid->size && block.suid->data[j] == suid) {
while (j < block.suid->size && block.suid->data[j] == suid) { if (block.uid->data[j] == uid) {
if (block.uid->data[j] == uid) { tStatisBlockDestroy(&block);
tStatisBlockDestroy(&block); return true;
return true; } else {
} else { j += 1;
j += 1; }
} }
} }
tStatisBlockDestroy(&block);
i += 1;
} }
tStatisBlockDestroy(&block);
return false; return false;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册