Avoid special XID snapshotConflictHorizon values.

petergeoghegan · petergeoghegan · commit 6daeeb1f9196 · 2023-01-02T10:16:51.000-08:00
Don't allow VACUUM to WAL-log the value FrozenTransactionId as the snapshotConflictHorizon of freezing or visibility map related WAL records. The only special XID value that's an allowable snapshotConflictHorizon is InvalidTransactionId, which is interpreted as "record definitely doesn't require a recovery conflict". Author: Peter Geoghegan <pg@bowt.ie> Discussion: https://postgr.es/m/CAH2-WznuNGSzF8v6OsgjaC5aYsb3cZ6HW6MLm30X0d65cmSH6A@mail.gmail.com
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
@@ -1698,7 +1698,8 @@ lazy_scan_prune(LVRelState *vacrel,
 					}
 
 					/* Track newest xmin on page. */
-					if (TransactionIdFollows(xmin, prunestate->visibility_cutoff_xid))
+					if (TransactionIdFollows(xmin, prunestate->visibility_cutoff_xid) &&
+						TransactionIdIsNormal(xmin))
 						prunestate->visibility_cutoff_xid = xmin;
 				}
 				break;
@@ -1863,7 +1864,7 @@ lazy_scan_prune(LVRelState *vacrel,
 		 * because visibility_cutoff_xid will be logged by our caller in a
 		 * moment.
 		 */
-		Assert(cutoff == FrozenTransactionId ||
+		Assert(!TransactionIdIsValid(cutoff) ||
 			   cutoff == prunestate->visibility_cutoff_xid);
 	}
 #endif
@@ -3293,7 +3294,8 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf,
 					}
 
 					/* Track newest xmin on page. */
-					if (TransactionIdFollows(xmin, *visibility_cutoff_xid))
+					if (TransactionIdFollows(xmin, *visibility_cutoff_xid) &&
+						TransactionIdIsNormal(xmin))
 						*visibility_cutoff_xid = xmin;
 
 					/* Check whether this tuple is already frozen or not */
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
@@ -493,6 +493,7 @@ ResolveRecoveryConflictWithSnapshot(TransactionId snapshotConflictHorizon,
 	if (!TransactionIdIsValid(snapshotConflictHorizon))
 		return;
 
+	Assert(TransactionIdIsNormal(snapshotConflictHorizon));
 	backends = GetConflictingVirtualXIDs(snapshotConflictHorizon,
 										 locator.dbOid);
 	ResolveRecoveryConflictWithVirtualXIDs(backends,

Original file line number	Diff line number	Diff line change
`@@ -1698,7 +1698,8 @@ lazy_scan_prune(LVRelState *vacrel,`
`1698`	`1698`	`}`
`1699`	`1699`
`1700`	`1700`	`/* Track newest xmin on page. */`
`1701`		`- if (TransactionIdFollows(xmin, prunestate->visibility_cutoff_xid))`
	`1701`	`+ if (TransactionIdFollows(xmin, prunestate->visibility_cutoff_xid) &&`
	`1702`	`+ TransactionIdIsNormal(xmin))`
`1702`	`1703`	`prunestate->visibility_cutoff_xid = xmin;`
`1703`	`1704`	`}`
`1704`	`1705`	`break;`
`@@ -1863,7 +1864,7 @@ lazy_scan_prune(LVRelState *vacrel,`
`1863`	`1864`	`* because visibility_cutoff_xid will be logged by our caller in a`
`1864`	`1865`	`* moment.`
`1865`	`1866`	`*/`
`1866`		`- Assert(cutoff == FrozenTransactionId \|\|`
	`1867`	`+ Assert(!TransactionIdIsValid(cutoff) \|\|`
`1867`	`1868`	`cutoff == prunestate->visibility_cutoff_xid);`
`1868`	`1869`	`}`
`1869`	`1870`	`#endif`
`@@ -3293,7 +3294,8 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf,`
`3293`	`3294`	`}`
`3294`	`3295`
`3295`	`3296`	`/* Track newest xmin on page. */`
`3296`		`- if (TransactionIdFollows(xmin, *visibility_cutoff_xid))`
	`3297`	`+ if (TransactionIdFollows(xmin, *visibility_cutoff_xid) &&`
	`3298`	`+ TransactionIdIsNormal(xmin))`
`3297`	`3299`	`*visibility_cutoff_xid = xmin;`
`3298`	`3300`
`3299`	`3301`	`/* Check whether this tuple is already frozen or not */`