Fix 64-bit XID issue in multimaster

knizhnik · kelvich · commit 1595b37fec79 · 2017-11-13T02:17:38.000+03:00
diff --git a/pglogical_apply.c b/pglogical_apply.c
@@ -342,7 +342,7 @@ process_remote_begin(StringInfo s)
 	int rc;
 
 	gtid.node = pq_getmsgint(s, 4); 
-	gtid.xid = pq_getmsgint(s, 4); 
+	gtid.xid = pq_getmsgint64(s); 
 	snapshot = pq_getmsgint64(s);    
 	participantsMask = pq_getmsgint64(s);
 	Assert(gtid.node > 0);
diff --git a/pglogical_proto.c b/pglogical_proto.c
@@ -159,7 +159,7 @@ pglogical_write_begin(StringInfo out, PGLogicalOutputData *data,
 		MTM_LOG2("%d: pglogical_write_begin XID=%lld sent", MyProcPid, (long64)txn->xid);
 		pq_sendbyte(out, 'B');		/* BEGIN */
 		pq_sendint(out, MtmNodeId, 4);
-		pq_sendint(out, isRecovery ? InvalidTransactionId : txn->xid, 4);
+		pq_sendint64(out, isRecovery ? InvalidTransactionId : txn->xid, 4);
 		pq_sendint64(out, csn);
 		pq_sendint64(out, participantsMask);
 
