summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier2023-01-03 07:26:38 +0000
committerMichael Paquier2023-01-03 07:26:38 +0000
commita80740a7c9792a622e5ebb75010ea48a5521bf56 (patch)
tree8fd13cf1acfe9bf175ce3cd91569814a8532b655
parent99f8bc335cbed43d64ed1e440a7fa43a8746a683 (diff)
Fix typos in comments, code and documentation
While on it, newlines are removed from the end of two elog() strings. The others are simple grammar mistakes. One comment in pg_upgrade referred incorrectly to sequences since a7e5457. Author: Justin Pryzby Discussion: https://postgr.es/m/20221230231257.GI1153@telsasoft.com Backpatch-through: 11
-rw-r--r--doc/src/sgml/parallel.sgml2
-rw-r--r--doc/src/sgml/ref/alter_table.sgml2
-rw-r--r--doc/src/sgml/sources.sgml4
-rw-r--r--src/backend/access/common/bufmask.c2
-rw-r--r--src/backend/jit/llvm/llvmjit.c2
-rw-r--r--src/backend/optimizer/util/tlist.c2
-rw-r--r--src/bin/pg_upgrade/info.c9
-rw-r--r--src/test/regress/expected/expressions.out2
-rw-r--r--src/test/regress/sql/expressions.sql2
9 files changed, 13 insertions, 14 deletions
diff --git a/doc/src/sgml/parallel.sgml b/doc/src/sgml/parallel.sgml
index 71a27180caf..a4509ed22c2 100644
--- a/doc/src/sgml/parallel.sgml
+++ b/doc/src/sgml/parallel.sgml
@@ -136,7 +136,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
<para>
In addition, the system must not be running in single-user mode. Since
- the entire database system is running in single process in this situation,
+ the entire database system is running as a single process in this situation,
no background workers will be available.
</para>
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 8564adb3d26..7363e4b458e 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -938,7 +938,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
constraint. This does not work, however, if any of the partition keys
is an expression and the partition does not accept
<literal>NULL</literal> values. If attaching a list partition that will
- not accept <literal>NULL</literal> values, also add
+ not accept <literal>NULL</literal> values, also add a
<literal>NOT NULL</literal> constraint to the partition key column,
unless it's an expression.
</para>
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index 36fe2abceff..fae750120aa 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -896,8 +896,8 @@ BETTER: unrecognized node type: 42
<simplesect>
<title>Function-Like Macros and Inline Functions</title>
<para>
- Both, macros with arguments and <literal>static inline</literal>
- functions, may be used. The latter are preferable if there are
+ Both macros with arguments and <literal>static inline</literal>
+ functions may be used. The latter are preferable if there are
multiple-evaluation hazards when written as a macro, as e.g., the
case with
<programlisting>
diff --git a/src/backend/access/common/bufmask.c b/src/backend/access/common/bufmask.c
index 57021f6ca1a..5bc29991311 100644
--- a/src/backend/access/common/bufmask.c
+++ b/src/backend/access/common/bufmask.c
@@ -78,7 +78,7 @@ mask_unused_space(Page page)
if (pd_lower > pd_upper || pd_special < pd_upper ||
pd_lower < SizeOfPageHeaderData || pd_special > BLCKSZ)
{
- elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u\n",
+ elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u",
pd_lower, pd_upper, pd_special);
}
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 83a0095fa29..8b0576b6e47 100644
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -780,7 +780,7 @@ llvm_session_initialize(void)
if (LLVMGetTargetFromTriple(llvm_triple, &llvm_targetref, &error) != 0)
{
- elog(FATAL, "failed to query triple %s\n", error);
+ elog(FATAL, "failed to query triple %s", error);
}
/*
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 5500f33e63d..4186b9c7b01 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -845,7 +845,7 @@ apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target)
*
* The outputs of this function are two parallel lists, one a list of
* PathTargets and the other an integer list of bool flags indicating
- * whether the corresponding PathTarget contains any evaluatable SRFs.
+ * whether the corresponding PathTarget contains any evaluable SRFs.
* The lists are given in the order they'd need to be evaluated in, with
* the "lowest" PathTarget first. So the last list entry is always the
* originally given PathTarget, and any entries before it indicate evaluation
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index fd0b44c3ce9..968db0d777d 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -433,11 +433,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
query[0] = '\0'; /* initialize query string to empty */
/*
- * Create a CTE that collects OIDs of regular user tables, including
- * matviews and sequences, but excluding toast tables and indexes. We
- * assume that relations with OIDs >= FirstNormalObjectId belong to the
- * user. (That's probably redundant with the namespace-name exclusions,
- * but let's be safe.)
+ * Create a CTE that collects OIDs of regular user tables and matviews,
+ * but excluding toast tables and indexes. We assume that relations with
+ * OIDs >= FirstNormalObjectId belong to the user. (That's probably
+ * redundant with the namespace-name exclusions, but let's be safe.)
*
* pg_largeobject contains user data that does not appear in pg_dump
* output, so we have to copy that system table. It's easiest to do that
diff --git a/src/test/regress/expected/expressions.out b/src/test/regress/expected/expressions.out
index 726c1198a92..69d819f3fd5 100644
--- a/src/test/regress/expected/expressions.out
+++ b/src/test/regress/expected/expressions.out
@@ -45,7 +45,7 @@ SELECT now()::timestamp::text = localtimestamp::text;
t
(1 row)
--- current_role/user/user is tested in rolnames.sql
+-- current_role/user/user is tested in rolenames.sql
-- current database / catalog
SELECT current_catalog = current_database();
?column?
diff --git a/src/test/regress/sql/expressions.sql b/src/test/regress/sql/expressions.sql
index 74189ad1fde..9cd37cf9d42 100644
--- a/src/test/regress/sql/expressions.sql
+++ b/src/test/regress/sql/expressions.sql
@@ -22,7 +22,7 @@ SELECT length(current_timestamp::text) >= length(current_timestamp(0)::text);
-- localtimestamp
SELECT now()::timestamp::text = localtimestamp::text;
--- current_role/user/user is tested in rolnames.sql
+-- current_role/user/user is tested in rolenames.sql
-- current database / catalog
SELECT current_catalog = current_database();