database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut
2022-09-24 18:38:35 -04:00
parent a6bc330192
commit 26f7802beb
29 changed files with 64 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/access/transam/xlogprefetcher.c
View File

@@ -1089,7 +1089,7 @@ check_recovery_prefetch(int *new_value, void **extra, GucSource source)
#ifndef USE_PREFETCH
if (*new_value == RECOVERY_PREFETCH_ON)
{
GUC_check_errdetail("recovery_prefetch not supported on platforms that lack posix_fadvise().");
GUC_check_errdetail("recovery_prefetch is not supported on platforms that lack posix_fadvise().");
return false;
}
#endif

4
src/backend/access/transam/xlogreader.c
View File

@@ -1963,10 +1963,10 @@ XLogRecGetBlockTag(XLogReaderState *record, uint8 block_id,
blknum, NULL))
{
#ifndef FRONTEND
elog(ERROR, "failed to locate backup block with ID %d in WAL record",
elog(ERROR, "could not locate backup block with ID %d in WAL record",
block_id);
#else
pg_fatal("failed to locate backup block with ID %d in WAL record",
pg_fatal("could not locate backup block with ID %d in WAL record",
block_id);
#endif
}

4
src/backend/backup/basebackup.c
View File

@@ -863,7 +863,7 @@ parse_basebackup_options(List *options, basebackup_options *opt)
if (!parse_compress_algorithm(optval, &opt->compression))
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("unrecognized compression algorithm \"%s\"",
errmsg("unrecognized compression algorithm: \"%s\"",
optval)));
o_compression = true;
}
@@ -919,7 +919,7 @@ parse_basebackup_options(List *options, basebackup_options *opt)
if (o_compression_detail && !o_compression)
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("compression detail requires compression")));
errmsg("compression detail cannot be specified unless compression is enabled")));
if (o_compression)
{

4
src/backend/backup/basebackup_server.c
View File

@@ -72,7 +72,7 @@ bbsink_server_new(bbsink *next, char *pathname)
if (!has_privs_of_role(GetUserId(), ROLE_PG_WRITE_SERVER_FILES))
ereport(ERROR,
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
errmsg("must be superuser or a role with privileges of the pg_write_server_files role to create server backup")));
errmsg("must be superuser or a role with privileges of the pg_write_server_files role to create backup stored on server")));
CommitTransactionCommand();
/*
@@ -86,7 +86,7 @@ bbsink_server_new(bbsink *next, char *pathname)
if (!is_absolute_path(pathname))
ereport(ERROR,
(errcode(ERRCODE_INVALID_NAME),
errmsg("relative path not allowed for server backup")));
errmsg("relative path not allowed for backup stored on server")));
switch (pg_check_dir(pathname))
{

4
src/backend/catalog/pg_publication.c
View File

@@ -513,13 +513,13 @@ publication_translate_columns(Relation targetrel, List *columns,
if (!AttrNumberIsForUserDefinedAttr(attnum))
ereport(ERROR,
errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("cannot reference system column \"%s\" in publication column list",
errmsg("cannot use system column \"%s\" in publication column list",
colname));
if (TupleDescAttr(tupdesc, attnum - 1)->attgenerated)
ereport(ERROR,
errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
errmsg("cannot reference generated column \"%s\" in publication column list",
errmsg("cannot use generated column \"%s\" in publication column list",
colname));
if (bms_is_member(attnum, set))

2
src/backend/commands/dbcommands.c
View File

@@ -992,7 +992,7 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
else
ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("invalid create database strategy %s", strategy),
errmsg("invalid create database strategy \"%s\"", strategy),
errhint("Valid strategies are \"wal_log\", and \"file_copy\".")));
}

4
src/backend/commands/publicationcmds.c
View File

@@ -575,7 +575,7 @@ check_simple_rowfilter_expr_walker(Node *node, ParseState *pstate)
/* OK, supported */
break;
default:
errdetail_msg = _("Expressions only allow columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions.");
errdetail_msg = _("Only columns, constants, built-in operators, built-in data types, built-in collations, and immutable built-in functions are allowed.");
break;
}
@@ -1359,7 +1359,7 @@ CheckAlterPublication(AlterPublicationStmt *stmt, HeapTuple tup,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("publication \"%s\" is defined as FOR ALL TABLES",
NameStr(pubform->pubname)),
errdetail("Tables from schema cannot be added to, dropped from, or set on FOR ALL TABLES publications.")));
errdetail("Schemas cannot be added to or dropped from FOR ALL TABLES publications.")));
/* Check that user is allowed to manipulate the publication tables. */
if (tables && pubform->puballtables)

