Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit e3b69be

Browse files
committed
Remove references to old function name
In a97bbe1 I accidentally referenced heapgetpage(), both in a function name and a comment. But since 44086b0 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
1 parent 13453ee commit e3b69be

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/backend/access/heap/heapam.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,13 @@ heap_setscanlimits(TableScanDesc sscan, BlockNumber startBlk, BlockNumber numBlk
434434
}
435435

436436
/*
437-
* Per-tuple loop for heapgetpage() in pagemode. Pulled out so it can be
438-
* called multiple times, with constant arguments for all_visible,
437+
* Per-tuple loop for heap_prepare_pagescan(). Pulled out so it can be called
438+
* multiple times, with constant arguments for all_visible,
439439
* check_serializable.
440440
*/
441441
pg_attribute_always_inline
442442
static int
443-
heapgetpage_collect(HeapScanDesc scan, Snapshot snapshot,
443+
page_collect_tuples(HeapScanDesc scan, Snapshot snapshot,
444444
Page page, Buffer buffer,
445445
BlockNumber block, int lines,
446446
bool all_visible, bool check_serializable)
@@ -547,27 +547,27 @@ heap_prepare_pagescan(TableScanDesc sscan)
547547
CheckForSerializableConflictOutNeeded(scan->rs_base.rs_rd, snapshot);
548548

549549
/*
550-
* We call heapgetpage_collect() with constant arguments, to get the
550+
* We call page_collect_tuples() with constant arguments, to get the
551551
* compiler to constant fold the constant arguments. Separate calls with
552552
* constant arguments, rather than variables, are needed on several
553553
* compilers to actually perform constant folding.
554554
*/
555555
if (likely(all_visible))
556556
{
557557
if (likely(!check_serializable))
558-
scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer,
558+
scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer,
559559
block, lines, true, false);
560560
else
561-
scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer,
561+
scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer,
562562
block, lines, true, true);
563563
}
564564
else
565565
{
566566
if (likely(!check_serializable))
567-
scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer,
567+
scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer,
568568
block, lines, false, false);
569569
else
570-
scan->rs_ntuples = heapgetpage_collect(scan, snapshot, page, buffer,
570+
scan->rs_ntuples = page_collect_tuples(scan, snapshot, page, buffer,
571571
block, lines, false, true);
572572
}
573573

0 commit comments

Comments
 (0)