From 0174b06e74adeedf425ac159cd04b11c9c35fd73 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Tue, 16 Sep 2025 15:39:31 -0400 Subject: [PATCH v15 12/23] 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 Reviewed-by: Robert Haas Discussion: https://postgr.es/m/flat/CAAKRu_ZMw6Npd_qm2KM%2BFwQ3cMOMx1Dh3VMhp8-V7SOLxdK9-g%40mail.gmail.com --- src/backend/access/heap/vacuumlazy.c | 57 ++++++++++++++++++---------- 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 735f1e7501e..a0f3984e37f 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -463,13 +463,18 @@ 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_would_be_all_visible(LVRelState *vacrel, Buffer buf, +static bool heap_page_is_all_visible(Relation rel, Buffer buf, + TransactionId OldestXmin, + bool *all_frozen, + TransactionId *visibility_cutoff_xid, + OffsetNumber *logging_offnum); +static bool heap_page_would_be_all_visible(Relation rel, Buffer buf, + TransactionId OldestXmin, OffsetNumber *deadoffsets, int ndeadoffsets, bool *all_frozen, - TransactionId *visibility_cutoff_xid); + 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, @@ -2030,8 +2035,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); @@ -2824,9 +2830,11 @@ lazy_vacuum_heap_page(LVRelState *vacrel, BlockNumber blkno, Buffer buffer, VACUUM_ERRCB_PHASE_VACUUM_HEAP, blkno, InvalidOffsetNumber); - if (heap_page_would_be_all_visible(vacrel, buffer, + if (heap_page_would_be_all_visible(vacrel->rel, buffer, + vacrel->cutoffs.OldestXmin, deadoffsets, num_offsets, - &all_frozen, &visibility_cutoff_xid)) + &all_frozen, &visibility_cutoff_xid, + &vacrel->offnum)) { vmflags |= VISIBILITYMAP_ALL_VISIBLE; if (all_frozen) @@ -3576,15 +3584,19 @@ dead_items_cleanup(LVRelState *vacrel) * callers that expect no LP_DEAD on the page. */ 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) { - return heap_page_would_be_all_visible(vacrel, buf, + return heap_page_would_be_all_visible(rel, buf, + OldestXmin, NULL, 0, all_frozen, - visibility_cutoff_xid); + visibility_cutoff_xid, + logging_offnum); } /* @@ -3599,7 +3611,7 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, * Returns true if the page is all-visible other than the provided * deadoffsets and false otherwise. * - * vacrel->cutoffs.OldestXmin is used to determine visibility. + * OldestXmin is used to determine visibility. * * *all_frozen is an output parameter indicating to the caller if every tuple * on the page is frozen. @@ -3607,6 +3619,9 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, * *visibility_cutoff_xid is an output parameter with 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. + * * Callers looking to verify that the page is already all-visible can call * heap_page_is_all_visible(). * @@ -3616,11 +3631,13 @@ heap_page_is_all_visible(LVRelState *vacrel, Buffer buf, * to avoid introducing new side-effects here. */ static bool -heap_page_would_be_all_visible(LVRelState *vacrel, Buffer buf, +heap_page_would_be_all_visible(Relation rel, Buffer buf, + TransactionId OldestXmin, OffsetNumber *deadoffsets, int ndeadoffsets, bool *all_frozen, - TransactionId *visibility_cutoff_xid) + TransactionId *visibility_cutoff_xid, + OffsetNumber *logging_offnum) { Page page = BufferGetPage(buf); BlockNumber blockno = BufferGetBlockNumber(buf); @@ -3655,7 +3672,7 @@ heap_page_would_be_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 */ @@ -3685,9 +3702,9 @@ heap_page_would_be_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: @@ -3708,7 +3725,7 @@ heap_page_would_be_all_visible(LVRelState *vacrel, Buffer buf, */ xmin = HeapTupleHeaderGetXmin(tuple.t_data); if (!TransactionIdPrecedes(xmin, - vacrel->cutoffs.OldestXmin)) + OldestXmin)) { all_visible = false; *all_frozen = false; @@ -3743,7 +3760,7 @@ heap_page_would_be_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