diff options
Diffstat (limited to 'src/backend/access/transam/xlogrecovery.c')
| -rw-r--r-- | src/backend/access/transam/xlogrecovery.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index e23451b0f10..5d6f1b5e468 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -2166,24 +2166,26 @@ xlog_block_info(StringInfo buf, XLogReaderState *record) /* decode block references */ for (block_id = 0; block_id <= XLogRecMaxBlockId(record); block_id++) { - RelFileNode rnode; + RelFileLocator rlocator; ForkNumber forknum; BlockNumber blk; if (!XLogRecGetBlockTagExtended(record, block_id, - &rnode, &forknum, &blk, NULL)) + &rlocator, &forknum, &blk, NULL)) continue; if (forknum != MAIN_FORKNUM) appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, fork %u, blk %u", block_id, - rnode.spcNode, rnode.dbNode, rnode.relNode, + rlocator.spcOid, rlocator.dbOid, + rlocator.relNumber, forknum, blk); else appendStringInfo(buf, "; blkref #%d: rel %u/%u/%u, blk %u", block_id, - rnode.spcNode, rnode.dbNode, rnode.relNode, + rlocator.spcOid, rlocator.dbOid, + rlocator.relNumber, blk); if (XLogRecHasBlockImage(record, block_id)) appendStringInfoString(buf, " FPW"); @@ -2285,7 +2287,7 @@ static void verifyBackupPageConsistency(XLogReaderState *record) { RmgrData rmgr = GetRmgr(XLogRecGetRmid(record)); - RelFileNode rnode; + RelFileLocator rlocator; ForkNumber forknum; BlockNumber blkno; int block_id; @@ -2302,7 +2304,7 @@ verifyBackupPageConsistency(XLogReaderState *record) Page page; if (!XLogRecGetBlockTagExtended(record, block_id, - &rnode, &forknum, &blkno, NULL)) + &rlocator, &forknum, &blkno, NULL)) { /* * WAL record doesn't contain a block reference with the given id. @@ -2327,7 +2329,7 @@ verifyBackupPageConsistency(XLogReaderState *record) * Read the contents from the current buffer and store it in a * temporary page. */ - buf = XLogReadBufferExtended(rnode, forknum, blkno, + buf = XLogReadBufferExtended(rlocator, forknum, blkno, RBM_NORMAL_NO_LOG, InvalidBuffer); if (!BufferIsValid(buf)) @@ -2377,7 +2379,7 @@ verifyBackupPageConsistency(XLogReaderState *record) { elog(FATAL, "inconsistent page found, rel %u/%u/%u, forknum %u, blkno %u", - rnode.spcNode, rnode.dbNode, rnode.relNode, + rlocator.spcOid, rlocator.dbOid, rlocator.relNumber, forknum, blkno); } } |