Rename user-facing tools with "xlog" in the name to say "wal".
authorRobert Haas
Thu, 9 Feb 2017 21:23:46 +0000 (16:23 -0500)
committerRobert Haas
Thu, 9 Feb 2017 21:23:46 +0000 (16:23 -0500)
This means pg_receivexlog because pg_receivewal, pg_resetxlog
becomes pg_resetwal, and pg_xlogdump becomes pg_waldump.

58 files changed:
doc/src/sgml/protocol.sgml
doc/src/sgml/ref/allfiles.sgml
doc/src/sgml/ref/pg_receivewal.sgml [moved from doc/src/sgml/ref/pg_receivexlog.sgml with 89% similarity]
doc/src/sgml/ref/pg_recvlogical.sgml
doc/src/sgml/ref/pg_resetwal.sgml [moved from doc/src/sgml/ref/pg_resetxlog.sgml with 89% similarity]
doc/src/sgml/ref/pg_waldump.sgml [moved from doc/src/sgml/ref/pg_xlogdump.sgml with 91% similarity]
doc/src/sgml/reference.sgml
doc/src/sgml/release-9.2.sgml
doc/src/sgml/release-9.3.sgml
doc/src/sgml/release-9.4.sgml
doc/src/sgml/release-9.5.sgml
src/backend/access/rmgrdesc/xactdesc.c
src/backend/access/transam/varsup.c
src/backend/access/transam/xlogutils.c
src/backend/replication/logical/snapbuild.c
src/backend/replication/walsender.c
src/backend/utils/misc/guc.c
src/bin/Makefile
src/bin/pg_basebackup/.gitignore
src/bin/pg_basebackup/Makefile
src/bin/pg_basebackup/nls.mk
src/bin/pg_basebackup/pg_receivewal.c [moved from src/bin/pg_basebackup/pg_receivexlog.c with 99% similarity]
src/bin/pg_basebackup/t/020_pg_receivewal.pl [new file with mode: 0644]
src/bin/pg_basebackup/t/020_pg_receivexlog.pl [deleted file]
src/bin/pg_basebackup/walmethods.h
src/bin/pg_resetwal/.gitignore [new file with mode: 0644]
src/bin/pg_resetwal/Makefile [moved from src/bin/pg_resetxlog/Makefile with 55% similarity]
src/bin/pg_resetwal/nls.mk [new file with mode: 0644]
src/bin/pg_resetwal/pg_resetwal.c [moved from src/bin/pg_resetxlog/pg_resetxlog.c with 99% similarity]
src/bin/pg_resetwal/po/cs.po [moved from src/bin/pg_resetxlog/po/cs.po with 100% similarity]
src/bin/pg_resetwal/po/de.po [moved from src/bin/pg_resetxlog/po/de.po with 100% similarity]
src/bin/pg_resetwal/po/es.po [moved from src/bin/pg_resetxlog/po/es.po with 100% similarity]
src/bin/pg_resetwal/po/fr.po [moved from src/bin/pg_resetxlog/po/fr.po with 100% similarity]
src/bin/pg_resetwal/po/it.po [moved from src/bin/pg_resetxlog/po/it.po with 100% similarity]
src/bin/pg_resetwal/po/ja.po [moved from src/bin/pg_resetxlog/po/ja.po with 100% similarity]
src/bin/pg_resetwal/po/ko.po [moved from src/bin/pg_resetxlog/po/ko.po with 100% similarity]
src/bin/pg_resetwal/po/pl.po [moved from src/bin/pg_resetxlog/po/pl.po with 100% similarity]
src/bin/pg_resetwal/po/pt_BR.po [moved from src/bin/pg_resetxlog/po/pt_BR.po with 100% similarity]
src/bin/pg_resetwal/po/ru.po [moved from src/bin/pg_resetxlog/po/ru.po with 100% similarity]
src/bin/pg_resetwal/po/sv.po [moved from src/bin/pg_resetxlog/po/sv.po with 100% similarity]
src/bin/pg_resetwal/po/zh_CN.po [moved from src/bin/pg_resetxlog/po/zh_CN.po with 100% similarity]
src/bin/pg_resetxlog/.gitignore [deleted file]
src/bin/pg_resetxlog/nls.mk [deleted file]
src/bin/pg_upgrade/controldata.c
src/bin/pg_upgrade/exec.c
src/bin/pg_upgrade/pg_upgrade.c
src/bin/pg_waldump/.gitignore [moved from src/bin/pg_xlogdump/.gitignore with 85% similarity]
src/bin/pg_waldump/Makefile [moved from src/bin/pg_xlogdump/Makefile with 62% similarity]
src/bin/pg_waldump/compat.c [moved from src/bin/pg_xlogdump/compat.c with 98% similarity]
src/bin/pg_waldump/nls.mk [new file with mode: 0644]
src/bin/pg_waldump/pg_waldump.c [moved from src/bin/pg_xlogdump/pg_xlogdump.c with 99% similarity]
src/bin/pg_waldump/rmgrdesc.c [moved from src/bin/pg_xlogdump/rmgrdesc.c with 92% similarity]
src/bin/pg_waldump/rmgrdesc.h [moved from src/bin/pg_xlogdump/rmgrdesc.h with 81% similarity]
src/bin/pg_xlogdump/nls.mk [deleted file]
src/include/access/xlog_internal.h
src/include/storage/bufmgr.h
src/tools/msvc/Install.pm
src/tools/msvc/Mkvcbuild.pm

