rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pg_upgrade: Add NLS 

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
Peter Eisentraut 2016-10-14 12:00:00 -04:00
parent 48dbcbf22c
commit 77517ba59f
8 changed files with 75 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_upgrade/function.c
View File

@ -252,7 +252,7 @@ check_loadable_libraries(void)
if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL) if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
pg_fatal("could not open file \"%s\": %s\n", pg_fatal("could not open file \"%s\": %s\n",
output_path, strerror(errno)); output_path, strerror(errno));
fprintf(script, "could not load library \"%s\":\n%s\n", fprintf(script, _("could not load library \"%s\":\n%s\n"),
lib, lib,
PQerrorMessage(conn)); PQerrorMessage(conn));
} }

8
src/bin/pg_upgrade/info.c
View File

@ -238,7 +238,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
{ {
snprintf(reldesc + strlen(reldesc), snprintf(reldesc + strlen(reldesc),
sizeof(reldesc) - strlen(reldesc), sizeof(reldesc) - strlen(reldesc),
" which is an index on \"%s.%s\"", _(" which is an index on \"%s.%s\""),
hrel->nspname, hrel->relname); hrel->nspname, hrel->relname);
/* Shift attention to index's table for toast check */ /* Shift attention to index's table for toast check */
rel = hrel; rel = hrel;
@ -248,7 +248,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
if (i >= db->rel_arr.nrels) if (i >= db->rel_arr.nrels)
snprintf(reldesc + strlen(reldesc), snprintf(reldesc + strlen(reldesc),
sizeof(reldesc) - strlen(reldesc), sizeof(reldesc) - strlen(reldesc),
" which is an index on OID %u", rel->indtable); _(" which is an index on OID %u"), rel->indtable);
} }
if (rel->toastheap) if (rel->toastheap)
{ {
@ -260,7 +260,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
{ {
snprintf(reldesc + strlen(reldesc), snprintf(reldesc + strlen(reldesc),
sizeof(reldesc) - strlen(reldesc), sizeof(reldesc) - strlen(reldesc),
" which is the TOAST table for \"%s.%s\"", _(" which is the TOAST table for \"%s.%s\""),
brel->nspname, brel->relname); brel->nspname, brel->relname);
break; break;
} }
@ -268,7 +268,7 @@ report_unmatched_relation(const RelInfo *rel, const DbInfo *db, bool is_new_db)
if (i >= db->rel_arr.nrels) if (i >= db->rel_arr.nrels)
snprintf(reldesc + strlen(reldesc), snprintf(reldesc + strlen(reldesc),
sizeof(reldesc) - strlen(reldesc), sizeof(reldesc) - strlen(reldesc),
" which is the TOAST table for OID %u", rel->toastheap); _(" which is the TOAST table for OID %u"), rel->toastheap);
} }
if (is_new_db) if (is_new_db)

12
src/bin/pg_upgrade/nls.mk Normal file
View File

@ -0,0 +1,12 @@
# src/bin/pg_upgrade/nls.mk
CATALOG_NAME = pg_upgrade
AVAIL_LANGUAGES =
GETTEXT_FILES = check.c controldata.c dump.c exec.c file.c function.c \
info.c option.c parallel.c pg_upgrade.c relfilenode.c \
server.c tablespace.c util.c version.c
GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status report_status:2
GETTEXT_FLAGS = \
pg_fatal:1:c-format \
pg_log:2:c-format \
prep_status:1:c-format \
report_status:2:c-format

101
src/bin/pg_upgrade/option.c
View File

