Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions src/backend/access/transam/xloginsert.c
Original file line number Diff line number Diff line change
Expand Up @@ -614,22 +614,30 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
*/
if (regbuf->flags & REGBUF_STANDARD)
{
/* Assume we can omit data between pd_lower and pd_upper */
uint16 lower = ((PageHeader) page)->pd_lower;
uint16 upper = ((PageHeader) page)->pd_upper;

if (lower >= SizeOfPageHeaderData &&
upper > lower &&
upper <= BLCKSZ)
if (PageIsNew(page))
{
bimg.hole_offset = lower;
cbimg.hole_length = upper - lower;
bimg.hole_offset = 0;
cbimg.hole_length = BLCKSZ;
}
else
{
/* No "hole" to remove */
bimg.hole_offset = 0;
cbimg.hole_length = 0;
/* Assume we can omit data between pd_lower and pd_upper */
uint16 lower = ((PageHeader) page)->pd_lower;
uint16 upper = ((PageHeader) page)->pd_upper;

if (lower >= SizeOfPageHeaderData &&
upper > lower &&
upper <= BLCKSZ)
{
bimg.hole_offset = lower;
cbimg.hole_length = upper - lower;
}
else
{
/* No "hole" to remove */
bimg.hole_offset = 0;
cbimg.hole_length = 0;
}
}
}
else
Expand Down
4 changes: 3 additions & 1 deletion src/backend/access/transam/xlogreader.c
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,9 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
if ((blk->bimg_info & BKPIMAGE_HAS_HOLE) &&
(blk->hole_offset == 0 ||
blk->hole_length == 0 ||
blk->bimg_len == BLCKSZ))
blk->bimg_len == BLCKSZ) &&
!(blk->hole_offset == 0 &&
blk->hole_length == BLCKSZ)) /* null page */
{
report_invalid_record(state,
"BKPIMAGE_HAS_HOLE set, but hole offset %u length %u block image length %u at %X/%X",
Expand Down