NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit9af34cd

committed

Revert behaviour of -x/--xlog to 9.1 semantics

To replace it, add -X/--xlog-method that allows the specificationof fetch or stream.Do this to avoid unnecessary backwards-incompatiblity. Spotted andsuggested by Peter Eisentraut.

1 parent927d61e commit9af34cdCopy full SHA for 9af34cd

File tree

2 files changed

+38

-6

lines changed

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

2 files changed

+38

-6

lines changed

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

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,8 @@ PostgreSQL documentation`
`186`	`186`	`</varlistentry>`
`187`	`187`
`188`	`188`	`<varlistentry>`
`189`		`- <term><option>-x <replaceable class="parameter">method</replaceable></option></term>`
`190`		`- <term><option>--xlog=<replaceable class="parameter">method</replaceable></option></term>`
	`189`	`+ <term><option>-X <replaceable class="parameter">method</replaceable></option></term>`
	`190`	`+ <term><option>--xlog-method=<replaceable class="parameter">method</replaceable></option></term>`
`191`	`191`	`<listitem>`
`192`	`192`	`<para>`
`193`	`193`	`Includes the required transaction log files (WAL files) in the`
`@@ -237,6 +237,17 @@ PostgreSQL documentation`
`237`	`237`	`</listitem>`
`238`	`238`	`</varlistentry>`
`239`	`239`
	`240`	`+ <varlistentry>`
	`241`	`+ <term><option>-x</option></term>`
	`242`	`+ <term><option>--xlog</option></term>`
	`243`	`+ <listitem>`
	`244`	`+ <para>`
	`245`	`+ Using this option is equivalent of using <literal>-X</literal> with`
	`246`	`+ method <literal>fetch</literal>.`
	`247`	`+ </para>`
	`248`	`+ </listitem>`
	`249`	`+ </varlistentry>`
	`250`	`+`
`240`	`251`	`<varlistentry>`
`241`	`252`	`<term><option>-z</option></term>`
`242`	`253`	`<term><option>--gzip</option></term>`

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

Lines changed: 25 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,9 @@ usage(void)`
`107`	`107`	`printf(_("\nOptions controlling the output:\n"));`
`108`	`108`	`printf(_(" -D, --pgdata=DIRECTORY receive base backup into directory\n"));`
`109`	`109`	`printf(_(" -F, --format=p\|t output format (plain (default), tar)\n"));`
`110`		`-printf(_(" -x, --xlog=fetch\|stream include required WAL files in backup\n"));`
	`110`	`+printf(_(" -x, --xlog include required WAL files in backup (fetch mode)\n"));`
	`111`	`+printf(_(" -X, --xlog-method=fetch\|stream\n"`
	`112`	`+" include required WAL files with specified method\n"));`
`111`	`113`	`printf(_(" -z, --gzip compress tar output\n"));`
`112`	`114`	`printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n"));`
`113`	`115`	`printf(_("\nGeneral options:\n"));`
`@@ -1194,7 +1196,8 @@ main(int argc, char **argv)`
`1194`	`1196`	`{"pgdata",required_argument,NULL,'D'},`
`1195`	`1197`	`{"format",required_argument,NULL,'F'},`
`1196`	`1198`	`{"checkpoint",required_argument,NULL,'c'},`
`1197`		`-{"xlog",required_argument,NULL,'x'},`
	`1199`	`+{"xlog",no_argument,NULL,'x'},`
	`1200`	`+{"xlog-method",required_argument,NULL,'X'},`
`1198`	`1201`	`{"gzip",no_argument,NULL,'z'},`
`1199`	`1202`	`{"compress",required_argument,NULL,'Z'},`
`1200`	`1203`	`{"label",required_argument,NULL,'l'},`
`@@ -1230,7 +1233,7 @@ main(int argc, char **argv)`
`1230`	`1233`	`}`
`1231`	`1234`	`}`
`1232`	`1235`
`1233`		`-while ((c=getopt_long(argc,argv,"D:F:x:l:zZ:c:h:p:U:s:wWvP",`
	`1236`	`+while ((c=getopt_long(argc,argv,"D:F:xX:l:zZ:c:h:p:U:s:wWvP",`
`1234`	`1237`	`long_options,&option_index))!=-1)`
`1235`	`1238`	`{`
`1236`	`1239`	`switch (c)`
`@@ -1251,6 +1254,24 @@ main(int argc, char **argv)`
`1251`	`1254`	`}`
`1252`	`1255`	`break;`
`1253`	`1256`	`case'x':`
	`1257`	`+if (includewal)`
	`1258`	`+{`
	`1259`	`+fprintf(stderr,_("%s: cannot specify both --xlog and --xlog-method\n"),`
	`1260`	`+progname);`
	`1261`	`+exit(1);`
	`1262`	`+}`
	`1263`	`+`
	`1264`	`+includewal= true;`
	`1265`	`+streamwal= false;`
	`1266`	`+break;`
	`1267`	`+case'X':`
	`1268`	`+if (includewal)`
	`1269`	`+{`
	`1270`	`+fprintf(stderr,_("%s: cannot specify both --xlog and --xlog-method\n"),`
	`1271`	`+progname);`
	`1272`	`+exit(1);`
	`1273`	`+}`
	`1274`	`+`
`1254`	`1275`	`includewal= true;`
`1255`	`1276`	`if (strcmp(optarg,"f")==0\|\|`
`1256`	`1277`	`strcmp(optarg,"fetch")==0)`
`@@ -1260,7 +1281,7 @@ main(int argc, char **argv)`
`1260`	`1281`	`streamwal= true;`
`1261`	`1282`	`else`
`1262`	`1283`	`{`
`1263`		`-fprintf(stderr,_("%s: invalid xlog option \"%s\", must be empty, \"fetch\", or \"stream\"\n"),`
	`1284`	`+fprintf(stderr,_("%s: invalid xlog-method option \"%s\", must be empty, \"fetch\", or \"stream\"\n"),`
`1264`	`1285`	`progname,optarg);`
`1265`	`1286`	`exit(1);`
`1266`	`1287`	`}`

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!

Commit9af34cd

File tree

2 files changed

2 files changed

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

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

0 commit comments