Always pass origin_lsn to rbtxn in DecodePrepare.

arssher · arssher · commit c5c69c1247cc · 2018-10-11T16:29:37.000+03:00
twophase.c forgets to set XACT_INFO_HAS_ORIGIN flag in prepare record, so
without that origin_lsn is lost.
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -705,9 +705,9 @@ static void
 DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 			  xl_xact_parsed_prepare * parsed)
 {
-	XLogRecPtr	origin_lsn = InvalidXLogRecPtr;
+	XLogRecPtr	origin_lsn = parsed->origin_lsn;
 	TimestampTz commit_time = parsed->xact_time;
-	XLogRecPtr	origin_id = XLogRecGetOrigin(buf->record);
+	RepOriginId	origin_id = XLogRecGetOrigin(buf->record);
 	int			i;
 	TransactionId xid = parsed->twophase_xid;
 	const char *gid	= parsed->twophase_gid;
@@ -716,7 +716,6 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	{
-		origin_lsn = parsed->origin_lsn;
 		commit_time = parsed->origin_timestamp;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -705,9 +705,9 @@ static void`
`705`	`705`	`DecodePrepare(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`706`	`706`	`xl_xact_parsed_prepare * parsed)`
`707`	`707`	`{`
`708`		`- XLogRecPtr origin_lsn = InvalidXLogRecPtr;`
	`708`	`+ XLogRecPtr origin_lsn = parsed->origin_lsn;`
`709`	`709`	`TimestampTz commit_time = parsed->xact_time;`
`710`		`- XLogRecPtr origin_id = XLogRecGetOrigin(buf->record);`
	`710`	`+ RepOriginId origin_id = XLogRecGetOrigin(buf->record);`
`711`	`711`	`int i;`
`712`	`712`	`TransactionId xid = parsed->twophase_xid;`
`713`	`713`	`const char *gid = parsed->twophase_gid;`
`@@ -716,7 +716,6 @@ DecodePrepare(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`716`	`716`
`717`	`717`	`if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)`
`718`	`718`	`{`
`719`		`- origin_lsn = parsed->origin_lsn;`
`720`	`719`	`commit_time = parsed->origin_timestamp;`
`721`	`720`	`}`
`722`	`721`