refactor: do some internal refactor.
This commit is contained in:
parent
4f59754a63
commit
f120a62434
|
@ -1553,7 +1553,7 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SArray*
|
||||||
blockDataCleanup(pHandle->pDataBlock);
|
blockDataCleanup(pHandle->pDataBlock);
|
||||||
blkPgSz = pgHeaderSz;
|
blkPgSz = pgHeaderSz;
|
||||||
incBlock = (pHandle->bSortByRowId) ? pHandle->pDataBlock : minBlk;
|
incBlock = (pHandle->bSortByRowId) ? pHandle->pDataBlock : minBlk;
|
||||||
bufInc = getPageBufIncForRow(incBlock, minRow, pHandle->pDataBlock->info.rows);
|
bufInc = getPageBufIncForRow(incBlock, minRow, 0);
|
||||||
|
|
||||||
if ((pHandle->mergeLimit != -1) && (nMergedRows >= pHandle->mergeLimit)) {
|
if ((pHandle->mergeLimit != -1) && (nMergedRows >= pHandle->mergeLimit)) {
|
||||||
mergeLimitReached = true;
|
mergeLimitReached = true;
|
||||||
|
@ -1573,6 +1573,7 @@ static int32_t sortBlocksToExtSource(SSortHandle* pHandle, SArray* aBlk, SArray*
|
||||||
}
|
}
|
||||||
|
|
||||||
blkPgSz += bufInc;
|
blkPgSz += bufInc;
|
||||||
|
ASSERT(blkPgSz == blockDataGetSize(pHandle->pDataBlock));
|
||||||
|
|
||||||
++nRows;
|
++nRows;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue