diff options
| -rw-r--r-- | doc/src/sgml/replication-origins.sgml | 4 | ||||
| -rw-r--r-- | src/backend/replication/logical/origin.c | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/sgml/replication-origins.sgml b/doc/src/sgml/replication-origins.sgml index 7e02c4605b2..bb0fb624d25 100644 --- a/doc/src/sgml/replication-origins.sgml +++ b/doc/src/sgml/replication-origins.sgml @@ -27,12 +27,12 @@ </para> <para> - Replication origins have just two properties, a name and an OID. The name, + Replication origins have just two properties, a name and an ID. The name, which is what should be used to refer to the origin across systems, is free-form <type>text</type>. It should be used in a way that makes conflicts between replication origins created by different replication solutions unlikely; e.g., by prefixing the replication solution's name to it. - The OID is used only to avoid having to store the long version + The ID is used only to avoid having to store the long version in situations where space efficiency is important. It should never be shared across systems. </para> diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index c72ad6b93de..9eb97fac582 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -328,7 +328,7 @@ replorigin_create(const char *roname) if (tuple == NULL) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("could not find free replication origin OID"))); + errmsg("could not find free replication origin ID"))); heap_freetuple(tuple); return roident; @@ -364,7 +364,7 @@ restart: if (nowait) ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("could not drop replication origin with OID %d, in use by PID %d", + errmsg("could not drop replication origin with ID %u, in use by PID %d", state->roident, state->acquired_by))); @@ -408,7 +408,7 @@ restart: */ tuple = SearchSysCache1(REPLORIGIDENT, ObjectIdGetDatum(roident)); if (!HeapTupleIsValid(tuple)) - elog(ERROR, "cache lookup failed for replication origin with oid %u", + elog(ERROR, "cache lookup failed for replication origin with ID %u", roident); CatalogTupleDelete(rel, &tuple->t_self); @@ -485,7 +485,7 @@ replorigin_by_oid(RepOriginId roident, bool missing_ok, char **roname) if (!missing_ok) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), - errmsg("replication origin with OID %u does not exist", + errmsg("replication origin with ID %u does not exist", roident))); return false; @@ -937,7 +937,7 @@ replorigin_advance(RepOriginId node, { ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("replication origin with OID %d is already active for PID %d", + errmsg("replication origin with ID %u is already active for PID %d", replication_state->roident, replication_state->acquired_by))); } @@ -948,7 +948,7 @@ replorigin_advance(RepOriginId node, if (replication_state == NULL && free_state == NULL) ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), - errmsg("could not find free replication state slot for replication origin with OID %u", + errmsg("could not find free replication state slot for replication origin with ID %u", node), errhint("Increase max_replication_slots and try again."))); @@ -1126,7 +1126,7 @@ replorigin_session_setup(RepOriginId node) { ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("replication origin with OID %d is already active for PID %d", + errmsg("replication origin with ID %u is already active for PID %d", curstate->roident, curstate->acquired_by))); } @@ -1138,7 +1138,7 @@ replorigin_session_setup(RepOriginId node) if (session_replication_state == NULL && free_slot == -1) ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), - errmsg("could not find free replication state slot for replication origin with OID %u", + errmsg("could not find free replication state slot for replication origin with ID %u", node), errhint("Increase max_replication_slots and try again."))); else if (session_replication_state == NULL) |