index 2e84a2990167d00280cd599b9bc1162ded404f48..05a0d6e8461b49365fc9f45bd684fe7990c1aba1 100644 (file)
@@ -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
xlog"> (for physical replication) or
wal"> (for physical replication) or
   (for logical replication).
 
 
index 0d09f81ccc75a732953742e2766d6a93fde9e0ea..2bc4d9fd64f51947e65f67e0921a19986527756d 100644 (file)
@@ -198,15 +198,15 @@ Complete list of usable sgml source files in this directory.
 
 
 
-xlog      SYSTEM "pg_receivexlog.sgml">
+wal       SYSTEM "pg_receivewal.sgml">
 
-xlog        SYSTEM "pg_resetxlog.sgml">
+wal         SYSTEM "pg_resetwal.sgml">
 
 
 
 
 
-xlogdump         SYSTEM "pg_xlogdump.sgml">
+waldump         SYSTEM "pg_waldump.sgml">
 
 
 
similarity index 89%
rename from doc/src/sgml/ref/pg_receivexlog.sgml
rename to doc/src/sgml/ref/pg_receivewal.sgml
index 8c1ea9a2e2e8f68b82204c47bdd6d1d902c554f0..0e6b636703cf1013df4f2df1f3af40bc66d2040f 100644 (file)
@@ -1,27 +1,27 @@
 
 
-xlog">
xlog">
-  pg_receivexlog
+wal">
wal">
+  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 
    in real time.
@@ -68,7 +68,7 @@ PostgreSQL documentation
 
   
    If the connection is lost, or if it cannot be initially established,
-   with a non-fatal error, pg_receivexlog will
+   with a non-fatal error, pg_receivewal will
    retry the connection indefinitely, and reestablish streaming as soon
    as possible. To avoid this behavior, use the -n
    parameter.
@@ -132,9 +132,9 @@ PostgreSQL documentation
       
       
         
-         Require pg_receivexlog to use an existing
+         Require pg_receivewal to use an existing
          replication slot (see ).
-         When this option is used, pg_receivexlog will report
+         When this option is used, pg_receivewal will report
          a flush position to the server, indicating when each segment has been
          synchronized to disk so that the server can remove that segment if it
          is not otherwise needed.
@@ -142,7 +142,7 @@ PostgreSQL documentation
 
         
          When the replication client
-         of pg_receivexlog is configured on the
+         of pg_receivewal is configured on the
          server as a synchronous standby, then using a replication slot will
          report the flush position to the server, but only when a WAL file is
          closed.  Therefore, that configuration will cause transactions on the
@@ -164,7 +164,7 @@ PostgreSQL documentation
 
        
         This option should be specified if the replication client
-        of pg_receivexlog is configured on the
+        of pg_receivewal is configured on the
         server as a synchronous standby, to ensure that timely feedback is
         sent to the server.
        
