track xact_action in ReorderBufferTXN

kelvich · kelvich · commit cff6d255a100 · 2016-02-25T20:54:04.000+03:00
diff --git a/contrib/pglogical_output/pglogical_proto_json.c b/contrib/pglogical_output/pglogical_proto_json.c
@@ -90,7 +90,13 @@ pglogical_json_write_commit(StringInfo out, PGLogicalOutputData *data, ReorderBu
 						XLogRecPtr commit_lsn)
 {
 	appendStringInfoChar(out, '{');
-	appendStringInfoString(out, "\"action\":\"C\"");
+	if (txn->xact_action == XLOG_XACT_PREPARE)
+		appendStringInfoString(out, "\"action\":\"P\"");
+	else if (txn->xact_action == XLOG_XACT_COMMIT_PREPARED)
+		appendStringInfoString(out, "\"action\":\"CP\"");
+	else
+		appendStringInfoString(out, "\"action\":\"C\"");
+
 	if (!data->client_no_txinfo)
 	{
 		appendStringInfo(out, ", \"final_lsn\":\"%X/%X\"",
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -197,6 +197,8 @@ DecodeXactOp(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT)
 		return;
 
+	reorder->xact_action = info;
+
 	switch (info)
 	{
 		case XLOG_XACT_COMMIT:
@@ -583,32 +585,6 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	SnapBuildCommitTxn(ctx->snapshot_builder, buf->origptr, xid,
 					   hdr->nsubxacts, children);
 
-	/* ----
-	 * Check whether we are interested in this specific transaction, and tell
-	 * the reorderbuffer to forget the content of the (sub-)transactions
-	 * if not.
-	 *
-	 * There can be several reasons we might not be interested in this
-	 * transaction:
-	 * 1) We might not be interested in decoding transactions up to this
-	 *	  LSN. This can happen because we previously decoded it and now just
-	 *	  are restarting or if we haven't assembled a consistent snapshot yet.
-	 * 2) The transaction happened in another database.
-	 * 3) The output plugin is not interested in the origin.
-	 *
-	 * We can't just use ReorderBufferAbort() here, because we need to execute
-	 * the transaction's invalidations.  This currently won't be needed if
-	 * we're just skipping over the transaction because currently we only do
-	 * so during startup, to get to the first transaction the client needs. As
-	 * we have reset the catalog caches before starting to read WAL, and we
-	 * haven't yet touched any catalogs, there can't be anything to invalidate.
-	 * But if we're "forgetting" this commit because it's it happened in
-	 * another database, the invalidations might be important, because they
-	 * could be for shared catalogs and we might have loaded data into the
-	 * relevant syscaches.
-	 * ---
-	 */
-
 	// Add db check here
 	if (SnapBuildXactNeedsSkip(ctx->snapshot_builder, buf->origptr) ||
 		FilterByOrigin(ctx, origin_id))
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -1278,6 +1278,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 	txn->commit_time = commit_time;
 	txn->origin_id = origin_id;
 	txn->origin_lsn = origin_lsn;
+	txn->xact_action = rb->xact_action;
 
 	/* serialize the last bunch of changes if we need start earlier anyway */
 	if (txn->nentries_mem != txn->nentries)
@@ -1626,6 +1627,7 @@ ReorderBufferCommitPrepared(ReorderBuffer *rb, TransactionId xid,
 	txn->commit_time = commit_time;
 	txn->origin_id = origin_id;
 	txn->origin_lsn = origin_lsn;
+	txn->xact_action = XLOG_XACT_COMMIT_PREPARED;
 
 	rb->commit(rb, txn, commit_lsn);
 }
diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
@@ -132,6 +132,13 @@ typedef struct ReorderBufferTXN
 	 */
 	TransactionId xid;
 
+	/*
+	 * Commit callback is used for COMMIT/PREPARE/COMMMIT PREPARED,
+	 * as well as abort for ROLLBACK and ROLLBACK PREPARED. Here
+	 * stored actual xact action allowing decoding plugin to distinguish them.
+	 */
+	uint8 xact_action;
+
 	/* did the TX have catalog changes */
 	bool		has_catalog_changes;
 
@@ -278,6 +285,9 @@ struct ReorderBuffer
 	 */
 	HTAB	   *by_txn;
 
+	/* For twophase tx support we need to pass XACT action to ReorderBufferTXN */
+	uint8 xact_action;
+
 	/*
 	 * Transactions that could be a toplevel xact, ordered by LSN of the first
 	 * record bearing that xid..
