pg_amcheck: Message style and structuring improvements

diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
index a17a2427c2b0b4bbe0e127f1faba11a4384391f5..bcb02db4958b6f297c67f84f6e2d276a9cfddf24 100644 (file)
--- a/src/bin/pg_amcheck/pg_amcheck.c
+++ b/src/bin/pg_amcheck/pg_amcheck.c
@@ -1026,29 +1026,28 @@ verify_heap_slot_handler(PGresult *res, PGconn *conn, void *context)
                msg = PQgetvalue(res, i, 3);
 
            if (!PQgetisnull(res, i, 2))
-               printf(_("heap table \"%s\".\"%s\".\"%s\", block %s, offset %s, attribute %s:\n    %s\n"),
+               printf(_("heap table \"%s.%s.%s\", block %s, offset %s, attribute %s:\n"),
                       rel->datinfo->datname, rel->nspname, rel->relname,
                       PQgetvalue(res, i, 0),   /* blkno */
                       PQgetvalue(res, i, 1),   /* offnum */
-                      PQgetvalue(res, i, 2),   /* attnum */
-                      msg);
+                      PQgetvalue(res, i, 2));  /* attnum */
 
            else if (!PQgetisnull(res, i, 1))
-               printf(_("heap table \"%s\".\"%s\".\"%s\", block %s, offset %s:\n    %s\n"),
+               printf(_("heap table \"%s.%s.%s\", block %s, offset %s:\n"),
                       rel->datinfo->datname, rel->nspname, rel->relname,
                       PQgetvalue(res, i, 0),   /* blkno */
-                      PQgetvalue(res, i, 1),   /* offnum */
-                      msg);
+                      PQgetvalue(res, i, 1));  /* offnum */
 
            else if (!PQgetisnull(res, i, 0))
-               printf(_("heap table \"%s\".\"%s\".\"%s\", block %s:\n    %s\n"),
+               printf(_("heap table \"%s.%s.%s\", block %s:\n"),
                       rel->datinfo->datname, rel->nspname, rel->relname,
-                      PQgetvalue(res, i, 0),   /* blkno */
-                      msg);
+                      PQgetvalue(res, i, 0));  /* blkno */
 
            else
-               printf(_("heap table \"%s\".\"%s\".\"%s\":\n    %s\n"),
-                      rel->datinfo->datname, rel->nspname, rel->relname, msg);
+               printf(_("heap table \"%s.%s.%s\":\n"),
+                      rel->datinfo->datname, rel->nspname, rel->relname);
+
+           printf("    %s\n", msg);
        }
    }
    else if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -1056,8 +1055,9 @@ verify_heap_slot_handler(PGresult *res, PGconn *conn, void *context)
        char       *msg = indent_lines(PQerrorMessage(conn));
 
        all_checks_pass = false;
-       printf(_("heap table \"%s\".\"%s\".\"%s\":\n%s"),
-              rel->datinfo->datname, rel->nspname, rel->relname, msg);
+       printf(_("heap table \"%s.%s.%s\":\n"),
+              rel->datinfo->datname, rel->nspname, rel->relname);
+       printf("%s", msg);
        if (opts.verbose)
            printf(_("query was: %s\n"), rel->sql);
        FREE_AND_SET_NULL(msg);
@@ -1122,8 +1122,9 @@ verify_btree_slot_handler(PGresult *res, PGconn *conn, void *context)
        char       *msg = indent_lines(PQerrorMessage(conn));
 
        all_checks_pass = false;
-       printf(_("btree index \"%s\".\"%s\".\"%s\":\n%s"),
-              rel->datinfo->datname, rel->nspname, rel->relname, msg);
+       printf(_("btree index \"%s.%s.%s\":\n"),
+              rel->datinfo->datname, rel->nspname, rel->relname);
+       printf("%s", msg);
        if (opts.verbose)
            printf(_("query was: %s\n"), rel->sql);
        FREE_AND_SET_NULL(msg);

diff --git a/src/bin/pg_amcheck/t/004_verify_heapam.pl b/src/bin/pg_amcheck/t/004_verify_heapam.pl
index e4c0b83a1c6683820bb325cf128a8ddbf7f43ffe..a9f485e527bdc358698515939daa5191a7baf23d 100644 (file)
--- a/src/bin/pg_amcheck/t/004_verify_heapam.pl
+++ b/src/bin/pg_amcheck/t/004_verify_heapam.pl
@@ -327,14 +327,14 @@ sub header
 {
    my ($blkno, $offnum, $attnum) = @_;
    return
-     qr/heap table "postgres"\."public"\."test", block $blkno, offset $offnum, attribute $attnum:\s+/ms
+     qr/heap table "postgres\.public\.test", block $blkno, offset $offnum, attribute $attnum:\s+/ms
      if (defined $attnum);
    return
-     qr/heap table "postgres"\."public"\."test", block $blkno, offset $offnum:\s+/ms
+     qr/heap table "postgres\.public\.test", block $blkno, offset $offnum:\s+/ms
      if (defined $offnum);
-   return qr/heap table "postgres"\."public"\."test", block $blkno:\s+/ms
+   return qr/heap table "postgres\.public\.test", block $blkno:\s+/ms
      if (defined $blkno);
-   return qr/heap table "postgres"\."public"\."test":\s+/ms;
+   return qr/heap table "postgres\.public\.test":\s+/ms;
 }
 
 # Corrupt the tuples, one type of corruption per tuple.  Some types of