pg_basebackup: Remove short option -k

-k meant --no-verify-checksums, which is the opposite of what initdb
uses -k for.  After discussion, a short option does not seem necessary,
so just keep the long option.

Discussion: https://www.postgresql.org/message-id/flat/d510f8aa-19e1-d06e-7630-ad27f7441d68%402ndquadrant.com

diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index fc1edf48645b13bd8d2cc5d6e8bd4ee7949c598a..05cab862b7caf44163793c2878d625edb1aaf2e0 100644 (file)
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -486,6 +486,18 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-v</option></term>
+      <term><option>--verbose</option></term>
+      <listitem>
+       <para>
+        Enables verbose mode. Will output some extra steps during startup and
+        shutdown, as well as show the exact file name that is currently being
+        processed if progress reporting is also enabled.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-slot</option></term>
       <listitem>
@@ -507,33 +519,20 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-k</option></term>
       <term><option>--no-verify-checksums</option></term>
       <listitem>
        <para>
         Disables verification of checksums, if they are enabled on the server
-        the base backup is taken from. 
+        the base backup is taken from.
        </para>
        <para>
-        By default, checksums are verified and checksum failures will result in
-        a non-zero exit status. However, the base backup will not be removed in
-        this case, as if the <literal>--no-clean</literal> option was used.
+        By default, checksums are verified and checksum failures will result
+        in a non-zero exit status. However, the base backup will not be
+        removed in such a case, as if the <option>--no-clean</option> option
+        had been used.
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry>
-      <term><option>-v</option></term>
-      <term><option>--verbose</option></term>
-      <listitem>
-       <para>
-        Enables verbose mode. Will output some extra steps during startup and
-        shutdown, as well as show the exact file name that is currently being
-        processed if progress reporting is also enabled.
-       </para>
-      </listitem>
-     </varlistentry>
-
     </variablelist>
    </para>
 

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index fb5b51d6bea17e5c04ac962b4228b290a078ed20..ef4cfc43847bd744c6c84e614314311bf58cc95f 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -363,11 +363,11 @@ usage(void)
        printf(_("  -N, --no-sync          do not wait for changes to be written safely to disk\n"));
        printf(_("  -P, --progress         show progress information\n"));
        printf(_("  -S, --slot=SLOTNAME    replication slot to use\n"));
-       printf(_("      --no-slot          prevent creation of temporary replication slot\n"));
-       printf(_("  -k, --no-verify-checksums\n"
-                        "                         do not verify checksums\n"));
        printf(_("  -v, --verbose          output verbose messages\n"));
        printf(_("  -V, --version          output version information, then exit\n"));
+       printf(_("      --no-slot          prevent creation of temporary replication slot\n"));
+       printf(_("      --no-verify-checksums\n"
+                        "                         do not verify checksums\n"));
        printf(_("  -?, --help             show this help, then exit\n"));
        printf(_("\nConnection options:\n"));
        printf(_("  -d, --dbname=CONNSTR   connection string\n"));
@@ -2159,7 +2159,7 @@ main(int argc, char **argv)
                {"progress", no_argument, NULL, 'P'},
                {"waldir", required_argument, NULL, 1},
                {"no-slot", no_argument, NULL, 2},
-               {"no-verify-checksums", no_argument, NULL, 'k'},
+               {"no-verify-checksums", no_argument, NULL, 3},
                {NULL, 0, NULL, 0}
        };
        int                     c;
@@ -2328,7 +2328,7 @@ main(int argc, char **argv)
                        case 'P':
                                showprogress = true;
                                break;
-                       case 'k':
+                       case 3:
                                verify_checksums = false;
                                break;
                        default:

diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index 6b2e0286c474a8ca57a7c849b9955c4153fcceeb..aab2e1eecff74cf10f0cb16f017ef7af50634cb1 100644 (file)
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -552,7 +552,7 @@ rmtree("$tempdir/backup_corrupt3");
 
 # do not verify checksums, should return ok
 $node->command_ok(
-       [ 'pg_basebackup', '-D', "$tempdir/backup_corrupt4", '-k' ],
+       [ 'pg_basebackup', '-D', "$tempdir/backup_corrupt4", '--no-verify-checksums' ],
        'pg_basebackup with -k does not report checksum mismatch');
 rmtree("$tempdir/backup_corrupt4");