From 3202f56fe96c30c79c03fa4e6090ae67012840aa Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Thu, 31 Jul 2025 14:07:51 -0400 Subject: [PATCH v8 13/22] Rename PruneState.freeze to attempt_freeze This makes it more clear that this is to indicate the caller would like heap_page_prune_and_freeze() to consider freezing tuples -- not that we ultimately will end up freezing them. Also rename local variable hint_bit_fpi to did_tuple_hint_fpi. This makes it clear it is about tuple hints and not page hints and that it indicates something that happened and not something that could happen. --- src/backend/access/heap/pruneheap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c index 7cef05be5d0..ef9bb0c273a 100644 --- a/src/backend/access/heap/pruneheap.c +++ b/src/backend/access/heap/pruneheap.c @@ -43,7 +43,7 @@ typedef struct /* whether or not dead items can be set LP_UNUSED during pruning */ bool mark_unused_now; /* whether to attempt freezing tuples */ - bool freeze; + bool attempt_freeze; /* * Whether or not to consider updating the VM. There is some bookkeeping @@ -452,7 +452,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, bool do_set_vm; uint8 vmflags = 0; uint8 old_vmbits = 0; - bool hint_bit_fpi; + bool did_tuple_hint_fpi; int64 fpi_before = pgWalUsage.wal_fpi; bool all_frozen_except_lp_dead = false; bool set_pd_all_visible = false; @@ -460,7 +460,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, /* Copy parameters to prstate */ prstate.vistest = vistest; prstate.mark_unused_now = (options & HEAP_PAGE_PRUNE_MARK_UNUSED_NOW) != 0; - prstate.freeze = (options & HEAP_PAGE_PRUNE_FREEZE) != 0; + prstate.attempt_freeze = (options & HEAP_PAGE_PRUNE_FREEZE) != 0; prstate.consider_update_vm = (options & HEAP_PAGE_PRUNE_UPDATE_VM) != 0; prstate.cutoffs = cutoffs; @@ -485,7 +485,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, /* initialize page freezing working state */ prstate.pagefrz.freeze_required = false; - if (prstate.freeze) + if (prstate.attempt_freeze) { Assert(new_relfrozen_xid && new_relmin_mxid); prstate.pagefrz.FreezePageRelfrozenXid = *new_relfrozen_xid; @@ -535,7 +535,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, * bookkeeping. Initializing all_visible to false allows skipping the work * to update them in heap_prune_record_unchanged_lp_normal(). */ - if (prstate.freeze) + if (prstate.attempt_freeze) { prstate.all_visible = true; prstate.all_frozen = true; @@ -653,7 +653,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, * If checksums are enabled, heap_prune_satisfies_vacuum() may have caused * an FPI to be emitted. */ - hint_bit_fpi = fpi_before != pgWalUsage.wal_fpi; + did_tuple_hint_fpi = fpi_before != pgWalUsage.wal_fpi; /* * Process HOT chains. @@ -770,7 +770,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, * plans we prepared, or not. */ do_freeze = false; - if (prstate.freeze) + if (prstate.attempt_freeze) { if (prstate.pagefrz.freeze_required) { @@ -803,7 +803,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, */ if (RelationNeedsWAL(relation)) { - if (hint_bit_fpi) + if (did_tuple_hint_fpi) do_freeze = true; else if (do_prune) { @@ -1127,7 +1127,7 @@ heap_page_prune_and_freeze(Relation relation, Buffer buffer, presult->lpdead_items = prstate.lpdead_items; /* the presult->deadoffsets array was already filled in */ - if (prstate.freeze) + if (prstate.attempt_freeze) { if (presult->nfrozen > 0) { @@ -1714,7 +1714,7 @@ heap_prune_record_unchanged_lp_normal(Page page, PruneState *prstate, OffsetNumb * to update the VM, we have to call heap_prepare_freeze_tuple() on every * tuple to know whether or not the page will be totally frozen. */ - if (prstate->freeze) + if (prstate->attempt_freeze) { bool totally_frozen; -- 2.43.0