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

fix(tsdb): set the correct start pos for binary search.

This commit is contained in:
Haojun Liao 2024-04-29 15:13:52 +08:00
parent 7a5cdb81d5
commit b0ef022e87
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -907,21 +907,19 @@ static int doBinarySearchKey(const TSKEY* keyList, int num, int pos, TSKEY key,
} }
// handle the repeat ts cases. // handle the repeat ts cases.
static int32_t doSearchStartPos(SBlockData* pBlock, int32_t num, int32_t pos, TSKEY key, int32_t order) { static int32_t findFirstPos(const int64_t* pTsList, int32_t num, int32_t startPos, bool asc) {
int32_t startPos = doBinarySearchKey(pBlock->aTSKEY, num, pos, key, order);
int32_t i = startPos; int32_t i = startPos;
int64_t startTs = pBlock->aTSKEY[startPos]; int64_t startTs = pTsList[startPos];
if (ASCENDING_TRAVERSE(order)) { if (asc) {
while (i >= 0 && (pBlock->aTSKEY[i] == startTs)) { while (i < num && (pTsList[i] == startTs)) {
i--;
}
return i + 1;
} else {
while (i < pBlock->nRow && (pBlock->aTSKEY[i] == startTs)) {
i++; i++;
} }
return i - 1; return i - 1;
} else {
while (i >= 0 && (pTsList[i] == startTs)) {
i--;
}
return i + 1;
} }
} }
@ -936,7 +934,8 @@ static int32_t getEndPosInDataBlock(STsdbReader* pReader, SBlockData* pBlockData
endPos = 0; endPos = 0;
} else { } else {
int64_t key = asc ? pReader->info.window.ekey : pReader->info.window.skey; int64_t key = asc ? pReader->info.window.ekey : pReader->info.window.skey;
endPos = doSearchStartPos(pBlockData, pRecord->numRow, pos, key, pReader->info.order); endPos = doBinarySearchKey(pBlockData->aTSKEY, pRecord->numRow, pos, key, pReader->info.order);
endPos = findFirstPos(pBlockData->aTSKEY, pRecord->numRow, endPos, asc);
} }
if ((pReader->info.verRange.maxVer >= pRecord->minVer && pReader->info.verRange.maxVer < pRecord->maxVer) || if ((pReader->info.verRange.maxVer >= pRecord->minVer && pReader->info.verRange.maxVer < pRecord->maxVer) ||
@ -1148,7 +1147,7 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, SRowKey* pLastPro
int32_t pos = asc ? pRecord->numRow - 1 : 0; int32_t pos = asc ? pRecord->numRow - 1 : 0;
int32_t order = asc ? TSDB_ORDER_DESC : TSDB_ORDER_ASC; int32_t order = asc ? TSDB_ORDER_DESC : TSDB_ORDER_ASC;
int64_t key = asc ? pReader->info.window.skey : pReader->info.window.ekey; int64_t key = asc ? pReader->info.window.skey : pReader->info.window.ekey;
pDumpInfo->rowIndex = doSearchStartPos(pBlockData, pRecord->numRow, pos, key, order); pDumpInfo->rowIndex = doBinarySearchKey(pBlockData->aTSKEY, pRecord->numRow, pos, key, order);
if (pDumpInfo->rowIndex < 0) { if (pDumpInfo->rowIndex < 0) {
tsdbError( tsdbError(
@ -1159,6 +1158,7 @@ static int32_t copyBlockDataToSDataBlock(STsdbReader* pReader, SRowKey* pLastPro
return TSDB_CODE_INVALID_PARA; return TSDB_CODE_INVALID_PARA;
} }
pDumpInfo->rowIndex = findFirstPos(pBlockData->aTSKEY, pRecord->numRow, pDumpInfo->rowIndex, (!asc));
ASSERT(pReader->info.verRange.minVer <= pRecord->maxVer && pReader->info.verRange.maxVer >= pRecord->minVer); ASSERT(pReader->info.verRange.minVer <= pRecord->maxVer && pReader->info.verRange.maxVer >= pRecord->minVer);
// find the appropriate start position that satisfies the version requirement. // find the appropriate start position that satisfies the version requirement.

1
source/libs/executor/src/scanoperator.c
View File

@ -4577,6 +4577,7 @@ void destroyTableMergeScanOperatorInfo(void* param) {
destroyTableScanBase(&pTableScanInfo->base, &pTableScanInfo->base.readerAPI); destroyTableScanBase(&pTableScanInfo->base, &pTableScanInfo->base.readerAPI);
pTableScanInfo->pResBlock = blockDataDestroy(pTableScanInfo->pResBlock); pTableScanInfo->pResBlock = blockDataDestroy(pTableScanInfo->pResBlock);
// remove it from the task->result list
pTableScanInfo->pReaderBlock = blockDataDestroy(pTableScanInfo->pReaderBlock); pTableScanInfo->pReaderBlock = blockDataDestroy(pTableScanInfo->pReaderBlock);
taosArrayDestroy(pTableScanInfo->pSortInfo); taosArrayDestroy(pTableScanInfo->pSortInfo);