Fix sending commit of prepared transaction

knizhnik · knizhnik · commit 73b401f4f580 · 2016-03-27T18:43:58.000+03:00
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -125,9 +125,6 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 {
     uint8 flags = 0;
 
-    if (MtmIsFilteredTxn) { 
-		return;
-	}
     if (txn->xact_action == XLOG_XACT_COMMIT) 
     	flags = PGLOGICAL_COMMIT;
 	else if (txn->xact_action == XLOG_XACT_PREPARE)
@@ -139,9 +136,8 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 	else
     	Assert(false);
 
-#if 0
 	if (flags == PGLOGICAL_COMMIT || flags == PGLOGICAL_PREPARE) { 
-		if (mm->isLocal) { 
+		if (MtmIsFilteredTxn) { 
 			return;
 		}
 	} else { 
@@ -151,7 +147,6 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 			return;
 		}
 	}
-#endif
 
     pq_sendbyte(out, 'C');		/* sending COMMIT */
 

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,6 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`125`	`125`	`{`
`126`	`126`	`uint8 flags = 0;`
`127`	`127`
`128`		`- if (MtmIsFilteredTxn) {`
`129`		`- return;`
`130`		`- }`
`131`	`128`	`if (txn->xact_action == XLOG_XACT_COMMIT)`
`132`	`129`	`flags = PGLOGICAL_COMMIT;`
`133`	`130`	`else if (txn->xact_action == XLOG_XACT_PREPARE)`
`@@ -139,9 +136,8 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`139`	`136`	`else`
`140`	`137`	`Assert(false);`
`141`	`138`
`142`		`-#if 0`
`143`	`139`	`if (flags == PGLOGICAL_COMMIT \|\| flags == PGLOGICAL_PREPARE) {`
`144`		`- if (mm->isLocal) {`
	`140`	`+ if (MtmIsFilteredTxn) {`
`145`	`141`	`return;`
`146`	`142`	`}`
`147`	`143`	`} else {`
`@@ -151,7 +147,6 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`151`	`147`	`return;`
`152`	`148`	`}`
`153`	`149`	`}`
`154`		`-#endif`
`155`	`150`
`156`	`151`	`pq_sendbyte(out, 'C'); /* sending COMMIT */`
`157`	`152`