database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

vacuumlazy.c: Save get_database_name() in vacrel.

Browse Source 
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
This commit is contained in:
Peter Geoghegan 2023-01-03 11:48:47 -08:00
parent 79d4bf4eff
commit 54afdcd618
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/access/heap/vacuumlazy.c
View File

@ -172,6 +172,7 @@ typedef struct LVRelState
bool skippedallvis; bool skippedallvis;
/* Error reporting state */ /* Error reporting state */
char *dbname;
char *relnamespace; char *relnamespace;
char *relname; char *relname;
char *indname; /* Current index name */ char *indname; /* Current index name */
@ -354,6 +355,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
* these temp copies. * these temp copies.
*/ */
vacrel = (LVRelState *) palloc0(sizeof(LVRelState)); vacrel = (LVRelState *) palloc0(sizeof(LVRelState));
vacrel->dbname = get_database_name(MyDatabaseId);
vacrel->relnamespace = get_namespace_name(RelationGetNamespace(rel)); vacrel->relnamespace = get_namespace_name(RelationGetNamespace(rel));
vacrel->relname = pstrdup(RelationGetRelationName(rel)); vacrel->relname = pstrdup(RelationGetRelationName(rel));
vacrel->indname = NULL; vacrel->indname = NULL;
@ -475,13 +477,13 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
if (vacrel->aggressive) if (vacrel->aggressive)
ereport(INFO, ereport(INFO,
(errmsg("aggressively vacuuming \"%s.%s.%s\"", (errmsg("aggressively vacuuming \"%s.%s.%s\"",
get_database_name(MyDatabaseId), vacrel->dbname, vacrel->relnamespace,
vacrel->relnamespace, vacrel->relname))); vacrel->relname)));
else else
ereport(INFO, ereport(INFO,
(errmsg("vacuuming \"%s.%s.%s\"", (errmsg("vacuuming \"%s.%s.%s\"",
get_database_name(MyDatabaseId), vacrel->dbname, vacrel->relnamespace,
vacrel->relnamespace, vacrel->relname))); vacrel->relname)));
} }
/* /*
@ -650,7 +652,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
msgfmt = _("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"); msgfmt = _("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n");
} }
appendStringInfo(&buf, msgfmt, appendStringInfo(&buf, msgfmt,
get_database_name(MyDatabaseId), vacrel->dbname,
vacrel->relnamespace, vacrel->relnamespace,
vacrel->relname, vacrel->relname,
vacrel->num_index_scans); vacrel->num_index_scans);
@ -2614,9 +2616,7 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
ereport(WARNING, ereport(WARNING,
(errmsg("bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans", (errmsg("bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans",
get_database_name(MyDatabaseId), vacrel->dbname, vacrel->relnamespace, vacrel->relname,
vacrel->relnamespace,
vacrel->relname,
vacrel->num_index_scans), vacrel->num_index_scans),
errdetail("The table's relfrozenxid or relminmxid is too far in the past."), errdetail("The table's relfrozenxid or relminmxid is too far in the past."),
errhint("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n" errhint("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"