From 815adb12158ee9e2795435cd33397e09bf728710 Mon Sep 17 00:00:00 2001 From: Melanie Plageman Date: Mon, 28 Oct 2024 10:53:37 -0400 Subject: [PATCH v1 1/3] Rename LVRelState->frozen_pages Rename frozen_pages to tuple_freeze_pages in LVRelState, the struct used for tracking state during vacuuming of a heap relation. frozen_pages sounds like it includes every all-frozen page. That is a misnomer. It does not include pages with already frozen tuples. It also includes pages that are not actually all-frozen. --- src/backend/access/heap/vacuumlazy.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 793bd33cb4d..a74ba75dde1 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -188,7 +188,7 @@ typedef struct LVRelState BlockNumber rel_pages; /* total number of pages */ BlockNumber scanned_pages; /* # pages examined (not skipped via VM) */ BlockNumber removed_pages; /* # pages removed by relation truncation */ - BlockNumber frozen_pages; /* # pages with newly frozen tuples */ + BlockNumber tuple_freeze_pages; /* # pages with newly frozen tuples */ BlockNumber lpdead_item_pages; /* # pages with LP_DEAD items */ BlockNumber missed_dead_pages; /* # pages with missed dead tuples */ BlockNumber nonempty_pages; /* actually, last nonempty page + 1 */ @@ -407,7 +407,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, /* Initialize page counters explicitly (be tidy) */ vacrel->scanned_pages = 0; vacrel->removed_pages = 0; - vacrel->frozen_pages = 0; + vacrel->tuple_freeze_pages = 0; vacrel->lpdead_item_pages = 0; vacrel->missed_dead_pages = 0; vacrel->nonempty_pages = 0; @@ -663,7 +663,8 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, new_rel_pages, vacrel->scanned_pages, orig_rel_pages == 0 ? 100.0 : - 100.0 * vacrel->scanned_pages / orig_rel_pages); + 100.0 * vacrel->scanned_pages / + orig_rel_pages); appendStringInfo(&buf, _("tuples: %lld removed, %lld remain, %lld are dead but not yet removable\n"), (long long) vacrel->tuples_deleted, @@ -696,9 +697,10 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, vacrel->NewRelminMxid, diff); } appendStringInfo(&buf, _("frozen: %u pages from table (%.2f%% of total) had %lld tuples frozen\n"), - vacrel->frozen_pages, + vacrel->tuple_freeze_pages, orig_rel_pages == 0 ? 100.0 : - 100.0 * vacrel->frozen_pages / orig_rel_pages, + 100.0 * vacrel->tuple_freeze_pages / + orig_rel_pages, (long long) vacrel->tuples_frozen); if (vacrel->do_index_vacuuming) { @@ -1455,11 +1457,11 @@ lazy_scan_prune(LVRelState *vacrel, if (presult.nfrozen > 0) { /* - * We don't increment the frozen_pages instrumentation counter when - * nfrozen == 0, since it only counts pages with newly frozen tuples - * (don't confuse that with pages newly set all-frozen in VM). + * We don't increment the tuple_freeze_pages instrumentation counter + * when nfrozen == 0, since it only counts pages with newly frozen + * tuples (don't confuse that with pages newly set all-frozen in VM). */ - vacrel->frozen_pages++; + vacrel->tuple_freeze_pages++; } /* -- 2.45.2