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

michaelpq · michaelpq · commit bd06cc338d82 · 2024-08-19T12:34:18.000+09:00
This is a continuation of c9e2457, containing changes included into the proposed patch that have been missed in the actual commit. I have managed to miss these diffs while doing a rebase of the original patch. Thanks to Noah Misch, Peter Eisentraut and Alexander Korotkov for the pokes. Discussion: https://postgr.es/m/92fe572d-638e-4162-aef6-1c42a2936f25@eisentraut.org Discussion: https://postgr.es/m/20240810175055.cd.nmisch@google.com Backpatch-through: 17
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
@@ -120,7 +120,7 @@ MultiXactIdToOffsetEntry(MultiXactId multi)
 	return multi % MULTIXACT_OFFSETS_PER_PAGE;
 }
 
-static inline int
+static inline int64
 MultiXactIdToOffsetSegment(MultiXactId multi)
 {
 	return MultiXactIdToOffsetPage(multi) / SLRU_PAGES_PER_SEGMENT;
@@ -174,7 +174,7 @@ MXOffsetToMemberPage(MultiXactOffset offset)
 	return offset / MULTIXACT_MEMBERS_PER_PAGE;
 }
 
-static inline int
+static inline int64
 MXOffsetToMemberSegment(MultiXactOffset offset)
 {
 	return MXOffsetToMemberPage(offset) / SLRU_PAGES_PER_SEGMENT;
@@ -3039,10 +3039,10 @@ SlruScanDirCbFindEarliest(SlruCtl ctl, char *filename, int64 segpage, void *data
 static void
 PerformMembersTruncation(MultiXactOffset oldestOffset, MultiXactOffset newOldestOffset)
 {
-	const int	maxsegment = MXOffsetToMemberSegment(MaxMultiXactOffset);
-	int			startsegment = MXOffsetToMemberSegment(oldestOffset);
-	int			endsegment = MXOffsetToMemberSegment(newOldestOffset);
-	int			segment = startsegment;
+	const int64 maxsegment = MXOffsetToMemberSegment(MaxMultiXactOffset);
+	int64		startsegment = MXOffsetToMemberSegment(oldestOffset);
+	int64		endsegment = MXOffsetToMemberSegment(newOldestOffset);
+	int64		segment = startsegment;
 
 	/*
 	 * Delete all the segments but the last one. The last segment can still
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
@@ -1532,7 +1532,7 @@ SlruDeleteSegment(SlruCtl ctl, int64 segno)
 	did_write = false;
 	for (int slotno = 0; slotno < shared->num_slots; slotno++)
 	{
-		int			pagesegno;
+		int64		pagesegno;
 		int			curbank = SlotGetBankNumber(slotno);
 
 		/*

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ MultiXactIdToOffsetEntry(MultiXactId multi)`
`120`	`120`	`return multi % MULTIXACT_OFFSETS_PER_PAGE;`
`121`	`121`	`}`
`122`	`122`
`123`		`-static inline int`
	`123`	`+static inline int64`
`124`	`124`	`MultiXactIdToOffsetSegment(MultiXactId multi)`
`125`	`125`	`{`
`126`	`126`	`return MultiXactIdToOffsetPage(multi) / SLRU_PAGES_PER_SEGMENT;`
`@@ -174,7 +174,7 @@ MXOffsetToMemberPage(MultiXactOffset offset)`
`174`	`174`	`return offset / MULTIXACT_MEMBERS_PER_PAGE;`
`175`	`175`	`}`
`176`	`176`
`177`		`-static inline int`
	`177`	`+static inline int64`
`178`	`178`	`MXOffsetToMemberSegment(MultiXactOffset offset)`
`179`	`179`	`{`
`180`	`180`	`return MXOffsetToMemberPage(offset) / SLRU_PAGES_PER_SEGMENT;`
`@@ -3039,10 +3039,10 @@ SlruScanDirCbFindEarliest(SlruCtl ctl, char filename, int64 segpage, void data`
`3039`	`3039`	`static void`
`3040`	`3040`	`PerformMembersTruncation(MultiXactOffset oldestOffset, MultiXactOffset newOldestOffset)`
`3041`	`3041`	`{`
`3042`		`- const int maxsegment = MXOffsetToMemberSegment(MaxMultiXactOffset);`
`3043`		`- int startsegment = MXOffsetToMemberSegment(oldestOffset);`
`3044`		`- int endsegment = MXOffsetToMemberSegment(newOldestOffset);`
`3045`		`- int segment = startsegment;`
	`3042`	`+ const int64 maxsegment = MXOffsetToMemberSegment(MaxMultiXactOffset);`
	`3043`	`+ int64 startsegment = MXOffsetToMemberSegment(oldestOffset);`
	`3044`	`+ int64 endsegment = MXOffsetToMemberSegment(newOldestOffset);`
	`3045`	`+ int64 segment = startsegment;`
`3046`	`3046`
`3047`	`3047`	`/*`
`3048`	`3048`	`* Delete all the segments but the last one. The last segment can still`
Original file line number	Diff line number	Diff line change
`@@ -1532,7 +1532,7 @@ SlruDeleteSegment(SlruCtl ctl, int64 segno)`
`1532`	`1532`	`did_write = false;`
`1533`	`1533`	`for (int slotno = 0; slotno < shared->num_slots; slotno++)`
`1534`	`1534`	`{`
`1535`		`- int pagesegno;`
	`1535`	`+ int64 pagesegno;`
`1536`	`1536`	`int curbank = SlotGetBankNumber(slotno);`
`1537`	`1537`
`1538`	`1538`	`/*`