From 16e55ffde1cb152dc94cf38a9f6c8442b78be284 Mon Sep 17 00:00:00 2001 From: Masahiko Sawada Date: Mon, 17 Apr 2023 18:07:04 +0900 Subject: [PATCH v32 15/18] vacuum: Miscellaneous updates fix typos, comment updates, etc. --- doc/src/sgml/monitoring.sgml | 2 +- src/backend/access/heap/vacuumlazy.c | 17 ++++++++--------- src/backend/commands/vacuumparallel.c | 13 +++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml index 9b64614beb..67ab9fa2bc 100644 --- a/doc/src/sgml/monitoring.sgml +++ b/doc/src/sgml/monitoring.sgml @@ -7331,7 +7331,7 @@ FROM pg_stat_get_backend_idset() AS backendid; - num_dead_tuple_bytes bigint + dead_tuple_bytes bigint Amount of dead tuple data collected since the last index vacuum cycle. diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index be487aced6..228daad750 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -10,11 +10,10 @@ * of dead TIDs at once. * * We are willing to use at most maintenance_work_mem (or perhaps - * autovacuum_work_mem) memory space to keep track of dead TIDs. We initially - * create a TidStore with the maximum bytes that can be used by the TidStore. - * If the TidStore is full, we must call lazy_vacuum to vacuum indexes (and to - * vacuum the pages that we've pruned). This frees up the memory space dedicated - * to storing dead TIDs. + * autovacuum_work_mem) memory space to keep track of dead TIDs. If the + * TidStore is full, we must call lazy_vacuum to vacuum indexes (and to vacuum + * the pages that we've pruned). This frees up the memory space dedicated to + * to store dead TIDs. * * In practice VACUUM will often complete its initial pass over the target * heap relation without ever running out of space to store TIDs. This means @@ -2392,7 +2391,7 @@ lazy_vacuum_heap_rel(LVRelState *vacrel) Buffer vmbuffer = InvalidBuffer; LVSavedErrInfo saved_err_info; TidStoreIter *iter; - TidStoreIterResult *result; + TidStoreIterResult *iter_result; Assert(vacrel->do_index_vacuuming); Assert(vacrel->do_index_cleanup); @@ -2417,7 +2416,7 @@ lazy_vacuum_heap_rel(LVRelState *vacrel) vacuum_delay_point(); - blkno = result->blkno; + blkno = iter_result->blkno; vacrel->blkno = blkno; /* @@ -2431,8 +2430,8 @@ lazy_vacuum_heap_rel(LVRelState *vacrel) buf = ReadBufferExtended(vacrel->rel, MAIN_FORKNUM, blkno, RBM_NORMAL, vacrel->bstrategy); LockBuffer(buf, BUFFER_LOCK_EXCLUSIVE); - lazy_vacuum_heap_page(vacrel, blkno, result->offsets, result->num_offsets, - buf, vmbuffer); + lazy_vacuum_heap_page(vacrel, blkno, iter_result->offsets, + iter_result->num_offsets, buf, vmbuffer); /* Now that we've vacuumed the page, record its available space */ page = BufferGetPage(buf); diff --git a/src/backend/commands/vacuumparallel.c b/src/backend/commands/vacuumparallel.c index be83ceb871..8385d375db 100644 --- a/src/backend/commands/vacuumparallel.c +++ b/src/backend/commands/vacuumparallel.c @@ -9,11 +9,12 @@ * In a parallel vacuum, we perform both index bulk deletion and index cleanup * with parallel worker processes. Individual indexes are processed by one * vacuum process. ParalleVacuumState contains shared information as well as - * the shared TidStore. We launch parallel worker processes at the start of - * parallel index bulk-deletion and index cleanup and once all indexes are - * processed, the parallel worker processes exit. Each time we process indexes - * in parallel, the parallel context is re-initialized so that the same DSM can - * be used for multiple passes of index bulk-deletion and index cleanup. + * the memory space for storing dead items allocated in the DSA area. We + * launch parallel worker processes at the start of parallel index + * bulk-deletion and index cleanup and once all indexes are processed, the + * parallel worker processes exit. Each time we process indexes in parallel, + * the parallel context is re-initialized so that the same DSM can be used for + * multiple passes of index bulk-deletion and index cleanup. * * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California @@ -299,7 +300,7 @@ parallel_vacuum_init(Relation rel, Relation *indrels, int nindexes, shm_toc_estimate_chunk(&pcxt->estimator, est_shared_len); shm_toc_estimate_keys(&pcxt->estimator, 1); - /* Estimate size for dead tuple DSA -- PARALLEL_VACUUM_KEY_DSA */ + /* Initial size for dead tuple DSA -- PARALLEL_VACUUM_KEY_DEAD_ITEMS */ shm_toc_estimate_chunk(&pcxt->estimator, dsa_minsize); shm_toc_estimate_keys(&pcxt->estimator, 1); -- 2.31.1