apply twophase tx with remote GID

kelvich · kelvich · commit a157e2ce3eac · 2016-03-02T14:18:30.000+03:00
diff --git a/contrib/pglogical/pglogical_apply.c b/contrib/pglogical/pglogical_apply.c
@@ -141,22 +141,50 @@ handle_begin(StringInfo s)
  * Handle COMMIT message.
  */
 static void
-handle_commit(StringInfo s)
+handle_commit(char action, StringInfo s)
 {
 	XLogRecPtr		commit_lsn;
 	XLogRecPtr		end_lsn;
 	TimestampTz		commit_time;
+	const char		   *gid;
+	PGLFlushPosition *flushpos;
 
-	pglogical_read_commit(s, &commit_lsn, &end_lsn, &commit_time);
+
+	if (action == 'C')
+		pglogical_read_commit(s, &commit_lsn, &end_lsn, &commit_time);
+	else if (action == 'P')
+		pglogical_read_twophase(s, &commit_lsn, &end_lsn, &commit_time, &gid);
+	else //if (action == 'F')
+	{
+		pglogical_read_twophase(s, &commit_lsn, &end_lsn, &commit_time, &gid);
+		replorigin_session_origin_timestamp = commit_time;
+		replorigin_session_origin_lsn = commit_lsn;
+	}
 
 	Assert(commit_lsn == replorigin_session_origin_lsn);
 	Assert(commit_time == replorigin_session_origin_timestamp);
 
-	if (IsTransactionState())
-	{
-		PGLFlushPosition *flushpos;
+	// if (IsTransactionState())
+	// {
+		if (action == 'C')
+		{
+			CommitTransactionCommand();
+		}
+		else if (action == 'P')
+		{
+			BeginTransactionBlock();
+			CommitTransactionCommand();
+			StartTransactionCommand();
+			PrepareTransactionBlock(gid);
+			CommitTransactionCommand();
+		}
+		else if (action == 'F')
+		{
+			StartTransactionCommand();
+			FinishPreparedTransaction(gid, true);
+			CommitTransactionCommand();
+		}
 
-		CommitTransactionCommand();
 		MemoryContextSwitchTo(TopMemoryContext);
 
 		/* Track commit lsn  */
@@ -166,7 +194,7 @@ handle_commit(StringInfo s)
 
 		dlist_push_tail(&lsn_mapping, &flushpos->node);
 		MemoryContextSwitchTo(MessageContext);
-	}
+	// }
 
 	/*
 	 * If the row isn't from the immediate upstream; advance the slot of the
@@ -216,24 +244,6 @@ handle_commit(StringInfo s)
 	pgstat_report_activity(STATE_IDLE, NULL);
 }
 
-static void
-handle_prepare(StringInfo s)
-{
-	BeginTransactionBlock();
-	CommitTransactionCommand();
-	StartTransactionCommand();
-	PrepareTransactionBlock("dumb_gid");
-	CommitTransactionCommand();
-}
-
-static void
-handle_commit_prepared(StringInfo s)
-{
-	StartTransactionCommand();
-	FinishPreparedTransaction("dumb_gid", true);
-	CommitTransactionCommand();
-}
-
 /*
  * Handle ORIGIN message.
  */
@@ -1042,20 +1052,16 @@ replication_handler(StringInfo s)
 			break;
 		/* COMMIT */
 		case 'C':
-			handle_commit(s);
-			break;
+		/* PREPARE */
+		case 'P':
 		/* COMMIT PREPARED (FINISH) */
 		case 'F':
-			handle_commit_prepared(s);
+			handle_commit(action, s);
 			break;
 		/* ORIGIN */
 		case 'O':
 			handle_origin(s);
 			break;
-		/* PREPARE */
-		case 'P':
-			handle_prepare(s);
-			break;
 		/* RELATION */
 		case 'R':
 			handle_relation(s);
diff --git a/contrib/pglogical/pglogical_proto.c b/contrib/pglogical/pglogical_proto.c
@@ -95,6 +95,25 @@ pglogical_read_commit(StringInfo in, XLogRecPtr *commit_lsn,
 	*committime = pq_getmsgint64(in);
 }
 
+/*
+ * Read transaction PREPARE or COMMIT PREPARED from the stream.
+ */
+void
+pglogical_read_twophase(StringInfo in, XLogRecPtr *commit_lsn,
+					   XLogRecPtr *end_lsn, TimestampTz *committime,
+					   const char **gid)
+{
+	/* read flags */
+	uint8	flags = pq_getmsgbyte(in);
+	Assert(flags == 0);
+
+	/* read fields */
+	*commit_lsn = pq_getmsgint64(in);
+	*end_lsn = pq_getmsgint64(in);
+	*committime = pq_getmsgint64(in);
+	*gid = pq_getmsgstring(in);
+}
+
 /*
  * Read ORIGIN from the output stream.
  */
diff --git a/contrib/pglogical/pglogical_proto.h b/contrib/pglogical/pglogical_proto.h
@@ -28,6 +28,8 @@ extern void pglogical_read_begin(StringInfo in, XLogRecPtr *remote_lsn,
 					  TimestampTz *committime, TransactionId *remote_xid);
 extern void pglogical_read_commit(StringInfo in, XLogRecPtr *commit_lsn,
 					   XLogRecPtr *end_lsn, TimestampTz *committime);
+extern void pglogical_read_twophase(StringInfo in, XLogRecPtr *commit_lsn,
+					   XLogRecPtr *end_lsn, TimestampTz *committime, const char **gid);
 extern char *pglogical_read_origin(StringInfo in, XLogRecPtr *origin_lsn);
 
 extern uint32 pglogical_read_rel(StringInfo in);
diff --git a/contrib/pglogical_output/pglogical_proto_native.c b/contrib/pglogical_output/pglogical_proto_native.c
@@ -212,7 +212,9 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 	pq_sendint64(out, txn->end_lsn);
 	pq_sendint64(out, txn->commit_time);
 
-	if (txn->xact_action == XLOG_XACT_PREPARE)
+	// send that as a cstring, instead of fixlen
+	if (txn->xact_action == XLOG_XACT_PREPARE || 
+		txn->xact_action == XLOG_XACT_COMMIT_PREPARED )
 		pq_sendbytes(out, txn->gid, GIDSIZE);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,9 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,`
`212`	`212`	`pq_sendint64(out, txn->end_lsn);`
`213`	`213`	`pq_sendint64(out, txn->commit_time);`
`214`	`214`
`215`		`- if (txn->xact_action == XLOG_XACT_PREPARE)`
	`215`	`+ // send that as a cstring, instead of fixlen`
	`216`	`+ if (txn->xact_action == XLOG_XACT_PREPARE \|\|`
	`217`	`+ txn->xact_action == XLOG_XACT_COMMIT_PREPARED )`
`216`	`218`	`pq_sendbytes(out, txn->gid, GIDSIZE);`
`217`	`219`	`}`
`218`	`220`