@@ -209,7 +209,7 @@ PostgreSQL documentation
        
        
         The option is called --dbname for consistency with other
-        client applications, but because pg_receivexlog
+        client applications, but because pg_receivewal
         doesn't connect to any particular database in the cluster, database
         name in the connection string will be ignored.
        
@@ -273,15 +273,15 @@ PostgreSQL documentation
       
       
        
-        Force pg_receivexlog to prompt for a
+        Force pg_receivewal to prompt for a
         password before connecting to a database.
        
 
        
         This option is never essential, since
-        pg_receivexlog will automatically prompt
+        pg_receivewal will automatically prompt
         for a password if the server demands password authentication.
-        However, pg_receivexlog will waste a
+        However, pg_receivewal will waste a
         connection attempt finding out that the server wants a password.
         In some cases it is worth typing 
         connection attempt.
@@ -292,7 +292,7 @@ PostgreSQL documentation
    
 
    
-    pg_receivexlog can perform one of the two
+    pg_receivewal can perform one of the two
     following actions in order to control physical replication slots:
 
     
@@ -327,7 +327,7 @@ PostgreSQL documentation
        
        
        
-       Print the pg_receivexlog version and exit.
+       Print the pg_receivewal version and exit.
        
        
      
@@ -337,7 +337,7 @@ PostgreSQL documentation
        
        
        
-       Show help about pg_receivexlog command line
+       Show help about pg_receivewal command line
        arguments, and exit.
        
        
@@ -363,7 +363,7 @@ PostgreSQL documentation
   Notes
 
   
-   When using pg_receivexlog instead of
+   When using pg_receivewal instead of
     as the main WAL backup method, it is
    strongly recommended to use replication slots.  Otherwise, the server is
    free to recycle or remove transaction log files before they are backed up,
@@ -384,7 +384,7 @@ PostgreSQL documentation
    mydbserver and store it in the local directory
    /usr/local/pgsql/archive:
 
-$ pg_receivexlog -h mydbserver -D /usr/local/pgsql/archive
+$ pg_receivewal -h mydbserver -D /usr/local/pgsql/archive
 
  
 
index d066ce87016e379ef935d137bd149aed71d74469..eaea94df8bb89678f2ff5168a96bb44d3d542b85 100644 (file)
@@ -35,7 +35,7 @@ PostgreSQL documentation
 
   
    It creates a replication-mode connection, so it is subject to the same
-   constraints as xlog">, plus those for logical
+   constraints as wal">, plus those for logical
    replication (see ).
   
 
@@ -238,7 +238,7 @@ PostgreSQL documentation
       
        
         This option has the same effect as the option of the same name
-        in xlog">.  See the description there.
+        in wal">.  See the description there.
        
       
      
@@ -411,7 +411,7 @@ PostgreSQL documentation
   See Also
 
   
-   xlog">
+   wal">
   
  
 
similarity index 89%
rename from doc/src/sgml/ref/pg_resetxlog.sgml
rename to doc/src/sgml/ref/pg_resetwal.sgml
index c949c5e8497ea8b645bf5c3eff5312664d7a7107..0cc6fb4c4db463e19e481913b8079f67792e06a4 100644 (file)
@@ -1,27 +1,27 @@
 
 
-XLOG">
xlog">
-  pg_resetxlog
+WAL">
wal">
+  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
   
  
 
XLOG-1">
WAL-1">
   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 
    values will be substituted for the missing data.  Most of the fields can be
@@ -80,7 +80,7 @@ PostgreSQL documentation
     
     
      
-      Force pg_resetxlog to proceed even if it cannot determine
+      Force pg_resetwal to proceed even if it cannot determine
       valid data for pg_control, as explained above.
      
     
@@ -91,10 +91,10 @@ PostgreSQL documentation
     
      
       The 
-      pg_resetxlog to print the values reconstructed from
+      pg_resetwal to print the values reconstructed from
       pg_control and values about to be changed, and then exit
       without modifying anything. This is mainly a debugging tool, but can be
-      useful as a sanity check before allowing pg_resetxlog
+      useful as a sanity check before allowing pg_resetwal
       to proceed for real.
      
     
@@ -115,7 +115,7 @@ PostgreSQL documentation
 
   
    The following options are only needed when
