Merge branch 'PGPROEE10' into PGPROEE10_pg_shardman

Author: vbwagner

src/backend/access/heap/heapam.c

@@ -2909,6 +2909,19 @@ heap_page_prepare_for_xid(Relation relation, Buffer buffer,
 
 			delta = (int64) (xid - FirstNormalTransactionId) - (int64) base;
 
+			if (xid < base + delta + FirstNormalTransactionId ||
+				xid > base + delta + MaxShortTransactionId)
+			{
+				elog(FATAL, "Fatal xid base calculation error: "
+					"xid = " XID_FMT ", "
+					"base = " XID_FMT ", "
+					"min = %u, "
+					"max = %u, "
+					"delta = " INT64_FORMAT,
+					xid, base, min, max, delta
+				);
+			}
+
 			Assert(xid >= base + delta + FirstNormalTransactionId);
 			Assert(xid <= base + delta + MaxShortTransactionId);
 
@@ -2926,6 +2939,9 @@ heap_page_prepare_for_xid(Relation relation, Buffer buffer,
 			int64	freeDelta = MaxShortTransactionId - max,
 					requiredDelta = (base + FirstNormalTransactionId) - xid;
 
+			/* Shouldn't consider setting base less than 0 */
+			freeDelta = Min(freeDelta, base);
+
 			if (requiredDelta <= freeDelta)
 			{
 				int64	delta = - (freeDelta + requiredDelta) / 2;
@@ -2967,6 +2983,21 @@ heap_page_prepare_for_xid(Relation relation, Buffer buffer,
 			{
 				int64	delta = (freeDelta + requiredDelta) / 2;
 
+				if (xid < base + delta + FirstNormalTransactionId ||
+					xid > base + delta + MaxShortTransactionId)
+				{
+					elog(FATAL, "Fatal xid base calculation error: "
+						"xid = " XID_FMT ", "
+						"base = " XID_FMT ", "
+						"min = %u, "
+						"max = %u, "
+						"freeDelta = " INT64_FORMAT ", "
+						"requiredDelta = " INT64_FORMAT ", "
+						"delta = " INT64_FORMAT,
+						xid, base, min, max, freeDelta, requiredDelta, delta
+					);
+				}
+
 				Assert(xid >= base + delta + FirstNormalTransactionId);
 				Assert(xid <= base + delta + MaxShortTransactionId);
 

src/backend/storage/ipc/procarray.c

@@ -1816,9 +1816,10 @@ PgGetSnapshotData(Snapshot snapshot)
 		globalxmin = xmin;
 
 	/* Update global variables too */
-	RecentGlobalXmin = globalxmin - vacuum_defer_cleanup_age;
-	if (!TransactionIdIsNormal(RecentGlobalXmin))
+	if (globalxmin <= FirstNormalTransactionId + vacuum_defer_cleanup_age)
 		RecentGlobalXmin = FirstNormalTransactionId;
+	else
+		RecentGlobalXmin = globalxmin - vacuum_defer_cleanup_age;
 
 	/* Check whether there's a replication slot requiring an older xmin. */
 	if (TransactionIdIsValid(replication_slot_xmin) &&