Standardize "WAL location" terminology

petere · petere · commit d496a6579073 · 2017-05-12T13:51:27.000-04:00
Other previously used terms were "WAL position" or "log position".
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
@@ -3312,7 +3312,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        to the primary or upstream standby, where it can be seen using the
        <link linkend="monitoring-stats-views-table">
        <literal>pg_stat_replication</></link> view.  The standby will report
-       the last write-ahead log position it has written, the last position it
+       the last write-ahead log location it has written, the last position it
        has flushed to disk, and the last position it has applied.
        This parameter's
        value is the maximum interval, in seconds, between reports.  Updates are
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
@@ -4635,7 +4635,7 @@ SELECT * FROM pg_attribute
     standard comparison operators, like <literal>=</literal> and
     <literal>&gt;</literal>.  Two LSNs can be subtracted using the
     <literal>-</literal> operator; the result is the number of bytes separating
-    those write-ahead log positions.
+    those write-ahead log locations.
    </para>
   </sect1>
 
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml
@@ -632,7 +632,7 @@ typedef void (*LogicalDecodeMessageCB) (struct LogicalDecodingContext *ctx,
       its XID. Note however that it can be NULL when the message is
       non-transactional and the XID was not assigned yet in the transaction
       which logged the message. The <parameter>lsn</parameter> has WAL
-      position of the message. The <parameter>transactional</parameter> says
+      location of the message. The <parameter>transactional</parameter> says
       if the message was sent as transactional or not.
       The <parameter>prefix</parameter> is arbitrary null-terminated prefix
       which can be used for identifying interesting messages for the current
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
@@ -1829,7 +1829,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     being generated, but would differ when the sender becomes idle.  In
     particular, when the standby has caught up completely, 
     <structname>pg_stat_replication</structname> shows the time taken to
-    write, flush and replay the most recent reported WAL position rather than
+    write, flush and replay the most recent reported WAL location rather than
     zero as some users might expect.  This is consistent with the goal of
     measuring synchronous commit and transaction visibility delays for
     recent write transactions.
@@ -1865,7 +1865,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     <row>
      <entry><structfield>receive_start_lsn</></entry>
      <entry><type>pg_lsn</></entry>
-     <entry>First write-ahead log position used when WAL receiver is
+     <entry>First write-ahead log location used when WAL receiver is
       started</entry>
     </row>
     <row>
@@ -1876,16 +1876,16 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     <row>
      <entry><structfield>received_lsn</></entry>
      <entry><type>pg_lsn</></entry>
-     <entry>Last write-ahead log position already received and flushed to
-      disk, the initial value of this field being the first log position used
+     <entry>Last write-ahead log location already received and flushed to
+      disk, the initial value of this field being the first log location used
       when WAL receiver is started</entry>
     </row>
     <row>
      <entry><structfield>received_tli</></entry>
      <entry><type>integer</></entry>
-     <entry>Timeline number of last write-ahead log position received and
+     <entry>Timeline number of last write-ahead log location received and
       flushed to disk, the initial value of this field being the timeline
-      number of the first log position used when WAL receiver is started
+      number of the first log location used when WAL receiver is started
      </entry>
     </row>
     <row>
@@ -1901,12 +1901,12 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     <row>
      <entry><structfield>latest_end_lsn</></entry>
      <entry><type>pg_lsn</></entry>
-     <entry>Last write-ahead log position reported to origin WAL sender</entry>
+     <entry>Last write-ahead log location reported to origin WAL sender</entry>
     </row>
     <row>
      <entry><structfield>latest_end_time</></entry>
      <entry><type>timestamp with time zone</></entry>
-     <entry>Time of last write-ahead log position reported to origin WAL sender</entry>
+     <entry>Time of last write-ahead log location reported to origin WAL sender</entry>
     </row>
     <row>
      <entry><structfield>slot_name</></entry>
@@ -1967,7 +1967,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     <row>
      <entry><structfield>received_lsn</></entry>
      <entry><type>pg_lsn</></entry>
-     <entry>Last write-ahead log position received, the initial value of
+     <entry>Last write-ahead log location received, the initial value of
       this field being 0</entry>
     </row>
     <row>
@@ -1984,13 +1984,13 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     <row>
      <entry><structfield>latest_end_lsn</></entry>
      <entry><type>pg_lsn</></entry>
-     <entry>Last write-ahead log position reported to origin WAL sender
+     <entry>Last write-ahead log location reported to origin WAL sender
      </entry>
     </row>
     <row>
      <entry><structfield>latest_end_time</></entry>
      <entry><type>timestamp with time zone</></entry>
-     <entry>Time of last write-ahead log position reported to origin WAL
+     <entry>Time of last write-ahead log location reported to origin WAL
       sender</entry>
     </row>
    </tbody>
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
@@ -1724,7 +1724,7 @@ The commands accepted in walsender mode are:
         <term><literal>consistent_point</literal> (<type>text</type>)</term>
         <listitem>
          <para>
-          The WAL position at which the slot became consistent.  This is the
+          The WAL location at which the slot became consistent.  This is the
           earliest location from which streaming can start on this replication
           slot.
          </para>
@@ -1764,7 +1764,7 @@ The commands accepted in walsender mode are:
     <listitem>
      <para>
       Instructs server to start streaming WAL, starting at
-      WAL position <replaceable class="parameter">XXX/XXX</>.
+      WAL location <replaceable class="parameter">XXX/XXX</>.
       If <literal>TIMELINE</literal> option is specified,
       streaming starts on timeline <replaceable class="parameter">tli</>;
       otherwise, the server's current timeline is selected. The server can
@@ -1796,7 +1796,7 @@ The commands accepted in walsender mode are:
       acknowledges this by also exiting COPY mode, the server sends a result
       set with one row and two columns, indicating the next timeline in this
       server's history. The first column is the next timeline's ID (type <type>int8</type>), and the
-      second column is the WAL position where the switch happened (type <type>text</type>). Usually,
+      second column is the WAL location where the switch happened (type <type>text</type>). Usually,
       the switch position is the end of the WAL that was streamed, but there
       are corner cases where the server can send some WAL from the old
       timeline that it has not itself replayed before promoting. Finally, the
@@ -2115,7 +2115,7 @@ The commands accepted in walsender mode are:
     <listitem>
      <para>
       Instructs server to start streaming WAL for logical replication, starting
-      at WAL position <replaceable class="parameter">XXX/XXX</>. The server can
+      at WAL location <replaceable class="parameter">XXX/XXX</>. The server can
       reply with an error, for example if the requested section of WAL has already
       been recycled. On success, server responds with a CopyBothResponse
       message, and then starts to stream WAL to the frontend.
@@ -2147,7 +2147,7 @@ The commands accepted in walsender mode are:
        <term><replaceable class="parameter">XXX/XXX</></term>
        <listitem>
         <para>
-         The WAL position to begin streaming at.
+         The WAL location to begin streaming at.
         </para>
        </listitem>
       </varlistentry>
diff --git a/doc/src/sgml/ref/pg_waldump.sgml b/doc/src/sgml/ref/pg_waldump.sgml
@@ -85,7 +85,7 @@ PostgreSQL documentation
       <term><option>--end=<replaceable>end</replaceable></option></term>
       <listitem>
        <para>
-        Stop reading at the specified log position, instead of reading to the
+        Stop reading at the specified WAL location, instead of reading to the
         end of the log stream.
        </para>
       </listitem>
@@ -144,7 +144,7 @@ PostgreSQL documentation
       <term><option>--start=<replaceable>start</replaceable></option></term>
       <listitem>
        <para>
-        Log position at which to start reading. The default is to start reading
+        WAL location at which to start reading. The default is to start reading
         the first valid log record found in the earliest file found.
        </para>
       </listitem>
diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml
@@ -791,7 +791,7 @@
    <filename>pg_control</filename>. Therefore, at the start of recovery,
    the server first reads <filename>pg_control</filename> and
    then the checkpoint record; then it performs the REDO operation by
-   scanning forward from the log position indicated in the checkpoint
+   scanning forward from the log location indicated in the checkpoint
    record.  Because the entire content of data pages is saved in the
    log on the first page modification after a checkpoint (assuming
    <xref linkend="guc-full-page-writes"> is not disabled), all pages
diff --git a/src/backend/access/transam/recovery.conf.sample b/src/backend/access/transam/recovery.conf.sample
@@ -67,7 +67,7 @@
 # must set a recovery target.
 #
 # You may set a recovery target either by transactionId, by name,
-# by timestamp or by WAL position (LSN). Recovery may either include or
+# by timestamp or by WAL location (LSN). Recovery may either include or
 # exclude the transaction(s) with the recovery target value (ie, stop either
 # just after or just before the given target, respectively).
 #
diff --git a/src/backend/access/transam/timeline.c b/src/backend/access/transam/timeline.c
@@ -15,7 +15,7 @@
  * <parentTLI> <switchpoint> <reason>
  *
  *	parentTLI	ID of the parent timeline
- *	switchpoint XLogRecPtr of the WAL position where the switch happened
+ *	switchpoint XLogRecPtr of the WAL location where the switch happened
  *	reason		human-readable explanation of why the timeline was changed
  *
  * The fields are separated by tabs. Lines beginning with # are comments, and
@@ -278,7 +278,7 @@ findNewestTimeLine(TimeLineID startTLI)
  *
  *	newTLI: ID of the new timeline
  *	parentTLI: ID of its immediate parent
- *	switchpoint: XLOG position where the system switched to the new timeline
+ *	switchpoint: WAL location where the system switched to the new timeline
  *	reason: human-readable explanation of why the timeline was switched
  *
  * Currently this is only used at the end recovery, and so there are no locking
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -2294,7 +2294,7 @@ RecordTransactionAbortPrepared(TransactionId xid,
  *
  * Store pointers to the start/end of the WAL record along with the xid in
  * a gxact entry in shared memory TwoPhaseState structure.  If caller
- * specifies InvalidXLogRecPtr as WAL position to fetch the two-phase
+ * specifies InvalidXLogRecPtr as WAL location to fetch the two-phase
  * data, the entry is marked as located on disk.
  */
 void
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -5643,7 +5643,7 @@ recoveryStopsBefore(XLogReaderState *record)
 		recoveryStopTime = 0;
 		recoveryStopName[0] = '\0';
 		ereport(LOG,
-				(errmsg("recovery stopping before WAL position (LSN) \"%X/%X\"",
+				(errmsg("recovery stopping before WAL location (LSN) \"%X/%X\"",
 						(uint32) (recoveryStopLSN >> 32),
 						(uint32) recoveryStopLSN)));
 		return true;
@@ -5800,7 +5800,7 @@ recoveryStopsAfter(XLogReaderState *record)
 		recoveryStopTime = 0;
 		recoveryStopName[0] = '\0';
 		ereport(LOG,
-				(errmsg("recovery stopping after WAL position (LSN) \"%X/%X\"",
+				(errmsg("recovery stopping after WAL location (LSN) \"%X/%X\"",
 						(uint32) (recoveryStopLSN >> 32),
 						(uint32) recoveryStopLSN)));
 		return true;
@@ -6323,7 +6323,7 @@ StartupXLOG(void)
 							recoveryTargetName)));
 		else if (recoveryTarget == RECOVERY_TARGET_LSN)
 			ereport(LOG,
-					(errmsg("starting point-in-time recovery to WAL position (LSN) \"%X/%X\"",
+					(errmsg("starting point-in-time recovery to WAL location (LSN) \"%X/%X\"",
 							(uint32) (recoveryTargetLSN >> 32),
 							(uint32) recoveryTargetLSN)));
 		else if (recoveryTarget == RECOVERY_TARGET_IMMEDIATE)
@@ -7455,7 +7455,7 @@ StartupXLOG(void)
 		exitArchiveRecovery(EndOfLogTLI, EndOfLog);
 
 	/*
-	 * Prepare to write WAL starting at EndOfLog position, and init xlog
+	 * Prepare to write WAL starting at EndOfLog location, and init xlog
 	 * buffer cache using the block containing the last record from the
 	 * previous incarnation.
 	 */
@@ -10159,7 +10159,7 @@ XLogFileNameP(TimeLineID tli, XLogSegNo segno)
  * when backup needs to generate tablespace_map file, it is used to
  * embed escape character before newline character in tablespace path.
  *
- * Returns the minimum WAL position that must be present to restore from this
+ * Returns the minimum WAL location that must be present to restore from this
  * backup, and the corresponding timeline ID in *starttli_p.
  *
  * Every successfully started non-exclusive backup must be stopped by calling
@@ -10669,7 +10669,7 @@ get_backup_status(void)
  * If labelfile is NULL, this stops an exclusive backup. Otherwise this stops
  * the non-exclusive backup specified by 'labelfile'.
  *
- * Returns the last WAL position that must be present to restore from this
+ * Returns the last WAL location that must be present to restore from this
  * backup, and the corresponding timeline ID in *stoptli_p.
  *
  * It is the responsibility of the caller of this function to verify the
@@ -11569,7 +11569,7 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
 }
 
 /*
- * Open the WAL segment containing WAL position 'RecPtr'.
+ * Open the WAL segment containing WAL location 'RecPtr'.
  *
  * The segment can be fetched via restore_command, or via walreceiver having
  * streamed the record, or it can already be present in pg_wal. Checking
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
@@ -1090,7 +1090,7 @@ XLogWalRcvFlush(bool dying)
 }
 
 /*
- * Send reply message to primary, indicating our current XLOG positions, oldest
+ * Send reply message to primary, indicating our current WAL locations, oldest
  * xmin and the current time.
  *
  * If 'force' is not set, the message is only sent if enough time has
@@ -1125,7 +1125,7 @@ XLogWalRcvSendReply(bool force, bool requestReply)
 	 * We can compare the write and flush positions to the last message we
 	 * sent without taking any lock, but the apply position requires a spin
 	 * lock, so we don't check that unless something else has changed or 10
-	 * seconds have passed.  This means that the apply log position will
+	 * seconds have passed.  This means that the apply WAL location will
 	 * appear, from the master's point of view, to lag slightly, but since
 	 * this is only for reporting purposes and only on idle systems, that's
 	 * probably OK.
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -194,7 +194,7 @@ static volatile sig_atomic_t replication_active = false;
 static LogicalDecodingContext *logical_decoding_ctx = NULL;
 static XLogRecPtr logical_startptr = InvalidXLogRecPtr;
 
-/* A sample associating a log position with the time it was written. */
+/* A sample associating a WAL location with the time it was written. */
 typedef struct
 {
 	XLogRecPtr lsn;
@@ -340,7 +340,7 @@ static void
 IdentifySystem(void)
 {
 	char		sysid[32];
-	char		xpos[MAXFNAMELEN];
+	char		xloc[MAXFNAMELEN];
 	XLogRecPtr	logptr;
 	char	   *dbname = NULL;
 	DestReceiver *dest;
@@ -367,7 +367,7 @@ IdentifySystem(void)
 	else
 		logptr = GetFlushRecPtr();
 
-	snprintf(xpos, sizeof(xpos), "%X/%X", (uint32) (logptr >> 32), (uint32) logptr);
+	snprintf(xloc, sizeof(xloc), "%X/%X", (uint32) (logptr >> 32), (uint32) logptr);
 
 	if (MyDatabaseId != InvalidOid)
 	{
@@ -406,8 +406,8 @@ IdentifySystem(void)
 	/* column 2: timeline */
 	values[1] = Int32GetDatum(ThisTimeLineID);
 
-	/* column 3: xlog position */
-	values[2] = CStringGetTextDatum(xpos);
+	/* column 3: wal location */
+	values[2] = CStringGetTextDatum(xloc);
 
 	/* column 4: database name, or NULL if none */
 	if (dbname)
@@ -842,7 +842,7 @@ static void
 CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
 {
 	const char *snapshot_name = NULL;
-	char		xpos[MAXFNAMELEN];
+	char		xloc[MAXFNAMELEN];
 	char	   *slot_name;
 	bool		reserve_wal = false;
 	CRSSnapshotAction snapshot_action = CRS_EXPORT_SNAPSHOT;
@@ -975,7 +975,7 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
 			ReplicationSlotSave();
 	}
 
-	snprintf(xpos, sizeof(xpos), "%X/%X",
+	snprintf(xloc, sizeof(xloc), "%X/%X",
 			 (uint32) (MyReplicationSlot->data.confirmed_flush >> 32),
 			 (uint32) MyReplicationSlot->data.confirmed_flush);
 
@@ -1008,7 +1008,7 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
 	values[0] = CStringGetTextDatum(slot_name);
 
 	/* consistent wal location */
-	values[1] = CStringGetTextDatum(xpos);
+	values[1] = CStringGetTextDatum(xloc);
 
 	/* snapshot name, or NULL if none */
 	if (snapshot_name != NULL)
@@ -1729,7 +1729,7 @@ PhysicalConfirmReceivedLocation(XLogRecPtr lsn)
 }
 
 /*
- * Regular reply from standby advising of WAL positions on standby server.
+ * Regular reply from standby advising of WAL locations on standby server.
  */
 static void
 ProcessStandbyReplyMessage(void)
@@ -2579,7 +2579,7 @@ XLogSendPhysical(void)
 
 	/*
 	 * Record the current system time as an approximation of the time at which
-	 * this WAL position was written for the purposes of lag tracking.
+	 * this WAL location was written for the purposes of lag tracking.
 	 *
 	 * In theory we could make XLogFlush() record a time in shmem whenever WAL
 	 * is flushed and we could get that time as well as the LSN when we call
@@ -3353,7 +3353,7 @@ WalSndKeepaliveIfNecessary(TimestampTz now)
 
 /*
  * Record the end of the WAL and the time it was flushed locally, so that
- * LagTrackerRead can compute the elapsed time (lag) when this WAL position is
+ * LagTrackerRead can compute the elapsed time (lag) when this WAL location is
  * eventually reported to have been written, flushed and applied by the
  * standby in a reply message.
  */
@@ -3410,7 +3410,7 @@ LagTrackerWrite(XLogRecPtr lsn, TimestampTz local_flush_time)
 }
 
 /*
- * Find out how much time has elapsed between the moment WAL position 'lsn'
+ * Find out how much time has elapsed between the moment WAL location 'lsn'
  * (or the highest known earlier LSN) was flushed locally and the time 'now'.
  * We have a separate read head for each of the reported LSN locations we
  * receive in replies from standby; 'head' controls which read head is
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
diff --git a/src/include/access/timeline.h b/src/include/access/timeline.h

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@`
`67`	`67`	`# must set a recovery target.`
`68`	`68`	`#`
`69`	`69`	`# You may set a recovery target either by transactionId, by name,`
`70`		`-# by timestamp or by WAL position (LSN). Recovery may either include or`
	`70`	`+# by timestamp or by WAL location (LSN). Recovery may either include or`
`71`	`71`	`# exclude the transaction(s) with the recovery target value (ie, stop either`
`72`	`72`	`# just after or just before the given target, respectively).`
`73`	`73`	`#`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* <parentTLI> <switchpoint> <reason>`
`16`	`16`	`*`
`17`	`17`	`* parentTLI ID of the parent timeline`
`18`		`- * switchpoint XLogRecPtr of the WAL position where the switch happened`
	`18`	`+ * switchpoint XLogRecPtr of the WAL location where the switch happened`
`19`	`19`	`* reason human-readable explanation of why the timeline was changed`
`20`	`20`	`*`
`21`	`21`	`* The fields are separated by tabs. Lines beginning with # are comments, and`
`@@ -278,7 +278,7 @@ findNewestTimeLine(TimeLineID startTLI)`
`278`	`278`	`*`
`279`	`279`	`* newTLI: ID of the new timeline`
`280`	`280`	`* parentTLI: ID of its immediate parent`
`281`		`- * switchpoint: XLOG position where the system switched to the new timeline`
	`281`	`+ * switchpoint: WAL location where the system switched to the new timeline`
`282`	`282`	`* reason: human-readable explanation of why the timeline was switched`
`283`	`283`	`*`
`284`	`284`	`* Currently this is only used at the end recovery, and so there are no locking`
Original file line number	Diff line number	Diff line change
`@@ -2294,7 +2294,7 @@ RecordTransactionAbortPrepared(TransactionId xid,`
`2294`	`2294`	`*`
`2295`	`2295`	`* Store pointers to the start/end of the WAL record along with the xid in`
`2296`	`2296`	`* a gxact entry in shared memory TwoPhaseState structure. If caller`
`2297`		`- * specifies InvalidXLogRecPtr as WAL position to fetch the two-phase`
	`2297`	`+ * specifies InvalidXLogRecPtr as WAL location to fetch the two-phase`
`2298`	`2298`	`* data, the entry is marked as located on disk.`
`2299`	`2299`	`*/`
`2300`	`2300`	`void`