From 887248e97e2da6f602ddf22aaaaf8cb41d0d010d Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 23 Sep 2019 13:37:33 +0200 Subject: [PATCH] Message style fixes --- contrib/test_decoding/expected/slot.out | 2 +- src/backend/access/transam/xlog.c | 2 +- src/backend/access/transam/xlogfuncs.c | 2 +- src/backend/catalog/pg_aggregate.c | 4 ++-- src/backend/libpq/auth.c | 2 +- src/backend/replication/basebackup.c | 8 +++++--- src/backend/replication/slotfuncs.c | 2 +- src/backend/storage/file/fd.c | 4 ++-- src/backend/utils/adt/ri_triggers.c | 2 +- src/backend/utils/misc/guc.c | 6 +++--- src/test/regress/expected/foreign_key.out | 10 +++++----- 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/contrib/test_decoding/expected/slot.out b/contrib/test_decoding/expected/slot.out index 3da6b0be63..1000171530 100644 --- a/contrib/test_decoding/expected/slot.out +++ b/contrib/test_decoding/expected/slot.out @@ -141,7 +141,7 @@ SELECT slot_name FROM pg_create_physical_replication_slot('regression_slot3'); (1 row) SELECT pg_replication_slot_advance('regression_slot3', '0/0'); -- invalid LSN -ERROR: invalid target wal lsn +ERROR: invalid target WAL LSN SELECT pg_replication_slot_advance('regression_slot3', '0/1'); -- error ERROR: cannot advance replication slot that has not previously reserved WAL SELECT pg_drop_replication_slot('regression_slot3'); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index b7ff004234..501f46fd52 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -11297,7 +11297,7 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired, ereport(FATAL, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE), - errdetail("Timeline ID parsed is %u, but expected %u", + errdetail("Timeline ID parsed is %u, but expected %u.", tli_from_file, tli_from_walseg))); ereport(DEBUG1, diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c index 8a70503228..8f179887ab 100644 --- a/src/backend/access/transam/xlogfuncs.c +++ b/src/backend/access/transam/xlogfuncs.c @@ -726,7 +726,7 @@ pg_promote(PG_FUNCTION_ARGS) if (wait_seconds <= 0) ereport(ERROR, (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("\"wait_seconds\" cannot be negative or equal zero"))); + errmsg("\"wait_seconds\" must not be negative or zero"))); /* create the promote signal file */ promote_file = AllocateFile(PROMOTE_SIGNAL_FILE, "w"); diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c index 201242e796..1ac235a0f4 100644 --- a/src/backend/catalog/pg_aggregate.c +++ b/src/backend/catalog/pg_aggregate.c @@ -116,7 +116,7 @@ AggregateCreate(const char *aggName, elog(ERROR, "aggregate must have a transition function"); if (numDirectArgs < 0 || numDirectArgs > numArgs) - elog(ERROR, "incorrect number of direct args for aggregate"); + elog(ERROR, "incorrect number of direct arguments for aggregate"); /* * Aggregates can have at most FUNC_MAX_ARGS-1 args, else the transfn @@ -711,7 +711,7 @@ AggregateCreate(const char *aggName, if (numDirectArgs != oldagg->aggnumdirectargs) ereport(ERROR, (errcode(ERRCODE_INVALID_FUNCTION_DEFINITION), - errmsg("cannot change number of direct args of an aggregate function"))); + errmsg("cannot change number of direct arguments of an aggregate function"))); replaces[Anum_pg_aggregate_aggfnoid - 1] = false; replaces[Anum_pg_aggregate_aggkind - 1] = false; diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 0e0a6d8752..3ef0171192 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -2859,7 +2859,7 @@ CheckCertAuth(Port *port) if (port->hba->clientcert == clientCertFull && port->hba->auth_method != uaCert) { ereport(LOG, - (errmsg("certificate validation (clientcert=verify-full) failed for user \"%s\": cn mismatch", + (errmsg("certificate validation (clientcert=verify-full) failed for user \"%s\": CN mismatch", port->user_name))); } } diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index f5f361c209..d0f210de8c 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -1442,7 +1442,7 @@ sendFile(const char *readfilename, const char *tarfilename, struct stat *statbuf if (verify_checksum && (cnt % BLCKSZ != 0)) { ereport(WARNING, - (errmsg("cannot verify checksum in file \"%s\", block " + (errmsg("could not verify checksum in file \"%s\", block " "%d: read buffer size %d and page size %d " "differ", readfilename, blkno, (int) cnt, BLCKSZ))); @@ -1599,8 +1599,10 @@ sendFile(const char *readfilename, const char *tarfilename, struct stat *statbuf if (checksum_failures > 1) { ereport(WARNING, - (errmsg("file \"%s\" has a total of %d checksum verification " - "failures", readfilename, checksum_failures))); + (errmsg_plural("file \"%s\" has a total of %d checksum verification failure", + "file \"%s\" has a total of %d checksum verification failures", + checksum_failures, + readfilename, checksum_failures))); pgstat_report_checksum_failures_in_db(dboid, checksum_failures); } diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c index 808a6f5b83..42da631823 100644 --- a/src/backend/replication/slotfuncs.c +++ b/src/backend/replication/slotfuncs.c @@ -523,7 +523,7 @@ pg_replication_slot_advance(PG_FUNCTION_ARGS) if (XLogRecPtrIsInvalid(moveto)) ereport(ERROR, - (errmsg("invalid target wal lsn"))); + (errmsg("invalid target WAL LSN"))); /* Build a tuple descriptor for our result type */ if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE) diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 25107e8a29..94be62fa6e 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1686,7 +1686,7 @@ PathNameDeleteTemporaryFile(const char *path, bool error_on_failure) if (errno != ENOENT) ereport(error_on_failure ? ERROR : LOG, (errcode_for_file_access(), - errmsg("cannot unlink temporary file \"%s\": %m", + errmsg("could not unlink temporary file \"%s\": %m", path))); return false; } @@ -3322,7 +3322,7 @@ unlink_if_exists_fname(const char *fname, bool isdir, int elevel) if (rmdir(fname) != 0 && errno != ENOENT) ereport(elevel, (errcode_for_file_access(), - errmsg("could not rmdir directory \"%s\": %m", fname))); + errmsg("could not remove directory \"%s\": %m", fname))); } else { diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index 8c895459c3..fb477d4fa0 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -2456,7 +2456,7 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo, errmsg("removing partition \"%s\" violates foreign key constraint \"%s\"", RelationGetRelationName(pk_rel), NameStr(riinfo->conname)), - errdetail("Key (%s)=(%s) still referenced from table \"%s\".", + errdetail("Key (%s)=(%s) is still referenced from table \"%s\".", key_names.data, key_values.data, RelationGetRelationName(fk_rel)))); else if (onfk) diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 90ffd89339..2178e1cf5e 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1042,7 +1042,7 @@ static struct config_bool ConfigureNamesBool[] = }, { {"enable_partition_pruning", PGC_USERSET, QUERY_TUNING_METHOD, - gettext_noop("Enable plan-time and run-time partition pruning."), + gettext_noop("Enables plan-time and run-time partition pruning."), gettext_noop("Allows the query planner and executor to compare partition " "bounds to conditions in the query to determine which " "partitions must be scanned."), @@ -3493,7 +3493,7 @@ static struct config_string ConfigureNamesString[] = { {"recovery_target_timeline", PGC_POSTMASTER, WAL_RECOVERY_TARGET, - gettext_noop("Specifies the timeline to recovery into."), + gettext_noop("Specifies the timeline to recover into."), NULL }, &recovery_target_timeline_string, @@ -3503,7 +3503,7 @@ static struct config_string ConfigureNamesString[] = { {"recovery_target", PGC_POSTMASTER, WAL_RECOVERY_TARGET, - gettext_noop("Set to 'immediate' to end recovery as soon as a consistent state is reached."), + gettext_noop("Set to \"immediate\" to end recovery as soon as a consistent state is reached."), NULL }, &recovery_target_string, diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out index f0ecf4b270..894084f94f 100644 --- a/src/test/regress/expected/foreign_key.out +++ b/src/test/regress/expected/foreign_key.out @@ -2167,19 +2167,19 @@ INSERT into dropfk VALUES (1), (1000), (1500), (2000); -- these should all fail ALTER TABLE droppk DETACH PARTITION droppk_d; ERROR: removing partition "droppk_d" violates foreign key constraint "dropfk_a_fkey5" -DETAIL: Key (a)=(2000) still referenced from table "dropfk". +DETAIL: Key (a)=(2000) is still referenced from table "dropfk". ALTER TABLE droppk2 DETACH PARTITION droppk2_d; ERROR: removing partition "droppk2_d" violates foreign key constraint "dropfk_a_fkey4" -DETAIL: Key (a)=(1500) still referenced from table "dropfk". +DETAIL: Key (a)=(1500) is still referenced from table "dropfk". ALTER TABLE droppk DETACH PARTITION droppk1; ERROR: removing partition "droppk1" violates foreign key constraint "dropfk_a_fkey1" -DETAIL: Key (a)=(1) still referenced from table "dropfk". +DETAIL: Key (a)=(1) is still referenced from table "dropfk". ALTER TABLE droppk DETACH PARTITION droppk2; ERROR: removing partition "droppk2" violates foreign key constraint "dropfk_a_fkey2" -DETAIL: Key (a)=(1000) still referenced from table "dropfk". +DETAIL: Key (a)=(1000) is still referenced from table "dropfk". ALTER TABLE droppk2 DETACH PARTITION droppk21; ERROR: removing partition "droppk21" violates foreign key constraint "dropfk_a_fkey3" -DETAIL: Key (a)=(1000) still referenced from table "dropfk". +DETAIL: Key (a)=(1000) is still referenced from table "dropfk". -- dropping partitions is disallowed DROP TABLE droppk_d; ERROR: cannot drop table droppk_d because other objects depend on it