From 3ea8f3ebd421e3c9b5633fffb7f38d999f21895f Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 22 Sep 2020 13:04:25 -0300 Subject: [PATCH 1/4] Simplify message The user doesn't really care that a particular index vacuum was executed by a parallel worker or not; remove that bit from the progress message. --- src/backend/access/heap/vacuumlazy.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 2174fccb1e..25f2d5df1b 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -2432,7 +2432,6 @@ lazy_vacuum_index(Relation indrel, IndexBulkDeleteResult **stats, LVDeadTuples *dead_tuples, double reltuples, LVRelStats *vacrelstats) { IndexVacuumInfo ivinfo; - const char *msg; PGRUsage ru0; LVSavedErrInfo saved_err_info; @@ -2462,13 +2461,8 @@ lazy_vacuum_index(Relation indrel, IndexBulkDeleteResult **stats, *stats = index_bulk_delete(&ivinfo, *stats, lazy_tid_reaped, (void *) dead_tuples); - if (IsParallelWorker()) - msg = gettext_noop("scanned index \"%s\" to remove %d row versions by parallel vacuum worker"); - else - msg = gettext_noop("scanned index \"%s\" to remove %d row versions"); - ereport(elevel, - (errmsg(msg, + (errmsg("scanned index \"%s\" to remove %d row versions", vacrelstats->indname, dead_tuples->num_tuples), errdetail_internal("%s", pg_rusage_show(&ru0)))); @@ -2491,7 +2485,6 @@ lazy_cleanup_index(Relation indrel, double reltuples, bool estimated_count, LVRelStats *vacrelstats) { IndexVacuumInfo ivinfo; - const char *msg; PGRUsage ru0; LVSavedErrInfo saved_err_info; @@ -2522,13 +2515,8 @@ lazy_cleanup_index(Relation indrel, if (*stats) { - if (IsParallelWorker()) - msg = gettext_noop("index \"%s\" now contains %.0f row versions in %u pages as reported by parallel vacuum worker"); - else - msg = gettext_noop("index \"%s\" now contains %.0f row versions in %u pages"); - ereport(elevel, - (errmsg(msg, + (errmsg("index \"%s\" now contains %.0f row versions in %u pages", RelationGetRelationName(indrel), (*stats)->num_index_tuples, (*stats)->num_pages), -- 2.20.1