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

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

This commit is contained in:
Haojun Liao 2023-08-02 12:44:45 +08:00
parent 2c357f1958
commit 0feffc687b
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
View File

@ -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); STbStatisBlock block = {0};
if (index == -1) { tsdbSttFileReadStatisBlock(pReader, p, &block);
tStatisBlockDestroy(&block);
return false; int32_t index = tarray2SearchIdx(block.suid, &suid, sizeof(int64_t), suidComparFn, TD_EQ);
} if (index == -1) {
tStatisBlockDestroy(&block);
int32_t j = index; return false;
if (block.uid->data[j] == uid) { }
tStatisBlockDestroy(&block);
return true; int32_t j = index;
} else if (block.uid->data[j] > uid) { if (block.uid->data[j] == uid) {
while (j >= 0 && block.suid->data[j] == suid) { tStatisBlockDestroy(&block);
if (block.uid->data[j] == uid) { return true;
tStatisBlockDestroy(&block); } else if (block.uid->data[j] > uid) {
return true; while (j >= 0 && block.suid->data[j] == suid) {
} else { if (block.uid->data[j] == uid) {
j -= 1; tStatisBlockDestroy(&block);
} return true;
} } else {
} else { j -= 1;
j = index + 1; }
while (j < block.suid->size && block.suid->data[j] == suid) { }
if (block.uid->data[j] == uid) { } else {
tStatisBlockDestroy(&block); j = index + 1;
return true; while (j < block.suid->size && block.suid->data[j] == suid) {
} else { if (block.uid->data[j] == uid) {
j += 1; tStatisBlockDestroy(&block);
return true;
} else {
j += 1;
}
} }
} }
tStatisBlockDestroy(&block);
i += 1;
} }
tStatisBlockDestroy(&block);
return false; return false;
} }