Skip to content

Commit f552d18

Browse files
peterepetere
committed
Message style fixes
1 parent 5c11717 commit f552d18

File tree

34 files changed

+100
-101
lines changed

34 files changed

+100
-101
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6442,7 +6442,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
64426442
<entry><type>char[]</type></entry>
64436443
<entry></entry>
64446444
<entry>
6445-
An array containing codes for the enabled statistic types;
6445+
An array containing codes for the enabled statistic kinds;
64466446
valid values are:
64476447
<literal>d</literal> for n-distinct statistics,
64486448
<literal>f</literal> for functional dependency statistics

‎doc/src/sgml/perform.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,15 +1107,15 @@ WHERE tablename = 'road';
11071107
</para>
11081108

11091109
<para>
1110-
The following subsections describe the types of extended statistics
1110+
The following subsections describe the kinds of extended statistics
11111111
that are currently supported.
11121112
</para>
11131113

11141114
<sect3>
11151115
<title>Functional Dependencies</title>
11161116

11171117
<para>
1118-
The simplest type of extended statistics tracks <firstterm>functional
1118+
The simplest kind of extended statistics tracks <firstterm>functional
11191119
dependencies</>, a concept used in definitions of database normal forms.
11201120
We say that column <structfield>b</> is functionally dependent on
11211121
column <structfield>a</> if knowledge of the value of

‎doc/src/sgml/ref/create_statistics.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PostgreSQL documentation
2222
<refsynopsisdiv>
2323
<synopsis>
2424
CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_name</replaceable>
25-
[ ( <replaceable class="PARAMETER">statistic_type</replaceable> [, ... ] ) ]
25+
[ ( <replaceable class="PARAMETER">statistics_kind</replaceable> [, ... ] ) ]
2626
ON <replaceable class="PARAMETER">column_name</replaceable>, <replaceable class="PARAMETER">column_name</replaceable> [, ...]
2727
FROM <replaceable class="PARAMETER">table_name</replaceable>
2828
</synopsis>
@@ -76,15 +76,15 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
7676
</varlistentry>
7777

7878
<varlistentry>
79-
<term><replaceable class="PARAMETER">statistic_type</replaceable></term>
79+
<term><replaceable class="PARAMETER">statistics_kind</replaceable></term>
8080
<listitem>
8181
<para>
82-
A statistic type to be computed in this statistics object.
83-
Currently supported types are
82+
A statistics kind to be computed in this statistics object.
83+
Currently supported kinds are
8484
<literal>ndistinct</literal>, which enables n-distinct statistics, and
8585
<literal>dependencies</literal>, which enables functional
8686
dependency statistics.
87-
If this clause is omitted, all supported statistic types are
87+
If this clause is omitted, all supported statistics kinds are
8888
included in the statistics object.
8989
For more information, see <xref linkend="planner-stats-extended">
9090
and <xref linkend="multivariate-statistics-examples">.

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3567,7 +3567,7 @@ bar
35673567
will terminate the application. If set to a larger numeric value,
35683568
that many consecutive <acronym>EOF</> characters must be typed to
35693569
make an interactive session terminate. If the variable is set to a
3570-
non-numeric value, it is interpreted as 10.
3570+
non-numeric value, it is interpreted as 10. The default is 0.
35713571
</para>
35723572
<note>
35733573
<para>

