rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename command line options for ongoing xlog -> wal conversion. 

initdb and pg_basebackup now have a --waldir option rather --xlogdir,
and pg_basebackup now has --wal-method rather than --xlog-method.
This commit is contained in:
Robert Haas 2017-02-09 16:42:51 -05:00
parent 3f01fd4ca0
commit 62e8b38751
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,7 @@ PostgreSQL documentation
<varlistentry> <varlistentry>
<term><option>-X <replaceable class="parameter">directory</replaceable></option></term> <term><option>-X <replaceable class="parameter">directory</replaceable></option></term>
<term><option>--xlogdir=<replaceable class="parameter">directory</replaceable></option></term> <term><option>--waldir=<replaceable class="parameter">directory</replaceable></option></term>
<listitem> <listitem>
<para> <para>
This option specifies the directory where the transaction log This option specifies the directory where the transaction log

6
doc/src/sgml/ref/pg_basebackup.sgml
View File

@ -296,11 +296,11 @@ PostgreSQL documentation
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--xlogdir=<replaceable class="parameter">xlogdir</replaceable></option></term> <term><option>--waldir=<replaceable class="parameter">waldir</replaceable></option></term>
<listitem> <listitem>
<para> <para>
Specifies the location for the transaction log directory. Specifies the location for the transaction log directory.
<replaceable>xlogdir</replaceable> must be an absolute path. <replaceable>waldir</replaceable> must be an absolute path.
The transaction log directory can only be specified when The transaction log directory can only be specified when
the backup is in plain mode. the backup is in plain mode.
</para> </para>
@ -309,7 +309,7 @@ PostgreSQL documentation
<varlistentry> <varlistentry>
<term><option>-X <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> <term><option>--wal-method=<replaceable class="parameter">method</replaceable></option></term>
<listitem> <listitem>
<para> <para>
Includes the required transaction log files (WAL files) in the Includes the required transaction log files (WAL files) in the

4
src/bin/initdb/initdb.c
View File

@ -2255,7 +2255,7 @@ usage(const char *progname)
" default text search configuration\n")); " default text search configuration\n"));
printf(_(" -U, --username=NAME database superuser name\n")); printf(_(" -U, --username=NAME database superuser name\n"));
printf(_(" -W, --pwprompt prompt for a password for the new superuser\n")); printf(_(" -W, --pwprompt prompt for a password for the new superuser\n"));
printf(_(" -X, --xlogdir=XLOGDIR location for the transaction log directory\n")); printf(_(" -X, --waldir=WALDIR location for the write-ahead log directory\n"));
printf(_("\nLess commonly used options:\n")); printf(_("\nLess commonly used options:\n"));
printf(_(" -d, --debug generate lots of debugging output\n")); printf(_(" -d, --debug generate lots of debugging output\n"));
printf(_(" -k, --data-checksums use data page checksums\n")); printf(_(" -k, --data-checksums use data page checksums\n"));
@ -2941,7 +2941,7 @@ main(int argc, char *argv[])
{"nosync", no_argument, NULL, 'N'}, /* for backwards compatibility */ {"nosync", no_argument, NULL, 'N'}, /* for backwards compatibility */
{"no-sync", no_argument, NULL, 'N'}, {"no-sync", no_argument, NULL, 'N'},
{"sync-only", no_argument, NULL, 'S'}, {"sync-only", no_argument, NULL, 'S'},
{"xlogdir", required_argument, NULL, 'X'}, {"waldir", required_argument, NULL, 'X'},
{"data-checksums", no_argument, NULL, 'k'}, {"data-checksums", no_argument, NULL, 'k'},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };

8
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -342,9 +342,9 @@ usage(void)
printf(_(" --no-slot prevent creation of temporary replication slot\n")); printf(_(" --no-slot prevent creation of temporary replication slot\n"));
printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n" printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
" relocate tablespace in OLDDIR to NEWDIR\n")); " relocate tablespace in OLDDIR to NEWDIR\n"));
printf(_(" -X, --xlog-method=none|fetch|stream\n" printf(_(" -X, --wal-method=none|fetch|stream\n"
" include required WAL files with specified method\n")); " include required WAL files with specified method\n"));
printf(_(" --xlogdir=XLOGDIR location for the transaction log directory\n")); printf(_(" --waldir=WALDIR location for the transaction log directory\n"));
printf(_(" -z, --gzip compress tar output\n")); printf(_(" -z, --gzip compress tar output\n"));
printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n")); printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n"));
printf(_("\nGeneral options:\n")); printf(_("\nGeneral options:\n"));
@ -2065,7 +2065,7 @@ main(int argc, char **argv)
{"write-recovery-conf", no_argument, NULL, 'R'}, {"write-recovery-conf", no_argument, NULL, 'R'},
{"slot", required_argument, NULL, 'S'}, {"slot", required_argument, NULL, 'S'},
{"tablespace-mapping", required_argument, NULL, 'T'}, {"tablespace-mapping", required_argument, NULL, 'T'},
{"xlog-method", required_argument, NULL, 'X'}, {"wal-method", required_argument, NULL, 'X'},
{"gzip", no_argument, NULL, 'z'}, {"gzip", no_argument, NULL, 'z'},
{"compress", required_argument, NULL, 'Z'}, {"compress", required_argument, NULL, 'Z'},
{"label", required_argument, NULL, 'l'}, {"label", required_argument, NULL, 'l'},
@ -2080,7 +2080,7 @@ main(int argc, char **argv)
{"status-interval", required_argument, NULL, 's'}, {"status-interval", required_argument, NULL, 's'},
{"verbose", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'v'},
{"progress", no_argument, NULL, 'P'}, {"progress", no_argument, NULL, 'P'},
{"xlogdir", required_argument, NULL, 1}, {"waldir", required_argument, NULL, 1},
{"no-slot", no_argument, NULL, 2}, {"no-slot", no_argument, NULL, 2},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };

2
src/bin/pg_basebackup/t/010_pg_basebackup.pl
View File

@ -93,7 +93,7 @@ isnt(slurp_file("$tempdir/backup/backup_label"), 'DONOTCOPY',
'existing backup_label not copied'); 'existing backup_label not copied');
$node->command_ok( $node->command_ok(
[ 'pg_basebackup', '-D', "$tempdir/backup2", '--xlogdir', [ 'pg_basebackup', '-D', "$tempdir/backup2", '--waldir',
"$tempdir/xlog2" ], "$tempdir/xlog2" ],
'separate xlog directory'); 'separate xlog directory');
ok(-f "$tempdir/backup2/PG_VERSION", 'backup was created'); ok(-f "$tempdir/backup2/PG_VERSION", 'backup was created');