From 9588622945754305836555273a6a3be814db315c Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Thu, 4 Nov 2021 12:32:37 +0900 Subject: [PATCH] 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. --- doc/src/sgml/ref/pg_receivewal.sgml | 2 +- src/bin/pg_basebackup/pg_receivewal.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml index 44ed6791e88..79a4436ab9a 100644 --- a/doc/src/sgml/ref/pg_receivewal.sgml +++ b/doc/src/sgml/ref/pg_receivewal.sgml @@ -264,7 +264,7 @@ PostgreSQL documentation - + 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 d47a59fe355..8acc0fc009b 100644 --- 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: /* -- 2.39.5