Add asserts for origin

knizhnik · knizhnik · commit 3158117a4d38 · 2016-08-22T12:20:21.000+03:00
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -199,7 +199,7 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 			elog(WARNING, "Failed to map origin %d", txn->origin_id);
 			i = MtmNodeId-1;
 		} else { 
-			//Assert(i == MtmNodeId-1 || txn->origin_lsn != InvalidXLogRecPtr);
+			Assert(i == MtmNodeId-1 || txn->origin_lsn != InvalidXLogRecPtr);
 		}
 		pq_sendbyte(out, i+1);
 	} else { 
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -1066,7 +1066,7 @@ EndPrepare(GlobalTransaction gxact)
 	if (replorigin_session_origin != InvalidRepOriginId)
 	{
 		xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
-
+		Assert(replorigin_session_origin_lsn != 0);
 		xl_origin.origin_lsn = replorigin_session_origin_lsn;
 		xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
 	}
@@ -1316,6 +1316,7 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
 		/* we're only guaranteed 4 byte alignment, so copy onto stack */
 		memcpy(&xl_origin, bufptr, sizeof(xl_origin));
 		parsed->origin_lsn = xl_origin.origin_lsn;
+		Assert(parsed->origin_lsn != 0);
 		parsed->origin_timestamp = xl_origin.origin_timestamp;
 		bufptr += sizeof(xl_xact_origin);
 	}
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5196,7 +5196,6 @@ XactLogCommitRecord(TimestampTz commit_time,
 	if (replorigin_session_origin != InvalidRepOriginId)
 	{
 		xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
-
 		xl_origin.origin_lsn = replorigin_session_origin_lsn;
 		xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
 	}
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -558,6 +558,7 @@ 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;
 	}
 
@@ -658,6 +659,7 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	{
 		origin_lsn = parsed->origin_lsn;
+		elog(LOG, "DecodePrepate: xid=%d (%s), origin_lsn=%ld", xid, parsed->twophase_gid, origin_lsn);
 		commit_time = parsed->origin_timestamp;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`199`	`199`	`elog(WARNING, "Failed to map origin %d", txn->origin_id);`
`200`	`200`	`i = MtmNodeId-1;`
`201`	`201`	`} else {`
`202`		`- //Assert(i == MtmNodeId-1 \|\| txn->origin_lsn != InvalidXLogRecPtr);`
	`202`	`+ Assert(i == MtmNodeId-1 \|\| txn->origin_lsn != InvalidXLogRecPtr);`
`203`	`203`	`}`
`204`	`204`	`pq_sendbyte(out, i+1);`
`205`	`205`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1066,7 +1066,7 @@ EndPrepare(GlobalTransaction gxact)`
`1066`	`1066`	`if (replorigin_session_origin != InvalidRepOriginId)`
`1067`	`1067`	`{`
`1068`	`1068`	`xl_xinfo.xinfo \|= XACT_XINFO_HAS_ORIGIN;`
`1069`		`-`
	`1069`	`+ Assert(replorigin_session_origin_lsn != 0);`
`1070`	`1070`	`xl_origin.origin_lsn = replorigin_session_origin_lsn;`
`1071`	`1071`	`xl_origin.origin_timestamp = replorigin_session_origin_timestamp;`
`1072`	`1072`	`}`
`@@ -1316,6 +1316,7 @@ ParsePrepareRecord(uint8 info, char xlrec, xl_xact_parsed_prepare parsed)`
`1316`	`1316`	`/* we're only guaranteed 4 byte alignment, so copy onto stack */`
`1317`	`1317`	`memcpy(&xl_origin, bufptr, sizeof(xl_origin));`
`1318`	`1318`	`parsed->origin_lsn = xl_origin.origin_lsn;`
	`1319`	`+ Assert(parsed->origin_lsn != 0);`
`1319`	`1320`	`parsed->origin_timestamp = xl_origin.origin_timestamp;`
`1320`	`1321`	`bufptr += sizeof(xl_xact_origin);`
`1321`	`1322`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5196,7 +5196,6 @@ XactLogCommitRecord(TimestampTz commit_time,`
`5196`	`5196`	`if (replorigin_session_origin != InvalidRepOriginId)`
`5197`	`5197`	`{`
`5198`	`5198`	`xl_xinfo.xinfo \|= XACT_XINFO_HAS_ORIGIN;`
`5199`		`-`
`5200`	`5199`	`xl_origin.origin_lsn = replorigin_session_origin_lsn;`
`5201`	`5200`	`xl_origin.origin_timestamp = replorigin_session_origin_timestamp;`
`5202`	`5201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -558,6 +558,7 @@ 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);`
`561`	`562`	`commit_time = parsed->origin_timestamp;`
`562`	`563`	`}`
`563`	`564`
`@@ -658,6 +659,7 @@ DecodePrepare(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`658`	`659`	`if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)`
`659`	`660`	`{`
`660`	`661`	`origin_lsn = parsed->origin_lsn;`
	`662`	`+ elog(LOG, "DecodePrepate: xid=%d (%s), origin_lsn=%ld", xid, parsed->twophase_gid, origin_lsn);`
`661`	`663`	`commit_time = parsed->origin_timestamp;`
`662`	`664`	`}`
`663`	`665`