database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-09 06:21:09 +03:00
Code Activity

Replace "transaction log" with "write-ahead log"

Browse Source 
This makes documentation and error messages match the renaming of "xlog"
to "wal" in APIs and file naming.
This commit is contained in:
Peter Eisentraut
2017-05-12 11:49:56 -04:00
parent 56b6ef893f
commit c1a7f64b4a
34 changed files with 157 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,19 +174,19 @@ cleanup_directories_atexit(void)
if (made_new_xlogdir)
{
fprintf(stderr, _("%s: removing transaction log directory \"%s\"\n"),
fprintf(stderr, _("%s: removing WAL directory \"%s\"\n"),
progname, xlog_dir);
if (!rmtree(xlog_dir, true))
fprintf(stderr, _("%s: failed to remove transaction log directory\n"),
fprintf(stderr, _("%s: failed to remove WAL directory\n"),
progname);
}
else if (found_existing_xlogdir)
{
fprintf(stderr,
_("%s: removing contents of transaction log directory \"%s\"\n"),
_("%s: removing contents of WAL directory \"%s\"\n"),
progname, xlog_dir);
if (!rmtree(xlog_dir, false))
fprintf(stderr, _("%s: failed to remove contents of transaction log directory\n"),
fprintf(stderr, _("%s: failed to remove contents of WAL directory\n"),
progname);
}
}
@@ -199,7 +199,7 @@ cleanup_directories_atexit(void)
if (made_new_xlogdir || found_existing_xlogdir)
fprintf(stderr,
_("%s: transaction log directory \"%s\" not removed at user's request\n"),
_("%s: WAL directory \"%s\" not removed at user's request\n"),
progname, xlog_dir);
}
@@ -341,7 +341,7 @@ usage(void)
" relocate tablespace in OLDDIR to NEWDIR\n"));
printf(_(" -X, --wal-method=none|fetch|stream\n"
" include required WAL files with specified method\n"));
printf(_(" --waldir=WALDIR location for the transaction log directory\n"));
printf(_(" --waldir=WALDIR location for the write-ahead log directory\n"));
printf(_(" -z, --gzip compress tar output\n"));
printf(_(" -Z, --compress=0-9 compress tar output with given compression level\n"));
printf(_("\nGeneral options:\n"));
@@ -414,7 +414,7 @@ reached_end_position(XLogRecPtr segendpos, uint32 timeline,
if (sscanf(xlogend, "%X/%X", &hi, &lo) != 2)
{
fprintf(stderr,
_("%s: could not parse transaction log location \"%s\"\n"),
_("%s: could not parse write-ahead log location \"%s\"\n"),
progname, xlogend);
exit(1);
}
@@ -549,7 +549,7 @@ StartLogStreamer(char *startpos, uint32 timeline, char *sysidentifier)
if (sscanf(startpos, "%X/%X", &hi, &lo) != 2)
{
fprintf(stderr,
_("%s: could not parse transaction log location \"%s\"\n"),
_("%s: could not parse write-ahead log location \"%s\"\n"),
progname, startpos);
disconnect_and_exit(1);
}
@@ -1404,7 +1404,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
/*
* When streaming WAL, pg_wal (or pg_xlog for pre-9.6
* clusters) will have been created by the wal receiver
* process. Also, when transaction log directory location
* process. Also, when the WAL directory location
* was specified, pg_wal (or pg_xlog) has already been
* created as a symbolic link before starting the actual
* backup. So just ignore creation failures on related
@@ -1817,7 +1817,7 @@ BaseBackup(void)
MemSet(xlogend, 0, sizeof(xlogend));
if (verbose && includewal != NO_WAL)
fprintf(stderr, _("%s: transaction log start point: %s on timeline %u\n"),
fprintf(stderr, _("%s: write-ahead log start point: %s on timeline %u\n"),
progname, xlogstart, starttli);
/*
@@ -1907,20 +1907,20 @@ BaseBackup(void)
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
fprintf(stderr,
_("%s: could not get transaction log end position from server: %s"),
_("%s: could not get write-ahead log end position from server: %s"),
progname, PQerrorMessage(conn));
disconnect_and_exit(1);
}
if (PQntuples(res) != 1)
{
fprintf(stderr,
_("%s: no transaction log end position returned from server\n"),
_("%s: no write-ahead log end position returned from server\n"),
progname);
disconnect_and_exit(1);
}
strlcpy(xlogend, PQgetvalue(res, 0, 0), sizeof(xlogend));
if (verbose && includewal != NO_WAL)
fprintf(stderr, _("%s: transaction log end point: %s\n"), progname, xlogend);
fprintf(stderr, _("%s: write-ahead log end point: %s\n"), progname, xlogend);
PQclear(res);
res = PQgetResult(conn);
@@ -1998,7 +1998,7 @@ BaseBackup(void)
if (sscanf(xlogend, "%X/%X", &hi, &lo) != 2)
{
fprintf(stderr,
_("%s: could not parse transaction log location \"%s\"\n"),
_("%s: could not parse write-ahead log location \"%s\"\n"),
progname, xlogend);
disconnect_and_exit(1);
}
@@ -2312,7 +2312,7 @@ main(int argc, char **argv)
if (format == 't' && includewal == STREAM_WAL && strcmp(basedir, "-") == 0)
{
fprintf(stderr,
_("%s: cannot stream transaction logs in tar mode to stdout\n"),
_("%s: cannot stream write-ahead logs in tar mode to stdout\n"),
progname);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
@@ -2348,7 +2348,7 @@ main(int argc, char **argv)
if (format != 'p')
{
fprintf(stderr,
_("%s: transaction log directory location can only be specified in plain mode\n"),
_("%s: WAL directory location can only be specified in plain mode\n"),
progname);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
@@ -2359,7 +2359,7 @@ main(int argc, char **argv)
canonicalize_path(xlog_dir);
if (!is_absolute_path(xlog_dir))
{
fprintf(stderr, _("%s: transaction log directory location must be "
fprintf(stderr, _("%s: WAL directory location must be "
"an absolute path\n"), progname);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
@@ -2393,7 +2393,7 @@ main(int argc, char **argv)
exit(1);
}
/* Create transaction log symlink, if required */
/* Create pg_wal symlink, if required */
if (strcmp(xlog_dir, "") != 0)
{
char *linkloc;