-   pg_resetxlog is unable to determine appropriate values
+   pg_resetwal is unable to determine appropriate values
    by reading pg_control.  Safe values can be determined as
    described below.  For values that take numeric arguments, hexadecimal
    values can be specified by using the prefix 0x.
@@ -152,7 +152,7 @@ PostgreSQL documentation
 
      
       The transaction ID epoch is not actually stored anywhere in the database
-      except in the field that is set by pg_resetxlog,
+      except in the field that is set by pg_resetwal,
       so any value will work so far as the database itself is concerned.
       You might need to adjust this value to ensure that replication
       systems such as Slony-I and
@@ -164,7 +164,7 @@ PostgreSQL documentation
    
 
    
-     xlogfile
+     walfile
     
      
       Manually set the WAL starting address.
@@ -182,7 +182,7 @@ PostgreSQL documentation
 
      
       
-       pg_resetxlog itself looks at the files in
+       pg_resetwal itself looks at the files in
        pg_wal and chooses a default 
        beyond the last existing file name.  Therefore, manual adjustment of
        
@@ -274,11 +274,11 @@ PostgreSQL documentation
 
   
    This command must not be used when the server is
-   running.  pg_resetxlog will refuse to start up if
+   running.  pg_resetwal will refuse to start up if
    it finds a server lock file in the data directory.  If the
    server crashed then a lock file might have been left
    behind; in that case you can remove the lock file to allow
-   pg_resetxlog to run.  But before you do
+   pg_resetwal to run.  But before you do
    so, make doubly certain that there is no server process still alive.
   
  
similarity index 91%
rename from doc/src/sgml/ref/pg_xlogdump.sgml
rename to doc/src/sgml/ref/pg_waldump.sgml
index 078b08e2e6b0cd5ebc4e1956de807369b412b872..4c92eeed6804d71bf43ff336af4b3c9a5626eee5 100644 (file)
@@ -1,27 +1,27 @@
 
 
-xlogdump">
xlogdump">
-  pg_xlogdump
+waldump">
waldump">
+  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
   
  
 
XLOGDUMP-1">
WALDUMP-1">
   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.
   
index 34007d3508def2de4405460abcaa3211df16f1b1..c8191de9fe305ae73b68da5c9c3d2df72fe386cb 100644 (file)
    &pgDump;
    &pgDumpall;
    &pgIsready;
-   &pgReceivexlog;
+   &pgReceivewal;
    &pgRecvlogical;
    &pgRestore;
    &psqlRef;
    &pgarchivecleanup;
    &pgControldata;
    &pgCtl;
-   &pgResetxlog;
+   &pgResetwal;
    &pgRewind;
    &pgtestfsync;
    &pgtesttiming;
    &pgupgrade;
-   &pgxlogdump;
+   &pgwaldump;
    &postgres;
    &postmaster;
 
index 9e99de882cf8c1210d3b74f587621902d8cbb17d..5c80517eafca2afe91af0993a97bb5dc775986d9 100644 (file)
@@ -8069,7 +8069,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       
        
         Add a 
-        linkend="app-pgreceivexlog">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 
-        linkend="app-pgreceivexlog">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)
        
index 19bb305f0e1e84eb7dcf9f295c67b7c16ba508de..7f4adcd8c3a25e6d61e41f5d0f8a10b90a64b4e5 100644 (file)
@@ -10080,7 +10080,7 @@ ALTER EXTENSION hstore UPDATE;
       
        
         Allow tools like 
-        linkend="app-pgreceivexlog">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 
-        linkend="app-pgreceivexlog">pg_receivexlog
+        linkend="app-pgreceivewal">pg_receivexlog
         and 
         linkend="app-pgbasebackup">pg_basebackup
         
@@ -10713,7 +10713,7 @@ ALTER EXTENSION hstore UPDATE;
         linkend="APP-PG-DUMPALL">pg_dumpall, 
         linkend="app-pgbasebackup">pg_basebackup, and
         
-        linkend="app-pgreceivexlog">pg_receivexlog
+        linkend="app-pgreceivewal">pg_receivexlog
         to allow specifying a connection string (Amit Kapila)
        
       
