From 4cf660283b1ed92befb5fd8a7f0c9a2819619038 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 22 Dec 2025 10:46:45 -0500 Subject: [PATCH v32 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 Reviewed-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/backend/commands/analyze.c | 6 +----- src/include/access/tableam.h | 5 ++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/backend/access/heap/heapam_handler.c b/src/backend/access/heap/heapam_handler.c index 09a456e9966..df2440e82a7 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/backend/commands/analyze.c b/src/backend/commands/analyze.c index a483424152c..53adac9139b 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -1213,7 +1213,6 @@ acquire_sample_rows(Relation onerel, int elevel, double rowstoskip = -1; /* -1 means not set yet */ uint32 randseed; /* Seed for block sampler(s) */ BlockNumber totalblocks; - TransactionId OldestXmin; BlockSamplerData bs; ReservoirStateData rstate; TupleTableSlot *slot; @@ -1226,9 +1225,6 @@ acquire_sample_rows(Relation onerel, int elevel, totalblocks = RelationGetNumberOfBlocks(onerel); - /* Need a cutoff xmin for HeapTupleSatisfiesVacuum */ - OldestXmin = GetOldestNonRemovableTransactionId(onerel); - /* Prepare for sampling block numbers */ randseed = pg_prng_uint32(&pg_global_prng_state); nblocks = BlockSampler_Init(&bs, totalblocks, targrows, randseed); @@ -1261,7 +1257,7 @@ acquire_sample_rows(Relation onerel, int elevel, { vacuum_delay_point(true); - while (table_scan_analyze_next_tuple(scan, OldestXmin, &liverows, &deadrows, slot)) + while (table_scan_analyze_next_tuple(scan, &liverows, &deadrows, slot)) { /* * The first targrows sample rows are simply copied into the diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index e2ec5289d4d..c9fa9f259cd 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); @@ -1714,11 +1713,11 @@ table_scan_analyze_next_block(TableScanDesc scan, ReadStream *stream) * tuples. */ static inline bool -table_scan_analyze_next_tuple(TableScanDesc scan, TransactionId OldestXmin, +table_scan_analyze_next_tuple(TableScanDesc scan, 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