‎src/backend/access/transam/twophase.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2031,14 +2031,14 @@ ProcessTwoPhaseBuffer(TransactionId xid,
20312031
if (fromdisk)
20322032
{
20332033
ereport(WARNING,
2034-
(errmsg("removing stale two-phase state file for \"%u\"",
2034+
(errmsg("removing stale two-phase state file for transaction %u",
20352035
xid)));
20362036
RemoveTwoPhaseFile(xid, true);
20372037
}
20382038
else
20392039
{
20402040
ereport(WARNING,
2041-
(errmsg("removing stale two-phase state from shared memory for \"%u\"",
2041+
(errmsg("removing stale two-phase state from memory for transaction %u",
20422042
xid)));
20432043
PrepareRedoRemove(xid, true);
20442044
}
@@ -2051,14 +2051,14 @@ ProcessTwoPhaseBuffer(TransactionId xid,
20512051
if (fromdisk)
20522052
{
20532053
ereport(WARNING,
2054-
(errmsg("removing future two-phase state file for \"%u\"",
2054+
(errmsg("removing future two-phase state file for transaction %u",
20552055
xid)));
20562056
RemoveTwoPhaseFile(xid, true);
20572057
}
20582058
else
20592059
{
20602060
ereport(WARNING,
2061-
(errmsg("removing future two-phase state from memory for \"%u\"",
2061+
(errmsg("removing future two-phase state from memory for transaction %u",
20622062
xid)));
20632063
PrepareRedoRemove(xid, true);
20642064
}
@@ -2072,7 +2072,7 @@ ProcessTwoPhaseBuffer(TransactionId xid,
20722072
if (buf == NULL)
20732073
{
20742074
ereport(WARNING,
2075-
(errmsg("removing corrupt two-phase state file for \"%u\"",
2075+
(errmsg("removing corrupt two-phase state file for transaction %u",
20762076
xid)));
20772077
RemoveTwoPhaseFile(xid, true);
20782078
return NULL;
@@ -2091,14 +2091,14 @@ ProcessTwoPhaseBuffer(TransactionId xid,
20912091
if (fromdisk)
20922092
{
20932093
ereport(WARNING,
2094-
(errmsg("removing corrupt two-phase state file for \"%u\"",
2094+
(errmsg("removing corrupt two-phase state file for transaction %u",
20952095
xid)));
20962096
RemoveTwoPhaseFile(xid, true);
20972097
}
20982098
else
20992099
{
21002100
ereport(WARNING,
2101-
(errmsg("removing corrupt two-phase state from memory for \"%u\"",
2101+
(errmsg("removing corrupt two-phase state from memory for transaction %u",
21022102
xid)));
21032103
PrepareRedoRemove(xid, true);
21042104
}

‎src/backend/access/transam/xlog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8646,7 +8646,7 @@ CreateCheckPoint(int flags)
86468646
LWLockRelease(CheckpointLock);
86478647
END_CRIT_SECTION();
86488648
ereport(DEBUG1,
8649-
(errmsg("checkpoint skipped due to an idle system")));
8649+
(errmsg("checkpoint skipped because system is idle")));
86508650
return;
86518651
}
86528652
}

‎src/backend/commands/publicationcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ parse_publication_options(List *options,
103103
if (!SplitIdentifierString(publish, ',', &publish_list))
104104
ereport(ERROR,
105105
(errcode(ERRCODE_SYNTAX_ERROR),
106-
errmsg("invalid publish list")));
106+
errmsg("invalid list syntax for \"publish\" option")));
107107

108108
/* Process the option list. */
109109
foreach(lc, publish_list)

‎src/backend/commands/statscmds.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ CreateStatistics(CreateStatsStmt *stmt)
180180
if (!HeapTupleIsValid(atttuple))
181181
ereport(ERROR,
182182
(errcode(ERRCODE_UNDEFINED_COLUMN),
183-
errmsg("column \"%s\" referenced in statistics does not exist",
183+
errmsg("column \"%s\" does not exist",
184184
attname)));
185185
attForm = (Form_pg_attribute) GETSTRUCT(atttuple);
186186

@@ -195,8 +195,8 @@ CreateStatistics(CreateStatsStmt *stmt)
195195
if (type->lt_opr == InvalidOid)
196196
ereport(ERROR,
197197
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
198-
errmsg("column \"%s\" cannot be used in statistics because its type has no default btree operator class",
199-
attname)));
198+
errmsg("column \"%s\" cannot be used in statistics because its type %s has no default btree operator class",
199+
attname, format_type_be(attForm->atttypid))));
200200

201201
/* Make sure no more than STATS_MAX_DIMENSIONS columns are used */
202202
if (numcols >= STATS_MAX_DIMENSIONS)
@@ -242,7 +242,7 @@ CreateStatistics(CreateStatsStmt *stmt)
242242
stxkeys = buildint2vector(attnums, numcols);
243243

244244
/*
245-
* Parse the statistics types.
245+
* Parse the statistics kinds.
246246
*/
247247
build_ndistinct = false;
248248
build_dependencies = false;
@@ -263,7 +263,7 @@ CreateStatistics(CreateStatsStmt *stmt)
263263
else
264264
ereport(ERROR,
265265
(errcode(ERRCODE_SYNTAX_ERROR),
266-
errmsg("unrecognized statistic type \"%s\"",
266+
errmsg("unrecognized statistics kind \"%s\"",
267267
type)));
268268
}
269269
/* If no statistic type was specified, build them all. */

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13584,7 +13584,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
1358413584
errmsg("table \"%s\" contains column \"%s\" not found in parent \"%s\"",
1358513585
RelationGetRelationName(attachrel), attributeName,
1358613586
RelationGetRelationName(rel)),
13587-
errdetail("New partition should contain only the columns present in parent.")));
13587+
errdetail("The new partition may contain only the columns present in parent.")));
1358813588
}
1358913589

1359013590
/*

‎src/backend/commands/trigger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
416416
(TRIGGER_FOR_DELETE(tgtype) ? 1 : 0)) != 1)
417417
ereport(ERROR,
418418
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
419-
errmsg("Transition tables cannot be specified for triggers with more than one event")));
419+
errmsg("transition tables cannot be specified for triggers with more than one event")));
420420

421421
if (tt->isNew)
422422
{

‎src/backend/executor/execReplication.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,13 +559,13 @@ CheckCmdReplicaIdentity(Relation rel, CmdType cmd)
559559
if (cmd == CMD_UPDATE && pubactions->pubupdate)
560560
ereport(ERROR,
561561
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
562-
errmsg("cannot update table \"%s\" because it does not have replica identity and publishes updates",
562+
errmsg("cannot update table \"%s\" because it does not have a replica identity and publishes updates",
563563
RelationGetRelationName(rel)),
564564
errhint("To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.")));
565565
else if (cmd == CMD_DELETE && pubactions->pubdelete)
566566
ereport(ERROR,
567567
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
568-
errmsg("cannot delete from table \"%s\" because it does not have replica identity and publishes deletes",
568+
errmsg("cannot delete from table \"%s\" because it does not have a replica identity and publishes deletes",
569569
RelationGetRelationName(rel)),
570570
errhint("To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE.")));
571571
}

‎src/backend/libpq/hba.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@ verify_option_list_length(List *options, char *optionname, List *masters, char *
16081608

16091609
ereport(LOG,
16101610
(errcode(ERRCODE_CONFIG_FILE_ERROR),
1611-
errmsg("the number of %s (%i) must be 1 or the same as the number of %s (%i)",
1611+
errmsg("the number of %s (%d) must be 1 or the same as the number of %s (%d)",
16121612
optionname,
16131613
list_length(options),
16141614
mastername,

‎src/backend/replication/logical/relation.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,8 @@ logicalrep_typmap_getid(Oid remoteid)
453453
{
454454
if (!get_typisdefined(remoteid))
455455
ereport(ERROR,
456-
(errmsg("builtin type %u not found", remoteid),
457-
errhint("This can be caused by having publisher with "
458-
"higher major version than subscriber")));
456+
(errmsg("built-in type %u not found", remoteid),
457+
errhint("This can be caused by having a publisher with a higher PostgreSQL major version than the subscriber.")));
459458
return remoteid;
460459
}
461460

‎src/backend/replication/logical/worker.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ check_relation_updatable(LogicalRepRelMapEntry *rel)
629629
{
630630
ereport(ERROR,
631631
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
632-
errmsg("publisher does not send replica identity column "
632+
errmsg("publisher did not send replica identity column "
633633
"expected by the logical replication target relation \"%s.%s\"",
634634
rel->remoterel.nspname, rel->remoterel.relname)));
635635
}
@@ -844,7 +844,7 @@ apply_handle_delete(StringInfo s)
844844
/* The tuple to be deleted could not be found. */
845845
ereport(DEBUG1,
846846
(errmsg("logical replication could not find row for delete "
847-
"in replication target %s",
847+
"in replication target relation \"%s\"",
848848
RelationGetRelationName(rel->localrel))));
849849
}
850850

@@ -910,7 +910,7 @@ apply_dispatch(StringInfo s)
910910
default:
911911
ereport(ERROR,
912912
(errcode(ERRCODE_PROTOCOL_VIOLATION),
913-
errmsg("invalid logical replication message type %c", action)));
913+
errmsg("invalid logical replication message type \"%c\"", action)));
914914
}
915915
}
916916

‎src/backend/replication/pgoutput/pgoutput.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ parse_output_parameters(List *options, uint32 *protocol_version,
115115
if (parsed > PG_UINT32_MAX || parsed < 0)
116116
ereport(ERROR,
117117
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
118-
errmsg("proto_verson \"%s\" out of range",
118+
errmsg("proto_version \"%s\" out of range",
119119
strVal(defel->arg))));
120120

121121
*protocol_version = (uint32) parsed;

‎src/backend/rewrite/rewriteDefine.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,13 +425,13 @@ DefineQueryRewrite(char *rulename,
425425
if (event_relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
426426
ereport(ERROR,
427427
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
428-
errmsg("could not convert partitioned table \"%s\" to a view",
428+
errmsg("cannot convert partitioned table \"%s\" to a view",
429429
RelationGetRelationName(event_relation))));
430430

431431
if (event_relation->rd_rel->relispartition)
432432
ereport(ERROR,
433433
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
434-
errmsg("could not convert partition \"%s\" to a view",
434+
errmsg("cannot convert partition \"%s\" to a view",
435435
RelationGetRelationName(event_relation))));
436436

437437
snapshot = RegisterSnapshot(GetLatestSnapshot());

‎src/backend/storage/lmgr/predicate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1769,7 +1769,7 @@ GetSerializableTransactionSnapshotInt(Snapshot snapshot,
17691769
ereport(ERROR,
17701770
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
17711771
errmsg("could not import the requested snapshot"),
1772-
errdetail("The source process with pid %d is not running anymore.",
1772+
errdetail("The source process with PID %d is not running anymore.",
17731773
sourcepid)));
17741774
}
17751775

‎src/backend/utils/adt/int8.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ scanint8(const char *str, bool errorOK, int64 *result)
9595
else
9696
ereport(ERROR,
9797
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
98-
errmsg("invalid input syntax for %s: \"%s\"",
99-
"integer", str)));
98+
errmsg("invalid input syntax for integer: \"%s\"",
99+
str)));
100100
}
101101

102102
/* process digits */
@@ -130,8 +130,8 @@ scanint8(const char *str, bool errorOK, int64 *result)
130130
else
131131
ereport(ERROR,
132132
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
133-
errmsg("invalid input syntax for %s: \"%s\"",
134-
"integer", str)));
133+
errmsg("invalid input syntax for integer: \"%s\"",
134+
str)));
135135
}
136136

