Fix order in xact wal messages.

Alexander Korotkov · Alexander Korotkov · commit 63325d20990d · 2016-11-17T13:49:35.000+03:00
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5210,6 +5210,9 @@ XactLogCommitRecord(TimestampTz commit_time,
 						 nsubxacts * sizeof(TransactionId));
 	}
 
+	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
+		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
+
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILENODES)
 	{
 		XLogRegisterData((char *) (&xl_relfilenodes),
@@ -5225,9 +5228,6 @@ XactLogCommitRecord(TimestampTz commit_time,
 						 nmsgs * sizeof(SharedInvalidationMessage));
 	}
 
-	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
-		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
-
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)
 		XLogRegisterData((char *) (&xl_origin), sizeof(xl_xact_origin));
 
@@ -5310,6 +5310,9 @@ XactLogAbortRecord(TimestampTz abort_time,
 						 nsubxacts * sizeof(TransactionId));
 	}
 
+	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
+		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
+
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILENODES)
 	{
 		XLogRegisterData((char *) (&xl_relfilenodes),
@@ -5318,9 +5321,6 @@ XactLogAbortRecord(TimestampTz abort_time,
 						 nrels * sizeof(RelFileNode));
 	}
 
-	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
-		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
-
 	return XLogInsert(RM_XACT_ID, info);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -5210,6 +5210,9 @@ XactLogCommitRecord(TimestampTz commit_time,`
`5210`	`5210`	`nsubxacts * sizeof(TransactionId));`
`5211`	`5211`	`}`
`5212`	`5212`
	`5213`	`+ if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
	`5214`	`+ XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));`
	`5215`	`+`
`5213`	`5216`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILENODES)`
`5214`	`5217`	`{`
`5215`	`5218`	`XLogRegisterData((char *) (&xl_relfilenodes),`
`@@ -5225,9 +5228,6 @@ XactLogCommitRecord(TimestampTz commit_time,`
`5225`	`5228`	`nmsgs * sizeof(SharedInvalidationMessage));`
`5226`	`5229`	`}`
`5227`	`5230`
`5228`		`- if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
`5229`		`- XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));`
`5230`		`-`
`5231`	`5231`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_ORIGIN)`
`5232`	`5232`	`XLogRegisterData((char *) (&xl_origin), sizeof(xl_xact_origin));`
`5233`	`5233`
`@@ -5310,6 +5310,9 @@ XactLogAbortRecord(TimestampTz abort_time,`
`5310`	`5310`	`nsubxacts * sizeof(TransactionId));`
`5311`	`5311`	`}`
`5312`	`5312`
	`5313`	`+ if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
	`5314`	`+ XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));`
	`5315`	`+`
`5313`	`5316`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_RELFILENODES)`
`5314`	`5317`	`{`
`5315`	`5318`	`XLogRegisterData((char *) (&xl_relfilenodes),`
`@@ -5318,9 +5321,6 @@ XactLogAbortRecord(TimestampTz abort_time,`
`5318`	`5321`	`nrels * sizeof(RelFileNode));`
`5319`	`5322`	`}`
`5320`	`5323`
`5321`		`- if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
`5322`		`- XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));`
`5323`		`-`
`5324`	`5324`	`return XLogInsert(RM_XACT_ID, info);`
`5325`	`5325`	`}`
`5326`	`5326`