diff options
Diffstat (limited to 'src/backend/replication/logical')
| -rw-r--r-- | src/backend/replication/logical/logicalfuncs.c | 2 | ||||
| -rw-r--r-- | src/backend/replication/logical/origin.c | 16 | ||||
| -rw-r--r-- | src/backend/replication/logical/snapbuild.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c index a354a3f819f..012987a9727 100644 --- a/src/backend/replication/logical/logicalfuncs.c +++ b/src/backend/replication/logical/logicalfuncs.c @@ -403,7 +403,7 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin ctx->options.output_type !=OUTPUT_PLUGIN_TEXTUAL_OUTPUT) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), - errmsg("logical decoding output plugin \"%s\" produces binary output, but \"%s\" expects textual data", + errmsg("logical decoding output plugin \"%s\" produces binary output, but function \"%s\" expects textual data", NameStr(MyReplicationSlot->data.plugin), format_procedure(fcinfo->flinfo->fn_oid)))); diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c index f55641bfb0d..8a3fb59e4ad 100644 --- a/src/backend/replication/logical/origin.c +++ b/src/backend/replication/logical/origin.c @@ -313,7 +313,7 @@ replorigin_create(char *roname) if (tuple == NULL) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), - errmsg("no free replication origin oid could be found"))); + errmsg("could not find free replication origin OID"))); heap_freetuple(tuple); return roident; @@ -350,7 +350,7 @@ replorigin_drop(RepOriginId roident) { ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("cannot drop replication origin with oid %d, in use by pid %d", + errmsg("could not drop replication origin with OID %d, in use by PID %d", state->roident, state->acquired_by))); } @@ -728,7 +728,7 @@ StartupReplicationOrigin(void) if (last_state == max_replication_slots) ereport(PANIC, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), - errmsg("no free replication state could be found, increase max_replication_slots"))); + errmsg("could not find free replication state, increase max_replication_slots"))); /* copy data to shared memory */ replication_states[last_state].roident = disk_state.roident; @@ -746,7 +746,7 @@ StartupReplicationOrigin(void) if (file_crc != crc) ereport(PANIC, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), - errmsg("replication_slot_checkpoint has wrong checksum %u, expected %u", + errmsg("replication slot checkpoint has wrong checksum %u, expected %u", crc, file_crc))); CloseTransientFile(fd); @@ -870,7 +870,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 OID %d is already active for PID %d", replication_state->roident, replication_state->acquired_by))); } @@ -881,7 +881,7 @@ replorigin_advance(RepOriginId node, if (replication_state == NULL && free_state == NULL) ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), - errmsg("no free replication state slot could be found for replication origin with oid %u", + errmsg("could not find free replication state slot for replication origin with OID %u", node), errhint("Increase max_replication_slots and try again."))); @@ -1049,7 +1049,7 @@ replorigin_session_setup(RepOriginId node) { ereport(ERROR, (errcode(ERRCODE_OBJECT_IN_USE), - errmsg("replication identifier %d is already active for pid %d", + errmsg("replication identifier %d is already active for PID %d", curstate->roident, curstate->acquired_by))); } @@ -1061,7 +1061,7 @@ replorigin_session_setup(RepOriginId node) if (session_replication_state == NULL && free_slot == -1) ereport(ERROR, (errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED), - errmsg("no free replication state slot could be found for replication origin with oid %u", + errmsg("could not find free replication state slot for replication origin with OID %u", node), errhint("Increase max_replication_slots and try again."))); else if (session_replication_state == NULL) diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c index a574cf365a3..ccc44faa625 100644 --- a/src/backend/replication/logical/snapbuild.c +++ b/src/backend/replication/logical/snapbuild.c @@ -1677,12 +1677,12 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) if (ondisk.magic != SNAPBUILD_MAGIC) ereport(ERROR, - (errmsg("snapbuild state file \"%s\" has wrong magic %u instead of %u", + (errmsg("snapbuild state file \"%s\" has wrong magic number: %u instead of %u", path, ondisk.magic, SNAPBUILD_MAGIC))); if (ondisk.version != SNAPBUILD_VERSION) ereport(ERROR, - (errmsg("snapbuild state file \"%s\" has unsupported version %u instead of %u", + (errmsg("snapbuild state file \"%s\" has unsupported version: %u instead of %u", path, ondisk.version, SNAPBUILD_VERSION))); INIT_CRC32C(checksum); @@ -1738,7 +1738,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn) if (!EQ_CRC32C(checksum, ondisk.checksum)) ereport(ERROR, (errcode_for_file_access(), - errmsg("snapbuild state file %s: checksum mismatch, is %u, should be %u", + errmsg("checksum mismatch for snapbuild state file \"%s\": is %u, should be %u", path, checksum, ondisk.checksum))); /* |