diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2022-11-23 14:41:30 -0500 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2022-11-23 14:43:16 -0500 |
| commit | b7a5ef17cf75c712b0fe5c5a20133a88da897aab (patch) | |
| tree | de657ef4e91a377bb87fd66d994304bab9040470 /src/backend/commands | |
| parent | 7b378237aa805711353075de142021b1d40ff3b0 (diff) | |
| download | postgresql-b7a5ef17cf75c712b0fe5c5a20133a88da897aab.tar.gz postgresql-b7a5ef17cf75c712b0fe5c5a20133a88da897aab.zip | |
Simplify WARNING messages from skipped vacuum/analyze on a table
This will more easily accomodate adding new permissions for vacuum and
analyze.
Nathan Bossart following a suggestion from Kyotaro Horiguchi
Discussion: https://postgr.es/m/20220726.104712.912995710251150228.horikyota.ntt@gmail.com
Diffstat (limited to 'src/backend/commands')
| -rw-r--r-- | src/backend/commands/vacuum.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index b5d0ac16156..15163c80dfe 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -579,18 +579,9 @@ vacuum_is_relation_owner(Oid relid, Form_pg_class reltuple, bits32 options) if ((options & VACOPT_VACUUM) != 0) { - if (reltuple->relisshared) - ereport(WARNING, - (errmsg("skipping \"%s\" --- only superuser can vacuum it", - relname))); - else if (reltuple->relnamespace == PG_CATALOG_NAMESPACE) - ereport(WARNING, - (errmsg("skipping \"%s\" --- only superuser or database owner can vacuum it", - relname))); - else - ereport(WARNING, - (errmsg("skipping \"%s\" --- only table or database owner can vacuum it", - relname))); + ereport(WARNING, + (errmsg("permission denied to vacuum \"%s\", skipping it", + relname))); /* * For VACUUM ANALYZE, both logs could show up, but just generate @@ -601,20 +592,9 @@ vacuum_is_relation_owner(Oid relid, Form_pg_class reltuple, bits32 options) } if ((options & VACOPT_ANALYZE) != 0) - { - if (reltuple->relisshared) - ereport(WARNING, - (errmsg("skipping \"%s\" --- only superuser can analyze it", - relname))); - else if (reltuple->relnamespace == PG_CATALOG_NAMESPACE) - ereport(WARNING, - (errmsg("skipping \"%s\" --- only superuser or database owner can analyze it", - relname))); - else - ereport(WARNING, - (errmsg("skipping \"%s\" --- only table or database owner can analyze it", - relname))); - } + ereport(WARNING, + (errmsg("permission denied to analyze \"%s\", skipping it", + relname))); return false; } |