diff options
| author | Andres Freund <andres@anarazel.de> | 2020-06-14 14:05:18 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2020-07-08 12:57:23 -0700 |
| commit | 5e7bbb528638c0f6d585bab107ec7a19e3a39deb (patch) | |
| tree | c01d61e45b23ef760e4225538ff24277346e34de /src/include | |
| parent | 229f8c219f8fffacc253eca6023eab10a16eb009 (diff) | |
| download | postgresql-5e7bbb528638c0f6d585bab107ec7a19e3a39deb.tar.gz postgresql-5e7bbb528638c0f6d585bab107ec7a19e3a39deb.zip | |
code: replace 'master' with 'primary' where appropriate.
Also changed "in the primary" to "on the primary", and added a few
"the" before "primary".
Author: Andres Freund
Reviewed-By: David Steele
Discussion: https://postgr.es/m/20200615182235.x7lch5n6kcjq4aue@alap3.anarazel.de
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/xlog.h | 4 | ||||
| -rw-r--r-- | src/include/tcop/utility.h | 2 | ||||
| -rw-r--r-- | src/include/utils/guc_tables.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h index 77ac4e785fc..5b143348879 100644 --- a/src/include/access/xlog.h +++ b/src/include/access/xlog.h @@ -50,7 +50,7 @@ extern bool InRecovery; * * In INITIALIZED state, we've run InitRecoveryTransactionEnvironment, but * we haven't yet processed a RUNNING_XACTS or shutdown-checkpoint WAL record - * to initialize our master-transaction tracking system. + * to initialize our primary-transaction tracking system. * * When the transaction tracking is initialized, we enter the SNAPSHOT_PENDING * state. The tracked information might still be incomplete, so we can't allow @@ -58,7 +58,7 @@ extern bool InRecovery; * appropriate. * * In SNAPSHOT_READY mode, we have full knowledge of transactions that are - * (or were) running in the master at the current WAL location. Snapshots + * (or were) running on the primary at the current WAL location. Snapshots * can be taken, and read-only queries can be run. */ typedef enum diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h index 4aec19a0087..9594856c88a 100644 --- a/src/include/tcop/utility.h +++ b/src/include/tcop/utility.h @@ -51,7 +51,7 @@ typedef struct AlterTableUtilityContext * * COMMAND_OK_IN_RECOVERY means that the command is permissible even when in * recovery. It can't write WAL, nor can it do things that would imperil - * replay of future WAL received from the master. + * replay of future WAL received from the primary. */ #define COMMAND_OK_IN_READ_ONLY_TXN 0x0001 #define COMMAND_OK_IN_PARALLEL_MODE 0x0002 diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h index 454c2df4878..04431d0eb25 100644 --- a/src/include/utils/guc_tables.h +++ b/src/include/utils/guc_tables.h @@ -73,7 +73,7 @@ enum config_group WAL_RECOVERY_TARGET, REPLICATION, REPLICATION_SENDING, - REPLICATION_MASTER, + REPLICATION_PRIMARY, REPLICATION_STANDBY, REPLICATION_SUBSCRIBERS, QUERY_TUNING, |