From 9af34cdec87d8e60f200ccd5b1b695880412c62b Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Sun, 10 Jun 2012 13:43:51 +0200
Subject: [PATCH] Revert behaviour of -x/--xlog to 9.1 semantics
To replace it, add -X/--xlog-method that allows the specification
of fetch or stream.
Do this to avoid unnecessary backwards-incompatiblity. Spotted and
suggested by Peter Eisentraut.
---
doc/src/sgml/ref/pg_basebackup.sgml | 15 ++++++++++++--
src/bin/pg_basebackup/pg_basebackup.c | 29 +++++++++++++++++++++++----
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 102d649f4e8..d03bedd12a9 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -186,8 +186,8 @@ PostgreSQL documentation
</varlistentry>
<varlistentry>
- <term><option>-x <replaceable class="parameter">method</replaceable></option></term>
- <term><option>--xlog=<replaceable class="parameter">method</replaceable></option></term>
+ <term><option>-X <replaceable class="parameter">method</replaceable></option></term>
+ <term><option>--xlog-method=<replaceable class="parameter">method</replaceable></option></term>
<listitem>
<para>
Includes the required transaction log files (WAL files) in the
@@ -237,6 +237,17 @@ PostgreSQL documentation
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>-x</option></term>
+ <term><option>--xlog</option></term>
+ <listitem>
+ <para>
+ Using this option is equivalent of using <literal>-X</literal> with
+ method <literal>fetch</literal>.
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><option>-z</option></term>
<term><option>--gzip</option></term>
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 66a281477a7..44fd8a969dd 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -107,7 +107,9 @@ usage(void)
printf(_("\nOptions controlling the output:\n"));
printf(_(" -D, --pgdata=DIRECTORY receive base backup into directory\n"));
printf(_(" -F, --format=p|t output format (plain (default), tar)\n"));
- printf(_(" -x, --xlog=fetch|stream include required WAL files in backup\n"));
+ printf(_(" -x, --xlog include required WAL files in backup (fetch mode)\n"));
+ printf(_(" -X, --xlog-method=fetch|stream\n"
+ " include required WAL files with specified method\n"));
printf(_(" -z, --gzip compress tar output\n"));
printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n"));
printf(_("\nGeneral options:\n"));
@@ -1194,7 +1196,8 @@ main(int argc, char **argv)
{"pgdata", required_argument, NULL, 'D'},
{"format", required_argument, NULL, 'F'},
{"checkpoint", required_argument, NULL, 'c'},
- {"xlog", required_argument, NULL, 'x'},
+ {"xlog", no_argument, NULL, 'x'},
+ {"xlog-method", required_argument, NULL, 'X'},
{"gzip", no_argument, NULL, 'z'},
{"compress", required_argument, NULL, 'Z'},
{"label", required_argument, NULL, 'l'},
@@ -1230,7 +1233,7 @@ main(int argc, char **argv)
}
}
- while ((c = getopt_long(argc, argv, "D:F:x:l:zZ:c:h:p:U:s:wWvP",
+ while ((c = getopt_long(argc, argv, "D:F:xX:l:zZ:c:h:p:U:s:wWvP",
long_options, &option_index)) != -1)
{
switch (c)
@@ -1251,6 +1254,24 @@ main(int argc, char **argv)
}
break;
case 'x':
+ if (includewal)
+ {
+ fprintf(stderr, _("%s: cannot specify both --xlog and --xlog-method\n"),
+ progname);
+ exit(1);
+ }
+
+ includewal = true;
+ streamwal = false;
+ break;
+ case 'X':
+ if (includewal)
+ {
+ fprintf(stderr, _("%s: cannot specify both --xlog and --xlog-method\n"),
+ progname);
+ exit(1);
+ }
+
includewal = true;
if (strcmp(optarg, "f") == 0 ||
strcmp(optarg, "fetch") == 0)
@@ -1260,7 +1281,7 @@ main(int argc, char **argv)
streamwal = true;
else
{
- fprintf(stderr, _("%s: invalid xlog option \"%s\", must be empty, \"fetch\", or \"stream\"\n"),
+ fprintf(stderr, _("%s: invalid xlog-method option \"%s\", must be empty, \"fetch\", or \"stream\"\n"),
progname, optarg);
exit(1);
}
--
GitLab