Support 64 bit XIDs.

stalkerg · stalkerg · commit cd96f2b37403 · 2016-12-07T17:45:20.000+03:00
diff --git a/backup.c b/backup.c
@@ -64,7 +64,7 @@ static void pg_start_backup(const char *label, bool smooth, pgBackup *backup);
 static void pg_stop_backup(pgBackup *backup);
 static bool pg_is_standby(void);
 static void get_lsn(PGconn *conn, PGresult *res, XLogRecPtr *lsn, bool stop_backup);
-static void get_xid(PGresult *res, uint32 *xid);
+static void get_xid(PGresult *res, TransactionId *xid);
 static void pg_ptrack_clear(void);
 static bool pg_ptrack_support(void);
 static bool pg_ptrack_enable(void);
@@ -1042,14 +1042,14 @@ get_lsn(PGconn *conn, PGresult *res, XLogRecPtr *lsn, bool stop_backup)
  * Get XID from result of txid_current() after pg_stop_backup().
  */
 static void
-get_xid(PGresult *res, uint32 *xid)
+get_xid(PGresult *res, TransactionId *xid)
 {
 	if (res == NULL || PQntuples(res) != 1 || PQnfields(res) != 1)
 		elog(ERROR,
 			"result of txid_current() is invalid: %s",
 			PQerrorMessage(connection));
 
-	if (sscanf(PQgetvalue(res, 0, 0), "%u", xid) != 1)
+	if (sscanf(PQgetvalue(res, 0, 0), XID_FMT, xid) != 1)
 	{
 		elog(ERROR,
 			"result of txid_current() is invalid: %s",
diff --git a/catalog.c b/catalog.c
@@ -337,7 +337,7 @@ catalog_read_ini(const char *path)
 		{ 's', 0, "stop-lsn"			, NULL, SOURCE_ENV },
 		{ 't', 0, "start-time"			, NULL, SOURCE_ENV },
 		{ 't', 0, "end-time"			, NULL, SOURCE_ENV },
-		{ 'u', 0, "recovery-xid"				, NULL, SOURCE_ENV },
+		{ 'U', 0, "recovery-xid"				, NULL, SOURCE_ENV },
 		{ 't', 0, "recovery-time"				, NULL, SOURCE_ENV },
 		{ 'I', 0, "data-bytes"		, NULL, SOURCE_ENV },
 		{ 'u', 0, "block-size"			, NULL, SOURCE_ENV },
diff --git a/pg_probackup.h b/pg_probackup.h
@@ -45,6 +45,10 @@
 #define DIR_PERMISSION		(0700)
 #define FILE_PERMISSION		(0600)
 
+#ifndef PGPRO_EE
+#define XID_FMT "%u"
+#endif
+
 /* backup mode file */
 typedef struct pgFile
 {
@@ -119,7 +123,7 @@ typedef struct pgBackup
 	time_t		start_time;
 	time_t		end_time;
 	time_t		recovery_time;
-	uint32		recovery_xid;
+	TransactionId		recovery_xid;
 
 	/* Different sizes (-1 means nothing was backed up) */
 	/*
@@ -159,7 +163,7 @@ typedef struct pgRecoveryTarget
 	bool		time_specified;
 	time_t		recovery_target_time;
 	bool		xid_specified;
-	unsigned int	recovery_target_xid;
+	TransactionId	recovery_target_xid;
 	bool		recovery_target_inclusive;
 } pgRecoveryTarget;
 
diff --git a/restore.c b/restore.c
@@ -775,7 +775,7 @@ checkIfCreateRecoveryConf(const char *target_time,
                    const char *target_inclusive)
 {
 	time_t		dummy_time;
-	unsigned int	dummy_xid;
+	TransactionId	dummy_xid;
 	bool		dummy_bool;
 	pgRecoveryTarget *rt;
 
@@ -798,7 +798,11 @@ checkIfCreateRecoveryConf(const char *target_time,
 	if (target_xid)
 	{
 		rt->xid_specified = true;
-		if (parse_uint32(target_xid, &dummy_xid))
+#ifdef PGPRO_EE
+				if (parse_uint64(target_xid, &dummy_xid))
+#else
+				if (parse_uint32(target_xid, &dummy_xid))
+#endif
 			rt->recovery_target_xid = dummy_xid;
 		else
 			elog(ERROR, "cannot create recovery.conf with %s", target_xid);
