From e3b69be951597eeee9c546fbfc51f9f801c7b198 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sun, 7 Apr 2024 21:41:00 -0700 Subject: [PATCH] Remove references to old function name In a97bbe1f1df I accidentally referenced heapgetpage(), both in a function name and a comment. But since 44086b09753 the relevant function is named heap_prepare_pagescan(). Rename the new function to page_collect_tuples(). Reported-by: Melanie Plageman Reported-by: David Rowley Discussion: https://postgr.es/m/20240407172615.cocrsvboqm3ttqe4@awork3.anarazel.de Discussion: https://postgr.es/m/CAApHDvp4SniHopTrVeKWcEvNXFtdki0utAvO=5R7H6TNhtULRQ@mail.gmail.com --- src/backend/access/heap/heapam.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 2663f52d1a..08f6a10ac3 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -434,13 +434,13 @@ heap_setscanlimits(TableScanDesc sscan, BlockNumber startBlk, BlockNumber numBlk } /* - * Per-tuple loop for heapgetpage() in pagemode. Pulled out so it can be - * called multiple times, with constant arguments for all_visible, + * Per-tuple loop for heap_prepare_pagescan(). Pulled out so it can be called + * multiple times, with constant arguments for all_visible, * check_serializable. */ pg_attribute_always_inline static int -heapgetpage_collect(HeapScanDesc scan, Snapshot snapshot, +page_collect_tuples(HeapScanDesc scan, Snapshot snapshot, Page page, Buffer buffer, BlockNumber block, int lines, bool all_visible, bool check_serializable) @@ -547,7 +547,7 @@ heap_prepare_pagescan(TableScanDesc sscan) CheckForSerializableConflictOutNeeded(scan->rs_base.rs_rd, snapshot); /* - * We call heapgetpage_collect() with constant arguments, to get the + * We call page_collect_tuples() with constant arguments, to get the * compiler to constant fold the constant arguments. Separate calls with * constant arguments, rather than variables, are needed on several * compilers to actually perform constant folding. @@ -555,19 +555,19 @@ heap_prepare_pagescan(TableScanDesc sscan) if (likely(all_visible)) { if (likely(!check_serializable)) - scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer, + scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer, block, lines, true, false); else - scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer, + scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer, block, lines, true, true); } else { if (likely(!check_serializable)) - scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer, + scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer, block, lines, false, false); else - scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer, + scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer, block, lines, false, true); }