6
src/backend/commands/subscriptioncmds.c
View File

@@ -461,10 +461,8 @@ check_publications(WalReceiverConn *wrconn, List *publications)
if (res->status != WALRCV_OK_TUPLES)
ereport(ERROR,
errmsg_plural("could not receive publication from the publisher: %s",
"could not receive list of publications from the publisher: %s",
list_length(publications),
res->err));
errmsg("could not receive list of publications from the publisher: %s",
res->err));
publicationsCopy = list_copy(publications);

2
src/backend/commands/trigger.c
View File

@@ -1532,7 +1532,7 @@ renametrig(RenameStmt *stmt)
ereport(ERROR,
errmsg("cannot rename trigger \"%s\" on table \"%s\"",
stmt->subname, RelationGetRelationName(targetrel)),
errhint("Rename trigger on partitioned table \"%s\" instead.",
errhint("Rename the trigger on the partitioned table \"%s\" instead.",
get_rel_name(get_partition_parent(relid, false))));

4
src/backend/executor/nodeModifyTable.c
View File

@@ -2082,10 +2082,10 @@ ExecCrossPartitionUpdateForeignKey(ModifyTableContext *context,
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot move tuple across partitions when a non-root ancestor of the source partition is directly referenced in a foreign key"),
errdetail("A foreign key points to ancestor \"%s\", but not the root ancestor \"%s\".",
errdetail("A foreign key points to ancestor \"%s\" but not the root ancestor \"%s\".",
RelationGetRelationName(rInfo->ri_RelationDesc),
RelationGetRelationName(rootRelInfo->ri_RelationDesc)),
errhint("Consider defining the foreign key on \"%s\".",
errhint("Consider defining the foreign key on table \"%s\".",
RelationGetRelationName(rootRelInfo->ri_RelationDesc))));
}

2
src/backend/postmaster/pgarch.c
View File

@@ -851,7 +851,7 @@ LoadArchiveLibrary(void)
if (archive_init == NULL)
ereport(ERROR,
(errmsg("archive modules have to declare the _PG_archive_module_init symbol")));
(errmsg("archive modules have to define the symbol %s", "_PG_archive_module_init")));
(*archive_init) (&ArchiveContext);

2
src/backend/replication/logical/tablesync.c
View File

@@ -1361,7 +1361,7 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
if (check_enable_rls(RelationGetRelid(rel), InvalidOid, false) == RLS_ENABLED)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("\"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
errmsg("user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
GetUserNameFromId(GetUserId(), true),
RelationGetRelationName(rel))));

18
src/backend/replication/logical/worker.c
View File

