do not create extra begin before commit_prepared

kelvich · kelvich · commit 5606374a7cd7 · 2016-02-25T19:28:54.000+03:00
diff --git a/reinit.sh b/reinit.sh
@@ -23,6 +23,13 @@ reinit_master() {
 	./install/bin/pg_ctl -sw -D ./install/data -l ./install/data/logfile start
 	./install/bin/createdb stas
 	./install/bin/psql -c "create table t(id int);"
+	./install/bin/psql -c "SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'pglogical_output');"
+	./install/bin/psql <<SQL
+		begin;
+		insert into t values (42);
+		prepare transaction 'x';
+		commit prepared 'x';
+SQL
 }
 
 reinit_slave() {
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -474,6 +474,12 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 		commit_time = parsed->origin_timestamp;
 	}
 
+	if (TransactionIdIsValid(parsed->twophase_xid)) {
+		ReorderBufferCommitPrepared(ctx->reorder, xid, buf->origptr, buf->endptr,
+							commit_time, origin_id, origin_lsn);
+		return;
+	}
+
 	/*
 	 * Process invalidation messages, even if we're not interested in the
 	 * transaction's contents, since the various caches need to always be
@@ -558,9 +564,7 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 	RelFileNode *abortrels;
 	SharedInvalidationMessage *invalmsgs;
 
-
-
-	// probably there are no origin
+	// probably there are no origin -- origin stored in hdr
 	// if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)
 	// {
 	// 	origin_lsn = parsed->origin_lsn;
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
@@ -1610,6 +1610,26 @@ ReorderBufferCommit(ReorderBuffer *rb, TransactionId xid,
 	PG_END_TRY();
 }
 
+void
+ReorderBufferCommitPrepared(ReorderBuffer *rb, TransactionId xid,
+					XLogRecPtr commit_lsn, XLogRecPtr end_lsn,
+					TimestampTz commit_time,
+					RepOriginId origin_id, XLogRecPtr origin_lsn)
+{
+	ReorderBufferTXN *txn;
+
+	txn = ReorderBufferTXNByXid(rb, xid, true, NULL, commit_lsn,
+								true);
+
+	txn->final_lsn = commit_lsn;
+	txn->end_lsn = end_lsn;
+	txn->commit_time = commit_time;
+	txn->origin_id = origin_id;
+	txn->origin_lsn = origin_lsn;
+
+	rb->commit(rb, txn, commit_lsn);
+}
+
 /*
  * Abort a transaction that possibly has previous changes. Needs to be first
  * called for subtransactions and then for the toplevel xid.
diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
@@ -350,6 +350,10 @@ void		ReorderBufferQueueChange(ReorderBuffer *, TransactionId, XLogRecPtr lsn, R
 void ReorderBufferCommit(ReorderBuffer *, TransactionId,
 					XLogRecPtr commit_lsn, XLogRecPtr end_lsn,
 	  TimestampTz commit_time, RepOriginId origin_id, XLogRecPtr origin_lsn);
+void ReorderBufferCommitPrepared(ReorderBuffer *rb, TransactionId xid,
+					XLogRecPtr commit_lsn, XLogRecPtr end_lsn,
+					TimestampTz commit_time,
+					RepOriginId origin_id, XLogRecPtr origin_lsn);
 void		ReorderBufferAssignChild(ReorderBuffer *, TransactionId, TransactionId, XLogRecPtr commit_lsn);
 void ReorderBufferCommitChild(ReorderBuffer *, TransactionId, TransactionId,
 						 XLogRecPtr commit_lsn, XLogRecPtr end_lsn);