@ -240,13 +240,13 @@ parseCommandLine(int argc, char *argv[])
/* Get values from env if not already set */ /* Get values from env if not already set */
check_required_directory(&old_cluster.bindir, NULL, "PGBINOLD", "-b", check_required_directory(&old_cluster.bindir, NULL, "PGBINOLD", "-b",
"old cluster binaries reside"); _("old cluster binaries reside"));
check_required_directory(&new_cluster.bindir, NULL, "PGBINNEW", "-B", check_required_directory(&new_cluster.bindir, NULL, "PGBINNEW", "-B",
"new cluster binaries reside"); _("new cluster binaries reside"));
check_required_directory(&old_cluster.pgdata, &old_cluster.pgconfig, check_required_directory(&old_cluster.pgdata, &old_cluster.pgconfig,
"PGDATAOLD", "-d", "old cluster data resides"); "PGDATAOLD", "-d", _("old cluster data resides"));
check_required_directory(&new_cluster.pgdata, &new_cluster.pgconfig, check_required_directory(&new_cluster.pgdata, &new_cluster.pgconfig,
"PGDATANEW", "-D", "new cluster data resides"); "PGDATANEW", "-D", _("new cluster data resides"));
#ifdef WIN32 #ifdef WIN32
@ -275,56 +275,53 @@ parseCommandLine(int argc, char *argv[])
static void static void
usage(void) usage(void)
{ {
printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\ printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\n"));
\nUsage:\n\ printf(_("Usage:\n"));
pg_upgrade [OPTION]...\n\ printf(_(" pg_upgrade [OPTION]...\n\n"));
\n\ printf(_("Options:\n"));
Options:\n\ printf(_(" -b, --old-bindir=BINDIR old cluster executable directory\n"));
-b, --old-bindir=BINDIR old cluster executable directory\n\ printf(_(" -B, --new-bindir=BINDIR new cluster executable directory\n"));
-B, --new-bindir=BINDIR new cluster executable directory\n\ printf(_(" -c, --check check clusters only, don't change any data\n"));
-c, --check check clusters only, don't change any data\n\ printf(_(" -d, --old-datadir=DATADIR old cluster data directory\n"));
-d, --old-datadir=DATADIR old cluster data directory\n\ printf(_(" -D, --new-datadir=DATADIR new cluster data directory\n"));
-D, --new-datadir=DATADIR new cluster data directory\n\ printf(_(" -j, --jobs number of simultaneous processes or threads to use\n"));
-j, --jobs number of simultaneous processes or threads to use\n\ printf(_(" -k, --link link instead of copying files to new cluster\n"));
-k, --link link instead of copying files to new cluster\n\ printf(_(" -o, --old-options=OPTIONS old cluster options to pass to the server\n"));
-o, --old-options=OPTIONS old cluster options to pass to the server\n\ printf(_(" -O, --new-options=OPTIONS new cluster options to pass to the server\n"));
-O, --new-options=OPTIONS new cluster options to pass to the server\n\ printf(_(" -p, --old-port=PORT old cluster port number (default %d)\n"), old_cluster.port);
-p, --old-port=PORT old cluster port number (default %d)\n\ printf(_(" -P, --new-port=PORT new cluster port number (default %d)\n"), new_cluster.port);
-P, --new-port=PORT new cluster port number (default %d)\n\ printf(_(" -r, --retain retain SQL and log files after success\n"));
-r, --retain retain SQL and log files after success\n\ printf(_(" -U, --username=NAME cluster superuser (default \"%s\")\n"), os_info.user);
-U, --username=NAME cluster superuser (default \"%s\")\n\ printf(_(" -v, --verbose enable verbose internal logging\n"));
-v, --verbose enable verbose internal logging\n\ printf(_(" -V, --version display version information, then exit\n"));
-V, --version display version information, then exit\n\ printf(_(" -?, --help show this help, then exit\n"));
-?, --help show this help, then exit\n\ printf(_("\n"
\n\ "Before running pg_upgrade you must:\n"
Before running pg_upgrade you must:\n\ " create a new database cluster (using the new version of initdb)\n"
create a new database cluster (using the new version of initdb)\n\ " shutdown the postmaster servicing the old cluster\n"
shutdown the postmaster servicing the old cluster\n\ " shutdown the postmaster servicing the new cluster\n"));
shutdown the postmaster servicing the new cluster\n\ printf(_("\n"
\n\ "When you run pg_upgrade, you must provide the following information:\n"
When you run pg_upgrade, you must provide the following information:\n\ " the data directory for the old cluster (-d DATADIR)\n"
the data directory for the old cluster (-d DATADIR)\n\ " the data directory for the new cluster (-D DATADIR)\n"
the data directory for the new cluster (-D DATADIR)\n\ " the \"bin\" directory for the old version (-b BINDIR)\n"
the \"bin\" directory for the old version (-b BINDIR)\n\ " the \"bin\" directory for the new version (-B BINDIR)\n"));
the \"bin\" directory for the new version (-B BINDIR)\n\ printf(_("\n"
\n\ "For example:\n"
For example:\n\ " pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n"
pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n\ "or\n"));
or\n"), old_cluster.port, new_cluster.port, os_info.user);
#ifndef WIN32 #ifndef WIN32
printf(_("\ printf(_(" $ export PGDATAOLD=oldCluster/data\n"
$ export PGDATAOLD=oldCluster/data\n\ " $ export PGDATANEW=newCluster/data\n"
$ export PGDATANEW=newCluster/data\n\ " $ export PGBINOLD=oldCluster/bin\n"
$ export PGBINOLD=oldCluster/bin\n\ " $ export PGBINNEW=newCluster/bin\n"
$ export PGBINNEW=newCluster/bin\n\ " $ pg_upgrade\n"));
$ pg_upgrade\n"));
#else #else
printf(_("\ printf(_(" C:\\> set PGDATAOLD=oldCluster/data\n"
C:\\> set PGDATAOLD=oldCluster/data\n\ " C:\\> set PGDATANEW=newCluster/data\n"
C:\\> set PGDATANEW=newCluster/data\n\ " C:\\> set PGBINOLD=oldCluster/bin\n"
C:\\> set PGBINOLD=oldCluster/bin\n\ " C:\\> set PGBINNEW=newCluster/bin\n"
C:\\> set PGBINNEW=newCluster/bin\n\ " C:\\> pg_upgrade\n"));
C:\\> pg_upgrade\n"));
#endif #endif
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n")); printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));
} }

