NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitd3821e7

committed

Code review for multixact bugfix

Reword messages, rename a confusingly named function.Per Robert Haas.

1 parentcbf9f0e commitd3821e7Copy full SHA for d3821e7

File tree

1 file changed

-13

lines changed

src/backend/access/transam
- multixact.c

1 file changed

-13

lines changed

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

Lines changed: 9 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ static void ExtendMultiXactMember(MultiXactOffset offset, int nmembers);`
`347`	`347`	`staticvoidDetermineSafeOldestOffset(MultiXactIdoldestMXact);`
`348`	`348`	`staticboolMultiXactOffsetWouldWrap(MultiXactOffsetboundary,`
`349`	`349`	`MultiXactOffsetstart,uint32distance);`
`350`		`-staticMultiXactOffsetread_offset_for_multi(MultiXactIdmulti);`
	`350`	`+staticMultiXactOffsetfind_multixact_start(MultiXactIdmulti);`
`351`	`351`	`staticvoidWriteMZeroPageXlogRec(intpageno,uint8info);`
`352`	`352`
`353`	`353`
`@@ -1074,12 +1074,12 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)`
`1074`	`1074`	`ereport(ERROR,`
`1075`	`1075`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`1076`	`1076`	`errmsg("multixact \"members\" limit exceeded"),`
`1077`		`-errdetail_plural("This command would create a multixact with %u members,which exceeds remaining space(%u member.)",`
`1078`		`-"This command would create a multixact with %u members,which exceeds remaining space(%u members.)",`
	`1077`	`+errdetail_plural("This command would create a multixact with %u members,but the remaining spaceis only enough for%u member.",`
	`1078`	`+"This command would create a multixact with %u members,but the remaining spaceis only enough for%u members.",`
`1079`	`1079`	`MultiXactState->offsetStopLimit-nextOffset-1,`
`1080`	`1080`	`nmembers,`
`1081`	`1081`	`MultiXactState->offsetStopLimit-nextOffset-1),`
`1082`		`-errhint("Execute a database-wide VACUUM in database with OID %u, with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.",`
	`1082`	`+errhint("Execute a database-wide VACUUM in database with OID %u with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.",`
`1083`	`1083`	`MultiXactState->oldestMultiXactDB)));`
`1084`	`1084`	`elseif (MultiXactOffsetWouldWrap(MultiXactState->offsetStopLimit,`
`1085`	`1085`	`nextOffset,`
`@@ -1089,7 +1089,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)`
`1089`	`1089`	`errmsg("database with OID %u must be vacuumed before %d more multixact members are used",`
`1090`	`1090`	`MultiXactState->oldestMultiXactDB,`
`1091`	`1091`	`MultiXactState->offsetStopLimit-nextOffset+nmembers),`
`1092`		`-errhint("Execute a database-wide VACUUM in that database, with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.")));`
	`1092`	`+errhint("Execute a database-wide VACUUM in that database with reduced vacuum_multixact_freeze_min_age and vacuum_multixact_freeze_table_age settings.")));`
`1093`	`1093`
`1094`	`1094`	`ExtendMultiXactMember(nextOffset,nmembers);`
`1095`	`1095`
`@@ -2487,7 +2487,7 @@ DetermineSafeOldestOffset(MultiXactId oldestMXact)`
`2487`	`2487`	`* one-segment hole at a minimum. We start spewing warnings a few`
`2488`	`2488`	`* complete segments before that.`
`2489`	`2489`	`*/`
`2490`		`-oldestOffset=read_offset_for_multi(oldestMXact);`
	`2490`	`+oldestOffset=find_multixact_start(oldestMXact);`
`2491`	`2491`	`/* move back to start of the corresponding segment */`
`2492`	`2492`	`oldestOffset-=oldestOffset /MULTIXACT_MEMBERS_PER_PAGE*SLRU_PAGES_PER_SEGMENT;`
`2493`	`2493`
`@@ -2543,20 +2543,16 @@ MultiXactOffsetWouldWrap(MultiXactOffset boundary, MultiXactOffset start,`
`2543`	`2543`	`*-----------------------------------------------------------------------`
`2544`	`2544`	`*/`
`2545`	`2545`	`if (start<boundary)`
`2546`		`-{`
`2547`	`2546`	`returnfinish >=boundary\|\|finish<start;`
`2548`		`-}`
`2549`	`2547`	`else`
`2550`		`-{`
`2551`	`2548`	`returnfinish >=boundary&&finish<start;`
`2552`		`-}`
`2553`	`2549`	`}`
`2554`	`2550`
`2555`	`2551`	`/*`
`2556`		`- *Read the offset of thefirst member of thegivenmultixact.`
	`2552`	`+ *Find thestartingoffset of the givenMultiXactId.`
`2557`	`2553`	`*/`
`2558`	`2554`	`staticMultiXactOffset`
`2559`		`-read_offset_for_multi(MultiXactIdmulti)`
	`2555`	`+find_multixact_start(MultiXactIdmulti)`
`2560`	`2556`	`{`
`2561`	`2557`	`MultiXactOffsetoffset;`
`2562`	`2558`	`intpageno;`
`@@ -2709,7 +2705,7 @@ TruncateMultiXact(void)`
`2709`	`2705`	`* First, compute the safe truncation point for MultiXactMember. This is`
`2710`	`2706`	`* the starting offset of the oldest multixact.`
`2711`	`2707`	`*/`
`2712`		`-oldestOffset=read_offset_for_multi(oldestMXact);`
	`2708`	`+oldestOffset=find_multixact_start(oldestMXact);`
`2713`	`2709`
`2714`	`2710`	`/*`
`2715`	`2711`	`* To truncate MultiXactMembers, we need to figure out the active page`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitd3821e7

File tree

1 file changed

1 file changed

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

0 commit comments