Rewrite storing origin in prepared record

knizhnik · knizhnik · commit 7fea40dd5b11 · 2016-11-07T17:11:58.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1165,7 +1165,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)
 						 : ts->status == TRANSACTION_STATUS_COMMITTED ? "committed" : "not prepared",
 						 ts->xid, ts->gid);
 				}
-				//Assert(ts->xid != 10000);
+				Assert(ts->xid != 10000);
 				if (x->csn > ts->csn || Mtm->status == MTM_RECOVERY) {
 					Assert(x->csn != INVALID_CSN);
 					ts->csn = x->csn;
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -871,6 +871,7 @@ typedef struct TwoPhaseFileHeader
 	int32		ninvalmsgs;		/* number of cache invalidation messages */
 	bool		initfileinval;	/* does relcache init file need invalidation? */
 	uint16		gidlen;			/* length of the GID - GID follows the header */
+	xl_xact_origin xl_origin;   /* replication origin information */
 } TwoPhaseFileHeader;
 
 /*
@@ -1022,12 +1023,10 @@ EndPrepare(GlobalTransaction gxact)
 {
 	TwoPhaseFileHeader *hdr;
 	StateFileChunk *record;
-	xl_xact_origin xl_origin;
-	xl_xact_xinfo xl_xinfo;
 	uint8		info = XLOG_XACT_PREPARE;
-	bool		replorigin;
+    bool            replorigin;
 
-	replorigin = (replorigin_session_origin != InvalidRepOriginId &&
+    replorigin = (replorigin_session_origin != InvalidRepOriginId &&
 				  replorigin_session_origin != DoNotReplicateId);
 
 	/* Add the end sentinel to the list of 2PC records */
@@ -1039,6 +1038,15 @@ EndPrepare(GlobalTransaction gxact)
 	Assert(hdr->magic == TWOPHASE_MAGIC);
 	hdr->total_len = records.total_len + sizeof(pg_crc32c);
 
+	if (replorigin) { 
+		Assert(replorigin_session_origin_lsn != InvalidXLogRecPtr);
+		hdr->xl_origin.origin_lsn = replorigin_session_origin_lsn;
+		hdr->xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
+	} else {
+		hdr->xl_origin.origin_lsn = InvalidXLogRecPtr;
+		hdr->xl_origin.origin_timestamp = 0;
+	}
+
 	/*
 	 * If the data size exceeds MaxAllocSize, we won't be able to read it in
 	 * ReadTwoPhaseFile. Check for that now, rather than fail in the case
@@ -1065,31 +1073,12 @@ EndPrepare(GlobalTransaction gxact)
 	XLogEnsureRecordSpace(0, records.num_chunks);
 
 	START_CRIT_SECTION();
-	xl_xinfo.xinfo = 0;
-	/* dump transaction origin information */
-	if (replorigin)
-	{
-		xl_xinfo.xinfo |= XACT_XINFO_HAS_ORIGIN;
-		Assert(replorigin_session_origin_lsn != InvalidXLogRecPtr);
-		xl_origin.origin_lsn = replorigin_session_origin_lsn;
-		xl_origin.origin_timestamp = replorigin_session_origin_timestamp;
-	}
-
-	if (xl_xinfo.xinfo != 0)
-		info |= XLOG_XACT_HAS_INFO;
-
 	MyPgXact->delayChkpt = true;
 
 	XLogBeginInsert();
 	for (record = records.head; record != NULL; record = record->next)
 		XLogRegisterData(record->data, record->len);
 
-	if (xl_xinfo.xinfo != 0)
-		XLogRegisterData((char *) (&xl_xinfo.xinfo), sizeof(xl_xinfo.xinfo));
-
-	if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)
-		XLogRegisterData((char *) (&xl_origin), sizeof(xl_xact_origin));
-
 	XLogIncludeOrigin();
 
 	gxact->prepare_end_lsn = XLogInsert(RM_XACT_ID, info);
@@ -1285,6 +1274,9 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
 	hdr = (TwoPhaseFileHeader *) xlrec;
 	bufptr = xlrec + MAXALIGN(sizeof(TwoPhaseFileHeader));
 	
+	parsed->origin_lsn = hdr->xl_origin.origin_lsn;
+	parsed->origin_timestamp = hdr->xl_origin.origin_timestamp;
+
 	strncpy(parsed->twophase_gid, bufptr, hdr->gidlen);
 	bufptr += MAXALIGN(hdr->gidlen);
 
@@ -1305,33 +1297,6 @@ ParsePrepareRecord(uint8 info, char *xlrec, xl_xact_parsed_prepare *parsed)
 
 	parsed->msgs = (SharedInvalidationMessage *) bufptr;
 	bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));