137137
*result = (sign < 0) ? -tmp : tmp;

‎src/backend/utils/adt/jsonfuncs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2314,7 +2314,7 @@ populate_array_report_expected_array(PopulateArrayContext *ctx, int ndim)
23142314
ereport(ERROR,
23152315
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
23162316
errmsg("expected json array"),
2317-
errhint("see the value of key \"%s\"", ctx->colname)));
2317+
errhint("See the value of key \"%s\".", ctx->colname)));
23182318
else
23192319
ereport(ERROR,
23202320
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
@@ -2336,13 +2336,13 @@ populate_array_report_expected_array(PopulateArrayContext *ctx, int ndim)
23362336
ereport(ERROR,
23372337
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
23382338
errmsg("expected json array"),
2339-
errhint("see the array element %s of key \"%s\"",
2339+
errhint("See the array element %s of key \"%s\".",
23402340
indices.data, ctx->colname)));
23412341
else
23422342
ereport(ERROR,
23432343
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
23442344
errmsg("expected json array"),
2345-
errhint("see the array element %s",
2345+
errhint("See the array element %s.",
23462346
indices.data)));
23472347
}
23482348
}

‎src/backend/utils/adt/mac8.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,8 @@ macaddr8tomacaddr(PG_FUNCTION_ARGS)
553553
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
554554
errmsg("macaddr8 data out of range to convert to macaddr"),
555555
errhint("Only addresses that have FF and FE as values in the "
556-
"4th and 5th bytes, from the left, for example: "
557-
"XX-XX-XX-FF-FE-XX-XX-XX, are eligible to be converted "
556+
"4th and 5th bytes from the left, for example "
557+
"xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted "
558558
"from macaddr8 to macaddr.")));
559559

