From 78ad9e022b95e024ff5bfa96af78e9e44730c970 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 28 Oct 2024 11:42:10 -0400 Subject: [PATCH v1 7/9] Make heap_vac_scan_next_block() return BlockNumber After removing the requirement for blkno to be set to rel_pages outside of lazy_scan_heap(), heap_vac_scan_next_block() can return the next block number for vacuum to scan. This makes the interface more straightforward as well as paving the way for heap_vac_scan_next_block() to be used by the read stream API as a callback to implement streaming vacuum. --- src/backend/access/heap/vacuumlazy.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 52c9d49f2b1..7ce69953ba0 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -229,8 +229,8 @@ typedef struct LVSavedErrInfo /* non-export function prototypes */ static void lazy_scan_heap(LVRelState *vacrel); -static bool heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, - bool *all_visible_according_to_vm); +static BlockNumber heap_vac_scan_next_block(LVRelState *vacrel, + bool *all_visible_according_to_vm); static void find_next_unskippable_block(LVRelState *vacrel, bool *skipsallvis); static bool lazy_scan_new_or_empty(LVRelState *vacrel, Buffer buf, BlockNumber blkno, Page page, @@ -857,7 +857,8 @@ lazy_scan_heap(LVRelState *vacrel) vacrel->next_unskippable_allvis = false; vacrel->next_unskippable_vmbuffer = InvalidBuffer; - while (heap_vac_scan_next_block(vacrel, &blkno, &all_visible_according_to_vm)) + while (BlockNumberIsValid(blkno = heap_vac_scan_next_block(vacrel, + &all_visible_according_to_vm))) { Buffer buf; Page page; @@ -1096,11 +1097,11 @@ lazy_scan_heap(LVRelState *vacrel) * lazy_scan_heap() calls here every time it needs to get the next block to * prune and vacuum. The function uses the visibility map, vacuum options, * and various thresholds to skip blocks which do not need to be processed and - * sets blkno to the next block to process. + * returns the next block to process. * - * The block number and visibility status of the next block to process are set - * in *blkno and *all_visible_according_to_vm. The return value is false if - * there are no further blocks to process. + * The block number and visibility status of the next block to process are + * returned and set in *all_visible_according_to_vm. The return value is + * InvalidBlockNumber if there are no further blocks to process. * * vacrel is an in/out parameter here. Vacuum options and information about * the relation are read. vacrel->skippedallvis is set if we skip a block @@ -1108,8 +1109,8 @@ lazy_scan_heap(LVRelState *vacrel) * relfrozenxid in that case. vacrel also holds information about the next * unskippable block, as bookkeeping for this function. */ -static bool -heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, +static BlockNumber +heap_vac_scan_next_block(LVRelState *vacrel, bool *all_visible_according_to_vm) { /* relies on InvalidBlockNumber + 1 overflowing to 0 on first call */ @@ -1117,7 +1118,7 @@ heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, /* Have we reached the end of the relation? */ if (vacrel->current_block >= vacrel->rel_pages) - return false; + return InvalidBlockNumber; /* * We must be in one of the three following states: @@ -1166,9 +1167,8 @@ heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, * but chose not to. We know that they are all-visible in the VM, * otherwise they would've been unskippable. */ - *blkno = vacrel->current_block; *all_visible_according_to_vm = true; - return true; + return vacrel->current_block; } else { @@ -1178,9 +1178,8 @@ heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, */ Assert(vacrel->current_block == vacrel->next_unskippable_block); - *blkno = vacrel->current_block; *all_visible_according_to_vm = vacrel->next_unskippable_allvis; - return true; + return vacrel->current_block; } } -- 2.34.1