Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
d496a657
Commit
d496a657
authored
May 12, 2017
by
Peter Eisentraut
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Standardize "WAL location" terminology
Other previously used terms were "WAL position" or "log position".
parent
c1a7f64b
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
62 additions
and
62 deletions
+62
-62
doc/src/sgml/config.sgml
doc/src/sgml/config.sgml
+1
-1
doc/src/sgml/datatype.sgml
doc/src/sgml/datatype.sgml
+1
-1
doc/src/sgml/logicaldecoding.sgml
doc/src/sgml/logicaldecoding.sgml
+1
-1
doc/src/sgml/monitoring.sgml
doc/src/sgml/monitoring.sgml
+11
-11
doc/src/sgml/protocol.sgml
doc/src/sgml/protocol.sgml
+5
-5
doc/src/sgml/ref/pg_waldump.sgml
doc/src/sgml/ref/pg_waldump.sgml
+2
-2
doc/src/sgml/wal.sgml
doc/src/sgml/wal.sgml
+1
-1
src/backend/access/transam/recovery.conf.sample
src/backend/access/transam/recovery.conf.sample
+1
-1
src/backend/access/transam/timeline.c
src/backend/access/transam/timeline.c
+2
-2
src/backend/access/transam/twophase.c
src/backend/access/transam/twophase.c
+1
-1
src/backend/access/transam/xlog.c
src/backend/access/transam/xlog.c
+7
-7
src/backend/replication/walreceiver.c
src/backend/replication/walreceiver.c
+2
-2
src/backend/replication/walsender.c
src/backend/replication/walsender.c
+12
-12
src/bin/pg_basebackup/pg_basebackup.c
src/bin/pg_basebackup/pg_basebackup.c
+1
-1
src/bin/pg_basebackup/receivelog.c
src/bin/pg_basebackup/receivelog.c
+2
-2
src/bin/pg_rewind/parsexlog.c
src/bin/pg_rewind/parsexlog.c
+1
-1
src/bin/pg_rewind/pg_rewind.c
src/bin/pg_rewind/pg_rewind.c
+3
-3
src/bin/pg_waldump/pg_waldump.c
src/bin/pg_waldump/pg_waldump.c
+7
-7
src/include/access/timeline.h
src/include/access/timeline.h
+1
-1
No files found.
doc/src/sgml/config.sgml
View file @
d496a657
...
...
@@ -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
posi
tion it has written, the last position it
the last write-ahead log
loca
tion 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
...
...
doc/src/sgml/datatype.sgml
View file @
d496a657
...
...
@@ -4635,7 +4635,7 @@ SELECT * FROM pg_attribute
standard comparison operators, like <literal>=</literal> and
<literal>></literal>. Two LSNs can be subtracted using the
<literal>-</literal> operator; the result is the number of bytes separating
those write-ahead log
posi
tions.
those write-ahead log
loca
tions.
</para>
</sect1>
...
...
doc/src/sgml/logicaldecoding.sgml
View file @
d496a657
...
...
@@ -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
posi
tion of the message. The <parameter>transactional</parameter> says
loca
tion 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
...
...
doc/src/sgml/monitoring.sgml
View file @
d496a657
...
...
@@ -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
posi
tion rather than
write, flush and replay the most recent reported WAL
loca
tion 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
posi
tion used when WAL receiver is
<entry>First write-ahead log
loca
tion 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
posi
tion already received and flushed to
disk, the initial value of this field being the first log
posi
tion used
<entry>Last write-ahead log
loca
tion already received and flushed to
disk, the initial value of this field being the first log
loca
tion 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
posi
tion received and
<entry>Timeline number of last write-ahead log
loca
tion received and
flushed to disk, the initial value of this field being the timeline
number of the first log
posi
tion used when WAL receiver is started
number of the first log
loca
tion 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
posi
tion reported to origin WAL sender</entry>
<entry>Last write-ahead log
loca
tion 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
posi
tion reported to origin WAL sender</entry>
<entry>Time of last write-ahead log
loca
tion 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
posi
tion received, the initial value of
<entry>Last write-ahead log
loca
tion 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
posi
tion reported to origin WAL sender
<entry>Last write-ahead log
loca
tion 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
posi
tion reported to origin WAL
<entry>Time of last write-ahead log
loca
tion reported to origin WAL
sender</entry>
</row>
</tbody>
...
...
doc/src/sgml/protocol.sgml
View file @
d496a657
...
...
@@ -1724,7 +1724,7 @@ The commands accepted in walsender mode are:
<term><literal>consistent_point</literal> (<type>text</type>)</term>
<listitem>
<para>
The WAL
posi
tion at which the slot became consistent. This is the
The WAL
loca
tion 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
posi
tion <replaceable class="parameter">XXX/XXX</>.
WAL
loca
tion <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
posi
tion where the switch happened (type <type>text</type>). Usually,
second column is the WAL
loca
tion 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
posi
tion <replaceable class="parameter">XXX/XXX</>. The server can
at WAL
loca
tion <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
posi
tion to begin streaming at.
The WAL
loca
tion to begin streaming at.
</para>
</listitem>
</varlistentry>
...
...
doc/src/sgml/ref/pg_waldump.sgml
View file @
d496a657
...
...
@@ -85,7 +85,7 @@ PostgreSQL documentation
<term><option>--end=<replaceable>end</replaceable></option></term>
<listitem>
<para>
Stop reading at the specified
log posi
tion, instead of reading to the
Stop reading at the specified
WAL loca
tion, 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 posi
tion at which to start reading. The default is to start reading
WAL loca
tion at which to start reading. The default is to start reading
the first valid log record found in the earliest file found.
</para>
</listitem>
...
...
doc/src/sgml/wal.sgml
View file @
d496a657
...
...
@@ -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
posi
tion indicated in the checkpoint
scanning forward from the log
loca
tion 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
...
...
src/backend/access/transam/recovery.conf.sample
View file @
d496a657
...
...
@@ -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
posi
tion (LSN). Recovery may either include or
# by timestamp or by WAL
loca
tion (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).
#
...
...
src/backend/access/transam/timeline.c
View file @
d496a657
...
...
@@ -15,7 +15,7 @@
* <parentTLI> <switchpoint> <reason>
*
* parentTLI ID of the parent timeline
* switchpoint XLogRecPtr of the WAL
posi
tion where the switch happened
* switchpoint XLogRecPtr of the WAL
loca
tion 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 posi
tion where the system switched to the new timeline
* switchpoint:
WAL loca
tion 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
...
...
src/backend/access/transam/twophase.c
View file @
d496a657
...
...
@@ -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
posi
tion to fetch the two-phase
* specifies InvalidXLogRecPtr as WAL
loca
tion to fetch the two-phase
* data, the entry is marked as located on disk.
*/
void
...
...
src/backend/access/transam/xlog.c
View file @
d496a657
...
...
@@ -5643,7 +5643,7 @@ recoveryStopsBefore(XLogReaderState *record)
recoveryStopTime
=
0
;
recoveryStopName
[
0
]
=
'\0'
;
ereport
(
LOG
,
(
errmsg
(
"recovery stopping before WAL
posi
tion (LSN)
\"
%X/%X
\"
"
,
(
errmsg
(
"recovery stopping before WAL
loca
tion (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
posi
tion (LSN)
\"
%X/%X
\"
"
,
(
errmsg
(
"recovery stopping after WAL
loca
tion (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
posi
tion (LSN)
\"
%X/%X
\"
"
,
(
errmsg
(
"starting point-in-time recovery to WAL
loca
tion (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
posi
tion, and init xlog
* Prepare to write WAL starting at EndOfLog
loca
tion, 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
posi
tion that must be present to restore from this
* Returns the minimum WAL
loca
tion 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
posi
tion that must be present to restore from this
* Returns the last WAL
loca
tion 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 @@ next_record_is_invalid:
}
/*
* Open the WAL segment containing WAL
posi
tion 'RecPtr'.
* Open the WAL segment containing WAL
loca
tion '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
...
...
src/backend/replication/walreceiver.c
View file @
d496a657
...
...
@@ -1090,7 +1090,7 @@ XLogWalRcvFlush(bool dying)
}
/*
* Send reply message to primary, indicating our current
XLOG posi
tions, oldest
* Send reply message to primary, indicating our current
WAL loca
tions, 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 posi
tion will
* seconds have passed. This means that the apply
WAL loca
tion 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.
...
...
src/backend/replication/walsender.c
View file @
d496a657
...
...
@@ -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 posi
tion with the time it was written. */
/* A sample associating a
WAL loca
tion with the time it was written. */
typedef
struct
{
XLogRecPtr
lsn
;
...
...
@@ -340,7 +340,7 @@ static void
IdentifySystem
(
void
)
{
char
sysid
[
32
];
char
x
pos
[
MAXFNAMELEN
];
char
x
loc
[
MAXFNAMELEN
];
XLogRecPtr
logptr
;
char
*
dbname
=
NULL
;
DestReceiver
*
dest
;
...
...
@@ -367,7 +367,7 @@ IdentifySystem(void)
else
logptr
=
GetFlushRecPtr
();
snprintf
(
x
pos
,
sizeof
(
xpos
),
"%X/%X"
,
(
uint32
)
(
logptr
>>
32
),
(
uint32
)
logptr
);
snprintf
(
x
loc
,
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 posi
tion */
values
[
2
]
=
CStringGetTextDatum
(
x
pos
);
/* column 3:
wal loca
tion */
values
[
2
]
=
CStringGetTextDatum
(
x
loc
);
/* 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
x
pos
[
MAXFNAMELEN
];
char
x
loc
[
MAXFNAMELEN
];
char
*
slot_name
;
bool
reserve_wal
=
false
;
CRSSnapshotAction
snapshot_action
=
CRS_EXPORT_SNAPSHOT
;
...
...
@@ -975,7 +975,7 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
ReplicationSlotSave
();
}
snprintf
(
x
pos
,
sizeof
(
xpos
),
"%X/%X"
,
snprintf
(
x
loc
,
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
(
x
pos
);
values
[
1
]
=
CStringGetTextDatum
(
x
loc
);
/* snapshot name, or NULL if none */
if
(
snapshot_name
!=
NULL
)
...
...
@@ -1729,7 +1729,7 @@ PhysicalConfirmReceivedLocation(XLogRecPtr lsn)
}
/*
* Regular reply from standby advising of WAL
posi
tions on standby server.
* Regular reply from standby advising of WAL
loca
tions 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
posi
tion was written for the purposes of lag tracking.
* this WAL
loca
tion 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
posi
tion is
* LagTrackerRead can compute the elapsed time (lag) when this WAL
loca
tion 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
posi
tion 'lsn'
* Find out how much time has elapsed between the moment WAL
loca
tion '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
...
...
src/bin/pg_basebackup/pg_basebackup.c
View file @
d496a657
...
...
@@ -1782,7 +1782,7 @@ BaseBackup(void)
}
/*
* Get the starting
xlog posi
tion
* Get the starting
WAL loca
tion
*/
res
=
PQgetResult
(
conn
);
if
(
PQresultStatus
(
res
)
!=
PGRES_TUPLES_OK
)
...
...
src/bin/pg_basebackup/receivelog.c
View file @
d496a657
...
...
@@ -438,7 +438,7 @@ CheckServerVersionForStreaming(PGconn *conn)
* If 'synchronous' is true, the received WAL is flushed as soon as written,
* otherwise only when the WAL file is closed.
*
* Note: The
log posi
tion *must* be at a log segment start!
* Note: The
WAL loca
tion *must* be at a log segment start!
*/
bool
ReceiveXlogStream
(
PGconn
*
conn
,
StreamCtl
*
stream
)
...
...
@@ -733,7 +733,7 @@ ReadEndOfStreamingResult(PGresult *res, XLogRecPtr *startpos, uint32 *timeline)
* 4 | 0/9949AE0
*
* next_tli is the timeline ID of the next timeline after the one that
* just finished streaming. next_tli_startpos is the
XLOG posi
tion where
* just finished streaming. next_tli_startpos is the
WAL loca
tion where
* the server switched to it.
*----------
*/
...
...
src/bin/pg_rewind/parsexlog.c
View file @
d496a657
...
...
@@ -149,7 +149,7 @@ readOneRecord(const char *datadir, XLogRecPtr ptr, int tliIndex)
}
/*
* Find the previous checkpoint preceding given WAL
posi
tion.
* Find the previous checkpoint preceding given WAL
loca
tion.
*/
void
findLastCheckpoint
(
const
char
*
datadir
,
XLogRecPtr
forkptr
,
int
tliIndex
,
...
...
src/bin/pg_rewind/pg_rewind.c
View file @
d496a657
...
...
@@ -231,7 +231,7 @@ main(int argc, char **argv)
else
{
findCommonAncestorTimeline
(
&
divergerec
,
&
lastcommontliIndex
);
printf
(
_
(
"servers diverged at WAL
posi
tion %X/%X on timeline %u
\n
"
),
printf
(
_
(
"servers diverged at WAL
loca
tion %X/%X on timeline %u
\n
"
),
(
uint32
)
(
divergerec
>>
32
),
(
uint32
)
divergerec
,
targetHistory
[
lastcommontliIndex
].
tli
);
...
...
@@ -415,9 +415,9 @@ sanityChecks(void)
}
/*
* Find minimum from two
XLOG posi
tions assuming InvalidXLogRecPtr means
* Find minimum from two
WAL loca
tions assuming InvalidXLogRecPtr means
* infinity as src/include/access/timeline.h states. This routine should
* be used only when comparing
XLOG posi
tions related to history files.
* be used only when comparing
WAL loca
tions related to history files.
*/
static
XLogRecPtr
MinXLogRecPtr
(
XLogRecPtr
a
,
XLogRecPtr
b
)
...
...
src/bin/pg_waldump/pg_waldump.c
View file @
d496a657
...
...
@@ -686,7 +686,7 @@ usage(void)
printf
(
_
(
" %s [OPTION]... [STARTSEG [ENDSEG]]
\n
"
),
progname
);
printf
(
_
(
"
\n
Options:
\n
"
));
printf
(
_
(
" -b, --bkp-details output detailed information about backup blocks
\n
"
));
printf
(
_
(
" -e, --end=RECPTR stop reading at
log posi
tion RECPTR
\n
"
));
printf
(
_
(
" -e, --end=RECPTR stop reading at
WAL loca
tion RECPTR
\n
"
));
printf
(
_
(
" -f, --follow keep retrying after reaching end of WAL
\n
"
));
printf
(
_
(
" -n, --limit=N number of records to display
\n
"
));
printf
(
_
(
" -p, --path=PATH directory in which to find log segment files or a
\n
"
...
...
@@ -694,7 +694,7 @@ usage(void)
" (default: current directory, ./pg_wal, PGDATA/pg_wal)
\n
"
));
printf
(
_
(
" -r, --rmgr=RMGR only show records generated by resource manager RMGR
\n
"
" use --rmgr=list to list valid resource manager names
\n
"
));
printf
(
_
(
" -s, --start=RECPTR start reading at
log posi
tion RECPTR
\n
"
));
printf
(
_
(
" -s, --start=RECPTR start reading at
WAL loca
tion RECPTR
\n
"
));
printf
(
_
(
" -t, --timeline=TLI timeline from which to read log records
\n
"
" (default: 1 or the value used in STARTSEG)
\n
"
));
printf
(
_
(
" -V, --version output version information, then exit
\n
"
));
...
...
@@ -775,7 +775,7 @@ main(int argc, char **argv)
case
'e'
:
if
(
sscanf
(
optarg
,
"%X/%X"
,
&
xlogid
,
&
xrecoff
)
!=
2
)
{
fprintf
(
stderr
,
_
(
"%s: could not parse end
log posi
tion
\"
%s
\"\n
"
),
fprintf
(
stderr
,
_
(
"%s: could not parse end
WAL loca
tion
\"
%s
\"\n
"
),
progname
,
optarg
);
goto
bad_argument
;
}
...
...
@@ -829,7 +829,7 @@ main(int argc, char **argv)
case
's'
:
if
(
sscanf
(
optarg
,
"%X/%X"
,
&
xlogid
,
&
xrecoff
)
!=
2
)
{
fprintf
(
stderr
,
_
(
"%s: could not parse start
log posi
tion
\"
%s
\"\n
"
),
fprintf
(
stderr
,
_
(
"%s: could not parse start
WAL loca
tion
\"
%s
\"\n
"
),
progname
,
optarg
);
goto
bad_argument
;
}
...
...
@@ -929,7 +929,7 @@ main(int argc, char **argv)
else
if
(
!
XLByteInSeg
(
private
.
startptr
,
segno
))
{
fprintf
(
stderr
,
_
(
"%s: start
log posi
tion %X/%X is not inside file
\"
%s
\"\n
"
),
_
(
"%s: start
WAL loca
tion %X/%X is not inside file
\"
%s
\"\n
"
),
progname
,
(
uint32
)
(
private
.
startptr
>>
32
),
(
uint32
)
private
.
startptr
,
...
...
@@ -973,7 +973,7 @@ main(int argc, char **argv)
private
.
endptr
!=
(
segno
+
1
)
*
XLogSegSize
)
{
fprintf
(
stderr
,
_
(
"%s: end
log posi
tion %X/%X is not inside file
\"
%s
\"\n
"
),
_
(
"%s: end
WAL loca
tion %X/%X is not inside file
\"
%s
\"\n
"
),
progname
,
(
uint32
)
(
private
.
endptr
>>
32
),
(
uint32
)
private
.
endptr
,
...
...
@@ -985,7 +985,7 @@ main(int argc, char **argv)
/* we don't know what to print */
if
(
XLogRecPtrIsInvalid
(
private
.
startptr
))
{
fprintf
(
stderr
,
_
(
"%s: no start
log position given.
\n
"
),
progname
);
fprintf
(
stderr
,
_
(
"%s: no start
WAL location given
\n
"
),
progname
);
goto
bad_argument
;
}
...
...
src/include/access/timeline.h
View file @
d496a657
...
...
@@ -17,7 +17,7 @@
/*
* A list of these structs describes the timeline history of the server. Each
* TimeLineHistoryEntry represents a piece of WAL belonging to the history,
* from newest to oldest. All WAL
posi
tions between 'begin' and 'end' belong to
* from newest to oldest. All WAL
loca
tions between 'begin' and 'end' belong to
* the timeline represented by the entry. Together the 'begin' and 'end'
* pointers of all the entries form a contiguous line from beginning of time
* to infinity.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment