Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbd06cc3

Browse files
committed
Fix more holes with SLRU code in need of int64 for segment numbers
This is a continuation ofc9e2457, containing changes included intothe proposed patch that have been missed in the actual commit. I havemanaged to miss these diffs while doing a rebase of the original patch.Thanks to Noah Misch, Peter Eisentraut and Alexander Korotkov for thepokes.Discussion:https://postgr.es/m/92fe572d-638e-4162-aef6-1c42a2936f25@eisentraut.orgDiscussion:https://postgr.es/m/20240810175055.cd.nmisch@google.comBackpatch-through: 17
1 parent7b063ff commitbd06cc3

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

‎src/backend/access/transam/multixact.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ MultiXactIdToOffsetEntry(MultiXactId multi)
120120
returnmulti %MULTIXACT_OFFSETS_PER_PAGE;
121121
}
122122

123-
staticinlineint
123+
staticinlineint64
124124
MultiXactIdToOffsetSegment(MultiXactIdmulti)
125125
{
126126
returnMultiXactIdToOffsetPage(multi) /SLRU_PAGES_PER_SEGMENT;
@@ -174,7 +174,7 @@ MXOffsetToMemberPage(MultiXactOffset offset)
174174
returnoffset /MULTIXACT_MEMBERS_PER_PAGE;
175175
}
176176

177-
staticinlineint
177+
staticinlineint64
178178
MXOffsetToMemberSegment(MultiXactOffsetoffset)
179179
{
180180
returnMXOffsetToMemberPage(offset) /SLRU_PAGES_PER_SEGMENT;
@@ -3039,10 +3039,10 @@ SlruScanDirCbFindEarliest(SlruCtl ctl, char *filename, int64 segpage, void *data
30393039
staticvoid
30403040
PerformMembersTruncation(MultiXactOffsetoldestOffset,MultiXactOffsetnewOldestOffset)
30413041
{
3042-
constintmaxsegment=MXOffsetToMemberSegment(MaxMultiXactOffset);
3043-
intstartsegment=MXOffsetToMemberSegment(oldestOffset);
3044-
intendsegment=MXOffsetToMemberSegment(newOldestOffset);
3045-
intsegment=startsegment;
3042+
constint64maxsegment=MXOffsetToMemberSegment(MaxMultiXactOffset);
3043+
int64startsegment=MXOffsetToMemberSegment(oldestOffset);
3044+
int64endsegment=MXOffsetToMemberSegment(newOldestOffset);
3045+
int64segment=startsegment;
30463046

30473047
/*
30483048
* Delete all the segments but the last one. The last segment can still

‎src/backend/access/transam/slru.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ SlruDeleteSegment(SlruCtl ctl, int64 segno)
15321532
did_write= false;
15331533
for (intslotno=0;slotno<shared->num_slots;slotno++)
15341534
{
1535-
intpagesegno;
1535+
int64pagesegno;
15361536
intcurbank=SlotGetBankNumber(slotno);
15371537

15381538
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp