mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce long options in pg_archivecleanup

Browse Source 
This patch is a preliminary refactoring for an upcoming patch aimed at
adding new options to this tool, and using long options for these is
more user-friendly.  The existing short options gain long flavors, as
of:
* -d/--debug
* -n/--dry-run
* -x/--strip-extension

Author: Atsushi Torikoshi
Reviewed-by: Fujii Masao, Kyotaro Horiguchi, Michael Paquier
Discussion: https://postgr.es/m/d660ef741ce3d82f3b4283f1cafd576c@oss.nttdata.com
This commit is contained in:
Michael Paquier 2023-06-30 15:47:11 +09:00
parent cfc43aeb38
commit dd7c60f193
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/src/sgml/ref/pgarchivecleanup.sgml
View File

@ -95,6 +95,7 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"
<varlistentry> <varlistentry>
<term><option>-d</option></term> <term><option>-d</option></term>
<term><option>--debug</option></term>
<listitem> <listitem>
<para> <para>
Print lots of debug logging output on <filename>stderr</filename>. Print lots of debug logging output on <filename>stderr</filename>.
@ -104,6 +105,7 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"
<varlistentry> <varlistentry>
<term><option>-n</option></term> <term><option>-n</option></term>
<term><option>--dry-run</option></term>
<listitem> <listitem>
<para> <para>
Print the names of the files that would have been removed on <filename>stdout</filename> (performs a dry run). Print the names of the files that would have been removed on <filename>stdout</filename> (performs a dry run).
@ -122,7 +124,8 @@ pg_archivecleanup: removing file "archive/00000001000000370000000E"
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>-x</option> <replaceable>extension</replaceable></term> <term><option>-x <replaceable class="parameter">extension</replaceable></option></term>
<term><option>--strip-extension=<replaceable class="parameter">extension</replaceable></option></term>
<listitem> <listitem>
<para> <para>
Provide an extension Provide an extension

22
src/bin/pg_archivecleanup/pg_archivecleanup.c
View File

@ -17,7 +17,7 @@
#include "access/xlog_internal.h" #include "access/xlog_internal.h"
#include "common/logging.h" #include "common/logging.h"
#include "pg_getopt.h" #include "getopt_long.h"
const char *progname; const char *progname;
@ -252,11 +252,13 @@ usage(void)
printf(_("Usage:\n")); printf(_("Usage:\n"));
printf(_(" %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"), progname); printf(_(" %s [OPTION]... ARCHIVELOCATION OLDESTKEPTWALFILE\n"), progname);
printf(_("\nOptions:\n")); printf(_("\nOptions:\n"));
printf(_(" -d generate debug output (verbose mode)\n")); printf(_(" -d, --debug generate debug output (verbose mode)\n"));
printf(_(" -n dry run, show the names of the files that would be removed\n")); printf(_(" -n, --dry-run dry run, show the names of the files that would be\n"
printf(_(" -V, --version output version information, then exit\n")); " removed\n"));
printf(_(" -x EXT clean up files if they have this extension\n")); printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -?, --help show this help, then exit\n")); printf(_(" -x, --strip-extension=EXT strip this extention before identifying files for\n"
" clean up\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\n" printf(_("\n"
"For use as archive_cleanup_command in postgresql.conf:\n" "For use as archive_cleanup_command in postgresql.conf:\n"
" archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n" " archive_cleanup_command = 'pg_archivecleanup [OPTION]... ARCHIVELOCATION %%r'\n"
@ -274,6 +276,12 @@ usage(void)
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
static struct option long_options[] = {
{"debug", no_argument, NULL, 'd'},
{"dry-run", no_argument, NULL, 'n'},
{"strip-extension", required_argument, NULL, 'x'},
{NULL, 0, NULL, 0}
};
int c; int c;
pg_logging_init(argv[0]); pg_logging_init(argv[0]);
@ -294,7 +302,7 @@ main(int argc, char **argv)
} }
} }
while ((c = getopt(argc, argv, "dnx:")) != -1) while ((c = getopt_long(argc, argv, "dnx:", long_options, NULL)) != -1)
{ {
switch (c) switch (c)
{ {