Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit62e8b38

Browse files
committed
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.
1 parent3f01fd4 commit62e8b38

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

‎doc/src/sgml/ref/initdb.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ PostgreSQL documentation
311311

312312
<varlistentry>
313313
<term><option>-X <replaceable class="parameter">directory</replaceable></option></term>
314-
<term><option>--xlogdir=<replaceable class="parameter">directory</replaceable></option></term>
314+
<term><option>--waldir=<replaceable class="parameter">directory</replaceable></option></term>
315315
<listitem>
316316
<para>
317317
This option specifies the directory where the transaction log

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ PostgreSQL documentation
296296
</varlistentry>
297297

298298
<varlistentry>
299-
<term><option>--xlogdir=<replaceable class="parameter">xlogdir</replaceable></option></term>
299+
<term><option>--waldir=<replaceable class="parameter">waldir</replaceable></option></term>
300300
<listitem>
301301
<para>
302302
Specifies the location for the transaction log directory.
303-
<replaceable>xlogdir</replaceable> must be an absolute path.
303+
<replaceable>waldir</replaceable> must be an absolute path.
304304
The transaction log directory can only be specified when
305305
the backup is in plain mode.
306306
</para>
@@ -309,7 +309,7 @@ PostgreSQL documentation
309309

310310
<varlistentry>
311311
<term><option>-X <replaceable class="parameter">method</replaceable></option></term>
312-
<term><option>--xlog-method=<replaceable class="parameter">method</replaceable></option></term>
312+
<term><option>--wal-method=<replaceable class="parameter">method</replaceable></option></term>
313313
<listitem>
314314
<para>
315315
Includes the required transaction log files (WAL files) in the

‎src/bin/initdb/initdb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2255,7 +2255,7 @@ usage(const char *progname)
22552255
" default text search configuration\n"));
22562256
printf(_(" -U, --username=NAME database superuser name\n"));
22572257
printf(_(" -W, --pwprompt prompt for a password for the new superuser\n"));
2258-
printf(_(" -X, --xlogdir=XLOGDIR location for thetransaction log directory\n"));
2258+
printf(_(" -X, --waldir=WALDIRlocation for thewrite-ahead log directory\n"));
22592259
printf(_("\nLess commonly used options:\n"));
22602260
printf(_(" -d, --debug generate lots of debugging output\n"));
22612261
printf(_(" -k, --data-checksums use data page checksums\n"));
@@ -2941,7 +2941,7 @@ main(int argc, char *argv[])
29412941
{"nosync",no_argument,NULL,'N'},/* for backwards compatibility */
29422942
{"no-sync",no_argument,NULL,'N'},
29432943
{"sync-only",no_argument,NULL,'S'},
2944-
{"xlogdir",required_argument,NULL,'X'},
2944+
{"waldir",required_argument,NULL,'X'},
29452945
{"data-checksums",no_argument,NULL,'k'},
29462946
{NULL,0,NULL,0}
29472947
};

‎src/bin/pg_basebackup/pg_basebackup.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,9 @@ usage(void)
342342
printf(_(" --no-slot prevent creation of temporary replication slot\n"));
343343
printf(_(" -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
344344
" relocate tablespace in OLDDIR to NEWDIR\n"));
345-
printf(_(" -X, --xlog-method=none|fetch|stream\n"
345+
printf(_(" -X, --wal-method=none|fetch|stream\n"
346346
" include required WAL files with specified method\n"));
347-
printf(_(" --xlogdir=XLOGDIR location for the transaction log directory\n"));
347+
printf(_(" --waldir=WALDIR location for the transaction log directory\n"));
348348
printf(_(" -z, --gzip compress tar output\n"));
349349
printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n"));
350350
printf(_("\nGeneral options:\n"));
@@ -2065,7 +2065,7 @@ main(int argc, char **argv)
20652065
{"write-recovery-conf",no_argument,NULL,'R'},
20662066
{"slot",required_argument,NULL,'S'},
20672067
{"tablespace-mapping",required_argument,NULL,'T'},
2068-
{"xlog-method",required_argument,NULL,'X'},
2068+
{"wal-method",required_argument,NULL,'X'},
20692069
{"gzip",no_argument,NULL,'z'},
20702070
{"compress",required_argument,NULL,'Z'},
20712071
{"label",required_argument,NULL,'l'},
@@ -2080,7 +2080,7 @@ main(int argc, char **argv)
20802080
{"status-interval",required_argument,NULL,'s'},
20812081
{"verbose",no_argument,NULL,'v'},
20822082
{"progress",no_argument,NULL,'P'},
2083-
{"xlogdir",required_argument,NULL,1},
2083+
{"waldir",required_argument,NULL,1},
20842084
{"no-slot",no_argument,NULL,2},
20852085
{NULL,0,NULL,0}
20862086
};

‎src/bin/pg_basebackup/t/010_pg_basebackup.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
'existing backup_label not copied');
9494

9595
$node->command_ok(
96-
['pg_basebackup','-D',"$tempdir/backup2",'--xlogdir',
96+
['pg_basebackup','-D',"$tempdir/backup2",'--waldir',
9797
"$tempdir/xlog2" ],
9898
'separate xlog directory');
9999
ok(-f"$tempdir/backup2/PG_VERSION",'backup was created');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp