From 4cfc623686cc7056365f7fbb39c422f3d5260fdb Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 27 Jan 2020 08:30:03 -0600 Subject: [PATCH v16 2/3] Include name of table in callback for index vacuum --- src/backend/access/heap/vacuumlazy.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c index 43859bd..5d4fb3d 100644 --- a/src/backend/access/heap/vacuumlazy.c +++ b/src/backend/access/heap/vacuumlazy.c @@ -296,6 +296,7 @@ typedef struct { char *relnamespace; char *relname; + char *indname; /* If vacuuming index */ BlockNumber blkno; int phase; /* Reusing same enums as for progress reporting */ } vacuum_error_callback_arg; @@ -2384,7 +2385,8 @@ lazy_vacuum_index(Relation indrel, IndexBulkDeleteResult **stats, /* Setup error traceback support for ereport() */ errcbarg.relnamespace = get_namespace_name(RelationGetNamespace(indrel)); - errcbarg.relname = RelationGetRelationName(indrel); + errcbarg.indname = RelationGetRelationName(indrel); + errcbarg.relname = get_rel_name(indrel->rd_index->indexrelid); errcbarg.phase = PROGRESS_VACUUM_PHASE_VACUUM_INDEX; errcallback.callback = vacuum_error_callback; @@ -3464,8 +3466,8 @@ vacuum_error_callback(void *arg) break; case PROGRESS_VACUUM_PHASE_VACUUM_INDEX: - errcontext(_("while vacuuming index \"%s.%s\""), - cbarg->relnamespace, cbarg->relname); + errcontext(_("while vacuuming index \"%s.%s\" of relation \"%s\""), + cbarg->relnamespace, cbarg->indname, cbarg->relname); break; } } -- 2.7.4