cleanups

kelvich · kelvich · commit d5fe0f396c44 · 2017-03-23T11:26:59.000+03:00
diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c
@@ -100,7 +100,7 @@ ParseCommitRecord(uint8 info, xl_xact_commit *xlrec, xl_xact_parsed_commit *pars
 		xl_xact_twophase *xl_twophase = (xl_xact_twophase *) data;
 
 		parsed->twophase_xid = xl_twophase->xid;
-		data += MinSizeOfXactTwophase;
+		data += sizeof(xl_xact_twophase);
 
 		if (parsed->xinfo & XACT_XINFO_HAS_GID)
 		{
@@ -181,7 +181,7 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec, xl_xact_parsed_abort *parsed)
 		xl_xact_twophase *xl_twophase = (xl_xact_twophase *) data;
 
 		parsed->twophase_xid = xl_twophase->xid;
-		data += MinSizeOfXactTwophase;
+		data += sizeof(xl_xact_twophase);
 
 		if (parsed->xinfo & XACT_XINFO_HAS_GID)
 		{
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -5239,7 +5239,7 @@ XactLogCommitRecord(TimestampTz commit_time,
 
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
 	{
-		XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);
+		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
 
 		if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID)
 			XLogRegisterData((char *) twophase_gid, gidlen);
@@ -5367,7 +5367,7 @@ XactLogAbortRecord(TimestampTz abort_time,
 
 	if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)
 	{
-		XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);
+		XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));
 
 		if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID)
 			XLogRegisterData((char *) twophase_gid, gidlen);
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
@@ -229,9 +229,7 @@ typedef struct xl_xact_invals
 typedef struct xl_xact_twophase
 {
 	TransactionId xid;
-	char gid[GIDSIZE];
 } xl_xact_twophase;
-#define MinSizeOfXactTwophase offsetof(xl_xact_twophase, gid)
 
 typedef struct xl_xact_origin
 {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ ParseCommitRecord(uint8 info, xl_xact_commit xlrec, xl_xact_parsed_commit pars`
`100`	`100`	`xl_xact_twophase xl_twophase = (xl_xact_twophase ) data;`
`101`	`101`
`102`	`102`	`parsed->twophase_xid = xl_twophase->xid;`
`103`		`- data += MinSizeOfXactTwophase;`
	`103`	`+ data += sizeof(xl_xact_twophase);`
`104`	`104`
`105`	`105`	`if (parsed->xinfo & XACT_XINFO_HAS_GID)`
`106`	`106`	`{`
`@@ -181,7 +181,7 @@ ParseAbortRecord(uint8 info, xl_xact_abort xlrec, xl_xact_parsed_abort parsed)`
`181`	`181`	`xl_xact_twophase xl_twophase = (xl_xact_twophase ) data;`
`182`	`182`
`183`	`183`	`parsed->twophase_xid = xl_twophase->xid;`
`184`		`- data += MinSizeOfXactTwophase;`
	`184`	`+ data += sizeof(xl_xact_twophase);`
`185`	`185`
`186`	`186`	`if (parsed->xinfo & XACT_XINFO_HAS_GID)`
`187`	`187`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5239,7 +5239,7 @@ XactLogCommitRecord(TimestampTz commit_time,`
`5239`	`5239`
`5240`	`5240`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
`5241`	`5241`	`{`
`5242`		`- XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);`
	`5242`	`+ XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));`
`5243`	`5243`
`5244`	`5244`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID)`
`5245`	`5245`	`XLogRegisterData((char *) twophase_gid, gidlen);`
`@@ -5367,7 +5367,7 @@ XactLogAbortRecord(TimestampTz abort_time,`
`5367`	`5367`
`5368`	`5368`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_TWOPHASE)`
`5369`	`5369`	`{`
`5370`		`- XLogRegisterData((char *) (&xl_twophase), MinSizeOfXactTwophase);`
	`5370`	`+ XLogRegisterData((char *) (&xl_twophase), sizeof(xl_xact_twophase));`
`5371`	`5371`
`5372`	`5372`	`if (xl_xinfo.xinfo & XACT_XINFO_HAS_GID)`
`5373`	`5373`	`XLogRegisterData((char *) twophase_gid, gidlen);`
Original file line number	Diff line number	Diff line change
`@@ -229,9 +229,7 @@ typedef struct xl_xact_invals`
`229`	`229`	`typedef struct xl_xact_twophase`
`230`	`230`	`{`
`231`	`231`	`TransactionId xid;`
`232`		`- char gid[GIDSIZE];`
`233`	`232`	`} xl_xact_twophase;`
`234`		`-#define MinSizeOfXactTwophase offsetof(xl_xact_twophase, gid)`
`235`	`233`
`236`	`234`	`typedef struct xl_xact_origin`
`237`	`235`	`{`