database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

initdb pg_basebackup: Rename --noxxx options to --no-xxx

Browse Source 
--noclean and --nosync were the only options spelled without a hyphen,
so change this for consistency with other options.  The options in
pg_basebackup have not been in a release, so we just rename them.  For
initdb, we retain the old variants.

Vik Fearing and me
This commit is contained in:
Peter Eisentraut 2016-10-19 12:00:00 -04:00
parent caf936b09f
commit 5d58c07a44
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ PostgreSQL documentation
<varlistentry>
<term><option>-N</option></term>
<term><option>--nosync</option></term>
<term><option>--no-sync</option></term>
<listitem>
<para>
By default, <command>initdb</command> will wait for all files to be
@ -355,7 +355,7 @@ PostgreSQL documentation
<varlistentry>
<term><option>-n</option></term>
<term><option>--noclean</option></term>
<term><option>--no-clean</option></term>
<listitem>
<para>
By default, when <command>initdb</command>

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

@ -400,7 +400,7 @@ PostgreSQL documentation
<varlistentry>
<term><option>-n</option></term>
<term><option>--noclean</option></term>
<term><option>--no-clean</option></term>
<listitem>
<para>
By default, when <command>pg_basebackup</command> aborts with an
@ -440,7 +440,7 @@ PostgreSQL documentation
<varlistentry>
<term><option>-N</option></term>
<term><option>--nosync</option></term>
<term><option>--no-sync</option></term>
<listitem>
<para>
By default, <command>pg_basebackup</command> will wait for all files

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

@ -2402,8 +2402,8 @@ usage(const char *progname)
printf(_(" -d, --debug generate lots of debugging output\n"));
printf(_(" -k, --data-checksums use data page checksums\n"));
printf(_(" -L DIRECTORY where to find the input files\n"));
printf(_(" -n, --noclean do not clean up after errors\n"));
printf(_(" -N, --nosync do not wait for changes to be written safely to disk\n"));
printf(_(" -n, --no-clean do not clean up after errors\n"));
printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n"));
printf(_(" -s, --show show internal settings\n"));
printf(_(" -S, --sync-only only sync data directory\n"));
printf(_("\nOther options:\n"));
@ -3078,8 +3078,10 @@ main(int argc, char *argv[])
{"version", no_argument, NULL, 'V'},
{"debug", no_argument, NULL, 'd'},
{"show", no_argument, NULL, 's'},
{"noclean", no_argument, NULL, 'n'},
{"nosync", no_argument, NULL, 'N'},
{"noclean", no_argument, NULL, 'n'}, /* for backwards compatibility */
{"no-clean", no_argument, NULL, 'n'},
{"nosync", no_argument, NULL, 'N'}, /* for backwards compatibility */
{"no-sync", no_argument, NULL, 'N'},
{"sync-only", no_argument, NULL, 'S'},
{"xlogdir", required_argument, NULL, 'X'},
{"data-checksums", no_argument, NULL, 'k'},
@ -3165,7 +3167,7 @@ main(int argc, char *argv[])
break;
case 'n':
noclean = true;
printf(_("Running in noclean mode. Mistakes will not be cleaned up.\n"));
printf(_("Running in no-clean mode. Mistakes will not be cleaned up.\n"));
break;
case 'N':
do_sync = false;

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

@ -329,8 +329,8 @@ usage(void)
printf(_(" -c, --checkpoint=fast|spread\n"
" set fast or spread checkpointing\n"));
printf(_(" -l, --label=LABEL set backup label\n"));
printf(_(" -n, --noclean do not clean up after errors\n"));
printf(_(" -N, --nosync do not wait for changes to be written safely to disk\n"));
printf(_(" -n, --no-clean do not clean up after errors\n"));
printf(_(" -N, --no-sync do not wait for changes to be written safely to disk\n"));
printf(_(" -P, --progress show progress information\n"));
printf(_(" -v, --verbose output verbose messages\n"));
printf(_(" -V, --version output version information, then exit\n"));
@ -2006,8 +2006,8 @@ main(int argc, char **argv)
{"gzip", no_argument, NULL, 'z'},
{"compress", required_argument, NULL, 'Z'},
{"label", required_argument, NULL, 'l'},
{"noclean", no_argument, NULL, 'n'},
{"nosync", no_argument, NULL, 'N'},
{"no-clean", no_argument, NULL, 'n'},
{"no-sync", no_argument, NULL, 'N'},
{"dbname", required_argument, NULL, 'd'},
{"host", required_argument, NULL, 'h'},
{"port", required_argument, NULL, 'p'},

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

@ -44,7 +44,7 @@ ok(! -d "$tempdir/backup", 'backup directory was cleaned up');
$node->command_fails(
[ 'pg_basebackup', '-D', "$tempdir/backup", '-n' ],
'failing run with noclean option');
'failing run with no-clean option');
ok(-d "$tempdir/backup", 'backup directory was created and left behind');

2
src/test/perl/PostgresNode.pm
View File

@ -484,7 +484,7 @@ sub backup
print "# Taking pg_basebackup $backup_name from node \"$name\"\n";
TestLib::system_or_bail('pg_basebackup', '-D', $backup_path, '-p', $port,
'-x', '--nosync');
'-x', '--no-sync');
print "# Backup finished\n";
}

2
src/test/regress/pg_regress.c
View File

@ -2239,7 +2239,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
/* initdb */
header(_("initializing database system"));
snprintf(buf, sizeof(buf),
"\"%s%sinitdb\" -D \"%s/data\" --noclean --nosync%s%s > \"%s/log/initdb.log\" 2>&1",
"\"%s%sinitdb\" -D \"%s/data\" --no-clean --no-sync%s%s > \"%s/log/initdb.log\" 2>&1",
bindir ? bindir : "",
bindir ? "/" : "",
temp_instance,