diff options
| author | Robert Haas | 2016-10-20 15:24:37 +0000 |
|---|---|---|
| committer | Robert Haas | 2016-10-20 15:32:18 +0000 |
| commit | f82ec32ac30ae7e3ec7c84067192535b2ff8ec0e (patch) | |
| tree | 929d4709a42149a4bbde12edad16183a96bcef6a /src/include | |
| parent | ec7db2b483e0ff247ed41612cdb5716022401fe6 (diff) | |
Rename "pg_xlog" directory to "pg_wal".
"xlog" is not a particularly clear abbreviation for "write-ahead log",
and it sometimes confuses users into believe that the contents of the
"pg_xlog" directory are not critical data, leading to unpleasant
consequences. So, rename the directory to "pg_wal".
This patch modifies pg_upgrade and pg_basebackup to understand both
the old and new directory layouts; the former is necessary given the
purpose of the tool, while the latter merely avoids an unnecessary
backward-compatibility break.
We may wish to consider renaming other programs, switches, and
functions which still use the old "xlog" naming to also refer to
"wal". However, that's still under discussion, so let's do just this
much for now.
Discussion: CAB7nPqTeC-8+zux8_-4ZD46V7YPwooeFxgndfsq5Rg8ibLVm1A@mail.gmail.com
Michael Paquier
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/xlog_internal.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/common/file_utils.h | 3 | ||||
| -rw-r--r-- | src/include/postmaster/pgarch.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 0a595ccc481..ceb0462098a 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -128,7 +128,7 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader; /* * The XLog directory and control file (relative to $PGDATA) */ -#define XLOGDIR "pg_xlog" +#define XLOGDIR "pg_wal" #define XLOG_CONTROL_FILE "global/pg_control" /* diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index bfa6b870a10..cd3048db868 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201610121 +#define CATALOG_VERSION_NO 201610201 #endif diff --git a/src/include/common/file_utils.h b/src/include/common/file_utils.h index 1cb263d9e20..b83c398235c 100644 --- a/src/include/common/file_utils.h +++ b/src/include/common/file_utils.h @@ -17,7 +17,8 @@ extern int fsync_fname(const char *fname, bool isdir, const char *progname); -extern void fsync_pgdata(const char *pg_data, const char *progname); +extern void fsync_pgdata(const char *pg_data, const char *progname, + int serverVersion); extern int durable_rename(const char *oldfile, const char *newfile, const char *progname); extern int fsync_parent_path(const char *fname, const char *progname); diff --git a/src/include/postmaster/pgarch.h b/src/include/postmaster/pgarch.h index f2cbfb3952a..6df73c946df 100644 --- a/src/include/postmaster/pgarch.h +++ b/src/include/postmaster/pgarch.h @@ -16,7 +16,7 @@ /* ---------- * Archiver control info. * - * We expect that archivable files within pg_xlog will have names between + * We expect that archivable files within pg_wal will have names between * MIN_XFN_CHARS and MAX_XFN_CHARS in length, consisting only of characters * appearing in VALID_XFN_CHARS. The status files in archive_status have * corresponding names with ".ready" or ".done" appended. |