NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9588622

committed

Fix some thinkos with pg_receivewal --compression-method

The option name was incorrect in one of the error messages, and theshort option 'I' was used in the code but we did not intend things to bethis way. While on it, fix the documentation to refer to a "method",and not a "level.Oversights in commitd62bcc8, that I have detected after more review ofthe LZ4 patch for pg_receivewal.

1 parentd62bcc8 commit9588622Copy full SHA for 9588622

File tree

2 files changed

+14

-14

lines changed

doc/src/sgml/ref
- pg_receivewal.sgml
src/bin/pg_basebackup
- pg_receivewal.c

2 files changed

+14

-14

lines changed

`‎doc/src/sgml/ref/pg_receivewal.sgml`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ PostgreSQL documentation`
`264`	`264`	`</varlistentry>`
`265`	`265`
`266`	`266`	`<varlistentry>`
`267`		`- <term><option>--compression-method=<replaceable class="parameter">level</replaceable></option></term>`
	`267`	`+ <term><option>--compression-method=<replaceable class="parameter">method</replaceable></option></term>`
`268`	`268`	`<listitem>`
`269`	`269`	`<para>`
`270`	`270`	`Enables compression of write-ahead logs using the specified method.`

`‎src/bin/pg_basebackup/pg_receivewal.c`

Lines changed: 13 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -540,14 +540,14 @@ main(int argc, char **argv)`
`540`	`540`	`{"status-interval",required_argument,NULL,'s'},`
`541`	`541`	`{"slot",required_argument,NULL,'S'},`
`542`	`542`	`{"verbose",no_argument,NULL,'v'},`
`543`		`-{"compression-method",required_argument,NULL,'I'},`
`544`	`543`	`{"compress",required_argument,NULL,'Z'},`
`545`	`544`	`/* action */`
`546`	`545`	`{"create-slot",no_argument,NULL,1},`
`547`	`546`	`{"drop-slot",no_argument,NULL,2},`
`548`	`547`	`{"if-not-exists",no_argument,NULL,3},`
`549`	`548`	`{"synchronous",no_argument,NULL,4},`
`550`	`549`	`{"no-sync",no_argument,NULL,5},`
	`550`	`+{"compression-method",required_argument,NULL,6},`
`551`	`551`	`{NULL,0,NULL,0}`
`552`	`552`	`};`
`553`	`553`
`@@ -626,18 +626,6 @@ main(int argc, char **argv)`
`626`	`626`	`case'v':`
`627`	`627`	`verbose++;`
`628`	`628`	`break;`
`629`		`-case'I':`
`630`		`-if (pg_strcasecmp(optarg,"gzip")==0)`
`631`		`-compression_method=COMPRESSION_GZIP;`
`632`		`-elseif (pg_strcasecmp(optarg,"none")==0)`
`633`		`-compression_method=COMPRESSION_NONE;`
`634`		`-else`
`635`		`-{`
`636`		`-pg_log_error("invalid value \"%s\" for option %s",`
`637`		`-optarg,"--compress-method");`
`638`		`-exit(1);`
`639`		`-}`
`640`		`-break;`
`641`	`629`	`case'Z':`
`642`	`630`	`if (!option_parse_int(optarg,"-Z/--compress",1,9,`
`643`	`631`	`&compresslevel))`
`@@ -659,6 +647,18 @@ main(int argc, char **argv)`
`659`	`647`	`case5:`
`660`	`648`	`do_sync= false;`
`661`	`649`	`break;`
	`650`	`+case6:`
	`651`	`+if (pg_strcasecmp(optarg,"gzip")==0)`
	`652`	`+compression_method=COMPRESSION_GZIP;`
	`653`	`+elseif (pg_strcasecmp(optarg,"none")==0)`
	`654`	`+compression_method=COMPRESSION_NONE;`
	`655`	`+else`
	`656`	`+{`
	`657`	`+pg_log_error("invalid value \"%s\" for option %s",`
	`658`	`+optarg,"--compression-method");`
	`659`	`+exit(1);`
	`660`	`+}`
	`661`	`+break;`
`662`	`662`	`default:`
`663`	`663`
`664`	`664`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9588622

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/pg_receivewal.sgml`

`‎src/bin/pg_basebackup/pg_receivewal.c`

0 commit comments