From abd46a0e574456401cb34380236673239c317361 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Wed, 18 Jun 2025 15:48:51 -0400 Subject: [PATCH v9 04/22] Make heap_page_is_all_visible independent of LVRelState Future commits will use this function inside of pruneheap.c where we do not have access to the LVRelState. We only need a few parameters from the LVRelState, so just pass those in explicitly. Author: Melanie Plageman Reviewed-by: Kirill Reshke Discussion: https://postgr.es/m/flat/CAAKRu_ZMw6Npd_qm2KM%2BFwQ3cMOMx1Dh3VMhp8-V7SOLxdK9-g%40mail.gmail.com --- src/backend/access/heap/vacuumlazy.c | 48 ++++++++++++++++++---------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 932701d8420..7f6f684bc63 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -463,8 +463,11 @@ static void dead_items_add(LVRelState *vacrel, BlockNumber blkno, OffsetNumber * int num_offsets); static void dead_items_reset(LVRelState *vacrel); static void dead_items_cleanup(LVRelState *vacrel); -static bool heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, - TransactionId *visibility_cutoff_xid, bool *all_frozen); +static bool heap_page_is_all_visible(Relation rel, Buffer buf, + TransactionId OldestXmin, + bool *all_frozen, + TransactionId *visibility_cutoff_xid, + OffsetNumber *logging_offnum); static void update_relstats_all_indexes(LVRelState *vacrel); static void vacuum_error_callback(void *arg); static void update_vacuum_error_info(LVRelState *vacrel, @@ -2009,8 +2012,9 @@ lazy_scan_prune(LVRelState *vacrel, Assert(presult.lpdead_items == 0); - if (!heap_page_is_all_visible(vacrel, buf, - &debug_cutoff, &debug_all_frozen)) + if (!heap_page_is_all_visible(vacrel->rel, buf, + vacrel->cutoffs.OldestXmin, &debug_all_frozen, + &debug_cutoff, &vacrel->offnum)) Assert(false); Assert(presult.all_frozen == debug_all_frozen); @@ -2906,8 +2910,8 @@ lazy_vacuum_heap_page(LVRelState *vacrel, BlockNumber blkno, Buffer buffer, * emitted. */ Assert(!PageIsAllVisible(page)); - if (heap_page_is_all_visible(vacrel, buffer, &visibility_cutoff_xid, - &all_frozen)) + if (heap_page_is_all_visible(vacrel->rel, buffer, vacrel->cutoffs.OldestXmin, + &all_frozen, &visibility_cutoff_xid, &vacrel->offnum)) { uint8 flags = VISIBILITYMAP_ALL_VISIBLE; @@ -3590,10 +3594,18 @@ dead_items_cleanup(LVRelState *vacrel) } /* - * Check if every tuple in the given page is visible to all current and future - * transactions. Also return the visibility_cutoff_xid which is the highest - * xmin amongst the visible tuples. Set *all_frozen to true if every tuple - * on this page is frozen. + * Check if every tuple in the given page in buf is visible to all current and + * future transactions. + * + * OldestXmin is used to determine visibility. + * + * Sets *all_frozen to true if every tuple on this page is frozen. + * + * Sets *visibility_cutoff_xid to the highest xmin amongst the visible tuples. + * It is only valid if the page is all-visible. + * + * *logging_offnum will have the OffsetNumber of the current tuple being + * processed for vacuum's error callback system. * * This is a stripped down version of lazy_scan_prune(). If you change * anything here, make sure that everything stays in sync. Note that an @@ -3601,9 +3613,11 @@ dead_items_cleanup(LVRelState *vacrel) * introducing new side-effects here. */ static bool -heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, +heap_page_is_all_visible(Relation rel, Buffer buf, + TransactionId OldestXmin, + bool *all_frozen, TransactionId *visibility_cutoff_xid, - bool *all_frozen) + OffsetNumber *logging_offnum) { Page page = BufferGetPage(buf); BlockNumber blockno = BufferGetBlockNumber(buf); @@ -3626,7 +3640,7 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, * Set the offset number so that we can display it along with any * error that occurred while processing this tuple. */ - vacrel->offnum = offnum; + *logging_offnum = offnum; itemid = PageGetItemId(page, offnum); /* Unused or redirect line pointers are of no interest */ @@ -3650,9 +3664,9 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, tuple.t_data = (HeapTupleHeader) PageGetItem(page, itemid); tuple.t_len = ItemIdGetLength(itemid); - tuple.t_tableOid = RelationGetRelid(vacrel->rel); + tuple.t_tableOid = RelationGetRelid(rel); - switch (HeapTupleSatisfiesVacuum(&tuple, vacrel->cutoffs.OldestXmin, + switch (HeapTupleSatisfiesVacuum(&tuple, OldestXmin, buf)) { case HEAPTUPLE_LIVE: @@ -3673,7 +3687,7 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, */ xmin = HeapTupleHeaderGetXmin(tuple.t_data); if (!TransactionIdPrecedes(xmin, - vacrel->cutoffs.OldestXmin)) + OldestXmin)) { all_visible = false; *all_frozen = false; @@ -3708,7 +3722,7 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, } /* scan along page */ /* Clear the offset information once we have processed the given page. */ - vacrel->offnum = InvalidOffsetNumber; + *logging_offnum = InvalidOffsetNumber; return all_visible; } -- 2.43.0