@@ -434,13 +434,13 @@ heap_setscanlimits(TableScanDesc sscan, BlockNumber startBlk, BlockNumber numBlk
434
434
}
435
435
436
436
/*
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,
439
439
* check_serializable.
440
440
*/
441
441
pg_attribute_always_inline
442
442
static int
443
- heapgetpage_collect (HeapScanDesc scan , Snapshot snapshot ,
443
+ page_collect_tuples (HeapScanDesc scan , Snapshot snapshot ,
444
444
Page page , Buffer buffer ,
445
445
BlockNumber block , int lines ,
446
446
bool all_visible , bool check_serializable )
@@ -547,27 +547,27 @@ heap_prepare_pagescan(TableScanDesc sscan)
547
547
CheckForSerializableConflictOutNeeded (scan -> rs_base .rs_rd , snapshot );
548
548
549
549
/*
550
- * We call heapgetpage_collect () with constant arguments, to get the
550
+ * We call page_collect_tuples () with constant arguments, to get the
551
551
* compiler to constant fold the constant arguments. Separate calls with
552
552
* constant arguments, rather than variables, are needed on several
553
553
* compilers to actually perform constant folding.
554
554
*/
555
555
if (likely (all_visible ))
556
556
{
557
557
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 ,
559
559
block , lines , true, false);
560
560
else
561
- scan -> rs_ntuples = heapgetpage_collect (scan , snapshot , page , buffer ,
561
+ scan -> rs_ntuples = page_collect_tuples (scan , snapshot , page , buffer ,
562
562
block , lines , true, true);
563
563
}
564
564
else
565
565
{
566
566
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 ,
568
568
block , lines , false, false);
569
569
else
570
- scan -> rs_ntuples = heapgetpage_collect (scan , snapshot , page , buffer ,
570
+ scan -> rs_ntuples = page_collect_tuples (scan , snapshot , page , buffer ,
571
571
block , lines , false, true);
572
572
}
573
573
0 commit comments