decode gid

kelvich · kelvich · commit 6d69f1540966 · 2016-02-26T15:44:13.000+03:00
diff --git a/contrib/pglogical_output/pglogical_proto_json.c b/contrib/pglogical_output/pglogical_proto_json.c
@@ -91,11 +91,18 @@ pglogical_json_write_commit(StringInfo out, PGLogicalOutputData *data, ReorderBu
 {
 	appendStringInfoChar(out, '{');
 	if (txn->xact_action == XLOG_XACT_PREPARE)
+	{
 		appendStringInfoString(out, "\"action\":\"P\"");
+		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);
+	}
 	else if (txn->xact_action == XLOG_XACT_COMMIT_PREPARED)
+	{
 		appendStringInfoString(out, "\"action\":\"CP\"");
+	}
 	else
+	{
 		appendStringInfoString(out, "\"action\":\"C\"");
+	}
 
 	if (!data->client_no_txinfo)
 	{
diff --git a/reinit.sh b/reinit.sh
@@ -51,3 +51,15 @@ make install > /dev/null
 pkill -9 postgres
 reinit_master >> /dev/null
 
+
+
+# SELECT * FROM pg_logical_slot_peek_changes('regression_slot',
+# 	NULL, NULL,
+# 	'expected_encoding', 'UTF8',
+# 	'min_proto_version', '1',
+# 	'max_proto_version', '1',
+# 	'startup_params_format', '1',
+# 	'proto_format', 'json',
+# 	'no_txinfo', 't');
+
+
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -570,6 +570,8 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	invalmsgs = (SharedInvalidationMessage *) twophase_bufptr;
 	twophase_bufptr += MAXALIGN(hdr->ninvalmsgs * sizeof(SharedInvalidationMessage));
 
+	memcpy(ctx->reorder->gid, hdr->gid, GIDSIZE);
+
 	/*
 	 * Process invalidation messages, even if we're not interested in the
 	 * transaction's contents, since the various caches need to always be
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -1279,6 +1279,7 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 	txn->origin_id = origin_id;
 	txn->origin_lsn = origin_lsn;
 	txn->xact_action = rb->xact_action;
+	memcpy(txn->gid, rb->gid, GIDSIZE);
 
 	/* serialize the last bunch of changes if we need start earlier anyway */
 	if (txn->nentries_mem != txn->nentries)
diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
@@ -10,6 +10,7 @@
 #define REORDERBUFFER_H
 
 #include "access/htup_details.h"
+#include "access/twophase.h"
 #include "lib/ilist.h"
 #include "storage/sinval.h"
 #include "utils/hsearch.h"
@@ -137,7 +138,8 @@ typedef struct ReorderBufferTXN
 	 * as well as abort for ROLLBACK and ROLLBACK PREPARED. Here
 	 * stored actual xact action allowing decoding plugin to distinguish them.
 	 */
-	uint8 xact_action;
+	uint8		xact_action;
+	char		gid[GIDSIZE];
 
 	/* did the TX have catalog changes */
 	bool		has_catalog_changes;
@@ -286,7 +288,8 @@ struct ReorderBuffer
 	HTAB	   *by_txn;
 
 	/* For twophase tx support we need to pass XACT action to ReorderBufferTXN */
-	uint8 xact_action;
+	uint8		xact_action;
+	char		gid[GIDSIZE];
 
 	/*
 	 * Transactions that could be a toplevel xact, ordered by LSN of the first
