From 3fa6bd308c7ac1bebf0b04efb7e943029cd68f8d Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 25 Mar 2024 18:02:09 -0400 Subject: [PATCH v7 03/16] Rename PruneState->snapshotConflictHorizon to latest_xid_removed In anticipation of combining pruning and freezing and emitting a single WAL record, rename PruneState->snapshotConflictHorizon to latest_xid_removed. After pruning and freezing, we will choose a combined record snapshot conflict horizon taking into account both values. --- src/backend/access/heap/pruneheap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index c1542b95af8..ca4301bb8a9 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -35,7 +35,7 @@ typedef struct bool mark_unused_now; TransactionId new_prune_xid; /* new prune hint value for page */ - TransactionId snapshotConflictHorizon; /* latest xid removed */ + TransactionId latest_xid_removed; int nredirected; /* numbers of entries in arrays below */ int ndead; int nunused; @@ -238,7 +238,7 @@ heap_page_prune(Relation relation, Buffer buffer, prstate.new_prune_xid = InvalidTransactionId; prstate.vistest = vistest; prstate.mark_unused_now = mark_unused_now; - prstate.snapshotConflictHorizon = InvalidTransactionId; + prstate.latest_xid_removed = InvalidTransactionId; prstate.nredirected = prstate.ndead = prstate.nunused = 0; memset(prstate.marked, 0, sizeof(prstate.marked)); @@ -367,7 +367,7 @@ heap_page_prune(Relation relation, Buffer buffer, if (RelationNeedsWAL(relation)) { log_heap_prune_and_freeze(relation, buffer, - prstate.snapshotConflictHorizon, + prstate.latest_xid_removed, true, reason, NULL, 0, prstate.redirected, prstate.nredirected, @@ -505,7 +505,7 @@ heap_prune_chain(Buffer buffer, OffsetNumber rootoffnum, { heap_prune_record_unused(prstate, rootoffnum); HeapTupleHeaderAdvanceConflictHorizon(htup, - &prstate->snapshotConflictHorizon); + &prstate->latest_xid_removed); ndeleted++; } @@ -651,7 +651,7 @@ heap_prune_chain(Buffer buffer, OffsetNumber rootoffnum, { latestdead = offnum; HeapTupleHeaderAdvanceConflictHorizon(htup, - &prstate->snapshotConflictHorizon); + &prstate->latest_xid_removed); } else if (!recent_dead) break; -- 2.40.1