Fix Xmax freeze conditions

alvherre · alvherre · commit 5766228bc642 · 2013-02-08T12:50:58.000-03:00
I broke this in 0ac5ad5; previously, freezing a tuple marked with an IS_MULTI xmax was not necessary. Per brokenness report from Jeff Janes.
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -5113,10 +5113,11 @@ heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 	 * cutoff; it doesn't remove dead members of a very old multixact.
 	 */
 	xid = HeapTupleHeaderGetRawXmax(tuple);
-	if (TransactionIdIsNormal(xid) &&
-		(((!(tuple->t_infomask & HEAP_XMAX_IS_MULTI) &&
-		   TransactionIdPrecedes(xid, cutoff_xid))) ||
-		 MultiXactIdPrecedes(xid, cutoff_multi)))
+	if ((tuple->t_infomask & HEAP_XMAX_IS_MULTI) ?
+		(MultiXactIdIsValid(xid) &&
+		 MultiXactIdPrecedes(xid, cutoff_multi)) :
+		(TransactionIdIsNormal(xid) &&
+		 TransactionIdPrecedes(xid, cutoff_xid)))
 	{
 		HeapTupleHeaderSetXmax(tuple, InvalidTransactionId);
 
