database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: pagehack double add number to endblock

Browse Source
This commit is contained in:
wuyuechuan
2024-05-20 11:52:21 +08:00
committed by yaoxin
parent 1d44fbd779
commit 959dfc3d9f
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/pagehack/pagehack.cpp
View File

@ -3120,22 +3120,23 @@ static int parse_a_page(const char* buffer, int blkno, int blknum, SegmentType t
return true;
}
static BlockNumber CalculateMaxBlockNumber(BlockNumber blknum, BlockNumber start, BlockNumber number)
static BlockNumber CalculateMaxBlockNumber(BlockNumber maxBlockNumber, BlockNumber start, BlockNumber number)
{
/* parse */
if (start >= blknum) {
BlockNumber endBlockNumber = InvalidBlockNumber;
if (start >= maxBlockNumber) {
(void)fprintf(stderr, "start point exceeds the total block number of relation.\n");
return InvalidBlockNumber;
} else if ((start + number) > blknum) {
} else if ((start + number) > maxBlockNumber) {
(void)fprintf(stderr, "don't have %u blocks from block %u in the relation, only %u blocks\n", number, start,
(blknum - start));
number = blknum;
(maxBlockNumber - start));
endBlockNumber = maxBlockNumber;
} else if (number == 0) {
number = blknum;
endBlockNumber = maxBlockNumber;
} else {
number += start;
endBlockNumber = number + start;
}
return number;
return endBlockNumber;
}
static void MarkBufferDirty(char *buffer, size_t len)
@ -3243,17 +3244,6 @@ static int parse_uncompressed_page_file(const char *filename, SegmentType type,
if (number == InvalidBlockNumber) {
fclose(fd);
return false;
} else if ((start + number) > blknum) {
fprintf(stderr,
"don't have %u blocks from block %u in the relation, only %u blocks\n",
number,
start,
(blknum - start));
number = blknum;
} else if (number == 0) {
number = blknum;
} else {
number += start;
}
Assert((start * BLCKSZ) < size);