Initialize xl_xinfo.xinfo in EndPrepare

knizhnik · knizhnik · commit ef97004cd675 · 2016-08-23T16:08:45.000+03:00
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1061,7 +1061,7 @@ EndPrepare(GlobalTransaction gxact)
 	XLogEnsureRecordSpace(0, records.num_chunks);
 
 	START_CRIT_SECTION();
-
+	xl_xinfo.xinfo = 0;
 	/* dump transaction origin information */
 	if (replorigin_session_origin != InvalidRepOriginId)
 	{
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -558,7 +558,6 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	{
 		origin_lsn = parsed->origin_lsn;
-		elog(LOG, "DecodeCommit: xid=%d, origin_lsn=%ld", xid, origin_lsn);
 		commit_time = parsed->origin_timestamp;
 	}
 
@@ -659,7 +658,6 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	{
 		origin_lsn = parsed->origin_lsn;
-		elog(LOG, "DecodePrepare: xid=%d (%s), origin_lsn=%ld", xid, parsed->twophase_gid, origin_lsn);
 		commit_time = parsed->origin_timestamp;
 	} else { 
 		Assert(origin_id == InvalidRepOriginId);

Original file line number	Diff line number	Diff line change
`@@ -1061,7 +1061,7 @@ EndPrepare(GlobalTransaction gxact)`
`1061`	`1061`	`XLogEnsureRecordSpace(0, records.num_chunks);`
`1062`	`1062`
`1063`	`1063`	`START_CRIT_SECTION();`
`1064`		`-`
	`1064`	`+ xl_xinfo.xinfo = 0;`
`1065`	`1065`	`/* dump transaction origin information */`
`1066`	`1066`	`if (replorigin_session_origin != InvalidRepOriginId)`
`1067`	`1067`	`{`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,6 @@ DecodeCommit(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`558`	`558`	`if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)`
`559`	`559`	`{`
`560`	`560`	`origin_lsn = parsed->origin_lsn;`
`561`		`- elog(LOG, "DecodeCommit: xid=%d, origin_lsn=%ld", xid, origin_lsn);`
`562`	`561`	`commit_time = parsed->origin_timestamp;`
`563`	`562`	`}`
`564`	`563`
`@@ -659,7 +658,6 @@ DecodePrepare(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`659`	`658`	`if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)`
`660`	`659`	`{`
`661`	`660`	`origin_lsn = parsed->origin_lsn;`
`662`		`- elog(LOG, "DecodePrepare: xid=%d (%s), origin_lsn=%ld", xid, parsed->twophase_gid, origin_lsn);`
`663`	`661`	`commit_time = parsed->origin_timestamp;`
`664`	`662`	`} else {`
`665`	`663`	`Assert(origin_id == InvalidRepOriginId);`