database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-07 11:02:12 +03:00
Code

pg_amcheck: Message style and formatting improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2021-05-13 08:09:53 +02:00
parent fc69509131
commit 5a73a9e3b5
1 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,7 @@ main(int argc, char *argv[])
opts.skip = "all frozen"; opts.skip = "all frozen";
else else
{ {
pg_log_error("invalid skip option"); pg_log_error("invalid argument for option %s", "--skip");
exit(1); exit(1);
} }
break; break;
@ -1114,7 +1114,7 @@ verify_btree_slot_handler(PGresult *res, PGconn *conn, void *context)
rel->datinfo->datname, rel->nspname, rel->relname, ntups); rel->datinfo->datname, rel->nspname, rel->relname, ntups);
if (opts.verbose) if (opts.verbose)
pg_log_info("query was: %s", rel->sql); pg_log_info("query was: %s", rel->sql);
pg_log_warning("are %s's and amcheck's versions compatible?", pg_log_warning("Are %s's and amcheck's versions compatible?",
progname); progname);
progress_since_last_stderr = false; progress_since_last_stderr = false;
} }
@ -1148,10 +1148,10 @@ verify_btree_slot_handler(PGresult *res, PGconn *conn, void *context)
static void static void
help(const char *progname) help(const char *progname)
{ {
printf(_("%s uses amcheck module to check objects in a PostgreSQL database for corruption.\n\n"), progname); printf(_("%s checks objects in a PostgreSQL database for corruption.\n\n"), progname);
printf(_("Usage:\n")); printf(_("Usage:\n"));
printf(_(" %s [OPTION]... [DBNAME]\n"), progname); printf(_(" %s [OPTION]... [DBNAME]\n"), progname);
printf(_("\nTarget Options:\n")); printf(_("\nTarget options:\n"));
printf(_(" -a, --all check all databases\n")); printf(_(" -a, --all check all databases\n"));
printf(_(" -d, --database=PATTERN check matching database(s)\n")); printf(_(" -d, --database=PATTERN check matching database(s)\n"));
printf(_(" -D, --exclude-database=PATTERN do NOT check matching database(s)\n")); printf(_(" -D, --exclude-database=PATTERN do NOT check matching database(s)\n"));
@ -1164,15 +1164,15 @@ help(const char *progname)
printf(_(" -t, --table=PATTERN check matching table(s)\n")); printf(_(" -t, --table=PATTERN check matching table(s)\n"));
printf(_(" -T, --exclude-table=PATTERN do NOT check matching table(s)\n")); printf(_(" -T, --exclude-table=PATTERN do NOT check matching table(s)\n"));
printf(_(" --no-dependent-indexes do NOT expand list of relations to include indexes\n")); printf(_(" --no-dependent-indexes do NOT expand list of relations to include indexes\n"));
printf(_(" --no-dependent-toast do NOT expand list of relations to include toast\n")); printf(_(" --no-dependent-toast do NOT expand list of relations to include TOAST tables\n"));
printf(_(" --no-strict-names do NOT require patterns to match objects\n")); printf(_(" --no-strict-names do NOT require patterns to match objects\n"));
printf(_("\nTable Checking Options:\n")); printf(_("\nTable checking options:\n"));
printf(_(" --exclude-toast-pointers do NOT follow relation toast pointers\n")); printf(_(" --exclude-toast-pointers do NOT follow relation TOAST pointers\n"));
printf(_(" --on-error-stop stop checking at end of first corrupt page\n")); printf(_(" --on-error-stop stop checking at end of first corrupt page\n"));
printf(_(" --skip=OPTION do NOT check \"all-frozen\" or \"all-visible\" blocks\n")); printf(_(" --skip=OPTION do NOT check \"all-frozen\" or \"all-visible\" blocks\n"));
printf(_(" --startblock=BLOCK begin checking table(s) at the given block number\n")); printf(_(" --startblock=BLOCK begin checking table(s) at the given block number\n"));
printf(_(" --endblock=BLOCK check table(s) only up to the given block number\n")); printf(_(" --endblock=BLOCK check table(s) only up to the given block number\n"));
printf(_("\nBtree Index Checking Options:\n")); printf(_("\nB-tree index checking options:\n"));
printf(_(" --heapallindexed check all heap tuples are found within indexes\n")); printf(_(" --heapallindexed check all heap tuples are found within indexes\n"));
printf(_(" --parent-check check index parent/child relationships\n")); printf(_(" --parent-check check index parent/child relationships\n"));
printf(_(" --rootdescend search from root page to refind tuples\n")); printf(_(" --rootdescend search from root page to refind tuples\n"));
@ -1183,7 +1183,7 @@ help(const char *progname)
printf(_(" -w, --no-password never prompt for password\n")); printf(_(" -w, --no-password never prompt for password\n"));
printf(_(" -W, --password force password prompt\n")); printf(_(" -W, --password force password prompt\n"));
printf(_(" --maintenance-db=DBNAME alternate maintenance database\n")); printf(_(" --maintenance-db=DBNAME alternate maintenance database\n"));
printf(_("\nOther Options:\n")); printf(_("\nOther options:\n"));
printf(_(" -e, --echo show the commands being sent to the server\n")); printf(_(" -e, --echo show the commands being sent to the server\n"));
printf(_(" -j, --jobs=NUM use this many concurrent connections to the server\n")); printf(_(" -j, --jobs=NUM use this many concurrent connections to the server\n"));
printf(_(" -q, --quiet don't write any messages\n")); printf(_(" -q, --quiet don't write any messages\n"));
@ -1547,7 +1547,7 @@ compile_database_list(PGconn *conn, SimplePtrList *databases,
/* This database is included. Add to list */ /* This database is included. Add to list */
if (opts.verbose) if (opts.verbose)
pg_log_info("including database: \"%s\"", initial_dbname); pg_log_info("including database \"%s\"", initial_dbname);
dat->datname = pstrdup(initial_dbname); dat->datname = pstrdup(initial_dbname);
simple_ptr_list_append(databases, dat); simple_ptr_list_append(databases, dat);
@ -1689,7 +1689,7 @@ compile_database_list(PGconn *conn, SimplePtrList *databases,
/* This database is included. Add to list */ /* This database is included. Add to list */
if (opts.verbose) if (opts.verbose)
pg_log_info("including database: \"%s\"", datname); pg_log_info("including database \"%s\"", datname);
dat = (DatabaseInfo *) pg_malloc0(sizeof(DatabaseInfo)); dat = (DatabaseInfo *) pg_malloc0(sizeof(DatabaseInfo));
dat->datname = pstrdup(datname); dat->datname = pstrdup(datname);