On Sun, Jan 8, 2017 at 03:27:59PM +0900, Michael Paquier wrote: > >> + subdirectory of both the current directory and the > >> + <envar>PGDATA</envar> directory. > >> This could say "of both the current directory and *then* the PGDATA > >> directory" to outline the order of the actions taken by the check > >> routine. Just my 2c on the matter. > > > > Ah, I see your point. I ended up rewording the text to be more explicit > > about the supplied argument and "searching". Updated patch attached. > > - Directory in which to find log segment files. The default is to > search > - for them in the <literal>pg_wal</literal> subdirectory of the current > - directory. > + Specifies a directory in which to find log segment files. > + In addition, searches are performed in the current directory, > + and the <literal>pg_wal</literal> subdirectory of both the current > + directory and the <envar>PGDATA</envar> directory. > Hm. This still misses the point that the lookup at PGDATA is done only > if no directory is defined. What do you think about the patch attached > that lists the five possible patterns: 2 for the case where a > directory is defined, and 3 for the default case.
Understood. Here is an updated patch which incorporates your suggestions. -- Bruce Momjian <br...@momjian.us> http://momjian.us EnterpriseDB http://enterprisedb.com + As you are, so once was I. As I am, so you will be. + + Ancient Roman grave inscription +
diff --git a/doc/src/sgml/ref/pg_xlogdump.sgml b/doc/src/sgml/ref/pg_xlogdump.sgml new file mode 100644 index cfb6d87..078b08e *** a/doc/src/sgml/ref/pg_xlogdump.sgml --- b/doc/src/sgml/ref/pg_xlogdump.sgml *************** PostgreSQL documentation *** 117,125 **** <term><option>--path=<replaceable>path</replaceable></option></term> <listitem> <para> ! Directory in which to find log segment files. The default is to search ! for them in the <literal>pg_wal</literal> subdirectory of the current ! directory. </para> </listitem> </varlistentry> --- 117,128 ---- <term><option>--path=<replaceable>path</replaceable></option></term> <listitem> <para> ! Specifies a directory to search for log segment files or a ! directory with a <literal>pg_wal</literal> subdirectory that ! contains such files. The default is to search in the current ! directory, the <literal>pg_wal</literal> subdirectory of the ! current directory, and the <literal>pg_wal</literal> subdirectory ! of <envar>PGDATA</envar>. </para> </listitem> </varlistentry> diff --git a/src/bin/pg_xlogdump/pg_xlogdump.c b/src/bin/pg_xlogdump/pg_xlogdump.c new file mode 100644 index 0ad441e..8bfa827 *** a/src/bin/pg_xlogdump/pg_xlogdump.c --- b/src/bin/pg_xlogdump/pg_xlogdump.c *************** usage(void) *** 680,686 **** printf(_(" -f, --follow keep retrying after reaching end of WAL\n")); printf(_(" -n, --limit=N number of records to display\n")); printf(_(" -p, --path=PATH directory in which to find log segment files\n" ! " (default: ./pg_wal)\n")); printf(_(" -r, --rmgr=RMGR only show records generated by resource manager RMGR\n" " use --rmgr=list to list valid resource manager names\n")); printf(_(" -s, --start=RECPTR start reading at log position RECPTR\n")); --- 680,687 ---- printf(_(" -f, --follow keep retrying after reaching end of WAL\n")); printf(_(" -n, --limit=N number of records to display\n")); printf(_(" -p, --path=PATH directory in which to find log segment files\n" ! printf(_(" or a directory with a ./pg_wal that contains such files\n" ! " (default: current directory, ./pg_wal, PGDATA/pg_wal)\n")); printf(_(" -r, --rmgr=RMGR only show records generated by resource manager RMGR\n" " use --rmgr=list to list valid resource manager names\n")); printf(_(" -s, --start=RECPTR start reading at log position RECPTR\n"));
-- Sent via pgsql-docs mailing list (pgsql-docs@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-docs