@@ -172,6 +172,7 @@ typedef struct LVRelState
172
172
bool skippedallvis ;
173
173
174
174
/* Error reporting state */
175
+ char * dbname ;
175
176
char * relnamespace ;
176
177
char * relname ;
177
178
char * indname ; /* Current index name */
@@ -354,6 +355,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
354
355
* these temp copies.
355
356
*/
356
357
vacrel = (LVRelState * ) palloc0 (sizeof (LVRelState ));
358
+ vacrel -> dbname = get_database_name (MyDatabaseId );
357
359
vacrel -> relnamespace = get_namespace_name (RelationGetNamespace (rel ));
358
360
vacrel -> relname = pstrdup (RelationGetRelationName (rel ));
359
361
vacrel -> indname = NULL ;
@@ -475,13 +477,13 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
475
477
if (vacrel -> aggressive )
476
478
ereport (INFO ,
477
479
(errmsg ("aggressively vacuuming \"%s.%s.%s\"" ,
478
- get_database_name ( MyDatabaseId ) ,
479
- vacrel -> relnamespace , vacrel -> relname )));
480
+ vacrel -> dbname , vacrel -> relnamespace ,
481
+ vacrel -> relname )));
480
482
else
481
483
ereport (INFO ,
482
484
(errmsg ("vacuuming \"%s.%s.%s\"" ,
483
- get_database_name ( MyDatabaseId ) ,
484
- vacrel -> relnamespace , vacrel -> relname )));
485
+ vacrel -> dbname , vacrel -> relnamespace ,
486
+ vacrel -> relname )));
485
487
}
486
488
487
489
/*
@@ -650,7 +652,7 @@ heap_vacuum_rel(Relation rel, VacuumParams *params,
650
652
msgfmt = _ ("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n" );
651
653
}
652
654
appendStringInfo (& buf , msgfmt ,
653
- get_database_name ( MyDatabaseId ) ,
655
+ vacrel -> dbname ,
654
656
vacrel -> relnamespace ,
655
657
vacrel -> relname ,
656
658
vacrel -> num_index_scans );
@@ -2614,9 +2616,7 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
2614
2616
2615
2617
ereport (WARNING ,
2616
2618
(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 ,
2620
2620
vacrel -> num_index_scans ),
2621
2621
errdetail ("The table's relfrozenxid or relminmxid is too far in the past." ),
2622
2622
errhint ("Consider increasing configuration parameter \"maintenance_work_mem\" or \"autovacuum_work_mem\".\n"
0 commit comments