mirror of
https://github.com/postgres/postgres.git
synced 2025-08-24 09:27:52 +03:00
Revert 56-bit relfilenode change and follow-up commits.
There are still some alignment-related failures in the buildfarm, which might or might not be able to be fixed quickly, but I've also just realized that it increased the size of many WAL records by 4 bytes because a block reference contains a RelFileLocator. The effect of that hasn't been studied or discussed, so revert for now.
This commit is contained in:
@@ -2228,14 +2228,14 @@ xlog_block_info(StringInfo buf, XLogReaderState *record)
|
||||
continue;
|
||||
|
||||
if (forknum != MAIN_FORKNUM)
|
||||
appendStringInfo(buf, "; blkref #%d: rel %u/%u/" UINT64_FORMAT ", fork %u, blk %u",
|
||||
appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, fork %u, blk %u",
|
||||
block_id,
|
||||
rlocator.spcOid, rlocator.dbOid,
|
||||
rlocator.relNumber,
|
||||
forknum,
|
||||
blk);
|
||||
else
|
||||
appendStringInfo(buf, "; blkref #%d: rel %u/%u/" UINT64_FORMAT ", blk %u",
|
||||
appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, blk %u",
|
||||
block_id,
|
||||
rlocator.spcOid, rlocator.dbOid,
|
||||
rlocator.relNumber,
|
||||
@@ -2433,7 +2433,7 @@ verifyBackupPageConsistency(XLogReaderState *record)
|
||||
if (memcmp(replay_image_masked, primary_image_masked, BLCKSZ) != 0)
|
||||
{
|
||||
elog(FATAL,
|
||||
"inconsistent page found, rel %u/%u/" UINT64_FORMAT ", forknum %u, blkno %u",
|
||||
"inconsistent page found, rel %u/%u/%u, forknum %u, blkno %u",
|
||||
rlocator.spcOid, rlocator.dbOid, rlocator.relNumber,
|
||||
forknum, blkno);
|
||||
}
|
||||
|
Reference in New Issue
Block a user