Properly set committed subtransactions in snapbuilder.

kelvich · kelvich · commit 905ce987a091 · 2017-06-08T16:15:27.000+03:00
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -579,7 +579,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	}
 
 	SnapBuildCommitTxn(ctx->snapshot_builder, buf->origptr, xid,
-					   parsed->nsubxacts, parsed->subxacts, true);
+					   parsed->nsubxacts, parsed->subxacts, true, parsed->nmsgs > 0);
 
 	/* ----
 	 * Check whether we are interested in this specific transaction, and tell
@@ -646,7 +646,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 		strcpy(ctx->reorder->gid, parsed->twophase_gid);
 		*ctx->reorder->state_3pc = '\0';
 		SnapBuildCommitTxn(ctx->snapshot_builder, buf->origptr, xid,
-						   parsed->nsubxacts, parsed->subxacts, true);
+						   parsed->nsubxacts, parsed->subxacts, true, false);
 		ReorderBufferCommitBareXact(ctx->reorder, xid, buf->origptr, buf->endptr,
 							commit_time, origin_id, origin_lsn);
 	} else {
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
@@ -948,7 +948,7 @@ SnapBuildAbortTxn(SnapBuild *builder, XLogRecPtr lsn,
  */
 void
 SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,
-				   int nsubxacts, TransactionId *subxacts, bool isCommit)
+				   int nsubxacts, TransactionId *subxacts, bool isCommit, bool forceCatalog)
 {
 	int			nxact;
 
@@ -1006,7 +1006,7 @@ SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,
 		 * Add subtransaction to base snapshot if it DDL, we don't distinguish
 		 * to toplevel transactions there.
 		 */
-		else if (ReorderBufferXidHasCatalogChanges(builder->reorder, subxid))
+		else if (ReorderBufferXidHasCatalogChanges(builder->reorder, subxid) || forceCatalog)
 		{
 			sub_needs_timetravel = true;
 
@@ -1034,7 +1034,7 @@ SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,
 		SnapBuildAddCommittedTxn(builder, xid);
 	}
 	/* add toplevel transaction to base snapshot */
-	else if (ReorderBufferXidHasCatalogChanges(builder->reorder, xid))
+	else if (ReorderBufferXidHasCatalogChanges(builder->reorder, xid) || forceCatalog)
 	{
 		elog(DEBUG2, "found top level transaction " XID_FMT ", with catalog changes!",
 			 xid);
diff --git a/src/include/replication/snapbuild.h b/src/include/replication/snapbuild.h
@@ -70,7 +70,7 @@ extern bool SnapBuildXactNeedsSkip(SnapBuild *snapstate, XLogRecPtr ptr);
 
 extern void SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn,
 				   TransactionId xid, int nsubxacts,
-				   TransactionId *subxacts, bool isCommit);
+				   TransactionId *subxacts, bool isCommit, bool forceCatalog);
 extern void SnapBuildAbortTxn(SnapBuild *builder, XLogRecPtr lsn,
 				  TransactionId xid, int nsubxacts,
 				  TransactionId *subxacts);

Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,7 @@ SnapBuildAbortTxn(SnapBuild *builder, XLogRecPtr lsn,`
`948`	`948`	`*/`
`949`	`949`	`void`
`950`	`950`	`SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,`
`951`		`- int nsubxacts, TransactionId *subxacts, bool isCommit)`
	`951`	`+ int nsubxacts, TransactionId *subxacts, bool isCommit, bool forceCatalog)`
`952`	`952`	`{`
`953`	`953`	`int nxact;`
`954`	`954`
`@@ -1006,7 +1006,7 @@ SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,`
`1006`	`1006`	`* Add subtransaction to base snapshot if it DDL, we don't distinguish`
`1007`	`1007`	`* to toplevel transactions there.`
`1008`	`1008`	`*/`
`1009`		`- else if (ReorderBufferXidHasCatalogChanges(builder->reorder, subxid))`
	`1009`	`+ else if (ReorderBufferXidHasCatalogChanges(builder->reorder, subxid) \|\| forceCatalog)`
`1010`	`1010`	`{`
`1011`	`1011`	`sub_needs_timetravel = true;`
`1012`	`1012`
`@@ -1034,7 +1034,7 @@ SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,`
`1034`	`1034`	`SnapBuildAddCommittedTxn(builder, xid);`
`1035`	`1035`	`}`
`1036`	`1036`	`/* add toplevel transaction to base snapshot */`
`1037`		`- else if (ReorderBufferXidHasCatalogChanges(builder->reorder, xid))`
	`1037`	`+ else if (ReorderBufferXidHasCatalogChanges(builder->reorder, xid) \|\| forceCatalog)`
`1038`	`1038`	`{`
`1039`	`1039`	`elog(DEBUG2, "found top level transaction " XID_FMT ", with catalog changes!",`
`1040`	`1040`	`xid);`