NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc963e84

committed

Make origin data initialization consistent other fields in 2PC header

As of1eb6d65, the origin data is optionally stored in a 2PC fileheader, with the data filled in EndPrepare() even in the default casewhere there is no origin data to add. This was inconsistent with allthe other fields of TwoPhaseFileHeader which are initialized inStartPrepare(), so move the initialization of origin_lsn andorigin_timestamp there instead. The effect of missing theinitialization at this early stage is only cosmetic based on the currentlogic of the code, but could have led to issues in the long-term, and itis more consistent done this way.Reported-by: Ranier VilelaDiscussion:https://postgr.es/m/CAEudQAooECJ+gU_RZB-yhioPOV94R4ucoHAf68PiJhLpgpVpBw@mail.gmail.com

1 parent994d767 commitc963e84Copy full SHA for c963e84

File tree

1 file changed

-5

lines changed

src/backend/access/transam
- twophase.c

1 file changed

-5

lines changed

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

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1074,6 +1074,9 @@ StartPrepare(GlobalTransaction gxact)`
`1074`	`1074`	`hdr.ninvalmsgs=xactGetCommittedInvalidationMessages(&invalmsgs,`
`1075`	`1075`	`&hdr.initfileinval);`
`1076`	`1076`	`hdr.gidlen=strlen(gxact->gid)+1;/* Include '\0' */`
	`1077`	`+/* EndPrepare will fill the origin data, if necessary */`
	`1078`	`+hdr.origin_lsn=InvalidXLogRecPtr;`
	`1079`	`+hdr.origin_timestamp=0;`
`1077`	`1080`
`1078`	`1081`	`save_state_data(&hdr,sizeof(TwoPhaseFileHeader));`
`1079`	`1082`	`save_state_data(gxact->gid,hdr.gidlen);`
`@@ -1133,11 +1136,6 @@ EndPrepare(GlobalTransaction gxact)`
`1133`	`1136`	`hdr->origin_lsn=replorigin_session_origin_lsn;`
`1134`	`1137`	`hdr->origin_timestamp=replorigin_session_origin_timestamp;`
`1135`	`1138`	`}`
`1136`		`-else`
`1137`		`-{`
`1138`		`-hdr->origin_lsn=InvalidXLogRecPtr;`
`1139`		`-hdr->origin_timestamp=0;`
`1140`		`-}`
`1141`	`1139`
`1142`	`1140`	`/*`
`1143`	`1141`	`* If the data size exceeds MaxAllocSize, we won't be able to read it in`

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!

Commitc963e84

File tree

1 file changed

1 file changed

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

0 commit comments