560560
result->a = addr->a;

‎src/backend/utils/adt/numutils.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ pg_atoi(const char *s, int size, int c)
4848
if (*s == 0)
4949
ereport(ERROR,
5050
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
51-
errmsg("invalid input syntax for %s: \"%s\"",
52-
"integer", s)));
51+
errmsg("invalid input syntax for integer: \"%s\"",
52+
s)));
5353

5454
errno = 0;
5555
l = strtol(s, &badp, 10);
@@ -58,8 +58,8 @@ pg_atoi(const char *s, int size, int c)
5858
if (s == badp)
5959
ereport(ERROR,
6060
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
61-
errmsg("invalid input syntax for %s: \"%s\"",
62-
"integer", s)));
61+
errmsg("invalid input syntax for integer: \"%s\"",
62+
s)));
6363

6464
switch (size)
6565
{
@@ -102,8 +102,8 @@ pg_atoi(const char *s, int size, int c)
102102
if (*badp && *badp != c)
103103
ereport(ERROR,
104104
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
105-
errmsg("invalid input syntax for %s: \"%s\"",
106-
"integer", s)));
105+
errmsg("invalid input syntax for integer: \"%s\"",
106+
s)));
107107

108108
return (int32) l;
109109
}

0 commit comments

Comments
 (0)