@@ -1632,7 +1632,7 @@ TargetPrivilegesCheck(Relation rel, AclMode mode)
if (check_enable_rls(relid, InvalidOid, false) == RLS_ENABLED)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("\"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
errmsg("user \"%s\" cannot replicate into relation with row-level security enabled: \"%s\"",
GetUserNameFromId(GetUserId(), true),
RelationGetRelationName(rel))));
}
@@ -3791,7 +3791,7 @@ ApplyWorkerMain(Datum main_arg)
}
ereport(DEBUG1,
(errmsg("logical replication apply worker for subscription \"%s\" two_phase is %s",
(errmsg_internal("logical replication apply worker for subscription \"%s\" two_phase is %s",
MySubscription->name,
MySubscription->twophasestate == LOGICALREP_TWOPHASE_STATE_DISABLED ? "DISABLED" :
MySubscription->twophasestate == LOGICALREP_TWOPHASE_STATE_PENDING ? "PENDING" :
@@ -3840,7 +3840,7 @@ DisableSubscriptionAndExit(void)
/* Notify the subscription has been disabled and exit */
ereport(LOG,
errmsg("logical replication subscription \"%s\" has been disabled due to an error",
errmsg("subscription \"%s\" has been disabled because of an error",
MySubscription->name));
proc_exit(0);
@@ -3975,7 +3975,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)
if (myskiplsn != finish_lsn)
ereport(WARNING,
errmsg("skip-LSN of logical replication subscription \"%s\" cleared", MySubscription->name),
errmsg("skip-LSN of subscription \"%s\" cleared", MySubscription->name),
errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X.",
LSN_FORMAT_ARGS(finish_lsn),
LSN_FORMAT_ARGS(myskiplsn)));
@@ -4002,23 +4002,23 @@ apply_error_callback(void *arg)
if (errarg->rel == NULL)
{
if (!TransactionIdIsValid(errarg->remote_xid))
errcontext("processing remote data for replication origin \"%s\" during \"%s\"",
errcontext("processing remote data for replication origin \"%s\" during message type \"%s\"",
errarg->origin_name,
logicalrep_message_type(errarg->command));
else if (XLogRecPtrIsInvalid(errarg->finish_lsn))
errcontext("processing remote data for replication origin \"%s\" during \"%s\" in transaction %u",
errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u",
errarg->origin_name,
logicalrep_message_type(errarg->command),
errarg->remote_xid);
else
errcontext("processing remote data for replication origin \"%s\" during \"%s\" in transaction %u finished at %X/%X",
errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" in transaction %u, finished at %X/%X",
errarg->origin_name,
logicalrep_message_type(errarg->command),
errarg->remote_xid,
LSN_FORMAT_ARGS(errarg->finish_lsn));
}
else if (errarg->remote_attnum < 0)
errcontext("processing remote data for replication origin \"%s\" during \"%s\" for replication target relation \"%s.%s\" in transaction %u finished at %X/%X",
errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" in transaction %u, finished at %X/%X",
errarg->origin_name,
logicalrep_message_type(errarg->command),
errarg->rel->remoterel.nspname,
@@ -4026,7 +4026,7 @@ apply_error_callback(void *arg)
errarg->remote_xid,
LSN_FORMAT_ARGS(errarg->finish_lsn));
else
errcontext("processing remote data for replication origin \"%s\" during \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u finished at %X/%X",
errcontext("processing remote data for replication origin \"%s\" during message type \"%s\" for replication target relation \"%s.%s\" column \"%s\" in transaction %u, finished at %X/%X",
errarg->origin_name,
logicalrep_message_type(errarg->command),
errarg->rel->remoterel.nspname,

5
src/backend/replication/walsender.c
View File

@@ -516,9 +516,8 @@ ReadReplicationSlot(ReadReplicationSlotCmd *cmd)
if (OidIsValid(slot_contents.data.database))
ereport(ERROR,
errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot use \"%s\" with logical replication slot \"%s\"",
"READ_REPLICATION_SLOT",
NameStr(slot_contents.data.name)));
errmsg("cannot use %s with a logical replication slot",
"READ_REPLICATION_SLOT"));
/* slot type */
values[i] = CStringGetTextDatum("physical");

2
src/backend/utils/activity/pgstat.c
View File

@@ -425,7 +425,7 @@ pgstat_discard_stats(void)
{
ereport(DEBUG2,
(errcode_for_file_access(),
errmsg("unlinked permanent statistics file \"%s\"",
errmsg_internal("unlinked permanent statistics file \"%s\"",
PGSTAT_STAT_PERMANENT_FILENAME)));
}

2
src/backend/utils/activity/pgstat_xact.c
View File

@@ -368,7 +368,7 @@ pgstat_create_transactional(PgStat_Kind kind, Oid dboid, Oid objoid)
if (pgstat_get_entry_ref(kind, dboid, objoid, false, NULL))
{
ereport(WARNING,
errmsg("resetting existing stats for type %s, db=%u, oid=%u",
errmsg("resetting existing statistics for kind %s, db=%u, oid=%u",
(pgstat_get_kind_info(kind))->name, dboid, objoid));
pgstat_reset(kind, dboid, objoid);