Improve error messages emitted when VACUUM and ANALYZE skip a table.

Per gripe from Clodoaldo Pinto Neto on
Message-ID: 

diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 82bb020bc57b80894d6253de4034a3c7765ce946..4d2ea3c612600f3d334df83108220bf0ad91e37d 100644 (file)
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.114 2008/01/03 21:23:15 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/commands/analyze.c,v 1.115 2008/02/20 14:31:35 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,6 +22,7 @@
 #include "catalog/index.h"
 #include "catalog/indexing.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_namespace.h"
 #include "commands/dbcommands.h"
 #include "commands/vacuum.h"
 #include "executor/executor.h"
@@ -161,9 +162,20 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt,
    {
        /* No need for a WARNING if we already complained during VACUUM */
        if (!vacstmt->vacuum)
-           ereport(WARNING,
-                   (errmsg("skipping \"%s\" --- only table or database owner can analyze it",
-                           RelationGetRelationName(onerel))));
+       {
+           if (onerel->rd_rel->relisshared)
+               ereport(WARNING,
+                       (errmsg("skipping \"%s\" --- only superuser can analyze it",
+                               RelationGetRelationName(onerel))));
+           else if (onerel->rd_rel->relnamespace == PG_CATALOG_NAMESPACE)
+               ereport(WARNING,
+                       (errmsg("skipping \"%s\" --- only superuser or database owner can analyze it",
+                               RelationGetRelationName(onerel))));
+           else
+               ereport(WARNING,
+                       (errmsg("skipping \"%s\" --- only table or database owner can analyze it",
+                               RelationGetRelationName(onerel))));
+       }
        relation_close(onerel, ShareUpdateExclusiveLock);
        return;
    }

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 20374f4cd651805f67a17f2d0272988705ac6b6d..7e31ac452a7f42fd3cc9dcb2dab391aae3445d21 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.364 2008/02/11 19:14:30 tgl Exp $
+ *   $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.365 2008/02/20 14:31:35 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,6 +30,7 @@
 #include "access/xlog.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_database.h"
+#include "catalog/pg_namespace.h"
 #include "commands/dbcommands.h"
 #include "commands/vacuum.h"
 #include "executor/executor.h"
@@ -1048,9 +1049,18 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, char expected_relkind)
    if (!(pg_class_ownercheck(RelationGetRelid(onerel), GetUserId()) ||
          (pg_database_ownercheck(MyDatabaseId, GetUserId()) && !onerel->rd_rel->relisshared)))
    {
-       ereport(WARNING,
-               (errmsg("skipping \"%s\" --- only table or database owner can vacuum it",
-                       RelationGetRelationName(onerel))));
+       if (onerel->rd_rel->relisshared)
+           ereport(WARNING,
+                   (errmsg("skipping \"%s\" --- only superuser can vacuum it",
+                           RelationGetRelationName(onerel))));
+       else if (onerel->rd_rel->relnamespace == PG_CATALOG_NAMESPACE)
+           ereport(WARNING,
+                   (errmsg("skipping \"%s\" --- only superuser or database owner can vacuum it",
+                           RelationGetRelationName(onerel))));
+       else
+           ereport(WARNING,
+                   (errmsg("skipping \"%s\" --- only table or database owner can vacuum it",
+                           RelationGetRelationName(onerel))));
        relation_close(onerel, lmode);
        CommitTransactionCommand();
        return;