diff options
| author | Joe Conway <mail@joeconway.com> | 2015-12-28 12:35:16 -0800 |
|---|---|---|
| committer | Joe Conway <mail@joeconway.com> | 2015-12-28 12:35:16 -0800 |
| commit | 282fdfcdc8a8f987c06e839d581b94bf196def8a (patch) | |
| tree | d11bcbd78b0f58d3b82d69da6125531190c4e8db /src/include | |
| parent | 5bf939411ce7a4ae87cee65daca2e4add44b2b46 (diff) | |
Rename (new|old)estCommitTs to (new|old)estCommitTsXid
The variables newestCommitTs and oldestCommitTs sound as if they are
timestamps, but in fact they are the transaction Ids that correspond
to the newest and oldest timestamps rather than the actual timestamps.
Rename these variables to reflect that they are actually xids: to wit
newestCommitTsXid and oldestCommitTsXid respectively. Also modify
related code in a similar fashion, particularly the user facing output
emitted by pg_controldata and pg_resetxlog.
Complaint and patch by me, review by Tom Lane and Alvaro Herrera.
Backpatch to 9.5 where these variables were first introduced.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/commit_ts.h | 2 | ||||
| -rw-r--r-- | src/include/access/transam.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_control.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h index 425f25870fd..b11715a2b95 100644 --- a/src/include/access/commit_ts.h +++ b/src/include/access/commit_ts.h @@ -43,7 +43,7 @@ extern void ExtendCommitTs(TransactionId newestXact); extern void TruncateCommitTs(TransactionId oldestXact); extern void SetCommitTsLimit(TransactionId oldestXact, TransactionId newestXact); -extern void AdvanceOldestCommitTs(TransactionId oldestXact); +extern void AdvanceOldestCommitTsXid(TransactionId oldestXact); /* XLOG stuff */ #define COMMIT_TS_ZEROPAGE 0x00 diff --git a/src/include/access/transam.h b/src/include/access/transam.h index 96b3facb14d..9ad5761f811 100644 --- a/src/include/access/transam.h +++ b/src/include/access/transam.h @@ -126,8 +126,8 @@ typedef struct VariableCacheData /* * These fields are protected by CommitTsLock */ - TransactionId oldestCommitTs; - TransactionId newestCommitTs; + TransactionId oldestCommitTsXid; + TransactionId newestCommitTsXid; /* * These fields are protected by ProcArrayLock. diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h index ad1eb4b9ccd..0b8bea74a89 100644 --- a/src/include/catalog/pg_control.h +++ b/src/include/catalog/pg_control.h @@ -46,9 +46,9 @@ typedef struct CheckPoint MultiXactId oldestMulti; /* cluster-wide minimum datminmxid */ Oid oldestMultiDB; /* database with minimum datminmxid */ pg_time_t time; /* time stamp of checkpoint */ - TransactionId oldestCommitTs; /* oldest Xid with valid commit + TransactionId oldestCommitTsXid; /* oldest Xid with valid commit * timestamp */ - TransactionId newestCommitTs; /* newest Xid with valid commit + TransactionId newestCommitTsXid; /* newest Xid with valid commit * timestamp */ /* |