From 8025146e100c0433670acb8dafa722b743842e2a Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 22 Dec 2025 10:46:45 -0500 Subject: [PATCH v30 10/16] Remove table_scan_analyze_next_tuple unneeded parameter OldestXmin heapam_scan_analyze_next_tuple() doesn't distinguish between dead and recently dead tuples when counting them, so it doesn't need OldestXmin. Looking at other table AMs implementing table_scan_analyze_next_tuple(), it appears most do not use OldestXmin either. Suggested-by: Kirill Reshke Discussion: https://postgr.es/m/CALdSSPjvhGXihT_9f-GJabYU%3D_PjrFDUxYaURuTbfLyQM6TErg%40mail.gmail.com --- src/backend/access/heap/heapam_handler.c | 13 +++++++++---- src/include/access/tableam.h | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index dd4fe6bf62f..8707d1aab4a 100644 --- a/src/backend/access/heap/heapam_handler.c +++ b/src/backend/access/heap/heapam_handler.c @@ -1026,7 +1026,7 @@ heapam_scan_analyze_next_block(TableScanDesc scan, ReadStream *stream) } static bool -heapam_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin, +heapam_scan_analyze_next_tuple(TableScanDesc scan, double *liverows, double *deadrows, TupleTableSlot *slot) { @@ -1047,6 +1047,7 @@ heapam_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin, ItemId itemid; HeapTuple targtuple = &hslot->base.tupdata; bool sample_it = false; + TransactionId dead_after; itemid = PageGetItemId(targpage, hscan->rs_cindex); @@ -1069,16 +1070,20 @@ heapam_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin, targtuple->t_data = (HeapTupleHeader) PageGetItem(targpage, itemid); targtuple->t_len = ItemIdGetLength(itemid); - switch (HeapTupleSatisfiesVacuum(targtuple, OldestXmin, - hscan->rs_cbuf)) + switch (HeapTupleSatisfiesVacuumHorizon(targtuple, + hscan->rs_cbuf, + &dead_after)) { case HEAPTUPLE_LIVE: sample_it = true; *liverows += 1; break; - case HEAPTUPLE_DEAD: case HEAPTUPLE_RECENTLY_DEAD: + Assert(TransactionIdIsValid(dead_after)); + /* FALLTHROUGH */ + + case HEAPTUPLE_DEAD: /* Count dead and recently-dead rows */ *deadrows += 1; break; diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index 2fa790b6bf5..767f5be838a 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -683,7 +683,6 @@ typedef struct TableAmRoutine * callback). */ bool (*scan_analyze_next_tuple) (TableScanDesc scan, - TransactionId OldestXmin, double *liverows, double *deadrows, TupleTableSlot *slot); @@ -1718,7 +1717,7 @@ table_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin, double *liverows, double *deadrows, TupleTableSlot *slot) { - return scan->rs_rd->rd_tableam->scan_analyze_next_tuple(scan, OldestXmin, + return scan->rs_rd->rd_tableam->scan_analyze_next_tuple(scan, liverows, deadrows, slot); } -- 2.43.0