From 5b9efa2d3b7ccca316ef9db18cd37a3d8c7a32a7 Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Thu, 26 Aug 2021 22:06:52 -0700 Subject: [PATCH v1] Reorder log_autovacuum output. --- src/backend/access/heap/vacuumlazy.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 334d8a2aa..35ab706ae 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -796,32 +796,27 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, (long long) vacrel->new_rel_tuples, (long long) vacrel->new_dead_tuples, OldestXmin); - appendStringInfo(&buf, - _("buffer usage: %lld hits, %lld misses, %lld dirtied\n"), - (long long) VacuumPageHit, - (long long) VacuumPageMiss, - (long long) VacuumPageDirty); if (vacrel->rel_pages > 0) { BlockNumber orig_rel_pages; if (vacrel->do_index_vacuuming) { - msgfmt = _("%u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"); - if (vacrel->nindexes == 0 || vacrel->num_index_scans == 0) appendStringInfoString(&buf, _("index scan not needed: ")); else appendStringInfoString(&buf, _("index scan needed: ")); + + msgfmt = _("%u pages from table (%.2f%% of total) had %lld dead item identifiers removed\n"); } else { - msgfmt = _("%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"); - if (!vacrel->failsafe_active) appendStringInfoString(&buf, _("index scan bypassed: ")); else appendStringInfoString(&buf, _("index scan bypassed by failsafe: ")); + + msgfmt = _("%u pages from table (%.2f%% of total) have %lld dead item identifiers\n"); } orig_rel_pages = vacrel->rel_pages + vacrel->pages_removed; appendStringInfo(&buf, msgfmt, @@ -844,8 +839,6 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, istat->pages_deleted, istat->pages_free); } - appendStringInfo(&buf, _("avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"), - read_rate, write_rate); if (track_io_timing) { appendStringInfoString(&buf, _("I/O timings:")); @@ -859,12 +852,19 @@ heap_vacuum_rel(Relation rel, VacuumParams *params, (double) (pgStatBlockWriteTime - startwritetime) / 1000); appendStringInfoChar(&buf, '\n'); } - appendStringInfo(&buf, _("system usage: %s\n"), pg_rusage_show(&ru0)); + appendStringInfo(&buf, _("avg read rate: %.3f MB/s, avg write rate: %.3f MB/s\n"), + read_rate, write_rate); appendStringInfo(&buf, - _("WAL usage: %lld records, %lld full page images, %llu bytes"), + _("buffer usage: %lld hits, %lld misses, %lld dirtied\n"), + (long long) VacuumPageHit, + (long long) VacuumPageMiss, + (long long) VacuumPageDirty); + appendStringInfo(&buf, + _("WAL usage: %lld records, %lld full page images, %llu bytes\n"), (long long) walusage.wal_records, (long long) walusage.wal_fpi, (unsigned long long) walusage.wal_bytes); + appendStringInfo(&buf, _("system usage: %s"), pg_rusage_show(&ru0)); ereport(LOG, (errmsg_internal("%s", buf.data))); -- 2.27.0