-
-	/*
-	 * Parse xinfo now.
-	 */
-
-	parsed->xinfo = 0;
-	bufptr = xlrec + hdr->total_len - sizeof(pg_crc32c);
-
-	if (info & XLOG_XACT_HAS_INFO)
-	{
-		xl_xact_xinfo *xl_xinfo = (xl_xact_xinfo *) bufptr;
-		parsed->xinfo = xl_xinfo->xinfo;
-		bufptr += sizeof(xl_xact_xinfo);
-	}
-
-
-	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
-	{
-		xl_xact_origin xl_origin;
-		/* 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
@@ -5657,20 +5657,20 @@ xact_redo(XLogReaderState *record)
 	}
 	else if (info == XLOG_XACT_PREPARE)
 	{
-		xl_xact_parsed_prepare parsed;
-
-		ParsePrepareRecord(XLogRecGetXid(record), XLogRecGetData(record), &parsed);
+		RepOriginId originId = XLogRecGetOrigin(record);
 
 		/* the record contents are exactly the 2PC file */
 		RecreateTwoPhaseFile(XLogRecGetXid(record),
-						  XLogRecGetData(record), XLogRecGetDataLen(record));
+							 XLogRecGetData(record), XLogRecGetDataLen(record));
 
-		if (parsed.xinfo & XACT_XINFO_HAS_ORIGIN)
+		if (originId != InvalidRepOriginId && originId != DoNotReplicateId) 
 		{
-			Assert(XLogRecGetOrigin(record) != InvalidRepOriginId);
+			xl_xact_parsed_prepare parsed;		
+			ParsePrepareRecord(XLogRecGetXid(record), XLogRecGetData(record), &parsed);
+			Assert(parsed.origin_lsn != InvalidXLogRecPtr);
 			/* recover apply progress */
-			replorigin_advance(XLogRecGetOrigin(record), parsed.origin_lsn,
-						record->EndRecPtr, false /* backward */ , false /* WAL */ );
+			replorigin_advance(originId, parsed.origin_lsn,
+							   record->EndRecPtr, false /* backward */ , false /* WAL */ );
 		}
 	}
 	else if (info == XLOG_XACT_ASSIGNMENT)

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ MtmEndTransaction(MtmCurrentTrans* x, bool commit)`
`1165`	`1165`	`: ts->status == TRANSACTION_STATUS_COMMITTED ? "committed" : "not prepared",`
`1166`	`1166`	`ts->xid, ts->gid);`
`1167`	`1167`	`}`
`1168`		`- //Assert(ts->xid != 10000);`
	`1168`	`+ Assert(ts->xid != 10000);`
`1169`	`1169`	`if (x->csn > ts->csn \|\| Mtm->status == MTM_RECOVERY) {`
`1170`	`1170`	`Assert(x->csn != INVALID_CSN);`
`1171`	`1171`	`ts->csn = x->csn;`
Original file line number	Diff line number	Diff line change
`@@ -5657,20 +5657,20 @@ xact_redo(XLogReaderState *record)`
`5657`	`5657`	`}`
`5658`	`5658`	`else if (info == XLOG_XACT_PREPARE)`
`5659`	`5659`	`{`
`5660`		`- xl_xact_parsed_prepare parsed;`
`5661`		`-`
`5662`		`- ParsePrepareRecord(XLogRecGetXid(record), XLogRecGetData(record), &parsed);`
	`5660`	`+ RepOriginId originId = XLogRecGetOrigin(record);`
`5663`	`5661`
`5664`	`5662`	`/* the record contents are exactly the 2PC file */`
`5665`	`5663`	`RecreateTwoPhaseFile(XLogRecGetXid(record),`
`5666`		`- XLogRecGetData(record), XLogRecGetDataLen(record));`
	`5664`	`+ XLogRecGetData(record), XLogRecGetDataLen(record));`
`5667`	`5665`
`5668`		`- if (parsed.xinfo & XACT_XINFO_HAS_ORIGIN)`
	`5666`	`+ if (originId != InvalidRepOriginId && originId != DoNotReplicateId)`
`5669`	`5667`	`{`
`5670`		`- Assert(XLogRecGetOrigin(record) != InvalidRepOriginId);`
	`5668`	`+ xl_xact_parsed_prepare parsed;`
	`5669`	`+ ParsePrepareRecord(XLogRecGetXid(record), XLogRecGetData(record), &parsed);`
	`5670`	`+ Assert(parsed.origin_lsn != InvalidXLogRecPtr);`
`5671`	`5671`	`/* recover apply progress */`
`5672`		`- replorigin_advance(XLogRecGetOrigin(record), parsed.origin_lsn,`
`5673`		`- record->EndRecPtr, false /* backward / , false / WAL */ );`
	`5672`	`+ replorigin_advance(originId, parsed.origin_lsn,`
	`5673`	`+ record->EndRecPtr, false /* backward / , false / WAL */ );`
`5674`	`5674`	`}`
`5675`	`5675`	`}`
`5676`	`5676`	`else if (info == XLOG_XACT_ASSIGNMENT)`