mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some thinkos with pg_receivewal --compression-method

Browse Source 
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.
This commit is contained in:
Michael Paquier 2021-11-04 12:32:37 +09:00
parent d62bcc8b07
commit 9588622945
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/src/sgml/ref/pg_receivewal.sgml
View File

@ -264,7 +264,7 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
<term><option>--compression-method=<replaceable class="parameter">level</replaceable></option></term>
<term><option>--compression-method=<replaceable class="parameter">method</replaceable></option></term>
<listitem>
<para>
Enables compression of write-ahead logs using the specified method.

26
src/bin/pg_basebackup/pg_receivewal.c
View File

@ -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:
/*