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[email protected]
Backpatch-through: 11

diff --git a/doc/src/sgml/parallel.sgml b/doc/src/sgml/parallel.sgml
index afdb9faeff8f041c6f9c56c8710f7b08c2db17a1..dc584049c4f8a945deb582e77d196273812133dd 100644 (file)
--- a/doc/src/sgml/parallel.sgml
+++ b/doc/src/sgml/parallel.sgml
@@ -128,7 +128,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
 
   
     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.
   
 

diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 2eced5d65b67bba95058cd26723487a47331152e..5710d46121330e96da0ef638ab19832a5d337e17 100644 (file)
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -944,7 +944,7 @@ WITH ( MODULUS numeric_literal, REM
       constraint. This does not work, however, if any of the partition keys
       is an expression and the partition does not accept
       NULL values. If attaching a list partition that will
-      not accept NULL values, also add
+      not accept NULL values, also add a
       NOT NULL constraint to the partition key column,
       unless it's an expression.
      

diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index 05445dd2d4ebbe728234c793b40db9e30558a156..15a8ade16f6f23d419ef6fdb281f8e9b8778fcc9 100644 (file)
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -921,8 +921,8 @@ BETTER: unrecognized node type: 42
    
     Function-Like Macros and Inline Functions
     
-     Both, macros with arguments and static inline
-     functions, may be used. The latter are preferable if there are
+     Both macros with arguments and static inline
+     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
 

diff --git a/src/backend/access/common/bufmask.c b/src/backend/access/common/bufmask.c
index 8dcc747b94a2fac00e2582ab0f9fea7e28ce0ac8..6ea8ec172180b9ec18967e0eb58c59641e641400 100644 (file)
--- 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/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 0efe05e552b631da2ca142a40f67a0dd9c49087c..f92d570e0494aa94adb26f70a494f3cfd54d246c 100644 (file)
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -1000,7 +1000,7 @@ spgproperty(Oid index_oid, int attno,
    /*
     * Currently, SP-GiST distance-ordered scans require that there be a
     * distance operator in the opclass with the default types. So we assume
-    * that if such a operator exists, then there's a reason for it.
+    * that if such an operator exists, then there's a reason for it.
     */
 
    /* First we need to know the column's opclass. */

diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index 11678eb0136065102038e591d007add1ac3b24f3..c8e67c6cbafc1414537d5bd0912be1c78545d348 100644 (file)
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -775,7 +775,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 2c58bd0d6fb98443478b5acb98926e1fbfe58606..f8ee6cb4edaf7458d677fd489c123a004560dfdb 100644 (file)
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -876,7 +876,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/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 76077f61c046920cceab71bfde68a756574df877..4aa2747c62f740be14668e76189dba80e283c07b 100644 (file)
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -10674,7 +10674,7 @@ get_opclass_name(Oid opclass, Oid actual_datatype,
 
 /*
  * generate_opclass_name
- *     Compute the name to display for a opclass specified by OID
+ *     Compute the name to display for an opclass specified by OID
  *
  * The result includes all necessary quoting and schema-prefixing.
  */

diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 7e524ea19206de7dcaa3862cf8f3a32577f31b1a..4930123e170eb9889150274f05780fbc4d70886a 100644 (file)
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -431,11 +431,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 550d557cb3a477b02e9c37e1b1f40798c1a69039..92e4f3b51d5938f3ae111ddadc5d2fe0d481f40a 100644 (file)
--- a/src/test/regress/expected/expressions.out
+++ b/src/test/regress/expected/expressions.out
@@ -57,7 +57,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 86f20ef55c85e6472617e4d84e950b75ae5abdd8..00a34d954d9b52e0dd1cbcdab8298c634dd37abf 100644 (file)
--- a/src/test/regress/sql/expressions.sql
+++ b/src/test/regress/sql/expressions.sql
@@ -24,7 +24,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();