Fix some thinkos with pg_receivewal --compression-method

The option name was incorrect in one of the error messages, and the
short option 'I' was used in the code but we did not intend things to be
this way.  While on it, fix the documentation to refer to a "method",
and not a "level.

Oversights in commit d62bcc8, that I have detected after more review of
the LZ4 patch for pg_receivewal.

diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml
index 44ed6791e88b0689fce5880457d05b38de451240..79a4436ab9a90b1fc16f6a740f233ba6feb24955 100644 (file)
--- a/doc/src/sgml/ref/pg_receivewal.sgml
+++ b/doc/src/sgml/ref/pg_receivewal.sgml
@@ -264,7 +264,7 @@ PostgreSQL documentation
      
 
      
-      --compression-method=level
+      --compression-method=method
       
        
         Enables compression of write-ahead logs using the specified method.

diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index d47a59fe35511e2815b2506de64d941f621165a9..8acc0fc009b39163558828d7ab38069a8d4da578 100644 (file)
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -540,7 +540,6 @@ main(int argc, char **argv)
        {"status-interval", required_argument, NULL, 's'},
        {"slot", required_argument, NULL, 'S'},
        {"verbose", no_argument, NULL, 'v'},
-       {"compression-method", required_argument, NULL, 'I'},
        {"compress", required_argument, NULL, 'Z'},
 /* action */
        {"create-slot", no_argument, NULL, 1},
@@ -548,6 +547,7 @@ main(int argc, char **argv)
        {"if-not-exists", no_argument, NULL, 3},
        {"synchronous", no_argument, NULL, 4},
        {"no-sync", no_argument, NULL, 5},
+       {"compression-method", required_argument, NULL, 6},
        {NULL, 0, NULL, 0}
    };
 
@@ -626,18 +626,6 @@ main(int argc, char **argv)
            case 'v':
                verbose++;
                break;
-           case 'I':
-               if (pg_strcasecmp(optarg, "gzip") == 0)
-                   compression_method = COMPRESSION_GZIP;
-               else if (pg_strcasecmp(optarg, "none") == 0)
-                   compression_method = COMPRESSION_NONE;
-               else
-               {
-                   pg_log_error("invalid value \"%s\" for option %s",
-                                optarg, "--compress-method");
-                   exit(1);
-               }
-               break;
            case 'Z':
                if (!option_parse_int(optarg, "-Z/--compress", 1, 9,
                                      &compresslevel))
@@ -659,6 +647,18 @@ main(int argc, char **argv)
            case 5:
                do_sync = false;
                break;
+           case 6:
+               if (pg_strcasecmp(optarg, "gzip") == 0)
+                   compression_method = COMPRESSION_GZIP;
+               else if (pg_strcasecmp(optarg, "none") == 0)
+                   compression_method = COMPRESSION_NONE;
+               else
+               {
+                   pg_log_error("invalid value \"%s\" for option %s",
+                                optarg, "--compression-method");
+                   exit(1);
+               }
+               break;
            default:
 
                /*