Support --verbose option in reindexdb.

Sawada Masahiko, reviewed by Fabrízio Mello

diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index a745f6cb21b484fb6c43730d7698d2ca476baa2e..713efc099be946d95ad52676137737340e47a25e 100644 (file)
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -23,7 +23,8 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>reindexdb</command>
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
-
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+   
    <arg choice="plain" rep="repeat">
     <arg choice="opt">
      <group choice="plain">
@@ -60,6 +61,8 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>reindexdb</command>
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+
    <group choice="plain">
     <arg choice="plain"><option>--all</option></arg>
     <arg choice="plain"><option>-a</option></arg>
@@ -69,6 +72,8 @@ PostgreSQL documentation
   <cmdsynopsis>
    <command>reindexdb</command>
    <arg rep="repeat"><replaceable>connection-option</replaceable></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
+
    <group choice="plain">
     <arg choice="plain"><option>--system</option></arg>
     <arg choice="plain"><option>-s</option></arg>
@@ -195,6 +200,16 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+    <varlistentry>
+     <term><option>-v</></term>
+     <term><option>--verbose</></term>
+     <listitem>
+      <para>
+       Print detailed information during processing.
+      </para>
+     </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term><option>-V</></term>
       <term><option>--version</></term>

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 778d72a7aaa96b074cbfc768d9a30ceacf3f6c89..32d3409e05722f43c20fa21d0d810136bac25085 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -18,16 +18,16 @@ static void reindex_one_database(const char *name, const char *dbname,
                                         const char *type, const char *host,
                                         const char *port, const char *username,
                                         enum trivalue prompt_password, const char *progname,
-                                        bool echo);
+                                        bool echo, bool verbose);
 static void reindex_all_databases(const char *maintenance_db,
                                          const char *host, const char *port,
                                          const char *username, enum trivalue prompt_password,
                                          const char *progname, bool echo,
-                                         bool quiet);
+                                         bool quiet, bool verbose);
 static void reindex_system_catalogs(const char *dbname,
                                                const char *host, const char *port,
                                                const char *username, enum trivalue prompt_password,
-                                               const char *progname, bool echo);
+                                               const char *progname, bool echo, bool verbose);
 static void help(const char *progname);
 
 int
@@ -47,6 +47,7 @@ main(int argc, char *argv[])
                {"system", no_argument, NULL, 's'},
                {"table", required_argument, NULL, 't'},
                {"index", required_argument, NULL, 'i'},
+               {"verbose", no_argument, NULL, 'v'},
                {"maintenance-db", required_argument, NULL, 2},
                {NULL, 0, NULL, 0}
        };
@@ -65,6 +66,7 @@ main(int argc, char *argv[])
        bool            alldb = false;
        bool            echo = false;
        bool            quiet = false;
+       bool            verbose = false;
        SimpleStringList indexes = {NULL, NULL};
        SimpleStringList tables = {NULL, NULL};
        SimpleStringList schemas = {NULL, NULL};
@@ -75,7 +77,7 @@ main(int argc, char *argv[])
        handle_help_version_opts(argc, argv, "reindexdb", help);
 
        /* process command-line options */
-       while ((c = getopt_long(argc, argv, "h:p:U:wWeqS:d:ast:i:", long_options, &optindex)) != -1)
+       while ((c = getopt_long(argc, argv, "h:p:U:wWeqS:d:ast:i:v", long_options, &optindex)) != -1)
        {
                switch (c)
                {
@@ -118,6 +120,9 @@ main(int argc, char *argv[])
                        case 'i':
                                simple_string_list_append(&indexes, optarg);
                                break;
+                       case 'v':
+                               verbose = true;
+                               break;
                        case 2:
                                maintenance_db = pg_strdup(optarg);
                                break;
@@ -176,7 +181,7 @@ main(int argc, char *argv[])
                }
 
                reindex_all_databases(maintenance_db, host, port, username,
-                                                         prompt_password, progname, echo, quiet);
+                                                         prompt_password, progname, echo, quiet, verbose);
        }
        else if (syscatalog)
        {
@@ -207,7 +212,7 @@ main(int argc, char *argv[])
                }
 
                reindex_system_catalogs(dbname, host, port, username, prompt_password,
-                                                               progname, echo);
+                                                               progname, echo, verbose);
        }
        else
        {
@@ -228,7 +233,7 @@ main(int argc, char *argv[])
                        for (cell = schemas.head; cell; cell = cell->next)
                        {
                                reindex_one_database(cell->val, dbname, "SCHEMA", host, port,
-                                                                  username, prompt_password, progname, echo);
+                                                                  username, prompt_password, progname, echo, verbose);
                        }
                }
 
