From 85c11324cabaddcfaf3347df78555b30d27c5b5a Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 9 Feb 2017 16:23:46 -0500 Subject: [PATCH] Rename user-facing tools with "xlog" in the name to say "wal". This means pg_receivexlog because pg_receivewal, pg_resetxlog becomes pg_resetwal, and pg_xlogdump becomes pg_waldump. --- doc/src/sgml/protocol.sgml | 2 +- doc/src/sgml/ref/allfiles.sgml | 6 +-- ...pg_receivexlog.sgml => pg_receivewal.sgml} | 50 +++++++++---------- doc/src/sgml/ref/pg_recvlogical.sgml | 6 +-- .../{pg_resetxlog.sgml => pg_resetwal.sgml} | 40 +++++++-------- .../ref/{pg_xlogdump.sgml => pg_waldump.sgml} | 24 ++++----- doc/src/sgml/reference.sgml | 6 +-- doc/src/sgml/release-9.2.sgml | 4 +- doc/src/sgml/release-9.3.sgml | 8 +-- doc/src/sgml/release-9.4.sgml | 10 ++-- doc/src/sgml/release-9.5.sgml | 8 +-- src/backend/access/rmgrdesc/xactdesc.c | 2 +- src/backend/access/transam/varsup.c | 2 +- src/backend/access/transam/xlogutils.c | 2 +- src/backend/replication/logical/snapbuild.c | 2 +- src/backend/replication/walsender.c | 2 +- src/backend/utils/misc/guc.c | 2 +- src/bin/Makefile | 4 +- src/bin/pg_basebackup/.gitignore | 2 +- src/bin/pg_basebackup/Makefile | 16 +++--- src/bin/pg_basebackup/nls.mk | 2 +- .../{pg_receivexlog.c => pg_receivewal.c} | 6 +-- src/bin/pg_basebackup/t/020_pg_receivewal.pl | 8 +++ src/bin/pg_basebackup/t/020_pg_receivexlog.pl | 8 --- src/bin/pg_basebackup/walmethods.h | 2 +- src/bin/pg_resetwal/.gitignore | 1 + .../{pg_resetxlog => pg_resetwal}/Makefile | 20 ++++---- src/bin/pg_resetwal/nls.mk | 4 ++ .../pg_resetwal.c} | 12 ++--- .../{pg_resetxlog => pg_resetwal}/po/cs.po | 0 .../{pg_resetxlog => pg_resetwal}/po/de.po | 0 .../{pg_resetxlog => pg_resetwal}/po/es.po | 0 .../{pg_resetxlog => pg_resetwal}/po/fr.po | 0 .../{pg_resetxlog => pg_resetwal}/po/it.po | 0 .../{pg_resetxlog => pg_resetwal}/po/ja.po | 0 .../{pg_resetxlog => pg_resetwal}/po/ko.po | 0 .../{pg_resetxlog => pg_resetwal}/po/pl.po | 0 .../{pg_resetxlog => pg_resetwal}/po/pt_BR.po | 0 .../{pg_resetxlog => pg_resetwal}/po/ru.po | 0 .../{pg_resetxlog => pg_resetwal}/po/sv.po | 0 .../{pg_resetxlog => pg_resetwal}/po/zh_CN.po | 0 src/bin/pg_resetxlog/.gitignore | 1 - src/bin/pg_resetxlog/nls.mk | 4 -- src/bin/pg_upgrade/controldata.c | 16 +++--- src/bin/pg_upgrade/exec.c | 2 +- src/bin/pg_upgrade/pg_upgrade.c | 14 +++--- .../{pg_xlogdump => pg_waldump}/.gitignore | 2 +- src/bin/{pg_xlogdump => pg_waldump}/Makefile | 18 +++---- src/bin/{pg_xlogdump => pg_waldump}/compat.c | 2 +- src/bin/pg_waldump/nls.mk | 6 +++ .../pg_xlogdump.c => pg_waldump/pg_waldump.c} | 8 +-- .../{pg_xlogdump => pg_waldump}/rmgrdesc.c | 4 +- .../{pg_xlogdump => pg_waldump}/rmgrdesc.h | 4 +- src/bin/pg_xlogdump/nls.mk | 6 --- src/include/access/xlog_internal.h | 4 +- src/include/storage/bufmgr.h | 2 +- src/tools/msvc/Install.pm | 2 +- src/tools/msvc/Mkvcbuild.pm | 24 ++++----- 58 files changed, 191 insertions(+), 189 deletions(-) rename doc/src/sgml/ref/{pg_receivexlog.sgml => pg_receivewal.sgml} (89%) rename doc/src/sgml/ref/{pg_resetxlog.sgml => pg_resetwal.sgml} (89%) rename doc/src/sgml/ref/{pg_xlogdump.sgml => pg_waldump.sgml} (91%) rename src/bin/pg_basebackup/{pg_receivexlog.c => pg_receivewal.c} (99%) create mode 100644 src/bin/pg_basebackup/t/020_pg_receivewal.pl delete mode 100644 src/bin/pg_basebackup/t/020_pg_receivexlog.pl create mode 100644 src/bin/pg_resetwal/.gitignore rename src/bin/{pg_resetxlog => pg_resetwal}/Makefile (55%) create mode 100644 src/bin/pg_resetwal/nls.mk rename src/bin/{pg_resetxlog/pg_resetxlog.c => pg_resetwal/pg_resetwal.c} (99%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/cs.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/de.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/es.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/fr.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/it.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/ja.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/ko.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/pl.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/pt_BR.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/ru.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/sv.po (100%) rename src/bin/{pg_resetxlog => pg_resetwal}/po/zh_CN.po (100%) delete mode 100644 src/bin/pg_resetxlog/.gitignore delete mode 100644 src/bin/pg_resetxlog/nls.mk rename src/bin/{pg_xlogdump => pg_waldump}/.gitignore (85%) rename src/bin/{pg_xlogdump => pg_waldump}/Makefile (62%) rename src/bin/{pg_xlogdump => pg_waldump}/compat.c (98%) create mode 100644 src/bin/pg_waldump/nls.mk rename src/bin/{pg_xlogdump/pg_xlogdump.c => pg_waldump/pg_waldump.c} (99%) rename src/bin/{pg_xlogdump => pg_waldump}/rmgrdesc.c (92%) rename src/bin/{pg_xlogdump => pg_waldump}/rmgrdesc.h (81%) delete mode 100644 src/bin/pg_xlogdump/nls.mk diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index 2e84a299016..05a0d6e8461 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -1321,7 +1321,7 @@ the connection to be used for logical replication from that database. psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;" However, it is often more useful to use - (for physical replication) or + (for physical replication) or (for logical replication). diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml index 0d09f81ccc7..2bc4d9fd64f 100644 --- a/doc/src/sgml/ref/allfiles.sgml +++ b/doc/src/sgml/ref/allfiles.sgml @@ -198,15 +198,15 @@ Complete list of usable sgml source files in this directory. - + - + - + diff --git a/doc/src/sgml/ref/pg_receivexlog.sgml b/doc/src/sgml/ref/pg_receivewal.sgml similarity index 89% rename from doc/src/sgml/ref/pg_receivexlog.sgml rename to doc/src/sgml/ref/pg_receivewal.sgml index 8c1ea9a2e2e..0e6b636703c 100644 --- a/doc/src/sgml/ref/pg_receivexlog.sgml +++ b/doc/src/sgml/ref/pg_receivewal.sgml @@ -1,27 +1,27 @@ - - - pg_receivexlog + + + pg_receivewal - pg_receivexlog + pg_receivewal 1 Application - pg_receivexlog + pg_receivewal stream transaction logs from a PostgreSQL server - pg_receivexlog + pg_receivewal option @@ -31,7 +31,7 @@ PostgreSQL documentation Description - pg_receivexlog is used to stream the transaction log + pg_receivewal is used to stream the transaction log from a running PostgreSQL cluster. The transaction log is streamed using the streaming replication protocol, and is written to a local directory of files. This directory can be used as the archive @@ -40,16 +40,16 @@ PostgreSQL documentation - pg_receivexlog streams the transaction + pg_receivewal streams the transaction log in real time as it's being generated on the server, and does not wait for segments to complete like does. For this reason, it is not necessary to set when using - pg_receivexlog. + pg_receivewal. - Unlike the WAL receiver of a PostgreSQL standby server, pg_receivexlog + Unlike the WAL receiver of a PostgreSQL standby server, pg_receivewal by default flushes WAL data only when a WAL file is closed. The option diff --git a/doc/src/sgml/ref/pg_resetxlog.sgml b/doc/src/sgml/ref/pg_resetwal.sgml similarity index 89% rename from doc/src/sgml/ref/pg_resetxlog.sgml rename to doc/src/sgml/ref/pg_resetwal.sgml index c949c5e8497..0cc6fb4c4db 100644 --- a/doc/src/sgml/ref/pg_resetxlog.sgml +++ b/doc/src/sgml/ref/pg_resetwal.sgml @@ -1,27 +1,27 @@ - - - pg_resetxlog + + + pg_resetwal - pg_resetxlog + pg_resetwal 1 Application - pg_resetxlog + pg_resetwal reset the write-ahead log and other control information of a PostgreSQL database cluster - pg_resetxlog + pg_resetwal option @@ -29,10 +29,10 @@ PostgreSQL documentation - + Description - pg_resetxlog clears the write-ahead log (WAL) and + pg_resetwal clears the write-ahead log (WAL) and optionally resets some other control information stored in the pg_control file. This function is sometimes needed if these files have become corrupted. It should be used only as a @@ -51,12 +51,12 @@ PostgreSQL documentation This utility can only be run by the user who installed the server, because it requires read/write access to the data directory. For safety reasons, you must specify the data directory on the command line. - pg_resetxlog does not use the environment variable + pg_resetwal does not use the environment variable PGDATA. - If pg_resetxlog complains that it cannot determine + If pg_resetwal complains that it cannot determine valid data for pg_control, you can force it to proceed anyway by specifying the diff --git a/doc/src/sgml/ref/pg_xlogdump.sgml b/doc/src/sgml/ref/pg_waldump.sgml similarity index 91% rename from doc/src/sgml/ref/pg_xlogdump.sgml rename to doc/src/sgml/ref/pg_waldump.sgml index 078b08e2e6b..4c92eeed680 100644 --- a/doc/src/sgml/ref/pg_xlogdump.sgml +++ b/doc/src/sgml/ref/pg_waldump.sgml @@ -1,27 +1,27 @@ - - - pg_xlogdump + + + pg_waldump - pg_xlogdump + pg_waldump 1 Application - pg_xlogdump + pg_waldump display a human-readable rendering of the write-ahead log of a PostgreSQL database cluster - pg_xlogdump + pg_waldump @@ -29,10 +29,10 @@ PostgreSQL documentation - + Description - pg_xlogdump displays the write-ahead log (WAL) and is mainly + pg_waldump displays the write-ahead log (WAL) and is mainly useful for debugging or educational purposes. @@ -167,7 +167,7 @@ PostgreSQL documentation - Print the pg_xlogdump version and exit. + Print the pg_waldump version and exit. @@ -199,7 +199,7 @@ PostgreSQL documentation - Show help about pg_xlogdump command line + Show help about pg_waldump command line arguments, and exit. @@ -220,7 +220,7 @@ PostgreSQL documentation - pg_xlogdump cannot read WAL files with suffix + pg_waldump cannot read WAL files with suffix .partial. If those files need to be read, .partial suffix needs to be removed from the file name. diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml index 34007d3508d..c8191de9fe3 100644 --- a/doc/src/sgml/reference.sgml +++ b/doc/src/sgml/reference.sgml @@ -245,7 +245,7 @@ &pgDump; &pgDumpall; &pgIsready; - &pgReceivexlog; + &pgReceivewal; &pgRecvlogical; &pgRestore; &psqlRef; @@ -271,12 +271,12 @@ &pgarchivecleanup; &pgControldata; &pgCtl; - &pgResetxlog; + &pgResetwal; &pgRewind; &pgtestfsync; &pgtesttiming; &pgupgrade; - &pgxlogdump; + &pgwaldump; &postgres; &postmaster; diff --git a/doc/src/sgml/release-9.2.sgml b/doc/src/sgml/release-9.2.sgml index 9e99de882cf..5c80517eafc 100644 --- a/doc/src/sgml/release-9.2.sgml +++ b/doc/src/sgml/release-9.2.sgml @@ -8069,7 +8069,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100 Add a pg_receivexlog + linkend="app-pgreceivewal">pg_receivexlog tool to archive WAL file changes as they are written @@ -9231,7 +9231,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100 Add a pg_receivexlog + linkend="app-pgreceivewal">pg_receivexlog tool to archive WAL file changes as they are written, rather than waiting for completed WAL files (Magnus Hagander) diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml index 19bb305f0e1..7f4adcd8c3a 100644 --- a/doc/src/sgml/release-9.3.sgml +++ b/doc/src/sgml/release-9.3.sgml @@ -10080,7 +10080,7 @@ ALTER EXTENSION hstore UPDATE; Allow tools like pg_receivexlog + linkend="app-pgreceivewal">pg_receivexlog to run on computers with different architectures (Heikki Linnakangas) @@ -10110,7 +10110,7 @@ ALTER EXTENSION hstore UPDATE; Allow pg_receivexlog + linkend="app-pgreceivewal">pg_receivexlog and pg_basebackup @@ -11250,7 +11250,7 @@ ALTER EXTENSION hstore UPDATE; - Add pg_xlogdump + Add pg_xlogdump contrib program (Andres Freund) diff --git a/doc/src/sgml/release-9.4.sgml b/doc/src/sgml/release-9.4.sgml index bbf2429475c..4b7e41b67f6 100644 --- a/doc/src/sgml/release-9.4.sgml +++ b/doc/src/sgml/release-9.4.sgml @@ -8917,8 +8917,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500 - Make with option @@ -9518,8 +9519,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500 - Allow to report a live log stream - with diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml index aab3ddc3c14..c2c653a9b38 100644 --- a/doc/src/sgml/release-9.5.sgml +++ b/doc/src/sgml/release-9.5.sgml @@ -6265,7 +6265,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list. linkend="pgarchivecleanup">pg_archivecleanup, pg_test_fsync, pg_test_timing, - and pg_xlogdump + and pg_xlogdump from contrib to src/bin (Peter Eisentraut) @@ -6292,7 +6292,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list. --> Allow pg_receivexlog + linkend="app-pgreceivewal">pg_receivexlog to manage physical replication slots (Michael Paquier) @@ -6308,7 +6308,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list. --> Allow pg_receivexlog + linkend="app-pgreceivewal">pg_receivexlog to synchronously flush WAL to storage using new @@ -6368,7 +6368,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list. 2014-09-19 [bdd5726] Andres..: Add the capability to display summary statistic.. --> - Add pg_xlogdump option + Add pg_xlogdump option diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c index c91ca03db1a..735f8c598fc 100644 --- a/src/backend/access/rmgrdesc/xactdesc.c +++ b/src/backend/access/rmgrdesc/xactdesc.c @@ -26,7 +26,7 @@ * understand format. * * This routines are in xactdesc.c because they're accessed in backend (when - * replaying WAL) and frontend (pg_xlogdump) code. This file is the only xact + * replaying WAL) and frontend (pg_waldump) code. This file is the only xact * specific one shared between both. They're complicated enough that * duplication would be bothersome. */ diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index fc084c5bdbb..42fc351f7bf 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -399,7 +399,7 @@ SetTransactionIdLimit(TransactionId oldest_datfrozenxid, Oid oldest_datoid) * * We primarily check whether oldestXidDB is valid. The cases we have in * mind are that that database was dropped, or the field was reset to zero - * by pg_resetxlog. In either case we should force recalculation of the + * by pg_resetwal. In either case we should force recalculation of the * wrap limit. Also do it if oldestXid is old enough to be forcing * autovacuums or other actions; this ensures we update our state as soon * as possible once extra overhead is being incurred. diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 6627f5498b9..8b99b782497 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -647,7 +647,7 @@ XLogTruncateRelation(RelFileNode rnode, ForkNumber forkNum, * always be one descriptor left open until the process ends, but never * more than one. * - * XXX This is very similar to pg_xlogdump's XLogDumpXLogRead and to XLogRead + * XXX This is very similar to pg_waldump's XLogDumpXLogRead and to XLogRead * in walsender.c but for small differences (such as lack of elog() in * frontend). Probably these should be merged at some point. */ diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index 62020b6ed03..c0f28ddc090 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -1473,7 +1473,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn) /* * We identify snapshots by the LSN they are valid for. We don't need to * include timelines in the name as each LSN maps to exactly one timeline - * unless the user used pg_resetxlog or similar. If a user did so, there's + * unless the user used pg_resetwal or similar. If a user did so, there's * no hope continuing to decode anyway. */ sprintf(path, "pg_logical/snapshots/%X-%X.snap", diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 76f09fbdbf2..ba506e28bc2 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -2435,7 +2435,7 @@ WalSndDone(WalSndSendDataCallback send_data) /* * To figure out whether all WAL has successfully been replicated, check - * flush location if valid, write otherwise. Tools like pg_receivexlog + * flush location if valid, write otherwise. Tools like pg_receivewal * will usually (unless in synchronous mode) return an invalid flush * location. */ diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index de85eca6a8f..0249721204a 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -2639,7 +2639,7 @@ static struct config_int ConfigureNamesInt[] = NULL }, &autovacuum_freeze_max_age, - /* see pg_resetxlog if you change the upper-limit value */ + /* see pg_resetwal if you change the upper-limit value */ 200000000, 100000, 2000000000, NULL, NULL, NULL }, diff --git a/src/bin/Makefile b/src/bin/Makefile index e0a5d92028f..bc96f37dfc4 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -21,12 +21,12 @@ SUBDIRS = \ pg_controldata \ pg_ctl \ pg_dump \ - pg_resetxlog \ + pg_resetwal \ pg_rewind \ pg_test_fsync \ pg_test_timing \ pg_upgrade \ - pg_xlogdump \ + pg_waldump \ pgbench \ psql \ scripts diff --git a/src/bin/pg_basebackup/.gitignore b/src/bin/pg_basebackup/.gitignore index 36a2f12d615..26048bdbd84 100644 --- a/src/bin/pg_basebackup/.gitignore +++ b/src/bin/pg_basebackup/.gitignore @@ -1,5 +1,5 @@ /pg_basebackup -/pg_receivexlog +/pg_receivewal /pg_recvlogical /tmp_check/ diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile index a6c307492f4..f0c3be83f30 100644 --- a/src/bin/pg_basebackup/Makefile +++ b/src/bin/pg_basebackup/Makefile @@ -9,7 +9,7 @@ # #------------------------------------------------------------------------- -PGFILEDESC = "pg_basebackup/pg_receivexlog/pg_recvlogical - streaming WAL and backup receivers" +PGFILEDESC = "pg_basebackup/pg_receivewal/pg_recvlogical - streaming WAL and backup receivers" PGAPPICON=win32 EXTRA_INSTALL=contrib/test_decoding @@ -23,20 +23,20 @@ LDFLAGS += -L$(top_builddir)/src/fe_utils -lpgfeutils -lpq OBJS=receivelog.o streamutil.o walmethods.o $(WIN32RES) -all: pg_basebackup pg_receivexlog pg_recvlogical +all: pg_basebackup pg_receivewal pg_recvlogical pg_basebackup: pg_basebackup.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils $(CC) $(CFLAGS) pg_basebackup.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) -pg_receivexlog: pg_receivexlog.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils - $(CC) $(CFLAGS) pg_receivexlog.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) +pg_receivewal: pg_receivewal.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils + $(CC) $(CFLAGS) pg_receivewal.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) pg_recvlogical: pg_recvlogical.o $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils $(CC) $(CFLAGS) pg_recvlogical.o $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs $(INSTALL_PROGRAM) pg_basebackup$(X) '$(DESTDIR)$(bindir)/pg_basebackup$(X)' - $(INSTALL_PROGRAM) pg_receivexlog$(X) '$(DESTDIR)$(bindir)/pg_receivexlog$(X)' + $(INSTALL_PROGRAM) pg_receivewal$(X) '$(DESTDIR)$(bindir)/pg_receivewal$(X)' $(INSTALL_PROGRAM) pg_recvlogical$(X) '$(DESTDIR)$(bindir)/pg_recvlogical$(X)' installdirs: @@ -44,12 +44,12 @@ installdirs: uninstall: rm -f '$(DESTDIR)$(bindir)/pg_basebackup$(X)' - rm -f '$(DESTDIR)$(bindir)/pg_receivexlog$(X)' + rm -f '$(DESTDIR)$(bindir)/pg_receivewal$(X)' rm -f '$(DESTDIR)$(bindir)/pg_recvlogical$(X)' clean distclean maintainer-clean: - rm -f pg_basebackup$(X) pg_receivexlog$(X) pg_recvlogical$(X) \ - pg_basebackup.o pg_receivexlog.o pg_recvlogical.o \ + rm -f pg_basebackup$(X) pg_receivewal$(X) pg_recvlogical$(X) \ + pg_basebackup.o pg_receivewal.o pg_recvlogical.o \ $(OBJS) rm -rf tmp_check diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk index dba43b857e9..2a6de08a645 100644 --- a/src/bin/pg_basebackup/nls.mk +++ b/src/bin/pg_basebackup/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_basebackup/nls.mk CATALOG_NAME = pg_basebackup AVAIL_LANGUAGES = de es fr it ko pl pt_BR ru zh_CN -GETTEXT_FILES = pg_basebackup.c pg_receivexlog.c pg_recvlogical.c receivelog.c streamutil.c ../../common/fe_memutils.c ../../common/file_utils.c +GETTEXT_FILES = pg_basebackup.c pg_receivewal.c pg_recvlogical.c receivelog.c streamutil.c ../../common/fe_memutils.c ../../common/file_utils.c GETTEXT_TRIGGERS = simple_prompt diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivewal.c similarity index 99% rename from src/bin/pg_basebackup/pg_receivexlog.c rename to src/bin/pg_basebackup/pg_receivewal.c index 135e2070f37..e8d0e8984e6 100644 --- a/src/bin/pg_basebackup/pg_receivexlog.c +++ b/src/bin/pg_basebackup/pg_receivewal.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- * - * pg_receivexlog.c - receive streaming transaction log data and write it + * pg_receivewal.c - receive streaming transaction log data and write it * to a local file. * * Author: Magnus Hagander @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group * * IDENTIFICATION - * src/bin/pg_basebackup/pg_receivexlog.c + * src/bin/pg_basebackup/pg_receivewal.c *------------------------------------------------------------------------- */ @@ -494,7 +494,7 @@ main(int argc, char **argv) else if (strcmp(argv[1], "-V") == 0 || strcmp(argv[1], "--version") == 0) { - puts("pg_receivexlog (PostgreSQL) " PG_VERSION); + puts("pg_receivewal (PostgreSQL) " PG_VERSION); exit(0); } } diff --git a/src/bin/pg_basebackup/t/020_pg_receivewal.pl b/src/bin/pg_basebackup/t/020_pg_receivewal.pl new file mode 100644 index 00000000000..b4cb6f729dc --- /dev/null +++ b/src/bin/pg_basebackup/t/020_pg_receivewal.pl @@ -0,0 +1,8 @@ +use strict; +use warnings; +use TestLib; +use Test::More tests => 8; + +program_help_ok('pg_receivewal'); +program_version_ok('pg_receivewal'); +program_options_handling_ok('pg_receivewal'); diff --git a/src/bin/pg_basebackup/t/020_pg_receivexlog.pl b/src/bin/pg_basebackup/t/020_pg_receivexlog.pl deleted file mode 100644 index c68e86d9120..00000000000 --- a/src/bin/pg_basebackup/t/020_pg_receivexlog.pl +++ /dev/null @@ -1,8 +0,0 @@ -use strict; -use warnings; -use TestLib; -use Test::More tests => 8; - -program_help_ok('pg_receivexlog'); -program_version_ok('pg_receivexlog'); -program_options_handling_ok('pg_receivexlog'); diff --git a/src/bin/pg_basebackup/walmethods.h b/src/bin/pg_basebackup/walmethods.h index 2cd8b6d7555..8d679dab615 100644 --- a/src/bin/pg_basebackup/walmethods.h +++ b/src/bin/pg_basebackup/walmethods.h @@ -39,7 +39,7 @@ struct WalWriteMethod * - WalDirectoryMethod - write WAL to regular files in a standard pg_xlog * - TarDirectoryMethod - write WAL to a tarfile corresponding to pg_xlog * (only implements the methods required for pg_basebackup, - * not all those required for pg_receivexlog) + * not all those required for pg_receivewal) */ WalWriteMethod *CreateWalDirectoryMethod(const char *basedir, int compression, bool sync); diff --git a/src/bin/pg_resetwal/.gitignore b/src/bin/pg_resetwal/.gitignore new file mode 100644 index 00000000000..236abb4323c --- /dev/null +++ b/src/bin/pg_resetwal/.gitignore @@ -0,0 +1 @@ +/pg_resetwal diff --git a/src/bin/pg_resetxlog/Makefile b/src/bin/pg_resetwal/Makefile similarity index 55% rename from src/bin/pg_resetxlog/Makefile rename to src/bin/pg_resetwal/Makefile index e04892479b5..0f6e5da255f 100644 --- a/src/bin/pg_resetxlog/Makefile +++ b/src/bin/pg_resetwal/Makefile @@ -1,35 +1,35 @@ #------------------------------------------------------------------------- # -# Makefile for src/bin/pg_resetxlog +# Makefile for src/bin/pg_resetwal # # Copyright (c) 1998-2017, PostgreSQL Global Development Group # -# src/bin/pg_resetxlog/Makefile +# src/bin/pg_resetwal/Makefile # #------------------------------------------------------------------------- -PGFILEDESC = "pg_resetxlog - reset PostgreSQL WAL log" +PGFILEDESC = "pg_resetwal - reset PostgreSQL WAL log" PGAPPICON=win32 -subdir = src/bin/pg_resetxlog +subdir = src/bin/pg_resetwal top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS= pg_resetxlog.o $(WIN32RES) +OBJS= pg_resetwal.o $(WIN32RES) -all: pg_resetxlog +all: pg_resetwal -pg_resetxlog: $(OBJS) | submake-libpgport +pg_resetwal: $(OBJS) | submake-libpgport $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) install: all installdirs - $(INSTALL_PROGRAM) pg_resetxlog$(X) '$(DESTDIR)$(bindir)/pg_resetxlog$(X)' + $(INSTALL_PROGRAM) pg_resetwal$(X) '$(DESTDIR)$(bindir)/pg_resetwal$(X)' installdirs: $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: - rm -f '$(DESTDIR)$(bindir)/pg_resetxlog$(X)' + rm -f '$(DESTDIR)$(bindir)/pg_resetwal$(X)' clean distclean maintainer-clean: - rm -f pg_resetxlog$(X) $(OBJS) + rm -f pg_resetwal$(X) $(OBJS) diff --git a/src/bin/pg_resetwal/nls.mk b/src/bin/pg_resetwal/nls.mk new file mode 100644 index 00000000000..d04d58ee340 --- /dev/null +++ b/src/bin/pg_resetwal/nls.mk @@ -0,0 +1,4 @@ +# src/bin/pg_resetwal/nls.mk +CATALOG_NAME = pg_resetwal +AVAIL_LANGUAGES = cs de es fr it ja ko pl pt_BR ru sv zh_CN +GETTEXT_FILES = pg_resetwal.c ../../common/restricted_token.c diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetwal/pg_resetwal.c similarity index 99% rename from src/bin/pg_resetxlog/pg_resetxlog.c rename to src/bin/pg_resetwal/pg_resetwal.c index 963802efc82..96b7097f8b7 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- * - * pg_resetxlog.c + * pg_resetwal.c * A utility to "zero out" the xlog when it's corrupt beyond recovery. * Can also rebuild pg_control if needed. * @@ -23,7 +23,7 @@ * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * src/bin/pg_resetxlog/pg_resetxlog.c + * src/bin/pg_resetwal/pg_resetwal.c * *------------------------------------------------------------------------- */ @@ -96,7 +96,7 @@ main(int argc, char *argv[]) char *DataDir = NULL; int fd; - set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetxlog")); + set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetwal")); progname = get_progname(argv[0]); @@ -109,7 +109,7 @@ main(int argc, char *argv[]) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - puts("pg_resetxlog (PostgreSQL) " PG_VERSION); + puts("pg_resetwal (PostgreSQL) " PG_VERSION); exit(0); } } @@ -295,7 +295,7 @@ main(int argc, char *argv[]) } /* - * Don't allow pg_resetxlog to be run as root, to avoid overwriting the + * Don't allow pg_resetwal to be run as root, to avoid overwriting the * ownership of files in the data directory. We need only check for root * -- any other user won't have sufficient permissions to modify files in * the data directory. @@ -915,7 +915,7 @@ FindEndOfXLOG(void) /* * Note: We don't use XLogFromFileName here, because we want to * use the segment size from the control file, not the size the - * pg_resetxlog binary was compiled with + * pg_resetwal binary was compiled with */ sscanf(xlde->d_name, "%08X%08X%08X", &tli, &log, &seg); segno = ((uint64) log) * segs_per_xlogid + seg; diff --git a/src/bin/pg_resetxlog/po/cs.po b/src/bin/pg_resetwal/po/cs.po similarity index 100% rename from src/bin/pg_resetxlog/po/cs.po rename to src/bin/pg_resetwal/po/cs.po diff --git a/src/bin/pg_resetxlog/po/de.po b/src/bin/pg_resetwal/po/de.po similarity index 100% rename from src/bin/pg_resetxlog/po/de.po rename to src/bin/pg_resetwal/po/de.po diff --git a/src/bin/pg_resetxlog/po/es.po b/src/bin/pg_resetwal/po/es.po similarity index 100% rename from src/bin/pg_resetxlog/po/es.po rename to src/bin/pg_resetwal/po/es.po diff --git a/src/bin/pg_resetxlog/po/fr.po b/src/bin/pg_resetwal/po/fr.po similarity index 100% rename from src/bin/pg_resetxlog/po/fr.po rename to src/bin/pg_resetwal/po/fr.po diff --git a/src/bin/pg_resetxlog/po/it.po b/src/bin/pg_resetwal/po/it.po similarity index 100% rename from src/bin/pg_resetxlog/po/it.po rename to src/bin/pg_resetwal/po/it.po diff --git a/src/bin/pg_resetxlog/po/ja.po b/src/bin/pg_resetwal/po/ja.po similarity index 100% rename from src/bin/pg_resetxlog/po/ja.po rename to src/bin/pg_resetwal/po/ja.po diff --git a/src/bin/pg_resetxlog/po/ko.po b/src/bin/pg_resetwal/po/ko.po similarity index 100% rename from src/bin/pg_resetxlog/po/ko.po rename to src/bin/pg_resetwal/po/ko.po diff --git a/src/bin/pg_resetxlog/po/pl.po b/src/bin/pg_resetwal/po/pl.po similarity index 100% rename from src/bin/pg_resetxlog/po/pl.po rename to src/bin/pg_resetwal/po/pl.po diff --git a/src/bin/pg_resetxlog/po/pt_BR.po b/src/bin/pg_resetwal/po/pt_BR.po similarity index 100% rename from src/bin/pg_resetxlog/po/pt_BR.po rename to src/bin/pg_resetwal/po/pt_BR.po diff --git a/src/bin/pg_resetxlog/po/ru.po b/src/bin/pg_resetwal/po/ru.po similarity index 100% rename from src/bin/pg_resetxlog/po/ru.po rename to src/bin/pg_resetwal/po/ru.po diff --git a/src/bin/pg_resetxlog/po/sv.po b/src/bin/pg_resetwal/po/sv.po similarity index 100% rename from src/bin/pg_resetxlog/po/sv.po rename to src/bin/pg_resetwal/po/sv.po diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/src/bin/pg_resetwal/po/zh_CN.po similarity index 100% rename from src/bin/pg_resetxlog/po/zh_CN.po rename to src/bin/pg_resetwal/po/zh_CN.po diff --git a/src/bin/pg_resetxlog/.gitignore b/src/bin/pg_resetxlog/.gitignore deleted file mode 100644 index 6b84208ee0c..00000000000 --- a/src/bin/pg_resetxlog/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pg_resetxlog diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk deleted file mode 100644 index ce18674d4bb..00000000000 --- a/src/bin/pg_resetxlog/nls.mk +++ /dev/null @@ -1,4 +0,0 @@ -# src/bin/pg_resetxlog/nls.mk -CATALOG_NAME = pg_resetxlog -AVAIL_LANGUAGES = cs de es fr it ja ko pl pt_BR ru sv zh_CN -GETTEXT_FILES = pg_resetxlog.c ../../common/restricted_token.c diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index b9387ff5a98..b075e26632e 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -18,16 +18,16 @@ * * gets pg_control information in "ctrl". Assumes that bindir and * datadir are valid absolute paths to postgresql bin and pgdata - * directories respectively *and* pg_resetxlog is version compatible + * directories respectively *and* pg_resetwal is version compatible * with datadir. The main purpose of this function is to get pg_control * data in a version independent manner. * - * The approach taken here is to invoke pg_resetxlog with -n option + * The approach taken here is to invoke pg_resetwal with -n option * and then pipe its output. With little string parsing we get the - * pg_control data. pg_resetxlog cannot be run while the server is running + * pg_control data. pg_resetwal cannot be run while the server is running * so we use pg_controldata; pg_controldata doesn't provide all the fields * we need to actually perform the upgrade, but it provides enough for - * check mode. We do not implement pg_resetxlog -n because it is hard to + * check mode. We do not implement pg_resetwal -n because it is hard to * return valid xid data for a running server. */ void @@ -73,7 +73,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) /* - * Because we test the pg_resetxlog output as strings, it has to be in + * Because we test the pg_resetwal output as strings, it has to be in * English. Copied from pg_regress.c. */ if (getenv("LC_COLLATE")) @@ -113,7 +113,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) snprintf(cmd, sizeof(cmd), "\"%s/%s \"%s\"", cluster->bindir, - live_check ? "pg_controldata\"" : "pg_resetxlog\" -n", + live_check ? "pg_controldata\"" : "pg_resetwal\" -n", cluster->pgdata); fflush(stdout); fflush(stderr); @@ -139,7 +139,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) p = strchr(p, ':'); if (p == NULL || strlen(p) <= 1) - pg_fatal("%d: pg_resetxlog problem\n", __LINE__); + pg_fatal("%d: pg_resetwal problem\n", __LINE__); p++; /* remove ':' char */ cluster->controldata.ctrl_ver = str2uint(p); @@ -440,7 +440,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) pg_free(lc_messages); /* - * Before 9.3, pg_resetxlog reported the xlogid and segno of the first log + * Before 9.3, pg_resetwal reported the xlogid and segno of the first log * file after reset as separate lines. Starting with 9.3, it reports the * WAL file name. If the old cluster is older than 9.3, we construct the * WAL file name from the xlogid and segno. diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c index 3a30ea74383..c74521f24a3 100644 --- a/src/bin/pg_upgrade/exec.c +++ b/src/bin/pg_upgrade/exec.c @@ -335,7 +335,7 @@ check_bin_dir(ClusterInfo *cluster) validate_exec(cluster->bindir, "postgres"); validate_exec(cluster->bindir, "pg_ctl"); - validate_exec(cluster->bindir, "pg_resetxlog"); + validate_exec(cluster->bindir, "pg_resetwal"); if (cluster == &new_cluster) { /* these are only needed in the new cluster */ diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c index 797e36d2530..145d2da69c4 100644 --- a/src/bin/pg_upgrade/pg_upgrade.c +++ b/src/bin/pg_upgrade/pg_upgrade.c @@ -147,7 +147,7 @@ main(int argc, char **argv) */ prep_status("Setting next OID for new cluster"); exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -o %u \"%s\"", + "\"%s/pg_resetwal\" -o %u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtoid, new_cluster.pgdata); check_ok(); @@ -408,16 +408,16 @@ copy_clog_xlog_xid(void) /* set the next transaction id and epoch of the new cluster */ prep_status("Setting next transaction ID and epoch for new cluster"); exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -f -x %u \"%s\"", + "\"%s/pg_resetwal\" -f -x %u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtxid, new_cluster.pgdata); exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -f -e %u \"%s\"", + "\"%s/pg_resetwal\" -f -e %u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtepoch, new_cluster.pgdata); /* must reset commit timestamp limits also */ exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -f -c %u,%u \"%s\"", + "\"%s/pg_resetwal\" -f -c %u,%u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtxid, old_cluster.controldata.chkpnt_nxtxid, @@ -443,7 +443,7 @@ copy_clog_xlog_xid(void) * counters here and the oldest multi present on system. */ exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -O %u -m %u,%u \"%s\"", + "\"%s/pg_resetwal\" -O %u -m %u,%u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtmxoff, old_cluster.controldata.chkpnt_nxtmulti, @@ -471,7 +471,7 @@ copy_clog_xlog_xid(void) * next=MaxMultiXactId, but multixact.c can cope with that just fine. */ exec_prog(UTILITY_LOG_FILE, NULL, true, - "\"%s/pg_resetxlog\" -m %u,%u \"%s\"", + "\"%s/pg_resetwal\" -m %u,%u \"%s\"", new_cluster.bindir, old_cluster.controldata.chkpnt_nxtmulti + 1, old_cluster.controldata.chkpnt_nxtmulti, @@ -483,7 +483,7 @@ copy_clog_xlog_xid(void) prep_status("Resetting WAL archives"); exec_prog(UTILITY_LOG_FILE, NULL, true, /* use timeline 1 to match controldata and no WAL history file */ - "\"%s/pg_resetxlog\" -l 00000001%s \"%s\"", new_cluster.bindir, + "\"%s/pg_resetwal\" -l 00000001%s \"%s\"", new_cluster.bindir, old_cluster.controldata.nextxlogfile + 8, new_cluster.pgdata); check_ok(); diff --git a/src/bin/pg_xlogdump/.gitignore b/src/bin/pg_waldump/.gitignore similarity index 85% rename from src/bin/pg_xlogdump/.gitignore rename to src/bin/pg_waldump/.gitignore index c4783f12bb5..0013a93189c 100644 --- a/src/bin/pg_xlogdump/.gitignore +++ b/src/bin/pg_waldump/.gitignore @@ -1,4 +1,4 @@ -/pg_xlogdump +/pg_waldump # Source files copied from src/backend/access/rmgrdesc/ /*desc.c /xlogreader.c diff --git a/src/bin/pg_xlogdump/Makefile b/src/bin/pg_waldump/Makefile similarity index 62% rename from src/bin/pg_xlogdump/Makefile rename to src/bin/pg_waldump/Makefile index 11df47d5169..f5957bd75a6 100644 --- a/src/bin/pg_xlogdump/Makefile +++ b/src/bin/pg_waldump/Makefile @@ -1,13 +1,13 @@ -# src/bin/pg_xlogdump/Makefile +# src/bin/pg_waldump/Makefile -PGFILEDESC = "pg_xlogdump - decode and display WAL" +PGFILEDESC = "pg_waldump - decode and display WAL" PGAPPICON=win32 -subdir = src/bin/pg_xlogdump +subdir = src/bin/pg_waldump top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = pg_xlogdump.o compat.o xlogreader.o rmgrdesc.o \ +OBJS = pg_waldump.o compat.o xlogreader.o rmgrdesc.o \ $(RMGRDESCOBJS) $(WIN32RES) override CPPFLAGS := -DFRONTEND $(CPPFLAGS) @@ -16,9 +16,9 @@ RMGRDESCSOURCES = $(sort $(notdir $(wildcard $(top_srcdir)/src/backend/access/rm RMGRDESCOBJS = $(patsubst %.c,%.o,$(RMGRDESCSOURCES)) -all: pg_xlogdump +all: pg_waldump -pg_xlogdump: $(OBJS) | submake-libpgport +pg_waldump: $(OBJS) | submake-libpgport $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/% @@ -28,13 +28,13 @@ $(RMGRDESCSOURCES): % : $(top_srcdir)/src/backend/access/rmgrdesc/% rm -f $@ && $(LN_S) $< . install: all installdirs - $(INSTALL_PROGRAM) pg_xlogdump$(X) '$(DESTDIR)$(bindir)/pg_xlogdump$(X)' + $(INSTALL_PROGRAM) pg_waldump$(X) '$(DESTDIR)$(bindir)/pg_waldump$(X)' installdirs: $(MKDIR_P) '$(DESTDIR)$(bindir)' uninstall: - rm -f '$(DESTDIR)$(bindir)/pg_xlogdump$(X)' + rm -f '$(DESTDIR)$(bindir)/pg_waldump$(X)' clean distclean maintainer-clean: - rm -f pg_xlogdump$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c + rm -f pg_waldump$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c diff --git a/src/bin/pg_xlogdump/compat.c b/src/bin/pg_waldump/compat.c similarity index 98% rename from src/bin/pg_xlogdump/compat.c rename to src/bin/pg_waldump/compat.c index ff5acdc830b..e9ceef51042 100644 --- a/src/bin/pg_xlogdump/compat.c +++ b/src/bin/pg_waldump/compat.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group * * IDENTIFICATION - * src/bin/pg_xlogdump/compat.c + * src/bin/pg_waldump/compat.c * * This file contains client-side implementations for various backend * functions that the rm_desc functions in *desc.c files rely on. diff --git a/src/bin/pg_waldump/nls.mk b/src/bin/pg_waldump/nls.mk new file mode 100644 index 00000000000..52f06da4db3 --- /dev/null +++ b/src/bin/pg_waldump/nls.mk @@ -0,0 +1,6 @@ +# src/bin/pg_waldump/nls.mk +CATALOG_NAME = pg_waldump +AVAIL_LANGUAGES = +GETTEXT_FILES = pg_waldump.c +GETTEXT_TRIGGERS = fatal_error +GETTEXT_FLAGS = fatal_error:1:c-format diff --git a/src/bin/pg_xlogdump/pg_xlogdump.c b/src/bin/pg_waldump/pg_waldump.c similarity index 99% rename from src/bin/pg_xlogdump/pg_xlogdump.c rename to src/bin/pg_waldump/pg_waldump.c index 679aead8951..f4bfacfe87f 100644 --- a/src/bin/pg_xlogdump/pg_xlogdump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -1,11 +1,11 @@ /*------------------------------------------------------------------------- * - * pg_xlogdump.c - decode and display WAL + * pg_waldump.c - decode and display WAL * * Copyright (c) 2013-2017, PostgreSQL Global Development Group * * IDENTIFICATION - * src/bin/pg_xlogdump/pg_xlogdump.c + * src/bin/pg_waldump/pg_waldump.c *------------------------------------------------------------------------- */ @@ -736,7 +736,7 @@ main(int argc, char **argv) int option; int optindex = 0; - set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_xlogdump")); + set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_waldump")); progname = get_progname(argv[0]); memset(&private, 0, sizeof(XLogDumpPrivate)); @@ -845,7 +845,7 @@ main(int argc, char **argv) } break; case 'V': - puts("pg_xlogdump (PostgreSQL) " PG_VERSION); + puts("pg_waldump (PostgreSQL) " PG_VERSION); exit(EXIT_SUCCESS); break; case 'x': diff --git a/src/bin/pg_xlogdump/rmgrdesc.c b/src/bin/pg_waldump/rmgrdesc.c similarity index 92% rename from src/bin/pg_xlogdump/rmgrdesc.c rename to src/bin/pg_waldump/rmgrdesc.c index 5d19a4af725..dd40ba07c76 100644 --- a/src/bin/pg_xlogdump/rmgrdesc.c +++ b/src/bin/pg_waldump/rmgrdesc.c @@ -1,9 +1,9 @@ /* * rmgrdesc.c * - * pg_xlogdump resource managers definition + * pg_waldump resource managers definition * - * src/bin/pg_xlogdump/rmgrdesc.c + * src/bin/pg_waldump/rmgrdesc.c */ #define FRONTEND 1 #include "postgres.h" diff --git a/src/bin/pg_xlogdump/rmgrdesc.h b/src/bin/pg_waldump/rmgrdesc.h similarity index 81% rename from src/bin/pg_xlogdump/rmgrdesc.h rename to src/bin/pg_waldump/rmgrdesc.h index 5440f9468f4..2fa60d90ad8 100644 --- a/src/bin/pg_xlogdump/rmgrdesc.h +++ b/src/bin/pg_waldump/rmgrdesc.h @@ -1,9 +1,9 @@ /* * rmgrdesc.h * - * pg_xlogdump resource managers declaration + * pg_waldump resource managers declaration * - * src/bin/pg_xlogdump/rmgrdesc.h + * src/bin/pg_waldump/rmgrdesc.h */ #ifndef RMGRDESC_H #define RMGRDESC_H diff --git a/src/bin/pg_xlogdump/nls.mk b/src/bin/pg_xlogdump/nls.mk deleted file mode 100644 index 2b254c35c6e..00000000000 --- a/src/bin/pg_xlogdump/nls.mk +++ /dev/null @@ -1,6 +0,0 @@ -# src/bin/pg_xlogdump/nls.mk -CATALOG_NAME = pg_xlogdump -AVAIL_LANGUAGES = -GETTEXT_FILES = pg_xlogdump.c -GETTEXT_TRIGGERS = fatal_error -GETTEXT_FLAGS = fatal_error:1:c-format diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h index 3005b98aaa8..578bff593c1 100644 --- a/src/include/access/xlog_internal.h +++ b/src/include/access/xlog_internal.h @@ -9,7 +9,7 @@ * So the XLogRecord typedef and associated stuff appear in xlogrecord.h. * * Note: This file must be includable in both frontend and backend contexts, - * to allow stand-alone tools like pg_receivexlog to deal with WAL files. + * to allow stand-alone tools like pg_receivewal to deal with WAL files. * * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California @@ -153,7 +153,7 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader; strspn(fname, "0123456789ABCDEF") == XLOG_FNAME_LEN) /* - * XLOG segment with .partial suffix. Used by pg_receivexlog and at end of + * XLOG segment with .partial suffix. Used by pg_receivewal and at end of * archive recovery, when we want to archive a WAL segment but it might not * be complete yet. */ diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 4c697e276cc..07a32d6dfcf 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -237,7 +237,7 @@ extern void FreeAccessStrategy(BufferAccessStrategy strategy); /* * Although this header file is nominally backend-only, certain frontend - * programs like pg_xlogdump include it. For compilers that emit static + * programs like pg_waldump include it. For compilers that emit static * inline functions even when they're unused, that leads to unsatisfied * external references; hence hide these with #ifndef FRONTEND. */ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index e04efe65599..0aa1422b9fb 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -24,7 +24,7 @@ my @client_program_files = ( 'dropdb', 'droplang', 'dropuser', 'ecpg', 'libecpg', 'libecpg_compat', 'libpgtypes', 'libpq', 'pg_basebackup', 'pg_config', 'pg_dump', 'pg_dumpall', - 'pg_isready', 'pg_receivexlog', 'pg_recvlogical', 'pg_restore', + 'pg_isready', 'pg_receivewal', 'pg_recvlogical', 'pg_restore', 'psql', 'reindexdb', 'vacuumdb', @client_contribs); sub lcopy diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index db566f9c88c..df06e73f0d6 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -54,11 +54,11 @@ my @frontend_uselibpq = ('pg_ctl', 'pg_upgrade', 'pgbench', 'psql', 'initdb'); my @frontend_uselibpgport = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_test_timing', 'pg_upgrade', - 'pg_xlogdump', 'pgbench'); + 'pg_waldump', 'pgbench'); my @frontend_uselibpgcommon = ( 'pg_archivecleanup', 'pg_test_fsync', 'pg_test_timing', 'pg_upgrade', - 'pg_xlogdump', 'pgbench'); + 'pg_waldump', 'pgbench'); my $frontend_extralibs = { 'initdb' => ['ws2_32.lib'], 'pg_restore' => ['ws2_32.lib'], @@ -73,7 +73,7 @@ my $frontend_extrasource = { [ 'src/bin/pgbench/exprscan.l', 'src/bin/pgbench/exprparse.y' ] }; my @frontend_excludes = ( 'pgevent', 'pg_basebackup', 'pg_rewind', 'pg_dump', - 'pg_xlogdump', 'scripts'); + 'pg_waldump', 'scripts'); sub mkvcbuild { @@ -324,10 +324,10 @@ sub mkvcbuild $pgbasebackup->AddFile('src/bin/pg_basebackup/pg_basebackup.c'); $pgbasebackup->AddLibrary('ws2_32.lib'); - my $pgreceivexlog = AddSimpleFrontend('pg_basebackup', 1); - $pgreceivexlog->{name} = 'pg_receivexlog'; - $pgreceivexlog->AddFile('src/bin/pg_basebackup/pg_receivexlog.c'); - $pgreceivexlog->AddLibrary('ws2_32.lib'); + my $pgreceivewal = AddSimpleFrontend('pg_basebackup', 1); + $pgreceivewal->{name} = 'pg_receivewal'; + $pgreceivewal->AddFile('src/bin/pg_basebackup/pg_receivewal.c'); + $pgreceivewal->AddLibrary('ws2_32.lib'); my $pgrecvlogical = AddSimpleFrontend('pg_basebackup', 1); $pgrecvlogical->{name} = 'pg_recvlogical'; @@ -631,15 +631,15 @@ sub mkvcbuild $pgregress->AddDirResourceFile('src/test/regress'); $pgregress->AddReference($libpgcommon, $libpgport); - # fix up pg_xlogdump once it's been set up + # fix up pg_waldump once it's been set up # files symlinked on Unix are copied on windows - my $pg_xlogdump = AddSimpleFrontend('pg_xlogdump'); - $pg_xlogdump->AddDefine('FRONTEND'); + my $pg_waldump = AddSimpleFrontend('pg_waldump'); + $pg_waldump->AddDefine('FRONTEND'); foreach my $xf (glob('src/backend/access/rmgrdesc/*desc.c')) { - $pg_xlogdump->AddFile($xf); + $pg_waldump->AddFile($xf); } - $pg_xlogdump->AddFile('src/backend/access/transam/xlogreader.c'); + $pg_waldump->AddFile('src/backend/access/transam/xlogreader.c'); $solution->Save(); return $solution->{vcver};