Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 54afdcd

Browse files
vacuumlazy.c: Save get_database_name() in vacrel.
This brings dbname strings in line with namespace and relation name strings. Author: Peter Geoghegan <pg@bowt.ie> Discussion: https://postgr.es/m/CAH2-WzkQ1TKU-DdNvnGeL870di3+CU1UTo-7nw7xFDpVE-XGjA@mail.gmail.com
1 parent 79d4bf4 commit 54afdcd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/backend/access/heap/vacuumlazy.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ typedef struct LVRelState
172172
bool skippedallvis;
173173

174174
/* Error reporting state */
175+
char *dbname;
175176
char *relnamespace;
176177
char *relname;
177178
char *indname; /* Current index name */
@@ -354,6 +355,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
354355
* these temp copies.
355356
*/
356357
vacrel = (LVRelState *) palloc0(sizeof(LVRelState));
358+
vacrel->dbname = get_database_name(MyDatabaseId);
357359
vacrel->relnamespace = get_namespace_name(RelationGetNamespace(rel));
358360
vacrel->relname = pstrdup(RelationGetRelationName(rel));
359361
vacrel->indname = NULL;
@@ -475,13 +477,13 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
475477
if (vacrel->aggressive)
476478
ereport(INFO,
477479
(errmsg("aggressively vacuuming \"%s.%s.%s\"",
478-
get_database_name(MyDatabaseId),
479-
vacrel->relnamespace, vacrel->relname)));
480+
vacrel->dbname, vacrel->relnamespace,
481+
vacrel->relname)));
480482
else
481483
ereport(INFO,
482484
(errmsg("vacuuming \"%s.%s.%s\"",
483-
get_database_name(MyDatabaseId),
484-
vacrel->relnamespace, vacrel->relname)));
485+
vacrel->dbname, vacrel->relnamespace,
486+
vacrel->relname)));
485487
}
486488

487489
/*
@@ -650,7 +652,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
650652
msgfmt = _("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n");
651653
}
652654
appendStringInfo(&buf, msgfmt,
653-
get_database_name(MyDatabaseId),
655+
vacrel->dbname,
654656
vacrel->relnamespace,
655657
vacrel->relname,
656658
vacrel->num_index_scans);
@@ -2614,9 +2616,7 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
26142616

26152617
ereport(WARNING,
26162618
(errmsg("bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans",
2617-
get_database_name(MyDatabaseId),
2618-
vacrel->relnamespace,
2619-
vacrel->relname,
2619+
vacrel->dbname, vacrel->relnamespace, vacrel->relname,
26202620
vacrel->num_index_scans),
26212621
errdetail("The table's relfrozenxid or relminmxid is too far in the past."),
26222622
errhint("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"

0 commit comments

Comments
 (0)