@@ -239,7 +244,7 @@ main(int argc, char *argv[])
                        for (cell = indexes.head; cell; cell = cell->next)
                        {
                                reindex_one_database(cell->val, dbname, "INDEX", host, port,
-                                                                 username, prompt_password, progname, echo);
+                                                                 username, prompt_password, progname, echo, verbose);
                        }
                }
                if (tables.head != NULL)
@@ -249,13 +254,13 @@ main(int argc, char *argv[])
                        for (cell = tables.head; cell; cell = cell->next)
                        {
                                reindex_one_database(cell->val, dbname, "TABLE", host, port,
-                                                                 username, prompt_password, progname, echo);
+                                                                 username, prompt_password, progname, echo, verbose);
                        }
                }
                /* reindex database only if neither index nor table nor schema is specified */
                if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL)
                        reindex_one_database(dbname, dbname, "DATABASE", host, port,
-                                                                username, prompt_password, progname, echo);
+                                                                username, prompt_password, progname, echo, verbose);
        }
 
        exit(0);
@@ -264,7 +269,8 @@ main(int argc, char *argv[])
 static void
 reindex_one_database(const char *name, const char *dbname, const char *type,
                                         const char *host, const char *port, const char *username,
-                         enum trivalue prompt_password, const char *progname, bool echo)
+                                        enum trivalue prompt_password, const char *progname, bool echo,
+                                        bool verbose)
 {
        PQExpBufferData sql;
 
@@ -273,6 +279,10 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
        initPQExpBuffer(&sql);
 
        appendPQExpBufferStr(&sql, "REINDEX");
+
+       if (verbose)
+               appendPQExpBufferStr(&sql, " (VERBOSE)");
+
        if (strcmp(type, "TABLE") == 0)
                appendPQExpBuffer(&sql, " TABLE %s", name);
        else if (strcmp(type, "INDEX") == 0)
@@ -312,7 +322,7 @@ static void
 reindex_all_databases(const char *maintenance_db,
                                          const char *host, const char *port,
                                          const char *username, enum trivalue prompt_password,
-                                         const char *progname, bool echo, bool quiet)
+                                         const char *progname, bool echo, bool quiet, bool verbose)
 {
        PGconn     *conn;
        PGresult   *result;
@@ -334,7 +344,7 @@ reindex_all_databases(const char *maintenance_db,
                }
 
                reindex_one_database(dbname, dbname, "DATABASE", host, port, username,
-                                                        prompt_password, progname, echo);
+                                                        prompt_password, progname, echo, verbose);
        }
 
        PQclear(result);
@@ -343,7 +353,7 @@ reindex_all_databases(const char *maintenance_db,
 static void
 reindex_system_catalogs(const char *dbname, const char *host, const char *port,
                                                const char *username, enum trivalue prompt_password,
-                                               const char *progname, bool echo)
+                                               const char *progname, bool echo, bool verbose)
 {
        PQExpBufferData sql;
 
@@ -351,7 +361,12 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 
        initPQExpBuffer(&sql);
 
-       appendPQExpBuffer(&sql, "REINDEX SYSTEM %s;", dbname);
+       appendPQExpBuffer(&sql, "REINDEX");
+
+       if (verbose)
+               appendPQExpBuffer(&sql, " (VERBOSE)");
+
+       appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
 
        conn = connectDatabase(dbname, host, port, username, prompt_password,
                                                   progname, false);
@@ -381,6 +396,7 @@ help(const char *progname)
        printf(_("  -s, --system              reindex system catalogs\n"));
        printf(_("  -S, --schema=SCHEMA       recreate specific schema(s) only\n"));
        printf(_("  -t, --table=TABLE         reindex specific table(s) only\n"));
+       printf(_("  -v, --verbose             write a lot of output\n"));
        printf(_("  -V, --version             output version information, then exit\n"));
        printf(_("  -?, --help                show this help, then exit\n"));
        printf(_("\nConnection options:\n"));

diff --git a/src/bin/scripts/t/090_reindexdb.pl b/src/bin/scripts/t/090_reindexdb.pl
index d5bce4334e803da24a0996911d8896a01693767b..42628c25e2b9dc00ea4ea182dc97a1f2b8ff67b7 100644 (file)
--- a/src/bin/scripts/t/090_reindexdb.pl
+++ b/src/bin/scripts/t/090_reindexdb.pl
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use TestLib;
-use Test::More tests => 18;
+use Test::More tests => 20;
 
 program_help_ok('reindexdb');
 program_version_ok('reindexdb');
@@ -35,3 +35,7 @@ issues_sql_like(
        [ 'reindexdb', '-s', 'postgres' ],
        qr/statement: REINDEX SYSTEM postgres;/,
        'reindex system tables');
+issues_sql_like(
+       [ 'reindexdb', '-v', '-t', 'test1', 'postgres' ],
+       qr/statement: REINDEX \(VERBOSE\) TABLE test1;/,
+       'reindex with verbose output');