opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove references to old function name 

In a97bbe1f1d I accidentally referenced heapgetpage(), both in a function
name and a comment. But since 44086b0975 the relevant function is named
heap_prepare_pagescan().  Rename the new function to page_collect_tuples().

Reported-by: Melanie Plageman <melanieplageman@gmail.com>
Reported-by: David Rowley <dgrowleyml@gmail.com>
Discussion: https://postgr.es/m/20240407172615.cocrsvboqm3ttqe4@awork3.anarazel.de
Discussion: https://postgr.es/m/CAApHDvp4SniHopTrVeKWcEvNXFtdki0utAvO=5R7H6TNhtULRQ@mail.gmail.com
This commit is contained in:
Andres Freund 2024-04-07 21:41:00 -07:00
parent 13453eedd3
commit e3b69be951
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/access/heap/heapam.c
View File

@ -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);
}