From 67b5565ad57d3b196695f85811dde2044ba79f3e Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 28 Oct 2024 11:14:24 -0400 Subject: [PATCH v1 5/9] Move vacuum VM buffer release The VM buffer for the next unskippable block can be released after the main loop in lazy_scan_heap(). Doing so de-clutters heap_vac_scan_next_block() and opens up more refactoring options. --- src/backend/access/heap/vacuumlazy.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 1d922b5a831..4b1eadea1f2 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -1038,6 +1038,14 @@ lazy_scan_heap(LVRelState *vacrel) } vacrel->blkno = InvalidBlockNumber; + + /* Release VM buffers */ + if (BufferIsValid(vacrel->next_unskippable_vmbuffer)) + { + ReleaseBuffer(vacrel->next_unskippable_vmbuffer); + vacrel->next_unskippable_vmbuffer = InvalidBuffer; + } + if (BufferIsValid(vmbuffer)) ReleaseBuffer(vmbuffer); @@ -1111,14 +1119,7 @@ heap_vac_scan_next_block(LVRelState *vacrel, BlockNumber *blkno, /* Have we reached the end of the relation? */ if (next_block >= vacrel->rel_pages) - { - if (BufferIsValid(vacrel->next_unskippable_vmbuffer)) - { - ReleaseBuffer(vacrel->next_unskippable_vmbuffer); - vacrel->next_unskippable_vmbuffer = InvalidBuffer; - } return false; - } /* * We must be in one of the three following states: -- 2.34.1