@@ -11250,7 +11250,7 @@ ALTER EXTENSION hstore UPDATE;
 
       
        
-        Add xlogdump">pg_xlogdump
+        Add waldump">pg_xlogdump
         contrib program (Andres Freund)
        
       
index bbf2429475c6795423ceb15fe8eff81a3ce95676..4b7e41b67f68fe9c3cf8f0e545097ffe665a35bd 100644 (file)
@@ -8917,8 +8917,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       
        
-        Make  with option 
-        output current and potentially changed values (Rajeev Rastogi)
+        Make pg_resetxlog
+        with option 
+        values (Rajeev Rastogi)
        
       
 
@@ -9518,8 +9519,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       
        
-        Allow  to report a live log stream
-        with 
+        Allow pg_xlogdump
+        to report a live log stream with 
+        (Heikki Linnakangas)
        
       
 
index aab3ddc3c14b56cafc70ec5b48316c1187ec44c5..c2c653a9b38e5cfbdf8f6e63a9f1036a1baa01d4 100644 (file)
@@ -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 xlogdump">pg_xlogdump
+       and waldump">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 
-       linkend="app-pgreceivexlog">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 
-       linkend="app-pgreceivexlog">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 xlogdump">pg_xlogdump option
+       Add waldump">pg_xlogdump option
        
       
      
index c91ca03db1a0460eb5d19136c2fe6ae4bc6cdef0..735f8c598fc512009a1c47b8c241909002001728 100644 (file)
@@ -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.
  */
index fc084c5bdbbcbbbbfa48881146fea6fc8ecccca6..42fc351f7bf1f0b7bf8528eef07a3d2b197a389c 100644 (file)
@@ -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.
index 6627f5498b9b5e3b05a741fb9b0976c4f406c593..8b99b7824978f29049cc0fa8709898b7359a926f 100644 (file)
@@ -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.
  */
index 62020b6ed03329d8ca404126ee31cc22a586cdb2..c0f28ddc090539ab2707907de7d75570a994472e 100644 (file)
@@ -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",
index 76f09fbdbf2256f5dec2f349194639bc690a2421..ba506e28bc264b430ef52a8b6ed340ad09d5d6f1 100644 (file)
@@ -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.
     */
index de85eca6a8f25bc06bdd6ddd744796f7c1c77f28..0249721204a7a14a316937ec41ed21750c85dc09 100644 (file)
@@ -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
    },
index e0a5d92028f611650bbeb7f34eba7071ce353332..bc96f37dfc4cfd4e37ba4af951ac0026608afe08 100644 (file)
@@ -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
index 36a2f12d61571a8d099d49fb0f3e41d5a4ec6d76..26048bdbd84329b20314b1395d12cb584531bbd6 100644 (file)
@@ -1,5 +1,5 @@
 /pg_basebackup
-/pg_receivexlog
+/pg_receivewal
 /pg_recvlogical
 
 /tmp_check/
index a6c307492f4b85b1007aacf288bf8bdd89efc65d..f0c3be83f30b5e071ca7c0fecf344328ec797c1f 100644 (file)
@@ -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
 
index dba43b857e9232c2075e02400e50c77ae5b854e1..2a6de08a645f6bc0a40780ed5b3a2cc4c67a0526 100644 (file)
@@ -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
similarity index 99%
rename from src/bin/pg_basebackup/pg_receivexlog.c
rename to src/bin/pg_basebackup/pg_receivewal.c
index 135e2070f37a104a7a02f92512f5c87b4db39dc3..e8d0e8984e6c1b9a9a17ba126be940c4dd465677 100644 (file)
@@ -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 (file)
index 0000000..b4cb6f7
--- /dev/null
@@ -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 (file)
index c68e86d..0000000
+++ /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');
index 2cd8b6d75551897d2a8c20ca89d64f57742187a9..8d679dab615765ed0413f08e861a2a8cd7aa8ed3 100644 (file)
@@ -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 (file)
index 0000000..236abb4
--- /dev/null
@@ -0,0 +1 @@
+/pg_resetwal
similarity index 55%
rename from src/bin/pg_resetxlog/Makefile
rename to src/bin/pg_resetwal/Makefile
index e04892479b574ebd672de5dbb938193c614d6bf8..0f6e5da255f92d2ce55c46a67902a2e760cdb389 100644 (file)
@@ -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 (file)
index 0000000..d04d58e
--- /dev/null
@@ -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
similarity index 99%
rename from src/bin/pg_resetxlog/pg_resetxlog.c
rename to src/bin/pg_resetwal/pg_resetwal.c
index 963802efc826f99404f394bfdc54516caf4dd6b3..96b7097f8b75edffdba465023bd02e768a99464a 100644 (file)
@@ -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/.gitignore b/src/bin/pg_resetxlog/.gitignore
deleted file mode 100644 (file)
index 6b84208..0000000
+++ /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 (file)
index ce18674..0000000
+++ /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
index b9387ff5a988b185ceba04527709dfdb79c42c2a..b075e26632e40a87da414b816abf79c1f56330e3 100644 (file)
  *
  * 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.
