From f3ffcbb190649dbc9cf2f5bfdc7d0a13d846cba9 Mon Sep 17 00:00:00 2001 From: Maxim Orlov Date: Wed, 23 Mar 2022 13:16:26 +0300 Subject: [PATCH v51 2/3] Use 64-bit pages representation in SLRU callers. Previously SLRU page counters were changed to unsigned 64-bit. As a next separate step to making XID's 64-bit, we switch internal page counters to 64-bit in SLRU callers: clog, mxact, commit_ts etc. This patch still doesn't change xid's representation but is a requirement to do so. Author: Alexander Korotkov Author: Teodor Sigaev Author: Nikita Glukhov Author: Maxim Orlov Author: Pavel Borisov Author: Yura Sokolov Author: Aleksander Alekseev Reviewed-by: Aleksander Alekseev Discussion: https://postgr.es/m/CACG%3DezZe1NQSCnfHOr78AtAZxJZeCvxrts0ygrxYwe%3DpyyjVWA%40mail.gmail.com Discussion: https://postgr.es/m/CAJ7c6TPDOYBYrnCAeyndkBktO0WG2xSdYduTF0nxq%2BvfkmTF5Q%40mail.gmail.com --- src/backend/access/rmgrdesc/committsdesc.c | 10 +-- src/backend/access/rmgrdesc/mxactdesc.c | 6 +- src/backend/access/transam/clog.c | 60 +++++++++++--- src/backend/access/transam/commit_ts.c | 82 ++++++++++++++----- src/backend/access/transam/multixact.c | 44 +++++----- src/backend/access/transam/slru.c | 8 +- src/backend/access/transam/subtrans.c | 72 +++++++++++----- src/bin/pg_verifybackup/t/003_corruption.pl | 2 +- src/include/access/commit_ts.h | 2 +- .../modules/test_slru/expected/test_slru.out | 2 +- src/test/recovery/t/003_recovery_targets.pl | 2 +- 11 files changed, 196 insertions(+), 94 deletions(-) diff --git a/src/backend/access/rmgrdesc/committsdesc.c b/src/backend/access/rmgrdesc/committsdesc.c index 3a65538bb0..623b93d0b5 100644 --- a/src/backend/access/rmgrdesc/committsdesc.c +++ b/src/backend/access/rmgrdesc/committsdesc.c @@ -26,17 +26,17 @@ commit_ts_desc(StringInfo buf, XLogReaderState *record) if (info == COMMIT_TS_ZEROPAGE) { - int pageno; + int64 pageno; - memcpy(&pageno, rec, sizeof(int)); - appendStringInfo(buf, "%d", pageno); + memcpy(&pageno, rec, sizeof(pageno)); + appendStringInfo(buf, "%lld", (long long) pageno); } else if (info == COMMIT_TS_TRUNCATE) { xl_commit_ts_truncate *trunc = (xl_commit_ts_truncate *) rec; - appendStringInfo(buf, "pageno %d, oldestXid %u", - trunc->pageno, trunc->oldestXid); + appendStringInfo(buf, "pageno %lld, oldestXid %u", + (long long) trunc->pageno, trunc->oldestXid); } } diff --git a/src/backend/access/rmgrdesc/mxactdesc.c b/src/backend/access/rmgrdesc/mxactdesc.c index 7076be2b3f..5db1960394 100644 --- a/src/backend/access/rmgrdesc/mxactdesc.c +++ b/src/backend/access/rmgrdesc/mxactdesc.c @@ -55,10 +55,10 @@ multixact_desc(StringInfo buf, XLogReaderState *record) if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE || info == XLOG_MULTIXACT_ZERO_MEM_PAGE) { - int pageno; + int64 pageno; - memcpy(&pageno, rec, sizeof(int)); - appendStringInfo(buf, "%d", pageno); + memcpy(&pageno, rec, sizeof(pageno)); + appendStringInfo(buf, "%lld", (long long) pageno); } else if (info == XLOG_MULTIXACT_CREATE_ID) { diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c index e73c8c8d91..6eb75d6577 100644 --- a/src/backend/access/transam/clog.c +++ b/src/backend/access/transam/clog.c @@ -47,13 +47,6 @@ /* * Defines for CLOG page sizes. A page is the same BLCKSZ as is used * everywhere else in Postgres. - * - * Note: because TransactionIds are 32 bits and wrap around at 0xFFFFFFFF, - * CLOG page numbering also wraps around at 0xFFFFFFFF/CLOG_XACTS_PER_PAGE, - * and CLOG segment numbering at - * 0xFFFFFFFF/CLOG_XACTS_PER_PAGE/SLRU_PAGES_PER_SEGMENT. We need take no - * explicit notice of that fact in this module, except when comparing segment - * and page numbers in TruncateCLOG (see CLOGPagePrecedes). */ /* We need two bits per xact, so four xacts fit in a byte */ @@ -62,7 +55,49 @@ #define CLOG_XACTS_PER_PAGE (BLCKSZ * CLOG_XACTS_PER_BYTE) #define CLOG_XACT_BITMASK ((1 << CLOG_BITS_PER_XACT) - 1) -#define TransactionIdToPage(xid) ((xid) / (TransactionId) CLOG_XACTS_PER_PAGE) +static inline int64 +TransactionIdToPageInternal(TransactionId xid, bool lock) +{ + FullTransactionId fxid, + nextXid; + uint32 epoch; + + if (lock) + LWLockAcquire(XidGenLock, LW_SHARED); + + /* make a local copy */ + nextXid = ShmemVariableCache->nextXid; + + if (lock) + LWLockRelease(XidGenLock); + + epoch = EpochFromFullTransactionId(nextXid); + if (xid > XidFromFullTransactionId(nextXid)) + --epoch; + + fxid = FullTransactionIdFromEpochAndXid(epoch, xid); + + return fxid.value / (uint64) CLOG_XACTS_PER_PAGE; +} + +static inline int64 +TransactionIdToPageNoLock(TransactionId xid) +{ + return TransactionIdToPageInternal(xid, false); +} + +static inline int64 +TransactionIdToPage(TransactionId xid) +{ + return TransactionIdToPageInternal(xid, true); +} + +static inline int64 +FullTransactionIdToPage(FullTransactionId xid) +{ + return xid.value / (uint64) CLOG_XACTS_PER_PAGE; +} + #define TransactionIdToPgIndex(xid) ((xid) % (TransactionId) CLOG_XACTS_PER_PAGE) #define TransactionIdToByte(xid) (TransactionIdToPgIndex(xid) / CLOG_XACTS_PER_BYTE) #define TransactionIdToBIndex(xid) ((xid) % (TransactionId) CLOG_XACTS_PER_BYTE) @@ -753,8 +788,7 @@ ZeroCLOGPage(int64 pageno, bool writeXlog) void StartupCLOG(void) { - TransactionId xid = XidFromFullTransactionId(ShmemVariableCache->nextXid); - int64 pageno = TransactionIdToPage(xid); + int64 pageno = FullTransactionIdToPage(ShmemVariableCache->nextXid); LWLockAcquire(XactSLRULock, LW_EXCLUSIVE); @@ -772,7 +806,8 @@ StartupCLOG(void) void TrimCLOG(void) { - TransactionId xid = XidFromFullTransactionId(ShmemVariableCache->nextXid); + FullTransactionId fxid = ShmemVariableCache->nextXid; + TransactionId xid = XidFromFullTransactionId(fxid); int64 pageno = TransactionIdToPage(xid); LWLockAcquire(XactSLRULock, LW_EXCLUSIVE); @@ -848,7 +883,7 @@ ExtendCLOG(TransactionId newestXact) !TransactionIdEquals(newestXact, FirstNormalTransactionId)) return; - pageno = TransactionIdToPage(newestXact); + pageno = TransactionIdToPageNoLock(newestXact); LWLockAcquire(XactSLRULock, LW_EXCLUSIVE); @@ -944,7 +979,6 @@ CLOGPagePrecedes(int64 page1, int64 page2) TransactionIdPrecedes(xid1, xid2 + CLOG_XACTS_PER_PAGE - 1)); } - /* * Write a ZEROPAGE xlog record */ diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index cdc1d15b48..9ec4d8c848 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -65,8 +65,49 @@ typedef struct CommitTimestampEntry #define COMMIT_TS_XACTS_PER_PAGE \ (BLCKSZ / SizeOfCommitTimestampEntry) -#define TransactionIdToCTsPage(xid) \ - ((xid) / (TransactionId) COMMIT_TS_XACTS_PER_PAGE) +static inline int64 +TransactionIdToCTsPageInternal(TransactionId xid, bool lock) +{ + FullTransactionId fxid, + nextXid; + uint32 epoch; + + if (lock) + LWLockAcquire(XidGenLock, LW_SHARED); + + /* make a local copy */ + nextXid = ShmemVariableCache->nextXid; + + if (lock) + LWLockRelease(XidGenLock); + + epoch = EpochFromFullTransactionId(nextXid); + if (xid > XidFromFullTransactionId(nextXid)) + --epoch; + + fxid = FullTransactionIdFromEpochAndXid(epoch, xid); + + return fxid.value / (uint64) COMMIT_TS_XACTS_PER_PAGE; +} + +static inline int64 +TransactionIdToCTsPage(TransactionId xid) +{ + return TransactionIdToCTsPageInternal(xid, true); +} + +static inline int64 +TransactionIdToCTsPageNoLock(TransactionId xid) +{ + return TransactionIdToCTsPageInternal(xid, false); +} + +static inline int64 +FullTransactionIdToCTsPage(FullTransactionId xid) +{ + return xid.value / (uint64) COMMIT_TS_XACTS_PER_PAGE; +} + #define TransactionIdToCTsEntry(xid) \ ((xid) % (TransactionId) COMMIT_TS_XACTS_PER_PAGE) @@ -103,16 +144,16 @@ bool track_commit_timestamp; static void SetXidCommitTsInPage(TransactionId xid, int nsubxids, TransactionId *subxids, TimestampTz ts, - RepOriginId nodeid, int pageno); + RepOriginId nodeid, int64 pageno); static void TransactionIdSetCommitTs(TransactionId xid, TimestampTz ts, RepOriginId nodeid, int slotno); static void error_commit_ts_disabled(void); -static int ZeroCommitTsPage(int pageno, bool writeXlog); +static int ZeroCommitTsPage(int64 pageno, bool writeXlog); static bool CommitTsPagePrecedes(int64 page1, int64 page2); static void ActivateCommitTs(void); static void DeactivateCommitTs(void); -static void WriteZeroPageXlogRec(int pageno); -static void WriteTruncateXlogRec(int pageno, TransactionId oldestXid); +static void WriteZeroPageXlogRec(int64 pageno); +static void WriteTruncateXlogRec(int64 pageno, TransactionId oldestXid); /* * TransactionTreeSetCommitTsData @@ -170,7 +211,7 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids, i = 0; for (;;) { - int pageno = TransactionIdToCTsPage(headxid); + int64 pageno = TransactionIdToCTsPage(headxid); int j; for (j = i; j < nsubxids; j++) @@ -214,7 +255,7 @@ TransactionTreeSetCommitTsData(TransactionId xid, int nsubxids, static void SetXidCommitTsInPage(TransactionId xid, int nsubxids, TransactionId *subxids, TimestampTz ts, - RepOriginId nodeid, int pageno) + RepOriginId nodeid, int64 pageno) { int slotno; int i; @@ -266,7 +307,7 @@ bool TransactionIdGetCommitTsData(TransactionId xid, TimestampTz *ts, RepOriginId *nodeid) { - int pageno = TransactionIdToCTsPage(xid); + int64 pageno = TransactionIdToCTsPage(xid); int entryno = TransactionIdToCTsEntry(xid); int slotno; CommitTimestampEntry entry; @@ -587,7 +628,7 @@ BootStrapCommitTs(void) * Control lock must be held at entry, and will be held at exit. */ static int -ZeroCommitTsPage(int pageno, bool writeXlog) +ZeroCommitTsPage(int64 pageno, bool writeXlog) { int slotno; @@ -679,8 +720,7 @@ CommitTsParameterChange(bool newvalue, bool oldvalue) static void ActivateCommitTs(void) { - TransactionId xid; - int pageno; + int64 pageno; /* If we've done this already, there's nothing to do */ LWLockAcquire(CommitTsLock, LW_EXCLUSIVE); @@ -691,8 +731,7 @@ ActivateCommitTs(void) } LWLockRelease(CommitTsLock); - xid = XidFromFullTransactionId(ShmemVariableCache->nextXid); - pageno = TransactionIdToCTsPage(xid); + pageno = FullTransactionIdToCTsPage(ShmemVariableCache->nextXid); /* * Re-Initialize our idea of the latest page number. @@ -813,7 +852,7 @@ CheckPointCommitTs(void) void ExtendCommitTs(TransactionId newestXact) { - int pageno; + int64 pageno; /* * Nothing to do if module not enabled. Note we do an unlocked read of @@ -832,7 +871,7 @@ ExtendCommitTs(TransactionId newestXact) !TransactionIdEquals(newestXact, FirstNormalTransactionId)) return; - pageno = TransactionIdToCTsPage(newestXact); + pageno = TransactionIdToCTsPageNoLock(newestXact); LWLockAcquire(CommitTsSLRULock, LW_EXCLUSIVE); @@ -950,15 +989,14 @@ CommitTsPagePrecedes(int64 page1, int64 page2) TransactionIdPrecedes(xid1, xid2 + COMMIT_TS_XACTS_PER_PAGE - 1)); } - /* * Write a ZEROPAGE xlog record */ static void -WriteZeroPageXlogRec(int pageno) +WriteZeroPageXlogRec(int64 pageno) { XLogBeginInsert(); - XLogRegisterData((char *) (&pageno), sizeof(int)); + XLogRegisterData((char *) (&pageno), sizeof(pageno)); (void) XLogInsert(RM_COMMIT_TS_ID, COMMIT_TS_ZEROPAGE); } @@ -966,7 +1004,7 @@ WriteZeroPageXlogRec(int pageno) * Write a TRUNCATE xlog record */ static void -WriteTruncateXlogRec(int pageno, TransactionId oldestXid) +WriteTruncateXlogRec(int64 pageno, TransactionId oldestXid) { xl_commit_ts_truncate xlrec; @@ -991,10 +1029,10 @@ commit_ts_redo(XLogReaderState *record) if (info == COMMIT_TS_ZEROPAGE) { - int pageno; + int64 pageno; int slotno; - memcpy(&pageno, XLogRecGetData(record), sizeof(int)); + memcpy(&pageno, XLogRecGetData(record), sizeof(pageno)); LWLockAcquire(CommitTsSLRULock, LW_EXCLUSIVE); diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index d97b63d8e6..a2573b3951 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -352,8 +352,8 @@ static void mXactCachePut(MultiXactId multi, int nmembers, static char *mxstatus_to_string(MultiXactStatus status); /* management of SLRU infrastructure */ -static int ZeroMultiXactOffsetPage(int pageno, bool writeXlog); -static int ZeroMultiXactMemberPage(int pageno, bool writeXlog); +static int ZeroMultiXactOffsetPage(int64 pageno, bool writeXlog); +static int ZeroMultiXactMemberPage(int64 pageno, bool writeXlog); static bool MultiXactOffsetPagePrecedes(int64 page1, int64 page2); static bool MultiXactMemberPagePrecedes(int64 page1, int64 page2); static bool MultiXactOffsetPrecedes(MultiXactOffset offset1, @@ -364,7 +364,7 @@ static bool MultiXactOffsetWouldWrap(MultiXactOffset boundary, MultiXactOffset start, uint32 distance); static bool SetOffsetVacuumLimit(bool is_startup); static bool find_multixact_start(MultiXactId multi, MultiXactOffset *result); -static void WriteMZeroPageXlogRec(int pageno, uint8 info); +static void WriteMZeroPageXlogRec(int64 pageno, uint8 info); static void WriteMTruncateXlogRec(Oid oldestMultiDB, MultiXactId startTruncOff, MultiXactId endTruncOff, @@ -862,8 +862,8 @@ static void RecordNewMultiXact(MultiXactId multi, MultiXactOffset offset, int nmembers, MultiXactMember *members) { - int pageno; - int prev_pageno; + int64 pageno; + int64 prev_pageno; int entryno; int slotno; MultiXactOffset *offptr; @@ -1223,8 +1223,8 @@ int GetMultiXactIdMembers(MultiXactId multi, MultiXactMember **members, bool from_pgupgrade, bool isLockOnly) { - int pageno; - int prev_pageno; + int64 pageno; + int64 prev_pageno; int entryno; int slotno; MultiXactOffset *offptr; @@ -1926,7 +1926,7 @@ BootStrapMultiXact(void) * Control lock must be held at entry, and will be held at exit. */ static int -ZeroMultiXactOffsetPage(int pageno, bool writeXlog) +ZeroMultiXactOffsetPage(int64 pageno, bool writeXlog) { int slotno; @@ -1942,7 +1942,7 @@ ZeroMultiXactOffsetPage(int pageno, bool writeXlog) * Ditto, for MultiXactMember */ static int -ZeroMultiXactMemberPage(int pageno, bool writeXlog) +ZeroMultiXactMemberPage(int64 pageno, bool writeXlog) { int slotno; @@ -1972,7 +1972,7 @@ ZeroMultiXactMemberPage(int pageno, bool writeXlog) static void MaybeExtendOffsetSlru(void) { - int pageno; + int64 pageno; pageno = MultiXactIdToOffsetPage(MultiXactState->nextMXact); @@ -2007,7 +2007,7 @@ StartupMultiXact(void) { MultiXactId multi = MultiXactState->nextMXact; MultiXactOffset offset = MultiXactState->nextOffset; - int pageno; + int64 pageno; /* * Initialize offset's idea of the latest page number. @@ -2032,7 +2032,7 @@ TrimMultiXact(void) MultiXactOffset offset; MultiXactId oldestMXact; Oid oldestMXactDB; - int pageno; + int64 pageno; int entryno; int flagsoff; @@ -2401,7 +2401,7 @@ MultiXactAdvanceOldest(MultiXactId oldestMulti, Oid oldestMultiDB) static void ExtendMultiXactOffset(MultiXactId multi) { - int pageno; + int64 pageno; /* * No work except at first MultiXactId of a page. But beware: just after @@ -2450,7 +2450,7 @@ ExtendMultiXactMember(MultiXactOffset offset, int nmembers) flagsbit = MXOffsetToFlagsBitShift(offset); if (flagsoff == 0 && flagsbit == 0) { - int pageno; + int64 pageno; pageno = MXOffsetToMemberPage(offset); @@ -2732,7 +2732,7 @@ static bool find_multixact_start(MultiXactId multi, MultiXactOffset *result) { MultiXactOffset offset; - int pageno; + int64 pageno; int entryno; int slotno; MultiXactOffset *offptr; @@ -3192,10 +3192,10 @@ MultiXactOffsetPrecedes(MultiXactOffset offset1, MultiXactOffset offset2) * OFFSETs page (info shows which) */ static void -WriteMZeroPageXlogRec(int pageno, uint8 info) +WriteMZeroPageXlogRec(int64 pageno, uint8 info) { XLogBeginInsert(); - XLogRegisterData((char *) (&pageno), sizeof(int)); + XLogRegisterData((char *) (&pageno), sizeof(pageno)); (void) XLogInsert(RM_MULTIXACT_ID, info); } @@ -3240,10 +3240,10 @@ multixact_redo(XLogReaderState *record) if (info == XLOG_MULTIXACT_ZERO_OFF_PAGE) { - int pageno; + int64 pageno; int slotno; - memcpy(&pageno, XLogRecGetData(record), sizeof(int)); + memcpy(&pageno, XLogRecGetData(record), sizeof(pageno)); LWLockAcquire(MultiXactOffsetSLRULock, LW_EXCLUSIVE); @@ -3255,10 +3255,10 @@ multixact_redo(XLogReaderState *record) } else if (info == XLOG_MULTIXACT_ZERO_MEM_PAGE) { - int pageno; + int64 pageno; int slotno; - memcpy(&pageno, XLogRecGetData(record), sizeof(int)); + memcpy(&pageno, XLogRecGetData(record), sizeof(pageno)); LWLockAcquire(MultiXactMemberSLRULock, LW_EXCLUSIVE); @@ -3300,7 +3300,7 @@ multixact_redo(XLogReaderState *record) else if (info == XLOG_MULTIXACT_TRUNCATE_ID) { xl_multixact_truncate xlrec; - int pageno; + int64 pageno; memcpy(&xlrec, XLogRecGetData(record), SizeOfMultiXactTruncate); diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c index 3703975a87..f9d182644d 100644 --- a/src/backend/access/transam/slru.c +++ b/src/backend/access/transam/slru.c @@ -63,11 +63,7 @@ static int inline SlruFileName(SlruCtl ctl, char *path, int64 segno) { - /* - * Since we do not have 64 bit SLRU yet, make sure have no overflow here. - */ - Assert(segno <= PG_INT32_MAX); - return snprintf(path, MAXPGPATH, "%s/%04X", ctl->Dir, (int) segno); + return snprintf(path, MAXPGPATH, "%s/%012llX", ctl->Dir, (long long) segno); } /* @@ -1576,7 +1572,7 @@ SlruScanDirectory(SlruCtl ctl, SlruScanCallback callback, void *data) len = strlen(clde->d_name); - if ((len == 4 || len == 5 || len == 6) && + if ((len == 12 || len == 13 || len == 14) && strspn(clde->d_name, "0123456789ABCDEF") == len) { segno = (int) strtol(clde->d_name, NULL, 16); diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c index 56c19021a9..ae48ba6914 100644 --- a/src/backend/access/transam/subtrans.c +++ b/src/backend/access/transam/subtrans.c @@ -38,20 +38,54 @@ /* * Defines for SubTrans page sizes. A page is the same BLCKSZ as is used * everywhere else in Postgres. - * - * Note: because TransactionIds are 32 bits and wrap around at 0xFFFFFFFF, - * SubTrans page numbering also wraps around at - * 0xFFFFFFFF/SUBTRANS_XACTS_PER_PAGE, and segment numbering at - * 0xFFFFFFFF/SUBTRANS_XACTS_PER_PAGE/SLRU_PAGES_PER_SEGMENT. We need take no - * explicit notice of that fact in this module, except when comparing segment - * and page numbers in TruncateSUBTRANS (see SubTransPagePrecedes) and zeroing - * them in StartupSUBTRANS. */ /* We need four bytes per xact */ #define SUBTRANS_XACTS_PER_PAGE (BLCKSZ / sizeof(TransactionId)) -#define TransactionIdToPage(xid) ((xid) / (TransactionId) SUBTRANS_XACTS_PER_PAGE) +static inline int64 +TransactionIdToPageInternal(TransactionId xid, bool lock) +{ + FullTransactionId fxid, + nextXid; + uint32 epoch; + + /* make local copy */ + if (lock) + LWLockAcquire(XidGenLock, LW_SHARED); + + nextXid = ShmemVariableCache->nextXid; + + if (lock) + LWLockRelease(XidGenLock); + + epoch = EpochFromFullTransactionId(nextXid); + if (xid > XidFromFullTransactionId(nextXid)) + --epoch; + + fxid = FullTransactionIdFromEpochAndXid(epoch, xid); + + return fxid.value / (uint64) SUBTRANS_XACTS_PER_PAGE; +} + +static inline int64 +TransactionIdToPage(TransactionId xid) +{ + return TransactionIdToPageInternal(xid, true); +} + +static inline int64 +TransactionIdToPageNoLock(TransactionId xid) +{ + return TransactionIdToPageInternal(xid, false); +} + +static inline int64 +FullTransactionIdToPage(FullTransactionId xid) +{ + return xid.value / (uint64) SUBTRANS_XACTS_PER_PAGE; +} + #define TransactionIdToEntry(xid) ((xid) % (TransactionId) SUBTRANS_XACTS_PER_PAGE) @@ -63,7 +97,7 @@ static SlruCtlData SubTransCtlData; #define SubTransCtl (&SubTransCtlData) -static int ZeroSUBTRANSPage(int pageno); +static int ZeroSUBTRANSPage(int64 pageno); static bool SubTransPagePrecedes(int64 page1, int64 page2); @@ -73,7 +107,7 @@ static bool SubTransPagePrecedes(int64 page1, int64 page2); void SubTransSetParent(TransactionId xid, TransactionId parent) { - int pageno = TransactionIdToPage(xid); + int64 pageno = TransactionIdToPage(xid); int entryno = TransactionIdToEntry(xid); int slotno; TransactionId *ptr; @@ -108,7 +142,7 @@ SubTransSetParent(TransactionId xid, TransactionId parent) TransactionId SubTransGetParent(TransactionId xid) { - int pageno = TransactionIdToPage(xid); + int64 pageno = TransactionIdToPage(xid); int entryno = TransactionIdToEntry(xid); int slotno; TransactionId *ptr; @@ -233,7 +267,7 @@ BootStrapSUBTRANS(void) * Control lock must be held at entry, and will be held at exit. */ static int -ZeroSUBTRANSPage(int pageno) +ZeroSUBTRANSPage(int64 pageno) { return SimpleLruZeroPage(SubTransCtl, pageno); } @@ -249,8 +283,8 @@ void StartupSUBTRANS(TransactionId oldestActiveXID) { FullTransactionId nextXid; - int startPage; - int endPage; + int64 startPage; + int64 endPage; /* * Since we don't expect pg_subtrans to be valid across crashes, we @@ -262,7 +296,7 @@ StartupSUBTRANS(TransactionId oldestActiveXID) startPage = TransactionIdToPage(oldestActiveXID); nextXid = ShmemVariableCache->nextXid; - endPage = TransactionIdToPage(XidFromFullTransactionId(nextXid)); + endPage = FullTransactionIdToPage(nextXid); while (startPage != endPage) { @@ -307,7 +341,7 @@ CheckPointSUBTRANS(void) void ExtendSUBTRANS(TransactionId newestXact) { - int pageno; + int64 pageno; /* * No work except at first XID of a page. But beware: just after @@ -317,7 +351,7 @@ ExtendSUBTRANS(TransactionId newestXact) !TransactionIdEquals(newestXact, FirstNormalTransactionId)) return; - pageno = TransactionIdToPage(newestXact); + pageno = TransactionIdToPageNoLock(newestXact); LWLockAcquire(SubtransSLRULock, LW_EXCLUSIVE); @@ -337,7 +371,7 @@ ExtendSUBTRANS(TransactionId newestXact) void TruncateSUBTRANS(TransactionId oldestXact) { - int cutoffPage; + int64 cutoffPage; /* * The cutoff point is the start of the segment containing oldestXact. We diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl index 3dba7d8a69..f1ceb4a4bd 100644 --- a/src/bin/pg_verifybackup/t/003_corruption.pl +++ b/src/bin/pg_verifybackup/t/003_corruption.pl @@ -174,7 +174,7 @@ sub mutilate_extra_tablespace_file sub mutilate_missing_file { my ($backup_path) = @_; - my $pathname = "$backup_path/pg_xact/0000"; + my $pathname = "$backup_path/pg_xact/000000000000"; unlink($pathname) || die "$pathname: $!"; return; } diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h index 7662f8e1a9..d2cfb02e14 100644 --- a/src/include/access/commit_ts.h +++ b/src/include/access/commit_ts.h @@ -60,7 +60,7 @@ typedef struct xl_commit_ts_set typedef struct xl_commit_ts_truncate { - int pageno; + int64 pageno; TransactionId oldestXid; } xl_commit_ts_truncate; diff --git a/src/test/modules/test_slru/expected/test_slru.out b/src/test/modules/test_slru/expected/test_slru.out index 0e66fdc205..8019ff916d 100644 --- a/src/test/modules/test_slru/expected/test_slru.out +++ b/src/test/modules/test_slru/expected/test_slru.out @@ -61,7 +61,7 @@ SELECT test_slru_page_writeall(); -- Flush the last page written out. SELECT test_slru_page_sync(12393); -NOTICE: Called SlruSyncFileTag() for segment 387 on path pg_test_slru/0183 +NOTICE: Called SlruSyncFileTag() for segment 387 on path pg_test_slru/000000000183 test_slru_page_sync --------------------- diff --git a/src/test/recovery/t/003_recovery_targets.pl b/src/test/recovery/t/003_recovery_targets.pl index e8e1a420bc..5da765d3e6 100644 --- a/src/test/recovery/t/003_recovery_targets.pl +++ b/src/test/recovery/t/003_recovery_targets.pl @@ -57,7 +57,7 @@ $node_primary->init(has_archiving => 1, allows_streaming => 1); # Bump the transaction ID epoch. This is useful to stress the portability # of recovery_target_xid parsing. -system_or_bail('pg_resetwal', '--epoch', '1', $node_primary->data_dir); +system_or_bail('pg_resetwal', '-x', '0x10000000', $node_primary->data_dir); # Start it $node_primary->start; -- 2.38.1