From 53529ef281a1e57a6837035deeb40679e41a2013 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 28 Oct 2024 11:14:24 -0400 Subject: [PATCH v3 2/7] 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 is more consistent. All other VM buffer releases happen in lazy_scan_heap(). --- src/backend/access/heap/vacuumlazy.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index f2ca9430581..c9e8ed0e049 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -1056,6 +1056,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); @@ -1127,11 +1135,6 @@ 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; - } *blkno = vacrel->rel_pages; return false; } -- 2.34.1