index 3a30ea74383531af250f709ff75ee7c58addb49d..c74521f24a334e85a646e347204fda26dfbbc5ea 100644 (file)
@@ -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 */
index 797e36d2530be14ec6a672c6df15187fa7eab40c..145d2da69c4a8c2455f45d0e9494b0f7cbc112a7 100644 (file)
@@ -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();
similarity index 85%
rename from src/bin/pg_xlogdump/.gitignore
rename to src/bin/pg_waldump/.gitignore
index c4783f12bb5c29709c5629c06d824b26864b99b0..0013a93189c05db7a3d34352cf14109dde490f31 100644 (file)
@@ -1,4 +1,4 @@
-/pg_xlogdump
+/pg_waldump
 # Source files copied from src/backend/access/rmgrdesc/
 /*desc.c
 /xlogreader.c
similarity index 62%
rename from src/bin/pg_xlogdump/Makefile
rename to src/bin/pg_waldump/Makefile
index 11df47d51697448eb368479efe771527b399cc02..f5957bd75a6aef71beaa12e60b6260fffc0e642f 100644 (file)
@@ -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
similarity index 98%
rename from src/bin/pg_xlogdump/compat.c
rename to src/bin/pg_waldump/compat.c
index ff5acdc830b0dac6f6fafd8f97f4e5ebf3d86859..e9ceef51042ce415cb452502b199a1abf64f4fbb 100644 (file)
@@ -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 (file)
index 0000000..52f06da
--- /dev/null
@@ -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
similarity index 99%
rename from src/bin/pg_xlogdump/pg_xlogdump.c
rename to src/bin/pg_waldump/pg_waldump.c
index 679aead8951d2c59884897c58b0e8d32d36bc82f..f4bfacfe87f66ebe0a8fc29400fef946cca9aa98 100644 (file)
@@ -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':
similarity index 92%
rename from src/bin/pg_xlogdump/rmgrdesc.c
rename to src/bin/pg_waldump/rmgrdesc.c
index 5d19a4af7257f2bd5fa9233552b5bd1df1d679a4..dd40ba07c763d449e78904518bc6d09ac530a494 100644 (file)
@@ -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"
similarity index 81%
rename from src/bin/pg_xlogdump/rmgrdesc.h
rename to src/bin/pg_waldump/rmgrdesc.h
index 5440f9468f456db0c2dc9b70395805c64911b056..2fa60d90ad8d2f1f73785ccfa81c283d469967ad 100644 (file)
@@ -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 (file)
index 2b254c3..0000000
+++ /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
index 3005b98aaa8e6e6bb121aa6bc64dd19fc0e476f8..578bff593c1152f8a3bf034f1647b3d0fa00e82a 100644 (file)
@@ -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.
  */
index 4c697e276cc819520b71e0f1f07d3d2607279c1d..07a32d6dfcf537d64baaa8bd1e1ce22b9ff9cff7 100644 (file)
@@ -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.
  */
index e04efe65599ae6bc34f205b08f4b078d54038ed7..0aa1422b9fb81abaf4e1c149336c3d9598868b80 100644 (file)
@@ -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
index db566f9c88ca69157a48c53143dadf246e994770..df06e73f0d6d7c17ba9223159506418fb33ae912 100644 (file)
@@ -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};