diff options
| author | Peter Eisentraut | 2017-08-07 21:42:47 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2017-08-11 02:55:41 +0000 |
| commit | a1ef920e27ba6ab3602aaf6d6751d8628fac1af8 (patch) | |
| tree | 51485b2898ae4b01b2e71ad5e40a7d3b02d75f91 /src/backend/access | |
| parent | d6391b03b3025372620925e5746e65c288a1e371 (diff) | |
Remove uses of "slave" in replication contexts
This affects mostly code comments, some documentation, and tests.
Official APIs already used "standby".
Diffstat (limited to 'src/backend/access')
| -rw-r--r-- | src/backend/access/transam/commit_ts.c | 2 | ||||
| -rw-r--r-- | src/backend/access/transam/multixact.c | 2 | ||||
| -rw-r--r-- | src/backend/access/transam/varsup.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c index 827d976db83..60fb9eeb061 100644 --- a/src/backend/access/transam/commit_ts.c +++ b/src/backend/access/transam/commit_ts.c @@ -621,7 +621,7 @@ CommitTsParameterChange(bool newvalue, bool oldvalue) * * The reason why this SLRU needs separate activation/deactivation functions is * that it can be enabled/disabled during start and the activation/deactivation - * on master is propagated to slave via replay. Other SLRUs don't have this + * on master is propagated to standby via replay. Other SLRUs don't have this * property and they can be just initialized during normal startup. * * This is in charge of creating the currently active segment, if it's not diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c index 682eef420bb..7142ecede0a 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -939,7 +939,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset) debug_elog3(DEBUG2, "GetNew: for %d xids", nmembers); - /* safety check, we should never get this far in a HS slave */ + /* safety check, we should never get this far in a HS standby */ if (RecoveryInProgress()) elog(ERROR, "cannot assign MultiXactIds during recovery"); diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c index 15e05591b74..702c8c957f0 100644 --- a/src/backend/access/transam/varsup.c +++ b/src/backend/access/transam/varsup.c @@ -67,7 +67,7 @@ GetNewTransactionId(bool isSubXact) return BootstrapTransactionId; } - /* safety check, we should never get this far in a HS slave */ + /* safety check, we should never get this far in a HS standby */ if (RecoveryInProgress()) elog(ERROR, "cannot assign TransactionIds during recovery"); @@ -468,7 +468,7 @@ GetNewObjectId(void) { Oid result; - /* safety check, we should never get this far in a HS slave */ + /* safety check, we should never get this far in a HS standby */ if (RecoveryInProgress()) elog(ERROR, "cannot assign OIDs during recovery"); |