aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/access/transam/multixact.c16
-rw-r--r--src/backend/access/transam/xlog.c2
-rw-r--r--src/backend/utils/adt/json.c14
-rw-r--r--src/backend/utils/adt/jsonfuncs.c4
4 files changed, 22 insertions, 14 deletions
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 95a39db545c..b553518bab6 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -940,14 +940,18 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
/* complain even if that DB has disappeared */
if (oldest_datname)
ereport(WARNING,
- (errmsg("database \"%s\" must be vacuumed before %u more MultiXactIds are used",
+ (errmsg_plural("database \"%s\" must be vacuumed before %u more MultiXactId is used",
+ "database \"%s\" must be vacuumed before %u more MultiXactIds are used",
+ multiWrapLimit - result,
oldest_datname,
multiWrapLimit - result),
errhint("Execute a database-wide VACUUM in that database.\n"
"You might also need to commit or roll back old prepared transactions.")));
else
ereport(WARNING,
- (errmsg("database with OID %u must be vacuumed before %u more MultiXactIds are used",
+ (errmsg_plural("database with OID %u must be vacuumed before %u more MultiXactId is used",
+ "database with OID %u must be vacuumed before %u more MultiXactIds are used",
+ multiWrapLimit - result,
oldest_datoid,
multiWrapLimit - result),
errhint("Execute a database-wide VACUUM in that database.\n"
@@ -1982,14 +1986,18 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid)
if (oldest_datname)
ereport(WARNING,
- (errmsg("database \"%s\" must be vacuumed before %u more MultiXactIds are used",
+ (errmsg_plural("database \"%s\" must be vacuumed before %u more MultiXactId is used",
+ "database \"%s\" must be vacuumed before %u more MultiXactIds are used",
+ multiWrapLimit - curMulti,
oldest_datname,
multiWrapLimit - curMulti),
errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
"You might also need to commit or roll back old prepared transactions.")));
else
ereport(WARNING,
- (errmsg("database with OID %u must be vacuumed before %u more MultiXactIds are used",
+ (errmsg_plural("database with OID %u must be vacuumed before %u more MultiXactId is used",
+ "database with OID %u must be vacuumed before %u more MultiXactIds are used",
+ multiWrapLimit - curMulti,
oldest_datoid,
multiWrapLimit - curMulti),
errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 16bf78d77f1..d08b38213bd 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6138,7 +6138,7 @@ StartupXLOG(void)
ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("out of memory"),
- errdetail("Failed while allocating an XLog reading processor")));
+ errdetail("Failed while allocating an XLog reading processor.")));
xlogreader->system_identifier = ControlFile->system_identifier;
if (read_backup_label(&checkPointLoc, &backupEndRequired,
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index ecfe0637623..9f3f5d4feb4 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -728,7 +728,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("high order surrogate must not follow a high order surrogate."),
+ errdetail("Unicode high surrogate must not follow a high surrogate."),
report_json_context(lex)));
hi_surrogate = (ch & 0x3ff) << 10;
continue;
@@ -739,7 +739,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("low order surrogate must follow a high order surrogate."),
+ errdetail("Unicode low surrogate must follow a high surrogate."),
report_json_context(lex)));
ch = 0x10000 + hi_surrogate + (ch & 0x3ff);
hi_surrogate = -1;
@@ -749,7 +749,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("low order surrogate must follow a high order surrogate."),
+ errdetail("Unicode low surrogate must follow a high surrogate."),
report_json_context(lex)));
/*
@@ -783,7 +783,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("Unicode escape for code points higher than U+007F not permitted in non-UTF8 encoding"),
+ errdetail("Unicode escape values cannot be used for code point values above 007F when the server encoding is not UTF8."),
report_json_context(lex)));
}
@@ -795,7 +795,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("low order surrogate must follow a high order surrogate."),
+ errdetail("Unicode low surrogate must follow a high surrogate."),
report_json_context(lex)));
switch (*s)
@@ -856,7 +856,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("low order surrogate must follow a high order surrogate."),
+ errdetail("Unicode low surrogate must follow a high surrogate."),
report_json_context(lex)));
appendStringInfoChar(lex->strval, *s);
@@ -868,7 +868,7 @@ json_lex_string(JsonLexContext *lex)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("invalid input syntax for type json"),
- errdetail("low order surrogate must follow a high order surrogate."),
+ errdetail("Unicode low surrogate must follow a high surrogate."),
report_json_context(lex)));
/* Hooray, we found the end of the string! */
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 2cbe83200f1..bcb9354364a 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -1239,7 +1239,7 @@ json_populate_record(PG_FUNCTION_ARGS)
if (!type_is_rowtype(argtype))
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
- errmsg("first argument must be a rowtype")));
+ errmsg("first argument of json_populate_record must be a row type")));
if (PG_ARGISNULL(0))
{
@@ -1581,7 +1581,7 @@ json_populate_recordset(PG_FUNCTION_ARGS)
if (!type_is_rowtype(argtype))
ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH),
- errmsg("first argument must be a rowtype")));
+ errmsg("first argument of json_populate_recordset must be a row type")));
rsi = (ReturnSetInfo *) fcinfo->resultinfo;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 14:32:38 +0000