mirror of
https://github.com/postgres/postgres.git
synced 2025-05-02 11:44:50 +03:00
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 <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:
parent
13453eedd3
commit
e3b69be951
@ -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
|
* Per-tuple loop for heap_prepare_pagescan(). Pulled out so it can be called
|
||||||
* called multiple times, with constant arguments for all_visible,
|
* multiple times, with constant arguments for all_visible,
|
||||||
* check_serializable.
|
* check_serializable.
|
||||||
*/
|
*/
|
||||||
pg_attribute_always_inline
|
pg_attribute_always_inline
|
||||||
static int
|
static int
|
||||||
heapgetpage_collect(HeapScanDesc scan, Snapshot snapshot,
|
page_collect_tuples(HeapScanDesc scan, Snapshot snapshot,
|
||||||
Page page, Buffer buffer,
|
Page page, Buffer buffer,
|
||||||
BlockNumber block, int lines,
|
BlockNumber block, int lines,
|
||||||
bool all_visible, bool check_serializable)
|
bool all_visible, bool check_serializable)
|
||||||
@ -547,7 +547,7 @@ heap_prepare_pagescan(TableScanDesc sscan)
|
|||||||
CheckForSerializableConflictOutNeeded(scan->rs_base.rs_rd, snapshot);
|
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
|
* compiler to constant fold the constant arguments. Separate calls with
|
||||||
* constant arguments, rather than variables, are needed on several
|
* constant arguments, rather than variables, are needed on several
|
||||||
* compilers to actually perform constant folding.
|
* compilers to actually perform constant folding.
|
||||||
@ -555,19 +555,19 @@ heap_prepare_pagescan(TableScanDesc sscan)
|
|||||||
if (likely(all_visible))
|
if (likely(all_visible))
|
||||||
{
|
{
|
||||||
if (likely(!check_serializable))
|
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);
|
block, lines, true, false);
|
||||||
else
|
else
|
||||||
scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer,
|
scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer,
|
||||||
block, lines, true, true);
|
block, lines, true, true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (likely(!check_serializable))
|
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);
|
block, lines, false, false);
|
||||||
else
|
else
|
||||||
scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer,
|
scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer,
|
||||||
block, lines, false, true);
|
block, lines, false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user