mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix more holes with SLRU code in need of int64 for segment numbers 

This is a continuation of 3937cadfd4, taking care of more areas I have
managed to miss previously.

Reported-by: Noah Misch
Reviewed-by: Noah Misch
Discussion: https://postgr.es/m/20240724130059.1f.nmisch@google.com
Backpatch-through: 17
This commit is contained in:
Michael Paquier 2024-07-27 07:16:52 +09:00
parent 0dcaea5690
commit c9e2457390
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/backend/access/transam/multixact.c
View File

@ -3050,7 +3050,8 @@ PerformMembersTruncation(MultiXactOffset oldestOffset, MultiXactOffset newOldest
*/ */
while (segment != endsegment) while (segment != endsegment)
{ {
elog(DEBUG2, "truncating multixact members segment %x", segment); elog(DEBUG2, "truncating multixact members segment %llx",
(unsigned long long) segment);
SlruDeleteSegment(MultiXactMemberCtl, segment); SlruDeleteSegment(MultiXactMemberCtl, segment);
/* move to next segment, handling wraparound correctly */ /* move to next segment, handling wraparound correctly */
@ -3201,14 +3202,14 @@ TruncateMultiXact(MultiXactId newOldestMulti, Oid newOldestMultiDB)
} }
elog(DEBUG1, "performing multixact truncation: " elog(DEBUG1, "performing multixact truncation: "
"offsets [%u, %u), offsets segments [%x, %x), " "offsets [%u, %u), offsets segments [%llx, %llx), "
"members [%u, %u), members segments [%x, %x)", "members [%u, %u), members segments [%llx, %llx)",
oldestMulti, newOldestMulti, oldestMulti, newOldestMulti,
MultiXactIdToOffsetSegment(oldestMulti), (unsigned long long) MultiXactIdToOffsetSegment(oldestMulti),
MultiXactIdToOffsetSegment(newOldestMulti), (unsigned long long) MultiXactIdToOffsetSegment(newOldestMulti),
oldestOffset, newOldestOffset, oldestOffset, newOldestOffset,
MXOffsetToMemberSegment(oldestOffset), (unsigned long long) MXOffsetToMemberSegment(oldestOffset),
MXOffsetToMemberSegment(newOldestOffset)); (unsigned long long) MXOffsetToMemberSegment(newOldestOffset));
/* /*
* Do truncation, and the WAL logging of the truncation, in a critical * Do truncation, and the WAL logging of the truncation, in a critical
@ -3461,14 +3462,14 @@ multixact_redo(XLogReaderState *record)
SizeOfMultiXactTruncate); SizeOfMultiXactTruncate);
elog(DEBUG1, "replaying multixact truncation: " elog(DEBUG1, "replaying multixact truncation: "
"offsets [%u, %u), offsets segments [%x, %x), " "offsets [%u, %u), offsets segments [%llx, %llx), "
"members [%u, %u), members segments [%x, %x)", "members [%u, %u), members segments [%llx, %llx)",
xlrec.startTruncOff, xlrec.endTruncOff, xlrec.startTruncOff, xlrec.endTruncOff,
MultiXactIdToOffsetSegment(xlrec.startTruncOff), (unsigned long long) MultiXactIdToOffsetSegment(xlrec.startTruncOff),
MultiXactIdToOffsetSegment(xlrec.endTruncOff), (unsigned long long) MultiXactIdToOffsetSegment(xlrec.endTruncOff),
xlrec.startTruncMemb, xlrec.endTruncMemb, xlrec.startTruncMemb, xlrec.endTruncMemb,
MXOffsetToMemberSegment(xlrec.startTruncMemb), (unsigned long long) MXOffsetToMemberSegment(xlrec.startTruncMemb),
MXOffsetToMemberSegment(xlrec.endTruncMemb)); (unsigned long long) MXOffsetToMemberSegment(xlrec.endTruncMemb));
/* should not be required, but more than cheap enough */ /* should not be required, but more than cheap enough */
LWLockAcquire(MultiXactTruncationLock, LW_EXCLUSIVE); LWLockAcquire(MultiXactTruncationLock, LW_EXCLUSIVE);