1
src/bin/pg_upgrade/pg_upgrade.c
View File

@ -75,6 +75,7 @@ main(int argc, char **argv)
char *deletion_script_file_name = NULL; char *deletion_script_file_name = NULL;
bool live_check = false; bool live_check = false;
set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_upgrade"));
parseCommandLine(argc, argv); parseCommandLine(argc, argv);
get_restricted_token(os_info.progname); get_restricted_token(os_info.progname);

6
src/bin/pg_upgrade/relfilenode.c
View File

@ -30,8 +30,10 @@ void
transfer_all_new_tablespaces(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr, transfer_all_new_tablespaces(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
char *old_pgdata, char *new_pgdata) char *old_pgdata, char *new_pgdata)
{ {
pg_log(PG_REPORT, "%s user relation files\n", if (user_opts.transfer_mode == TRANSFER_MODE_LINK)
user_opts.transfer_mode == TRANSFER_MODE_LINK ? "Linking" : "Copying"); pg_log(PG_REPORT, "Linking user relation files\n");
else
pg_log(PG_REPORT, "Copying user relation files\n");
/* /*
* Transferring files by tablespace is tricky because a single database * Transferring files by tablespace is tricky because a single database

4
src/bin/pg_upgrade/server.c
View File

@ -36,7 +36,7 @@ connectToServer(ClusterInfo *cluster, const char *db_name)
if (conn) if (conn)
PQfinish(conn); PQfinish(conn);
printf("Failure, exiting\n"); printf(_("Failure, exiting\n"));
exit(1); exit(1);
} }
@ -136,7 +136,7 @@ executeQueryOrDie(PGconn *conn, const char *fmt,...)
PQerrorMessage(conn)); PQerrorMessage(conn));
PQclear(result); PQclear(result);
PQfinish(conn); PQfinish(conn);
printf("Failure, exiting\n"); printf(_("Failure, exiting\n"));
exit(1); exit(1);
} }
else else

4
src/bin/pg_upgrade/util.c
View File

@ -133,7 +133,7 @@ pg_log_v(eLogType type, const char *fmt, va_list ap)
case PG_FATAL: case PG_FATAL:
printf("\n%s", message); printf("\n%s", message);
printf("Failure, exiting\n"); printf(_("Failure, exiting\n"));
exit(1); exit(1);
break; break;
@ -163,7 +163,7 @@ pg_fatal(const char *fmt,...)
va_start(args, fmt); va_start(args, fmt);
pg_log_v(PG_FATAL, fmt, args); pg_log_v(PG_FATAL, fmt, args);
va_end(args); va_end(args);
printf("Failure, exiting\n"); printf(_("Failure, exiting\n"));
exit(1); exit(1);
} }