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

fix(tsdb): check numOfPks before load pk

This commit is contained in:
Haojun Liao 2024-04-11 15:16:21 +08:00
parent 1751b84188
commit a3bbf3ba0e
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,28 +399,31 @@ static int32_t loadSttStatisticsBlockData(SSttFileReader *pSttFileReader, SSttBl
rows - i); rows - i);
taosArrayAddBatch(pBlockLoadInfo->info.pCount, tBufferGetDataAt(&block.counts, i * sizeof(int64_t)), rows - i); taosArrayAddBatch(pBlockLoadInfo->info.pCount, tBufferGetDataAt(&block.counts, i * sizeof(int64_t)), rows - i);
SValue vFirst = {0}, vLast = {0}; if (block.numOfPKs > 0) {
for (int32_t f = i; f < rows; ++f) { SValue vFirst = {0}, vLast = {0};
int32_t code = tValueColumnGet(&block.firstKeyPKs[0], f, &vFirst); for (int32_t f = i; f < rows; ++f) {
if (code) { int32_t code = tValueColumnGet(&block.firstKeyPKs[0], f, &vFirst);
break; if (code) {
break;
}
tValueDupPayload(&vFirst);
taosArrayPush(pBlockLoadInfo->info.pFirstKey, &vFirst);
// todo add api to clone the original data
code = tValueColumnGet(&block.lastKeyPKs[0], f, &vLast);
if (code) {
break;
}
tValueDupPayload(&vLast);
taosArrayPush(pBlockLoadInfo->info.pLastKey, &vLast);
} }
tValueDupPayload(&vFirst);
taosArrayPush(pBlockLoadInfo->info.pFirstKey, &vFirst);
// todo add api to clone the original data
code = tValueColumnGet(&block.lastKeyPKs[0], f, &vLast);
if (code) {
break;
}
tValueDupPayload(&vLast);
taosArrayPush(pBlockLoadInfo->info.pLastKey, &vLast);
} }
} else { } else {
STbStatisRecord record; STbStatisRecord record = {0};
while (i < rows) { while (i < rows) {
tStatisBlockGet(&block, i, &record); tStatisBlockGet(&block, i, &record);
if (record.suid != suid) { if (record.suid != suid) {
@ -433,15 +436,18 @@ static int32_t loadSttStatisticsBlockData(SSttFileReader *pSttFileReader, SSttBl
taosArrayPush(pBlockLoadInfo->info.pFirstTs, &record.firstKey.ts); taosArrayPush(pBlockLoadInfo->info.pFirstTs, &record.firstKey.ts);
taosArrayPush(pBlockLoadInfo->info.pLastTs, &record.lastKey.ts); taosArrayPush(pBlockLoadInfo->info.pLastTs, &record.lastKey.ts);
SValue s = record.firstKey.pks[0]; if (record.firstKey.numOfPKs > 0) {
tValueDupPayload(&s); SValue s = record.firstKey.pks[0];
tValueDupPayload(&s);
taosArrayPush(pBlockLoadInfo->info.pFirstKey, &s); taosArrayPush(pBlockLoadInfo->info.pFirstKey, &s);
s = record.lastKey.pks[0]; s = record.lastKey.pks[0];
tValueDupPayload(&s); tValueDupPayload(&s);
taosArrayPush(pBlockLoadInfo->info.pLastKey, &s);
}
taosArrayPush(pBlockLoadInfo->info.pLastKey, &s);
i += 1; i += 1;
} }
} }