typos
Started by Justin Pryzbyalmost 4 years ago25 messages
In docs and comments. Mostly for v15.
Maybe Fabien will want to comment on the pgbench one.
Attachments:
0001-doc-database-SYSTEM-since-aa01051418f10afbdfa781b8dc.patchtext/x-diff; charset=us-asciiDownload
From b1fb6d9bae1b0d69a30d59e65ed4f5a10f4141da Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Tue, 25 Jan 2022 10:47:55 -0600
Subject: [PATCH 01/19] doc: database SYSTEM since
aa01051418f10afbdfa781b8dc109615ca785ff9
---
doc/src/sgml/ref/create_database.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 255ad3a1ce0..b2bb3da5fdb 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -278,7 +278,7 @@ CREATE DATABASE <replaceable class="parameter">name</replaceable>
<listitem>
<para>
The object identifier to be used for the new database. If this
- parameter is not specified, the database will choose a suitable
+ parameter is not specified, the database system will choose a suitable
OID automatically. This parameter is primarily intended for internal
use by <application>pg_upgrade</application>, and only
<application>pg_upgrade</application> can specify a value less
--
2.17.1
0002-doc-Remove-synchronized-from-no-sync.patchtext/x-diff; charset=us-asciiDownload
From 5631996e4ebf996ff89f19b52e9bf616cad09d6c Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 16 Feb 2022 21:07:53 -0600
Subject: [PATCH 02/19] doc: Remove 'synchronized' from --no-sync
Since it would be more accurate to say "unsynchronized".
The corresponding change was made for pgupgrade.sgml in commit 410aa248
---
doc/src/sgml/ref/pg_rewind.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index e808239aa5b..3231f67845a 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -210,7 +210,7 @@ PostgreSQL documentation
to be written safely to disk. This option causes
<command>pg_rewind</command> to return without waiting, which is
faster, but means that a subsequent operating system crash can leave
- the synchronized data directory corrupt. Generally, this option is
+ the data directory corrupt. Generally, this option is
useful for testing but should not be used on a production
installation.
</para>
--
2.17.1
0003-doc-json-log-dc686681e0799b12c40f44f85fc5bfd7fed4e57.patchtext/x-diff; charset=us-asciiDownload
From a16152c556661be0217b689218def3ac0d308d96 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 16 Feb 2022 21:26:17 -0600
Subject: [PATCH 03/19] doc: json log dc686681e0799b12c40f44f85fc5bfd7fed4e57f
---
doc/src/sgml/config.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 6e3e27bed76..30ac8e0137f 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -7657,8 +7657,8 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
</para>
<para>
- Each log line is serialized as a JSON object as of the following
- set of keys with their values.
+ Each log line is serialized as a JSON object with the following
+ set of keys and their associated values.
</para>
<table>
--
2.17.1
0004-doc-s-in-local-server-on-local-server-94c49d53402240.patchtext/x-diff; charset=us-asciiDownload
From 1d565b227c1184fd0e58b4acf69a289c3e2f3b35 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Thu, 17 Feb 2022 21:08:56 -0600
Subject: [PATCH 04/19] doc: s/in local server/on local server/
94c49d53402240ad7ddbcae9049ff2840a54b9c6
many similar things were fixed in 410aa248e5a883fde4832999cc9b23c7ace0f2ff
---
doc/src/sgml/postgres-fdw.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/postgres-fdw.sgml b/doc/src/sgml/postgres-fdw.sgml
index d8dc7155874..92d89c0fc99 100644
--- a/doc/src/sgml/postgres-fdw.sgml
+++ b/doc/src/sgml/postgres-fdw.sgml
@@ -1040,7 +1040,7 @@ postgres=# SELECT postgres_fdw_disconnect_all();
<row>
<entry><literal>%C</literal></entry>
<entry>
- Cluster name in local server
+ Cluster name on local server
(see <xref linkend="guc-cluster-name"/> for details)
</entry>
</row>
--
2.17.1
0005-doc-pg_column_compression-we-say-method-not-algorith.patchtext/x-diff; charset=us-asciiDownload
From 732aebc934ac8539f49535cb3c17d67805fbd583 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 19 Feb 2022 11:47:35 -0600
Subject: [PATCH 05/19] doc: pg_column_compression(): we say method not
algorithm everywhere else
could backpatch to v14
---
doc/src/sgml/func.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 2ecf0482d84..a34eb8b43e0 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -29285,7 +29285,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset((pg_backup_stop()).lsn);
<returnvalue>text</returnvalue>
</para>
<para>
- Shows the compression algorithm that was used to compress
+ Shows the compression method that was used to compress
an individual variable-length value. Returns <literal>NULL</literal>
if the value is not compressed.
</para></entry>
--
2.17.1
0006-doc-review-postgres_fdw-parallel-commit.patchtext/x-diff; charset=utf-8Download
From 0586643c7405d4d922c7cc0739a4d207d73fba8a Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 12:25:04 -0500
Subject: [PATCH 06/19] doc review: postgres_fdw parallel commit
This has a unicode apostrophe, unlike everywhere else in the docs.
04e706d4238f98a98e1c0b1a02db9d4280b96f04
---
doc/src/sgml/postgres-fdw.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/postgres-fdw.sgml b/doc/src/sgml/postgres-fdw.sgml
index 92d89c0fc99..1901736e600 100644
--- a/doc/src/sgml/postgres-fdw.sgml
+++ b/doc/src/sgml/postgres-fdw.sgml
@@ -491,7 +491,7 @@ OPTIONS (ADD password_required 'false');
<para>
For a foreign server with this option enabled, if many remote
(sub)transactions are opened on the foreign server in a local
- (sub)transaction, this option might increase the remote serverâs load
+ (sub)transaction, this option might increase the remote server's load
when the local (sub)transaction commits, so be careful when using this
option.
</para>
--
2.17.1
0007-doc-review-pgbench-retries.patchtext/x-diff; charset=us-asciiDownload
From 77c637a74df21f697dac76eb5c55ac5a45fde257 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 26 Mar 2022 00:26:33 -0500
Subject: [PATCH 07/19] doc review: pgbench retries
4a39f87acd6e681e5ded1239391d8a92645b43d6
---
doc/src/sgml/ref/pgbench.sgml | 40 +++++++++++++++++------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index 659fe2d984d..f855249a3dd 100644
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -541,11 +541,11 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
<firstterm>skipped</firstterm>.
</para>
<para>
- When the <option>--max-tries</option> option is used, the transaction with
- serialization or deadlock error cannot be retried if the total time of
+ When the <option>--max-tries</option> option is used, a transaction with
+ serialization or deadlock error will not be retried if the total time of
all its tries is greater than <replaceable>limit</replaceable> ms. To
limit only the time of tries and not their number, use
- <literal>--max-tries=0</literal>. By default option
+ <literal>--max-tries=0</literal>. By default, the option
<option>--max-tries</option> is set to 1 and transactions with
serialization/deadlock errors are not retried. See <xref
linkend="failures-and-retries"/> for more information about retrying
@@ -622,7 +622,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
throttling (<option>-R</option>), the latency is computed with respect
to the transaction scheduled start time, not the actual transaction
beginning time, thus it also includes the average schedule lag time.
- When <option>--max-tries</option> is used to enable transactions retries
+ When <option>--max-tries</option> is used to enable transaction retries
after serialization/deadlock errors, the report includes the number of
retried transactions and the sum of all retries.
</para>
@@ -818,7 +818,7 @@ pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>d
<listitem>
<para>
Print messages about all errors and failures (errors without retrying)
- including which limit for retries was violated and how far it was
+ including which limit for retries was exceeded and how far it was
exceeded for the serialization/deadlock failures. (Note that in this
case the output can be significantly increased.).
See <xref linkend="failures-and-retries"/> for more information.
@@ -2433,7 +2433,7 @@ END;
</para>
<para>
- If <option>--failures-detailed</option> option is used, the type of
+ If the <option>--failures-detailed</option> option is used, the type of
failure is reported in the <replaceable>time</replaceable> like this:
<screen>
3 0 47423 0 1499414498 34501 3
@@ -2773,12 +2773,12 @@ statement latencies in milliseconds, failures and retries:
<listitem>
<para>
Errors of the main program. They are the most serious and always result
- in an immediate exit from the <application>pgbench</application> with
+ in an immediate exit from <application>pgbench</application> with
the corresponding error message. They include:
<itemizedlist>
<listitem>
<para>
- errors at the beginning of the <application>pgbench</application>
+ errors at the beginning of <application>pgbench</application>
(e.g. an invalid option value);
</para>
</listitem>
@@ -2791,7 +2791,7 @@ statement latencies in milliseconds, failures and retries:
<listitem>
<para>
errors before starting threads (e.g. we could not connect to the
- database server / the syntax error in the meta command / thread
+ database server / syntax error in the meta command / thread
creation failure);
</para>
</listitem>
@@ -2813,7 +2813,7 @@ statement latencies in milliseconds, failures and retries:
</listitem>
<listitem>
<para>
- Direct client errors. They lead to immediate exit from the
+ Direct client errors. They lead to immediate exit from
<application>pgbench</application> with the corresponding error message
only in the case of an internal <application>pgbench</application>
error (which are supposed to never occur...). Otherwise in the worst
@@ -2829,11 +2829,11 @@ statement latencies in milliseconds, failures and retries:
</para>
<para>
- Client's run is aborted in case of a serious error, for example, the
- connection with the database server was lost or the end of script reached
- without completing the last transaction. In addition, if an execution of SQL
+ A client's run is aborted in case of a serious error; for example, the
+ connection with the database server was lost or the end of script was reached
+ without completing the last transaction. In addition, if execution of an SQL
or meta command fails for reasons other than serialization or deadlock errors,
- the client is aborted. Otherwise, if an SQL fails with serialization or
+ the client is aborted. Otherwise, if an SQL command fails with serialization or
deadlock errors, the client is not aborted. In such cases, the current
transaction is rolled back, which also includes setting the client variables
as they were before the run of this transaction (it is assumed that one
@@ -2845,21 +2845,21 @@ statement latencies in milliseconds, failures and retries:
time of retries (specified by the <option>--latency-limit</option> option) / the end
of benchmark (specified by the <option>--time</option> option). If
the last trial run fails, this transaction will be reported as failed but
- the client is not aborted and continue to work.
+ the client is not aborted and continues to work.
</para>
<note>
<para>
- Without specifying the <option>--max-tries</option> option a transaction will
+ Without specifying the <option>--max-tries</option> option, a transaction will
never be retried after a serialization or deadlock error because its default
- values is 1. Use an unlimited number of tries (<literal>--max-tries=0</literal>)
+ value is 1. Use an unlimited number of tries (<literal>--max-tries=0</literal>)
and the <option>--latency-limit</option> option to limit only the maximum time
of tries. You can also use the <option>--time</option> option to limit the
benchmark duration under an unlimited number of tries.
</para>
<para>
Be careful when repeating scripts that contain multiple transactions: the
- script is always retried completely, so the successful transactions can be
+ script is always retried completely, so successful transactions can be
performed several times.
</para>
<para>
@@ -2879,7 +2879,7 @@ statement latencies in milliseconds, failures and retries:
<para>
The main report contains the number of failed transactions. If the
<option>--max-tries</option> option is not equal to 1, the main report also
- contains the statistics related to retries: the total number of retried
+ contains statistics related to retries: the total number of retried
transactions and total number of retries. The per-script report inherits all
these fields from the main report. The per-statement report displays retry
statistics only if the <option>--max-tries</option> option is not equal to 1.
@@ -2890,7 +2890,7 @@ statement latencies in milliseconds, failures and retries:
aggregation logs, as well as in the main and per-script reports, use the
<option>--failures-detailed</option> option. If you also want to distinguish
all errors and failures (errors without retrying) by type including which
- limit for retries was violated and how far it was exceeded for the
+ limit for retries was exceeded and how much it was exceeded by for the
serialization/deadlock failures, use the <option>--verbose-errors</option>
option.
</para>
--
2.17.1
0008-doc-review-CREATE-DATABASE-STRATEGY.patchtext/x-diff; charset=us-asciiDownload
From fe57c203b6c5104ffacef50f104d625d3fb73031 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Tue, 29 Mar 2022 11:18:59 -0500
Subject: [PATCH 08/19] doc review: CREATE DATABASE STRATEGY
9c08aea6a3090a396be334cc58c511edab05776a
---
doc/src/sgml/ref/create_database.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index b2bb3da5fdb..ed0cbe3473c 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -132,7 +132,7 @@ CREATE DATABASE <replaceable class="parameter">name</replaceable>
available. This strategy writes a small record to the write-ahead log
for each tablespace used by the target database. Each such record
represents copying an entire directory to a new location at the
- filesystem level. While this does reduce the write-ahed
+ filesystem level. While this does reduce the write-ahead
log volume substantially, especially if the template database is large,
it also forces the system to perform a checkpoint both before and
after the creation of the new database. In some situations, this may
--
2.17.1
0009-doc-review-GROUP-BY-optimization.patchtext/x-diff; charset=us-asciiDownload
From 8b4f76a9f82e1b74ec6cf4d460151473674ab723 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 4 Apr 2022 08:24:23 -0500
Subject: [PATCH 09/19] doc review: GROUP BY optimization
db0d67db2401eb6238ccc04c6407a4fd4f985832
---
doc/src/sgml/config.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 30ac8e0137f..81cacdcbe40 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -5047,7 +5047,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
</term>
<listitem>
<para>
- Enables or disables reodering of keys in <literal>GROUP BY</literal>
+ Enables or disables reordering of keys in <literal>GROUP BY</literal>
clause. The default is <literal>on</literal>.
</para>
</listitem>
--
2.17.1
0010-doc-review-update-synopsis-pg_upgrade-optional-newbi.patchtext/x-diff; charset=us-asciiDownload
From 84dc962ccb57437054f5798e4cdde2a358ca2280 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 20 Dec 2021 19:13:29 -0600
Subject: [PATCH 10/19] doc review: update synopsis: pg_upgrade optional
newbindir
See also: 959f6d6a1821b7d9068244f500dd80953e768d16
---
doc/src/sgml/ref/pgupgrade.sgml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index f024c3ef259..8cda8d16d17 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -24,8 +24,7 @@ PostgreSQL documentation
<command>pg_upgrade</command>
<arg choice="plain"><option>-b</option></arg>
<arg choice="plain"><replaceable>oldbindir</replaceable></arg>
- <arg choice="plain"><option>-B</option></arg>
- <arg choice="plain"><replaceable>newbindir</replaceable></arg>
+ <arg choice="opt"><option>-B</option> <replaceable>newbindir</replaceable></arg>
<arg choice="plain"><option>-d</option></arg>
<arg choice="plain"><replaceable>oldconfigdir</replaceable></arg>
<arg choice="plain"><option>-D</option></arg>
--
2.17.1
0011-doc-review-basebackup_to_shell.required_role.patchtext/x-diff; charset=us-asciiDownload
From 30b07b0d385d4adb2f130f1383a34f8c731b786c Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Thu, 7 Apr 2022 09:04:23 -0500
Subject: [PATCH 11/19] doc review: basebackup_to_shell.required_role
c6306db24bd913375f99494e38ab315befe44e11
See also:
https://www.postgresql.org/message-id/CA%2BTgmoaBQ5idAh7OsQGAbLY166SVkj7KkKROkTyN5sOF6QDuww%40mail.gmail.com
---
doc/src/sgml/basebackup-to-shell.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/basebackup-to-shell.sgml b/doc/src/sgml/basebackup-to-shell.sgml
index 9f44071d502..15231ef3939 100644
--- a/doc/src/sgml/basebackup-to-shell.sgml
+++ b/doc/src/sgml/basebackup-to-shell.sgml
@@ -65,8 +65,8 @@
</term>
<listitem>
<para>
- A role which replication whose privileges users are required to possess
- in order to make use of the <literal>shell</literal> backup target.
+ The role required in order to
+ make use of the <literal>shell</literal> backup target.
If this is not set, any replication user may make use of the
<literal>shell</literal> backup target.
</para>
--
2.17.1
0012-v15-comment-typos.patchtext/x-diff; charset=us-asciiDownload
From 118a3ad6ce6a33b6e393a889322616ded8ac646a Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 6 Apr 2022 07:38:49 -0500
Subject: [PATCH 12/19] v15 comment typos
---
contrib/ltree/ltree.h | 2 +-
doc/src/sgml/glossary.sgml | 2 +-
doc/src/sgml/monitoring.sgml | 2 +-
src/backend/access/heap/heapam.c | 2 +-
src/backend/access/transam/xlogrecovery.c | 2 +-
src/backend/commands/dbcommands.c | 2 +-
src/backend/commands/vacuumparallel.c | 2 +-
src/backend/optimizer/path/costsize.c | 2 +-
src/backend/optimizer/path/pathkeys.c | 4 ++--
src/backend/parser/parse_expr.c | 2 +-
src/backend/utils/adt/genfile.c | 2 +-
src/backend/utils/cache/relmapper.c | 4 ++--
src/backend/utils/error/csvlog.c | 2 +-
src/backend/utils/error/jsonlog.c | 2 +-
src/backend/utils/mmgr/generation.c | 2 +-
src/bin/pg_basebackup/pg_basebackup.c | 2 +-
src/bin/pgbench/pgbench.c | 4 ++--
src/bin/psql/copy.c | 2 +-
src/bin/psql/describe.c | 2 +-
src/bin/psql/tab-complete.c | 2 +-
src/tools/mark_pgdllimport.pl | 2 +-
21 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index 10341d60212..564e4fa81b8 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -24,7 +24,7 @@
* modified to look for -D compile flags in Makefiles, so here, in order to
* get the historic behavior of LOWER_NODE not being defined on MSVC, we only
* define it when not building in that environment. This is important as we
- * want to maintain the same LOWER_NODE behavior after a pg_update.
+ * want to maintain the same LOWER_NODE behavior after a pg_upgrade.
*/
#ifndef _MSC_VER
#define LOWER_NODE
diff --git a/doc/src/sgml/glossary.sgml b/doc/src/sgml/glossary.sgml
index b187506d5e5..f81fdc31f9e 100644
--- a/doc/src/sgml/glossary.sgml
+++ b/doc/src/sgml/glossary.sgml
@@ -137,7 +137,7 @@
<!-- NB: In the code, the autovac launcher doesn't use the auxiliary
process scaffolding; however it does behave as one so we list it
here anyway. In addition, logger isn't connected to shared memory so
- most code outside postmaster.c doesn't even consider them "procs" in
+ most code outside postmaster.c doesn't even consider it a "proc" in
the first place.
-->
the <glossterm linkend="glossary-autovacuum">autovacuum launcher</glossterm>
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 2f44113caa5..87b6e5fb5e8 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -200,7 +200,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
<para>
Cumulative statistics are collected in shared memory. Every
- <productname>PostgreSQL</productname> process collects statistics locally
+ <productname>PostgreSQL</productname> process collects statistics locally,
then updates the shared data at appropriate intervals. When a server,
including a physical replica, shuts down cleanly, a permanent copy of the
statistics data is stored in the <filename>pg_stat</filename> subdirectory,
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 1ee985f6330..983db140aaf 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -1470,7 +1470,7 @@ heap_getnextslot_tidrange(TableScanDesc sscan, ScanDirection direction,
* heap_set_tidrange will have used heap_setscanlimits to limit the
* range of pages we scan to only ones that can contain the TID range
* we're scanning for. Here we must filter out any tuples from these
- * pages that are outwith that range.
+ * pages that are outside that range.
*/
if (ItemPointerCompare(&scan->rs_ctup.t_self, mintid) < 0)
{
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 2e555f8573d..4ee29182ac8 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -2975,7 +2975,7 @@ ReadRecord(XLogPrefetcher *xlogprefetcher, int emode,
/*
* When not in standby mode we find that WAL ends in an incomplete
* record, keep track of that record. After recovery is done,
- * we'll write a record to indicate downstream WAL readers that
+ * we'll write a record to indicate to downstream WAL readers that
* that portion is to be ignored.
*/
if (!StandbyMode &&
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index ce776c53cad..1bbecfeddf6 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -386,7 +386,7 @@ ScanSourceDatabasePgClassPage(Page page, Buffer buf, Oid tbid, Oid dbid,
* needs to be copied from the source database to the destination database,
* and if so, construct a CreateDBRelInfo for it.
*
- * Visbility checks are handled by the caller, so our job here is just
+ * Visibility checks are handled by the caller, so our job here is just
* to assess the data stored in the tuple.
*/
CreateDBRelInfo *
diff --git a/src/backend/commands/vacuumparallel.c b/src/backend/commands/vacuumparallel.c
index 6b4f742578e..bbf3b69c57e 100644
--- a/src/backend/commands/vacuumparallel.c
+++ b/src/backend/commands/vacuumparallel.c
@@ -12,7 +12,7 @@
* the memory space for storing dead items allocated in the DSM segment. We
* launch parallel worker processes at the start of parallel index
* bulk-deletion and index cleanup and once all indexes are processed, the
- * parallel worker processes exit. Each time we process indexes parallelly,
+ * parallel worker processes exit. Each time we process indexes in parallel,
* the parallel context is re-initialized so that the same DSM can be used for
* multiple passes of index bulk-deletion and index cleanup.
*
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index ec3c23013a3..8166224dcc8 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -1976,7 +1976,7 @@ compute_cpu_sort_cost(PlannerInfo *root, List *pathkeys, int nPresortedKeys,
* by calling estimate_num_groups_incremental(), which estimates the
* group size for "new" pathkeys.
*
- * Note: estimate_num_groups_incremntal does not handle fake Vars, so use
+ * Note: estimate_num_groups_incremental does not handle fake Vars, so use
* a default estimate otherwise.
*/
if (!has_fake_var)
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 75fe03fd04b..b1e0c3e41cf 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -2383,7 +2383,7 @@ pathkeys_useful_for_ordering(PlannerInfo *root, List *pathkeys)
* Count the number of pathkeys that are useful for grouping (instead of
* explicit sort)
*
- * Group pathkeys could be reordered to benefit from the odering. The ordering
+ * Group pathkeys could be reordered to benefit from the ordering. The ordering
* may not be "complete" and may require incremental sort, but that's fine. So
* we simply count prefix pathkeys with a matching group key, and stop once we
* find the first pathkey without a match.
@@ -2392,7 +2392,7 @@ pathkeys_useful_for_ordering(PlannerInfo *root, List *pathkeys)
* pathkeys are useful for grouping, and we might do incremental sort to get
* path ordered by (a,b,e).
*
- * This logic is necessary to retain paths with ordeding not matching grouping
+ * This logic is necessary to retain paths with ordering not matching grouping
* keys directly, without the reordering.
*
* Returns the length of pathkey prefix with matching group keys.
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index b6a2482f23a..3cbd5161528 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -3507,7 +3507,7 @@ transformJsonOutput(ParseState *pstate, const JsonOutput *output,
}
/*
- * Transform JSON output clause of JSON contructor functions.
+ * Transform JSON output clause of JSON constructor functions.
*
* Derive RETURNING type, if not specified, from argument types.
*/
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 88f279d1b31..648d0f590b9 100644
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -59,7 +59,7 @@ convert_and_check_filename(text *arg)
canonicalize_path(filename); /* filename can change length here */
/*
- * Roles with privleges of the 'pg_read_server_files' role are allowed to access
+ * Roles with privileges of the 'pg_read_server_files' role are allowed to access
* any files on the server as the PG user, so no need to do any further checks
* here.
*/
diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c
index dee3387d026..75a3aedc5af 100644
--- a/src/backend/utils/cache/relmapper.c
+++ b/src/backend/utils/cache/relmapper.c
@@ -1044,7 +1044,7 @@ perform_relmap_update(bool shared, const RelMapFile *updates)
(shared ? "global" : DatabasePath));
/*
- * We succesfully wrote the updated file, so it's now safe to rely on the
+ * We successfully wrote the updated file, so it's now safe to rely on the
* new values in this process, too.
*/
if (shared)
@@ -1093,7 +1093,7 @@ relmap_redo(XLogReaderState *record)
* an existing database as we do for creating a new database. In
* the latter case, taking the relmap log and sending sinval messages
* is unnecessary, but harmless. If we wanted to avoid it, we could
- * add a flag to the WAL record to indicate which opration is being
+ * add a flag to the WAL record to indicate which operation is being
* performed.
*/
LWLockAcquire(RelationMappingLock, LW_EXCLUSIVE);
diff --git a/src/backend/utils/error/csvlog.c b/src/backend/utils/error/csvlog.c
index 89f78b447d9..5c49bc4209e 100644
--- a/src/backend/utils/error/csvlog.c
+++ b/src/backend/utils/error/csvlog.c
@@ -4,7 +4,7 @@
* CSV logging
*
* Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of Californi
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/error/jsonlog.c b/src/backend/utils/error/jsonlog.c
index 843641c865f..f336c063e58 100644
--- a/src/backend/utils/error/jsonlog.c
+++ b/src/backend/utils/error/jsonlog.c
@@ -4,7 +4,7 @@
* JSON logging
*
* Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of Californi
+ * Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
diff --git a/src/backend/utils/mmgr/generation.c b/src/backend/utils/mmgr/generation.c
index 685688c1554..56ed496386e 100644
--- a/src/backend/utils/mmgr/generation.c
+++ b/src/backend/utils/mmgr/generation.c
@@ -27,7 +27,7 @@
* context's 'freeblock' field. If the freeblock field is already occupied
* by another free block we simply return the newly empty block to malloc.
*
- * This approach to free blocks requires fewer malloc/free calls for truely
+ * This approach to free blocks requires fewer malloc/free calls for truly
* first allocated, first free'd allocation patterns.
*
*-------------------------------------------------------------------------
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 65dcfff0a03..e9e5d44abbc 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1464,7 +1464,7 @@ ReceiveArchiveStreamChunk(size_t r, char *copybuf, void *callback_data)
GetCopyDataEnd(r, copybuf, cursor);
/*
- * The server shouldn't send progres report messages too
+ * The server shouldn't send progress report messages too
* often, so we force an update each time we receive one.
*/
progress_report(state->tablespacenum, true, false);
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index 8a31ffa0677..2430a490a95 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -3450,7 +3450,7 @@ discardUntilSync(CState *st)
PQclear(res);
}
- /* exit pipline */
+ /* exit pipeline */
if (PQexitPipelineMode(st->con) != 1)
{
pg_log_error("client %d aborted: failed to exit pipeline mode for rolling back the failed transaction",
@@ -7261,7 +7261,7 @@ main(int argc, char **argv)
/*
* All connections should be already closed in threadRun(), so this
- * disconnect_all() will be a no-op, but clean up the connecions just to
+ * disconnect_all() will be a no-op, but clean up the connections just to
* be sure. We don't need to measure the disconnection delays here.
*/
disconnect_all(state, nclients);
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index a5ceaec3ac7..a73e22f723e 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -653,7 +653,7 @@ handleCopyIn(PGconn *conn, FILE *copystream, bool isbinary, PGresult **res)
*
* Make sure there's always space for four more bytes in the
* buffer, plus a NUL terminator. That way, an EOF marker is
- * never split across two fgets() calls, which simplies the logic.
+ * never split across two fgets() calls, which simplifies the logic.
*/
if (buflen >= COPYBUFSIZ - 5 || (copydone && buflen > 0))
{
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index e8919ab0be2..d04ba2b0290 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3080,7 +3080,7 @@ describeOneTableDetails(const char *schemaname,
* servers between v11 and v14, though these must still be shown to
* the user. So we use another property that is true for such
* inherited triggers to avoid them being hidden, which is their
- * dependendence on another trigger.
+ * dependence on another trigger.
*/
if (pset.sversion >= 110000 && pset.sversion < 150000)
appendPQExpBufferStr(&buf, "(NOT t.tgisinternal OR (t.tgisinternal AND t.tgenabled = 'D') \n"
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 8f163fb7bac..10e8dbc9b1f 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -2257,7 +2257,7 @@ psql_completion(const char *text, int start, int end)
COMPLETE_WITH("COLUMN", "CONSTRAINT", "CHECK", "UNIQUE", "PRIMARY KEY",
"EXCLUDE", "FOREIGN KEY");
}
- /* ATER TABLE xxx ADD [COLUMN] yyy */
+ /* ALTER TABLE xxx ADD [COLUMN] yyy */
else if (Matches("ALTER", "TABLE", MatchAny, "ADD", "COLUMN", MatchAny) ||
(Matches("ALTER", "TABLE", MatchAny, "ADD", MatchAny) &&
!Matches("ALTER", "TABLE", MatchAny, "ADD", "COLUMN|CONSTRAINT|CHECK|UNIQUE|PRIMARY|EXCLUDE|FOREIGN")))
diff --git a/src/tools/mark_pgdllimport.pl b/src/tools/mark_pgdllimport.pl
index a09ec5a369e..83b90db6ef9 100755
--- a/src/tools/mark_pgdllimport.pl
+++ b/src/tools/mark_pgdllimport.pl
@@ -6,7 +6,7 @@
# Perl script that tries to add PGDLLIMPORT markings to PostgreSQL
# header files.
#
-# This relies on a few idiosyncracies of the PostgreSQL cding style,
+# This relies on a few idiosyncracies of the PostgreSQL coding style,
# such as the fact that we always use "extern" in function
# declarations, and that we don't use // comments. It's not very
# smart and may not catch all cases.
--
2.17.1
0013-f-old-comment-typos.patchtext/x-diff; charset=us-asciiDownload
From c9d16b0cd6e28a14f448c0a3317f3a86d40ef0f8 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 6 Apr 2022 07:42:39 -0500
Subject: [PATCH 13/19] f!old comment typos
---
src/backend/access/brin/brin_minmax_multi.c | 2 +-
src/backend/storage/ipc/procarray.c | 2 +-
src/backend/utils/error/elog.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/access/brin/brin_minmax_multi.c b/src/backend/access/brin/brin_minmax_multi.c
index 82333752f1f..10d4f17bc6f 100644
--- a/src/backend/access/brin/brin_minmax_multi.c
+++ b/src/backend/access/brin/brin_minmax_multi.c
@@ -310,7 +310,7 @@ AssertCheckRanges(Ranges *ranges, FmgrInfo *cmpFn, Oid colloid)
*/
AssertArrayOrder(cmpFn, colloid, ranges->values, 2 * ranges->nranges);
- /* then the single-point ranges (with nvalues boundar values ) */
+ /* then the single-point ranges (with nvalues boundary values ) */
AssertArrayOrder(cmpFn, colloid, &ranges->values[2 * ranges->nranges],
ranges->nsorted);
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 603f6aba71f..e184a3552c8 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -2338,7 +2338,7 @@ GetSnapshotData(Snapshot snapshot)
/*
* We don't include our own XIDs (if any) in the snapshot. It
- * needs to be includeded in the xmin computation, but we did so
+ * needs to be included in the xmin computation, but we did so
* outside the loop.
*/
if (pgxactoff == mypgxactoff)
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index bd4b2c19b1c..72778b896a2 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2269,7 +2269,7 @@ write_console(const char *line, int len)
/*
* Conversion on non-win32 platforms is not implemented yet. It requires
* non-throw version of pg_do_encoding_conversion(), that converts
- * unconvertable characters to '?' without errors.
+ * unconvertible characters to '?' without errors.
*
* XXX: We have a no-throw version now. It doesn't convert to '?' though.
*/
--
2.17.1
0014-duplicate-words.patchtext/x-diff; charset=us-asciiDownload
From cfff9bf8378252b4c642f2b960954194ed5a93ea Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 6 Apr 2022 07:24:48 -0500
Subject: [PATCH 14/19] duplicate words
3f1ce973467a0d285961bf2f99b11d06e264e2c1n 3500ccc39b0dadd1068a03938e4b8ff562587ccc
---
src/backend/access/transam/xlogreader.c | 2 +-
src/backend/replication/basebackup_server.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index a5f1a648d3d..b3e37003ac5 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -300,7 +300,7 @@ XLogReleasePreviousRecord(XLogReaderState *state)
/* Release the space. */
if (unlikely(record->oversized))
{
- /* It's not in the the decode buffer, so free it to release space. */
+ /* It's not in the decode buffer, so free it to release space. */
pfree(record);
}
else
diff --git a/src/backend/replication/basebackup_server.c b/src/backend/replication/basebackup_server.c
index bc16897b33f..33595616894 100644
--- a/src/backend/replication/basebackup_server.c
+++ b/src/backend/replication/basebackup_server.c
@@ -195,7 +195,7 @@ bbsink_server_end_archive(bbsink *sink)
/*
* We intentionally don't use data_sync_elevel here, because the server
- * shouldn't PANIC just because we can't guarantee the the backup has been
+ * shouldn't PANIC just because we can't guarantee the backup has been
* written down to disk. Running recovery won't fix anything in this case
* anyway.
*/
--
2.17.1
0015-f-relpersistence.patchtext/x-diff; charset=us-asciiDownload
From 4242150d1d27803e25c259c3f845a8c04be98b0e Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Thu, 7 Apr 2022 10:34:06 -0500
Subject: [PATCH 15/19] f!relpersistence
344d62fb9a978a72cf8347f0369b9ee643fd0b31
---
doc/src/sgml/catalogs.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index c1c89a95c6b..6f285871b64 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -2065,8 +2065,8 @@ SCRAM-SHA-256$<replaceable><iteration count></replaceable>:<replaceable>&l
<structfield>relpersistence</structfield> <type>char</type>
</para>
<para>
- <literal>p</literal> = permanent table, <literal>u</literal> = unlogged table,
- <literal>t</literal> = temporary table
+ <literal>p</literal> = permanent table/sequence, <literal>u</literal> = unlogged table/sequence,
+ <literal>t</literal> = temporary table/sequence
</para></entry>
</row>
--
2.17.1
0016-Extraneous-blank-lines.patchtext/x-diff; charset=us-asciiDownload
From 183c98e6b028dd08036502d74a307034fb44c1ac Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 2 Apr 2022 11:58:06 -0500
Subject: [PATCH 16/19] Extraneous blank lines
I noticed some left behind by d61a361d1, and searched for the others like:
git grep -nB1 '^}' '*.c' |less
... \.c-[0-9]*-$
I've omitted some that involved structures or conditional compilation.
---
contrib/btree_gist/btree_bit.c | 1 -
contrib/btree_gist/btree_cash.c | 1 -
contrib/btree_gist/btree_float4.c | 1 -
contrib/btree_gist/btree_float8.c | 1 -
contrib/btree_gist/btree_inet.c | 1 -
contrib/btree_gist/btree_interval.c | 2 --
contrib/btree_gist/btree_macaddr.c | 1 -
contrib/btree_gist/btree_macaddr8.c | 1 -
contrib/btree_gist/btree_ts.c | 1 -
contrib/dblink/dblink.c | 2 --
contrib/pg_stat_statements/pg_stat_statements.c | 1 -
contrib/postgres_fdw/connection.c | 1 -
src/backend/access/nbtree/nbtutils.c | 1 -
src/backend/access/rmgrdesc/gistdesc.c | 1 -
src/backend/access/spgist/spgutils.c | 1 -
src/backend/access/table/tableam.c | 1 -
src/backend/commands/tablecmds.c | 1 -
src/backend/executor/nodeMergejoin.c | 1 -
src/backend/optimizer/geqo/geqo_erx.c | 1 -
src/backend/optimizer/geqo/geqo_ox1.c | 1 -
src/backend/optimizer/geqo/geqo_ox2.c | 1 -
src/backend/optimizer/geqo/geqo_px.c | 1 -
src/backend/replication/logical/snapbuild.c | 1 -
src/backend/replication/pgoutput/pgoutput.c | 1 -
src/backend/statistics/dependencies.c | 1 -
src/backend/storage/sync/sync.c | 1 -
src/backend/tcop/postgres.c | 1 -
src/backend/tsearch/to_tsany.c | 1 -
src/backend/utils/adt/acl.c | 1 -
src/backend/utils/adt/json.c | 1 -
src/backend/utils/adt/jsonfuncs.c | 1 -
src/backend/utils/cache/catcache.c | 1 -
src/backend/utils/resowner/resowner.c | 1 -
src/bin/initdb/initdb.c | 2 --
src/interfaces/ecpg/ecpglib/misc.c | 1 -
src/interfaces/ecpg/pgtypeslib/numeric.c | 1 -
src/interfaces/ecpg/pgtypeslib/timestamp.c | 4 +---
src/interfaces/libpq/fe-connect.c | 1 -
.../modules/ssl_passphrase_callback/ssl_passphrase_func.c | 1 -
39 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index 2225244ded5..5b246bcde4b 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -104,7 +104,6 @@ gbt_bit_l2n(GBT_VARKEY *leaf, FmgrInfo *flinfo)
pfree(o);
return out;
-
}
static const gbtree_vinfo tinfo =
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index dfa23224b6f..6ac97e2b12a 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -195,7 +195,6 @@ gbt_cash_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index b5d9175e6d5..3cbd9a06dcc 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -190,7 +190,6 @@ gbt_float4_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index 8fe1fedeef8..b95a08e228b 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -197,7 +197,6 @@ gbt_float8_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index e4b3a946b27..2fb952dca83 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -165,7 +165,6 @@ gbt_inet_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index a4b3b2b1e6f..c2bf82086df 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -173,7 +173,6 @@ gbt_intv_compress(PG_FUNCTION_ARGS)
}
PG_RETURN_POINTER(retval);
-
}
Datum
@@ -276,7 +275,6 @@ gbt_intv_penalty(PG_FUNCTION_ARGS)
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index 7f0e9e9c912..17290529c02 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -174,7 +174,6 @@ gbt_macad_penalty(PG_FUNCTION_ARGS)
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_macaddr8.c b/contrib/btree_gist/btree_macaddr8.c
index ab4bca5d50d..796cc4efee3 100644
--- a/contrib/btree_gist/btree_macaddr8.c
+++ b/contrib/btree_gist/btree_macaddr8.c
@@ -174,7 +174,6 @@ gbt_macad8_penalty(PG_FUNCTION_ARGS)
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 2671ba961cd..a51900941e5 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -377,7 +377,6 @@ gbt_ts_penalty(PG_FUNCTION_ARGS)
penalty_num(result, orgdbl[0], orgdbl[1], newdbl[0], newdbl[1]);
PG_RETURN_POINTER(result);
-
}
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index a06d4bd12db..a561d1d6524 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -1004,7 +1004,6 @@ materializeResult(FunctionCallInfo fcinfo, PGconn *conn, PGresult *res)
/* clean up GUC settings, if we changed any */
restoreLocalGucs(nestlevel);
-
}
}
PG_FINALLY();
@@ -2635,7 +2634,6 @@ deleteConnection(const char *name)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("undefined connection name")));
-
}
static void
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 1ca67ef6234..df2ce63790b 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -1849,7 +1849,6 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
if (qbuffer)
free(qbuffer);
-
}
/* Number of output arguments (columns) for pg_stat_statements_info */
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 129ca792214..f9b8c01f3b9 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -1734,7 +1734,6 @@ postgres_fdw_get_connections(PG_FUNCTION_ARGS)
tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls);
}
-
PG_RETURN_VOID();
}
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 96c72fc4324..5361b147e30 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -2123,7 +2123,6 @@ btoptions(Datum reloptions, bool validate)
RELOPT_KIND_BTREE,
sizeof(BTOptions),
tab, lengthof(tab));
-
}
/*
diff --git a/src/backend/access/rmgrdesc/gistdesc.c b/src/backend/access/rmgrdesc/gistdesc.c
index 9cab4fa1580..d0c8e247c1d 100644
--- a/src/backend/access/rmgrdesc/gistdesc.c
+++ b/src/backend/access/rmgrdesc/gistdesc.c
@@ -38,7 +38,6 @@ out_gistxlogDelete(StringInfo buf, gistxlogDelete *xlrec)
{
appendStringInfo(buf, "delete: latestRemovedXid %u, nitems: %u",
xlrec->latestRemovedXid, xlrec->ntodelete);
-
}
static void
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 1ae7492216a..a171ca8a08a 100644
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -747,7 +747,6 @@ spgoptions(Datum reloptions, bool validate)
RELOPT_KIND_SPGIST,
sizeof(SpGistOptions),
tab, lengthof(tab));
-
}
/*
diff --git a/src/backend/access/table/tableam.c b/src/backend/access/table/tableam.c
index 4f20c6ac12a..b3d1a6c3f8f 100644
--- a/src/backend/access/table/tableam.c
+++ b/src/backend/access/table/tableam.c
@@ -381,7 +381,6 @@ simple_table_tuple_update(Relation rel, ItemPointer otid,
elog(ERROR, "unrecognized table_tuple_update status: %u", result);
break;
}
-
}
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 90edd0bb97d..2840bc527bc 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -3773,7 +3773,6 @@ RenameConstraint(RenameStmt *stmt)
stmt->relation->inh), /* recursive? */
false, /* recursing? */
0 /* expected inhcount */ );
-
}
/*
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index edb8972c5bf..864e3baf86b 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -1674,5 +1674,4 @@ ExecReScanMergeJoin(MergeJoinState *node)
ExecReScan(node->js.ps.lefttree);
if (node->js.ps.righttree->chgParam == NULL)
ExecReScan(node->js.ps.righttree);
-
}
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index 3b92f420e0a..d98c0a59e71 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -226,7 +226,6 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene)
} /* for (i=1; i<num_gene; i++) */
return edge_failures;
-
}
/* remove_gene
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index 10d2d0a33ae..ede7abb4177 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -89,7 +89,6 @@ ox1(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
}
p = (p + 1) % num_gene; /* increment tour2-index */
}
-
}
#endif /* defined(OX1) */
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index 72b9b0fb871..080dbc076cc 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -106,7 +106,6 @@ ox2(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
/* city isn't used yet, so inherit from tour2 */
offspring[k] = tour2[k];
}
-
}
#endif /* defined(OX2) */
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index ad5ad3f1e57..0346554bc09 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -104,7 +104,6 @@ px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
}
}
-
}
#endif /* defined(PX) */
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 83fca8a77d9..1119a12db9e 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -1380,7 +1380,6 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
* records so incremental cleanup can be performed.
*/
return true;
-
}
/* ---
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index fe5accca576..8b55ebdd4d2 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -1066,7 +1066,6 @@ pgoutput_column_list_init(PGOutputData *data, List *publications,
ReleaseSysCache(cftuple);
} /* loop all subscribed publications */
-
}
/*
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 34326d55619..b6f31849616 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -199,7 +199,6 @@ DependencyGenerator_free(DependencyGenerator state)
{
pfree(state->dependencies);
pfree(state);
-
}
/* generate next combination */
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index c695d816fc6..e1fb6310038 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -162,7 +162,6 @@ InitSync(void)
HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
pendingUnlinks = NIL;
}
-
}
/*
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 95dc2e2c835..304cce135aa 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2636,7 +2636,6 @@ exec_describe_statement_message(const char *stmt_name)
}
else
pq_putemptymessage('n'); /* NoData */
-
}
/*
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 1b0a1e244b8..6053a9e31f2 100644
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -720,5 +720,4 @@ websearch_to_tsquery(PG_FUNCTION_ARGS)
PG_RETURN_DATUM(DirectFunctionCall2(websearch_to_tsquery_byid,
ObjectIdGetDatum(cfgId),
PointerGetDatum(in)));
-
}
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 8bdba1c42a5..772c04155c3 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -3094,7 +3094,6 @@ convert_database_priv_string(text *priv_type_text)
};
return convert_any_priv_string(priv_type_text, database_priv_map);
-
}
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index 4cf01300d8b..18f19014d0a 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -1501,7 +1501,6 @@ json_object(PG_FUNCTION_ARGS)
pfree(result.data);
PG_RETURN_TEXT_P(rval);
-
}
/*
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index a682d9c9734..d1356d64166 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -4168,7 +4168,6 @@ json_strip_nulls(PG_FUNCTION_ARGS)
PG_RETURN_TEXT_P(cstring_to_text_with_len(state->strval->data,
state->strval->len));
-
}
/*
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index ec073e1ed06..233bcb63180 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -1962,7 +1962,6 @@ CatCacheCopyKeys(TupleDesc tupdesc, int nkeys, int *attnos,
att->attbyval,
att->attlen);
}
-
}
/*
diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index 3236b1b9195..ceb4b0e3f75 100644
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -896,7 +896,6 @@ CreateAuxProcessResourceOwner(void)
* owner. (This needs to run after, e.g., ShutdownXLOG.)
*/
on_shmem_exit(ReleaseAuxProcessResourcesCallback, 0);
-
}
/*
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index ab826da6505..1cb4a5b0d21 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2407,7 +2407,6 @@ setup_locale_encoding(void)
if (!check_locale_encoding(lc_ctype, encodingid) ||
!check_locale_encoding(lc_collate, encodingid))
exit(1); /* check_locale_encoding printed the error */
-
}
@@ -2486,7 +2485,6 @@ setup_text_search(void)
printf(_("The default text search configuration will be set to \"%s\".\n"),
default_text_search_config);
-
}
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index b8dbe5e7f3b..1eef1ec044c 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -191,7 +191,6 @@ ECPGtransactionStatus(const char *connection_name)
}
return PQtransactionStatus(con->connection);
-
}
bool
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index dbe4eb21e27..34efc9045f3 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1308,7 +1308,6 @@ PGTYPESnumeric_cmp(numeric *var1, numeric *var2)
errno = PGTYPES_NUM_BAD_NUMERIC;
return INT_MAX;
-
}
int
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 3f82ee54a5f..9aff95cf5e3 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -863,8 +863,6 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout
{
if (TIMESTAMP_NOT_FINITE(*tin))
*tout = *tin;
-
-
else
{
if (span->month != 0)
@@ -902,8 +900,8 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout
*tin += span->time;
*tout = *tin;
}
- return 0;
+ return 0;
}
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index cf554d389fa..4c12f1411f7 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -664,7 +664,6 @@ PQconnectdbParams(const char *const *keywords,
(void) connectDBComplete(conn);
return conn;
-
}
/*
diff --git a/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c b/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c
index 7c469fd57e8..b5bb5580a0f 100644
--- a/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c
+++ b/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c
@@ -89,5 +89,4 @@ rot13_passphrase(char *buf, int size, int rwflag, void *userdata)
}
return strlen(buf);
-
}
--
2.17.1
0017-f-blanks-which-involve-tabs.patchtext/x-diff; charset=us-asciiDownload
From 1d63edf98c702f40ddd77045eec9cb490049f7dc Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 2 Apr 2022 16:28:41 -0500
Subject: [PATCH 17/19] f!blanks which involve tabs
I excluded things involving conditional compilation and do{}while statements
---
contrib/intarray/_int_bool.c | 1 -
contrib/ltree/ltxtquery_io.c | 1 -
contrib/spi/refint.c | 2 --
src/backend/access/gin/ginbtree.c | 1 -
src/backend/access/heap/heapam.c | 1 -
src/backend/access/heap/vacuumlazy.c | 1 -
src/backend/access/nbtree/nbtutils.c | 2 --
src/backend/access/transam/xlogrecovery.c | 1 -
src/backend/catalog/objectaddress.c | 2 --
src/backend/catalog/pg_attrdef.c | 1 -
src/backend/commands/subscriptioncmds.c | 1 -
src/backend/commands/tablecmds.c | 2 --
src/backend/executor/execParallel.c | 1 -
src/backend/executor/execReplication.c | 1 -
src/backend/executor/nodeAgg.c | 1 -
src/backend/jit/llvm/llvmjit_deform.c | 2 --
src/backend/jit/llvm/llvmjit_expr.c | 1 -
src/backend/libpq/hba.c | 1 -
src/backend/optimizer/geqo/geqo_cx.c | 1 -
src/backend/optimizer/geqo/geqo_erx.c | 2 --
src/backend/optimizer/geqo/geqo_pmx.c | 6 ------
src/backend/optimizer/geqo/geqo_px.c | 2 --
src/backend/optimizer/plan/planner.c | 1 -
src/backend/postmaster/postmaster.c | 1 -
src/backend/replication/logical/worker.c | 1 -
src/backend/replication/walsender.c | 1 -
src/backend/storage/buffer/bufmgr.c | 2 --
src/backend/storage/buffer/freelist.c | 1 -
src/backend/storage/ipc/procarray.c | 1 -
src/backend/storage/page/bufpage.c | 2 --
src/backend/tcop/utility.c | 1 -
src/backend/tsearch/to_tsany.c | 1 -
src/backend/tsearch/ts_parse.c | 2 --
src/backend/utils/adt/jsonb.c | 1 -
src/backend/utils/adt/multirangetypes.c | 2 --
src/backend/utils/adt/oracle_compat.c | 1 -
src/backend/utils/adt/ruleutils.c | 1 -
src/backend/utils/adt/selfuncs.c | 1 -
src/backend/utils/adt/timestamp.c | 2 --
src/backend/utils/adt/tsvector_op.c | 1 -
src/backend/utils/cache/catcache.c | 1 -
src/backend/utils/error/elog.c | 2 --
src/backend/utils/sort/tuplesort.c | 1 -
src/bin/pg_dump/pg_dumpall.c | 1 -
src/bin/pg_rewind/parsexlog.c | 1 -
src/bin/pg_verifybackup/pg_verifybackup.c | 2 --
src/bin/psql/describe.c | 2 --
src/bin/psql/prompt.c | 1 -
src/common/jsonapi.c | 3 ---
src/fe_utils/print.c | 1 -
src/interfaces/ecpg/ecpglib/connect.c | 1 -
src/interfaces/ecpg/ecpglib/data.c | 1 -
src/interfaces/ecpg/ecpglib/execute.c | 1 -
src/interfaces/ecpg/pgtypeslib/dt_common.c | 1 -
src/interfaces/ecpg/pgtypeslib/interval.c | 1 -
src/interfaces/libpq/fe-secure-openssl.c | 1 -
src/pl/tcl/pltcl.c | 1 -
src/port/chklocale.c | 1 -
58 files changed, 80 deletions(-)
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 4b6a31080e4..3ed88af76d7 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -210,7 +210,6 @@ makepol(WORKSTATE *state)
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error")));
return ERR;
-
}
}
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index d967f92110f..3eca5cb8ff3 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -260,7 +260,6 @@ makepol(QPRS_STATE *state)
errmsg("syntax error")));
return ERR;
-
}
}
while (lenstack)
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 6fbfef2b121..18062eb1cff 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -497,12 +497,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
nv, (is_char_type > 0) ? "'" : "", (k < nkeys) ? ", " : "");
}
strcat(sql, " where ");
-
}
else
/* DELETE */
snprintf(sql, sizeof(sql), "delete from %s where ", relname);
-
}
/*
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 8df45478f10..cc6d4e63382 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -527,7 +527,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
BufferGetBlockNumber(stack->buffer),
BufferGetBlockNumber(rbuffer));
}
-
}
else
{
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 983db140aaf..cd1dfaa1d09 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8481,7 +8481,6 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
{
xlrec.cmin = InvalidCommandId;
xlrec.cmax = HeapTupleHeaderGetRawCommandId(hdr);
-
}
xlrec.combocid = InvalidCommandId;
}
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index e1cac74e620..a3c8ccdbe5c 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -2073,7 +2073,6 @@ lazy_scan_noprune(LVRelState *vacrel,
elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
break;
}
-
}
vacrel->offnum = InvalidOffsetNumber;
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 5361b147e30..9daf57d4038 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -2116,7 +2116,6 @@ btoptions(Datum reloptions, bool validate)
offsetof(BTOptions, vacuum_cleanup_index_scale_factor)},
{"deduplicate_items", RELOPT_TYPE_BOOL,
offsetof(BTOptions, deduplicate_items)}
-
};
return (bytea *) build_reloptions(reloptions, validate,
@@ -2590,7 +2589,6 @@ _bt_check_natts(Relation rel, bool heapkeyspace, Page page, OffsetNumber offnum)
/* Use generic heapkeyspace pivot tuple handling */
}
-
}
/* Handle heapkeyspace pivot tuples (excluding minus infinity items) */
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 4ee29182ac8..5c002359ed6 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -1790,7 +1790,6 @@ PerformWalRecovery(void)
/* there are no WAL records following the checkpoint */
ereport(LOG,
(errmsg("redo is not required")));
-
}
/*
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ac6043514f1..8377b4f7d4d 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -1007,7 +1007,6 @@ get_object_address(ObjectType objtype, Node *object,
address.objectId = get_domain_constraint_oid(domaddr.objectId,
constrname, missing_ok);
address.objectSubId = 0;
-
}
break;
case OBJECT_DATABASE:
@@ -5621,7 +5620,6 @@ getObjectIdentityParts(const ObjectAddress *object,
systable_endscan(rcscan);
table_close(defaclrel, AccessShareLock);
break;
-
}
defacl = (Form_pg_default_acl) GETSTRUCT(tup);
diff --git a/src/backend/catalog/pg_attrdef.c b/src/backend/catalog/pg_attrdef.c
index 2d63c6e62a3..c5d4a9912ea 100644
--- a/src/backend/catalog/pg_attrdef.c
+++ b/src/backend/catalog/pg_attrdef.c
@@ -167,7 +167,6 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
if (!missingIsNull)
pfree(DatumGetPointer(missingval));
-
}
table_close(attrrel, RowExclusiveLock);
heap_freetuple(atttup);
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 2e8d8afead8..b94236f74d3 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -1570,7 +1570,6 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
*/
if (slotname)
ReplicationSlotDropAtPubNode(wrconn, slotname, false);
-
}
PG_FINALLY();
{
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 2840bc527bc..23e572dd227 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -945,7 +945,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("specifying a table access method is not supported on a partitioned table")));
-
}
else if (RELKIND_HAS_TABLE_AM(relkind))
accessMethod = default_table_access_method;
@@ -17450,7 +17449,6 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
errmsg("data type %s has no default operator class for access method \"%s\"",
format_type_be(atttype), "btree"),
errhint("You must specify a btree operator class or define a default btree operator class for the data type.")));
-
}
}
else
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 9a0d5d59ef6..f1fd7f7e8b2 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -1439,7 +1439,6 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
paramexec_space = dsa_get_address(area, fpes->param_exec);
RestoreParamExecParams(paramexec_space, queryDesc->estate);
-
}
pwcxt.toc = toc;
pwcxt.seg = seg;
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 27989bd723d..b000645d48b 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -548,7 +548,6 @@ ExecSimpleRelationDelete(ResultRelInfo *resultRelInfo,
{
skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
tid, NULL, NULL);
-
}
if (!skip_tuple)
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 23030a32a59..3223d9b24e5 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -4119,7 +4119,6 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
2,
InvalidOid,
(void *) aggstate, NULL);
-
}
/*
diff --git a/src/backend/jit/llvm/llvmjit_deform.c b/src/backend/jit/llvm/llvmjit_deform.c
index a3355860c3e..661f15272b7 100644
--- a/src/backend/jit/llvm/llvmjit_deform.c
+++ b/src/backend/jit/llvm/llvmjit_deform.c
@@ -192,7 +192,6 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
v_tupleheaderp =
l_load_struct_gep(b, v_heapslot, FIELDNO_HEAPTUPLETABLESLOT_TUPLE,
"tupleheader");
-
}
else if (ops == &TTSOpsMinimalTuple)
{
@@ -357,7 +356,6 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
LLVMAddCase(v_switch, v_attno, attcheckattnoblocks[attnum]);
}
-
}
else
{
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index 9c8f341d966..b6b6512ef1f 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -2173,7 +2173,6 @@ llvm_compile_expr(ExprState *state)
"");
LLVMBuildBr(b, opblocks[opno + 1]);
-
}
LLVMPositionBuilderAtEnd(b, b_no_init);
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index cbd17b790d8..327a4b42af7 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1775,7 +1775,6 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
hbaline->pam_use_hostname = true;
else
hbaline->pam_use_hostname = false;
-
}
else if (strcmp(name, "ldapurl") == 0)
{
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 3b8d2fe5601..34cc53af53e 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -115,7 +115,6 @@ cx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
for (i = 0; i < num_gene; i++)
if (tour1[i] != offspring[i])
num_diffs++;
-
}
return num_diffs;
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index d98c0a59e71..cc0661365f6 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -222,7 +222,6 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene)
/* mark this node as incorporated */
edge_table[(int) new_gene[i - 1]].unused_edges = -1;
-
} /* for (i=1; i<num_gene; i++) */
return edge_failures;
@@ -336,7 +335,6 @@ gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table)
elog(ERROR, "minimum_count not set");
else if (edge_table[(int) friend].unused_edges == minimum_edges)
minimum_count++;
-
} /* for (i=0; i<edge.unused_edges; i++) */
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index ddbc78172c0..e44fd0bae5a 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -131,7 +131,6 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
j++;
}
-
}
if (!(found))
@@ -140,7 +139,6 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
indx[mx_fail] = k;
mx_fail++;
}
-
} /* ... for */
@@ -172,9 +170,7 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
j++;
}
-
} /* ... for */
-
} /* ... if */
@@ -206,12 +202,10 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
j++;
}
-
} /* ... if */
i++;
} /* end while */
-
}
} /* ... for */
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index 0346554bc09..914296b53d2 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -96,13 +96,11 @@ px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
{ /* next city in tour2 has been used */
tour2_index++;
}
-
}
else
{ /* next position in offspring is filled */
offspring_index++;
}
-
}
}
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index b090b087e95..9a4accb4d9d 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -6848,7 +6848,6 @@ create_partial_grouping_paths(PlannerInfo *root,
dNumPartialGroups));
}
}
-
}
if (can_sort && cheapest_partial_path != NULL)
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 3535e9e47d2..3fceda8cff9 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -5851,7 +5851,6 @@ bgworker_should_start_now(BgWorkerStartTime start_time)
if (start_time == BgWorkerStart_PostmasterStart)
return true;
/* fall through */
-
}
return false;
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 9181d3e8636..4171371296f 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -600,7 +600,6 @@ slot_fill_defaults(LogicalRepRelMapEntry *rel, EState *estate,
defmap[num_defaults] = attnum;
num_defaults++;
}
-
}
for (i = 0; i < num_defaults; i++)
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 75400a53f2f..be402613936 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -1000,7 +1000,6 @@ parseCreateReplSlotOptions(CreateReplicationSlotCmd *cmd,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\"",
defel->defname, action)));
-
}
else if (strcmp(defel->defname, "reserve_wal") == 0)
{
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index c12028ca0fe..e02ea3a977c 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -2676,7 +2676,6 @@ CheckForBufferLeaks(void)
PrintBufferLeakWarning(res->buffer);
RefCountErrors++;
}
-
}
Assert(RefCountErrors == 0);
@@ -3652,7 +3651,6 @@ FlushRelationsAllBuffers(SMgrRelation *smgrs, int nrels)
break;
}
}
-
}
else
{
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 3b98e68d50f..990e081aaec 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -308,7 +308,6 @@ StrategyGetBuffer(BufferAccessStrategy strategy, uint32 *buf_state)
return buf;
}
UnlockBufHdr(buf, local_buf_state);
-
}
}
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index e184a3552c8..beef69eab22 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -1848,7 +1848,6 @@ ComputeXidHorizons(ComputeXidHorizonsResult *h)
/* Catalog tables need to consider all backends in this db */
h->catalog_oldest_nonremovable =
TransactionIdOlder(h->catalog_oldest_nonremovable, xmin);
-
}
}
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 366d57ea7ac..cc15396789b 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -563,7 +563,6 @@ compactify_tuples(itemIdCompact itemidbase, int nitems, Page page, bool presorte
/* update the line pointer to reference the new offset */
lp->lp_off = upper;
-
}
/* move the remaining tuples. */
@@ -669,7 +668,6 @@ compactify_tuples(itemIdCompact itemidbase, int nitems, Page page, bool presorte
/* update the line pointer to reference the new offset */
lp->lp_off = upper;
-
}
/* Copy the remaining chunk */
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index f364a9b88a9..0e7b7b31384 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -3741,7 +3741,6 @@ GetCommandLogLevel(Node *parsetree)
lev = LOGSTMT_ALL;
break;
}
-
}
break;
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 6053a9e31f2..edeffacc2d7 100644
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -569,7 +569,6 @@ pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval,
}
pfree(prs.words);
-
}
else
pushStop(state);
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
index bf4247048dd..056a18e8f9f 100644
--- a/src/backend/tsearch/ts_parse.c
+++ b/src/backend/tsearch/ts_parse.c
@@ -584,7 +584,6 @@ hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int bu
else
addHLParsedLex(prs, query, lexs, NULL);
} while (norms);
-
} while (type > 0);
FunctionCall1(&(prsobj->prsend), PointerGetDatum(prsdata));
@@ -629,7 +628,6 @@ generateHeadline(HeadlineParsedText *prs)
memcpy(ptr, prs->fragdelim, prs->fragdelimlen);
ptr += prs->fragdelimlen;
}
-
}
if (wrd->replace)
{
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 2043f2e74af..56c588bbabd 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -851,7 +851,6 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
sem.object_field_start = jsonb_in_object_field_start;
pg_parse_json_or_ereport(lex, &sem);
-
}
break;
case JSONBTYPE_JSONB:
diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c
index efd8584a3d8..67d7d67fb83 100644
--- a/src/backend/utils/adt/multirangetypes.c
+++ b/src/backend/utils/adt/multirangetypes.c
@@ -1181,7 +1181,6 @@ multirange_minus_internal(Oid mltrngtypoid, TypeCacheEntry *rangetyp,
*/
range_count3++;
r2 = ++i2 >= range_count2 ? NULL : ranges2[i2];
-
}
else if (range_overlaps_internal(rangetyp, r1, r2))
{
@@ -1200,7 +1199,6 @@ multirange_minus_internal(Oid mltrngtypoid, TypeCacheEntry *rangetyp,
break;
else
r2 = ++i2 >= range_count2 ? NULL : ranges2[i2];
-
}
else
{
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index f1673cc1456..a6e043c32c5 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -868,7 +868,6 @@ translate(PG_FUNCTION_ARGS)
target += len;
retlen += len;
}
-
}
else
{
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3296ad070ed..7e08d7fe6c2 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -9440,7 +9440,6 @@ get_rule_expr(Node *node, deparse_context *context,
get_rule_expr_paren((Node *) xexpr->args, context, false, node);
break;
}
-
}
if (xexpr->op == IS_XMLSERIALIZE)
appendStringInfo(buf, " AS %s",
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index fb4fb987e7f..71cbc1c3d80 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -3628,7 +3628,6 @@ estimate_num_groups_incremental(PlannerInfo *root, List *groupExprs,
*/
if (estinfo != NULL && varinfo2->isdefault)
estinfo->flags |= SELFLAG_USED_DEFAULT;
-
}
/* we're done with this relation */
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 70937eaa461..da73796eac8 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -4898,7 +4898,6 @@ timestamp_part_common(PG_FUNCTION_ARGS, bool retnumeric)
lowunits, format_type_be(TIMESTAMPOID))));
intresult = 0;
}
-
}
else
{
@@ -5123,7 +5122,6 @@ timestamptz_part_common(PG_FUNCTION_ARGS, bool retnumeric)
lowunits, format_type_be(TIMESTAMPTZOID))));
intresult = 0;
}
-
}
else if (type == RESERV)
{
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 8ba9ef22f56..addc3491518 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -2196,7 +2196,6 @@ insertStatEntry(MemoryContext persistentContext, TSVectorStat *stat, TSVector tx
else
pnode->right = node;
}
-
}
else
{
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 233bcb63180..6ae7c1f50b8 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -1710,7 +1710,6 @@ SearchCatCacheList(CatCache *cache,
* we'd better do so before we start marking the members as belonging
* to the list.
*/
-
}
PG_CATCH();
{
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 72778b896a2..55ee5423afb 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2683,7 +2683,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
appendStringInfo(buf, "%*s", padding, psdisp);
else
appendBinaryStringInfo(buf, psdisp, displen);
-
}
else if (padding != 0)
appendStringInfoSpaces(buf,
@@ -2722,7 +2721,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
appendStringInfo(buf, "(%s)",
MyProcPort->remote_port);
}
-
}
else if (padding != 0)
appendStringInfoSpaces(buf,
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 571fb955327..1174e1a31c9 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -3186,7 +3186,6 @@ mergeonerun(Tuplesortstate *state)
{
stup.srctape = srcTapeIndex;
tuplesort_heap_replace_top(state, &stup);
-
}
else
{
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 6ef3d614211..79a723885ed 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1373,7 +1373,6 @@ dumpDatabases(PGconn *conn)
pg_fatal("could not re-open the output file \"%s\": %m",
filename);
}
-
}
PQclear(res);
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index dfa836d1561..7e7346c79a1 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -98,7 +98,6 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex,
}
extractPageInfo(xlogreader);
-
} while (xlogreader->EndRecPtr < endpoint);
/*
diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c
index 6671a841502..bd18b4491d5 100644
--- a/src/bin/pg_verifybackup/pg_verifybackup.c
+++ b/src/bin/pg_verifybackup/pg_verifybackup.c
@@ -740,8 +740,6 @@ verify_file_checksum(verifier_context *context, manifest_file *m,
close(fd);
return;
}
-
-
}
if (rc < 0)
report_backup_error(context, "could not read file \"%s\": %m",
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d04ba2b0290..b0aa0cf2466 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -2622,7 +2622,6 @@ describeOneTableDetails(const char *schemaname,
PQgetvalue(result, i, 4));
printTableAddFooter(&cont, buf.data);
-
}
PQclear(result);
}
@@ -3172,7 +3171,6 @@ describeOneTableDetails(const char *schemaname,
case 4:
printfPQExpBuffer(&buf, _("Triggers firing on replica only:"));
break;
-
}
printTableAddFooter(&cont, buf.data);
have_heading = true;
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 10ab390531b..509e6422b7e 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -316,7 +316,6 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
buf[0] = *p;
buf[1] = '\0';
break;
-
}
esc = false;
}
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 6666077a934..98e4ef09426 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -658,7 +658,6 @@ json_lex(JsonLexContext *lex)
lex->token_type = JSON_TOKEN_FALSE;
else
return JSON_INVALID_TOKEN;
-
}
} /* end of switch */
}
@@ -856,7 +855,6 @@ json_lex_string(JsonLexContext *lex)
lex->token_terminator = s + pg_encoding_mblen_bounded(lex->input_encoding, s);
return JSON_ESCAPING_INVALID;
}
-
}
else if (lex->strval != NULL)
{
@@ -865,7 +863,6 @@ json_lex_string(JsonLexContext *lex)
appendStringInfoChar(lex->strval, *s);
}
-
}
if (hi_surrogate != -1)
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index dcdb2e0d0cb..fe676a971b9 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -1173,7 +1173,6 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
if (opt_border == 2)
fputs(dformat->rightvrule, fout);
fputc('\n', fout);
-
} while (more_lines);
}
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index a2166b1e12f..8dfcabe3b50 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -315,7 +315,6 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
ecpg_free(dbname);
dbname = ecpg_strdup(envname, lineno);
}
-
}
if (dbname == NULL && connection_name == NULL)
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 6bc91ef7eb6..a1bba42bb8f 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -564,7 +564,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
}
pval += size;
-
}
break;
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 930b6adbe4f..6a7ef0bbf67 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1392,7 +1392,6 @@ ecpg_build_params(struct statement *stmt)
if (sqlda->sqln == desc_counter)
desc_counter = 0;
}
-
}
else
{
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index e8a8a0f0ed3..e0fae3d5f1d 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -1740,7 +1740,6 @@ ParseDateTime(char *timestr, char *lowstr,
{
(*endstr)++;
continue;
-
}
/* otherwise, something is not right... */
else
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index a7e530cb5d2..73bde94aaf0 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -947,7 +947,6 @@ interval2tm(interval span, struct tm *tm, fsec_t *fsec)
{
tm->tm_year = span.month / MONTHS_PER_YEAR;
tm->tm_mon = span.month % MONTHS_PER_YEAR;
-
}
else
{
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index 24a598b6e41..42d8d4616e7 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -1432,7 +1432,6 @@ initialize_SSL(PGconn *conn)
}
SSLerrfree(err);
-
}
}
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 68c9bd1970e..0dd6d8ab2c2 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -1243,7 +1243,6 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
for (i = 0; i < trigdata->tg_trigger->tgnargs; i++)
Tcl_ListObjAppendElement(NULL, tcl_cmd,
Tcl_NewStringObj(utf_e2u(trigdata->tg_trigger->tgargs[i]), -1));
-
}
PG_CATCH();
{
diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index 3e777253524..c85d8da3c8b 100644
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@ -278,7 +278,6 @@ win32_langinfo(const char *ctype)
strcpy(r, codepage);
}
}
-
}
#endif
--
2.17.1
0018-Double-spaces.patchtext/x-diff; charset=us-asciiDownload
From 5a17c2290039e99d4ec74846fda3ca0f5adf61ba Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Tue, 8 Mar 2022 09:19:01 -0600
Subject: [PATCH 18/19] Double spaces
I noticed one which was introduced at 9e9858389, and then grepped for the
others like:
git grep '^ * \* *[^ ].*[[:alnum:]] '
---
src/backend/optimizer/path/costsize.c | 2 +-
src/backend/replication/logical/reorderbuffer.c | 2 +-
src/backend/replication/slot.c | 2 +-
src/backend/tsearch/ts_parse.c | 2 +-
src/backend/utils/adt/geo_ops.c | 2 +-
src/backend/utils/adt/pg_locale.c | 2 +-
src/backend/utils/adt/tsquery.c | 2 +-
src/backend/utils/fmgr/funcapi.c | 2 +-
src/include/utils/sortsupport.h | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 8166224dcc8..ac73ef9390b 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -6471,7 +6471,7 @@ compute_bitmap_pages(PlannerInfo *root, RelOptInfo *baserel, Path *bitmapqual,
exact_pages = heap_pages - lossy_pages;
/*
- * If there are lossy pages then recompute the number of tuples
+ * If there are lossy pages then recompute the number of tuples
* processed by the bitmap heap node. We assume here that the chance
* of a given tuple coming from an exact page is the same as the
* chance that a given page is exact. This might not be true, but
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
index 5adc016d449..6887dc23f61 100644
--- a/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@ -1876,7 +1876,7 @@ ReorderBufferStreamCommit(ReorderBuffer *rb, ReorderBufferTXN *txn)
* xid 502 which is not visible to our snapshot. And when we will try to
* decode with that catalog tuple, it can lead to a wrong result or a crash.
* So, it is necessary to detect concurrent aborts to allow streaming of
- * in-progress transactions or decoding of prepared transactions.
+ * in-progress transactions or decoding of prepared transactions.
*
* For detecting the concurrent abort we set CheckXidAlive to the current
* (sub)transaction's xid for which this change belongs to. And, during
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index c35ea7c35bf..5c778f5333b 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -247,7 +247,7 @@ ReplicationSlotValidateName(const char *name, int elevel)
* to be enabled only at the slot creation time. If we allow this option
* to be changed during decoding then it is quite possible that we skip
* prepare first time because this option was not enabled. Now next time
- * during getting changes, if the two_phase option is enabled it can skip
+ * during getting changes, if the two_phase option is enabled it can skip
* prepare because by that time start decoding point has been moved. So the
* user will only get commit prepared.
*/
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
index 056a18e8f9f..27b2cca2dfb 100644
--- a/src/backend/tsearch/ts_parse.c
+++ b/src/backend/tsearch/ts_parse.c
@@ -248,7 +248,7 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
dict = lookup_ts_dictionary_cache(ld->curDictId);
/*
- * Dictionary ld->curDictId asks us about following words
+ * Dictionary ld->curDictId asks us about following words
*/
while (ld->curSub)
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 609aab2e651..b79705f8b3f 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -3878,7 +3878,7 @@ lseg_inside_poly(Point *a, Point *b, POLYGON *poly, int start)
Point p;
/*
- * if X-intersection wasn't found then check central point of tested
+ * if X-intersection wasn't found, then check central point of tested
* segment. In opposite case we already check all subsegments
*/
p.x = float8_div(float8_pl(t.p[0].x, t.p[1].x), 2.0);
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 12603b727cd..2c47dea3429 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -991,7 +991,7 @@ search_locale_enum(LPWSTR pStr, DWORD dwFlags, LPARAM lparam)
test_locale, LOCALE_NAME_MAX_LENGTH))
{
/*
- * If the enumerated locale does not have a hyphen ("en") OR the
+ * If the enumerated locale does not have a hyphen ("en") OR the
* lc_message input does not have an underscore ("English"), we only
* need to compare the <Language> tags.
*/
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index f0a95297b3e..f54f2988149 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -261,7 +261,7 @@ parse_or_operator(TSQueryParserState pstate)
/*
* Suppose, we found an operand, but could be a not correct operand.
* So we still treat OR literal as operation with possibly incorrect
- * operand and will not search it as lexeme
+ * operand and will not search it as lexeme
*/
if (!t_isspace(ptr))
break;
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index d269662ad8e..9197b0f1e26 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -69,7 +69,7 @@ static TypeFuncClass get_type_func_class(Oid typid, Oid *base_typeid);
* descriptor coming from expectedDesc, which is the tuple descriptor
* expected by the caller. SRF_SINGLE_BLESS can be set to complete the
* information associated to the tuple descriptor, which is necessary
- * in some cases where the tuple descriptor comes from a transient
+ * in some cases where the tuple descriptor comes from a transient
* RECORD datatype.
*/
void
diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h
index 60e5f9940d4..4f7c73f0aac 100644
--- a/src/include/utils/sortsupport.h
+++ b/src/include/utils/sortsupport.h
@@ -24,7 +24,7 @@
* function will have a shim set up by sort support automatically. However,
* opclasses that support the optional additional abbreviated key capability
* must always provide an authoritative comparator used to tie-break
- * inconclusive abbreviated comparisons and also used when aborting
+ * inconclusive abbreviated comparisons and also used when aborting
* abbreviation. Furthermore, a converter and abort/costing function must be
* provided.
*
--
2.17.1
0019-comment-spaces.patchtext/x-diff; charset=us-asciiDownload
From 6dc2b500028ef0a24747514876bbbb1af141af8b Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 12 Mar 2022 14:55:18 -0600
Subject: [PATCH 19/19] comment spaces
---
src/backend/storage/file/fd.c | 2 +-
src/include/replication/message.h | 2 +-
src/include/tsearch/ts_type.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 14b77f28617..24704b6a023 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -912,7 +912,7 @@ InitFileAccess(void)
void
InitTemporaryFileAccess(void)
{
- Assert(SizeVfdCache != 0); /* InitFileAccess() needs to have run*/
+ Assert(SizeVfdCache != 0); /* InitFileAccess() needs to have run */
Assert(!temporary_files_allowed); /* call me only once */
/*
diff --git a/src/include/replication/message.h b/src/include/replication/message.h
index 7d7785292f1..b9686c28550 100644
--- a/src/include/replication/message.h
+++ b/src/include/replication/message.h
@@ -32,7 +32,7 @@ typedef struct xl_logical_message
extern XLogRecPtr LogLogicalMessage(const char *prefix, const char *message,
size_t size, bool transactional);
-/* RMGR API*/
+/* RMGR API */
#define XLOG_LOGICAL_MESSAGE 0x00
void logicalmsg_redo(XLogReaderState *record);
void logicalmsg_desc(StringInfo buf, XLogReaderState *record);
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index a2008f5504b..689b2d1cfb6 100644
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -171,7 +171,7 @@ typedef struct
extern PGDLLIMPORT const int tsearch_op_priority[OP_COUNT];
-/* get operation priority by its code*/
+/* get operation priority by its code */
#define OP_PRIORITY(x) ( tsearch_op_priority[(x) - 1] )
/* get QueryOperator priority */
#define QO_PRIORITY(x) OP_PRIORITY(((QueryOperator *) (x))->oper)
--
2.17.1
Re: typos
( Added Joe and Robert for 0011 )
On Mon, 11 Apr 2022 at 14:03, Justin Pryzby <pryzby@telsasoft.com> wrote:
In docs and comments. Mostly for v15.
0001:
Should this not use <productname>PostgreSQL</productname>? (new to master)
0002:
The patch looks good. (new to v12)
0003:
The patch looks good. (new to master)
0004:
The patch looks good. (new to master)
0005:
I'm not entirely certain this is an improvement. Your commit message
I'd say is not true going by git grep "compression algorithm". There
are 3 matches in the docs and take [1]https://www.postgresql.org/docs/devel/app-pgbasebackup.html, for example. I'd say in that
one it's better to use "algorithm". In that case, "method" could be
talking about client or server.
That makes me wonder if the change you're proposing is an improvement or not.
0006:
The patch looks good. (new to master)
0007:
- When the <option>--max-tries</option> option is used, the
transaction with
- serialization or deadlock error cannot be retried if the total time of
+ When the <option>--max-tries</option> option is used, a
transaction with
+ serialization or deadlock error will not be retried if the
total time ofShouldn't this be slightly clearer and say "a transaction which fails
due to a serialization anomaly or a deadlock"?
- database server / the syntax error in the meta command / thread
+ database server / syntax error in the meta command / threadShould we not separate these items out with commas?
- the client is aborted. Otherwise, if an SQL fails with serialization or
+ the client is aborted. Otherwise, if an SQL command fails with
serialization or
deadlock errors, the client is not aborted. In such cases, the currentI'd say "if an SQL command fails due to a serialization anomaly or due
to deadlocking".
(new to master)
0008:
The patch looks good. (new to master)
0009:
The patch looks good. (new to master)
0010:
I don't understand this change.
0011:
I can't quite parse the original. I might not have enough context
here. Robert, Joe? (new to master)
0012:
This seems to contain some documentation fixes too. The patch claims
it's just for comments.
- * pages that are outwith that range.
+ * pages that are outside that range.I personally don't see the issue here, but I'm Scottish. I think the
best transaction is just "outside of" rather than replacing with just
"outside".
All the other changes look fine.
0013:
I think we should fix all these, regardless of how old the mistake is.
0014:
- * shouldn't PANIC just because we can't guarantee the the backup has been
+ * shouldn't PANIC just because we can't guarantee the backup has been"that the"
0015:
Patch looks fine.
0016:
0017:
I'm not really sure if we should fix these or not. From having a
quick look at some of them it seems we'd be adding churn to some
pretty old code. Happy to hear what others think.
0018:
The patch looks good.
0019:
-1. pgindent will fix these.
I will start pushing the less controversial of these, after a bit of squashing.
David
[1]: https://www.postgresql.org/docs/devel/app-pgbasebackup.html
Re: typos
On Mon, 11 Apr 2022 at 16:39, David Rowley <dgrowleyml@gmail.com> wrote:
I will start pushing the less controversial of these, after a bit of squashing.
I just committed 3 separate commits for the following:
Committed: 0001 + 0003 + 0004 + 0006 + 0007 (modified) + 0008 + 0009 +
0012 (doc parts)
Committed: 0012 (remainder) + 0013 + 0014 + 0018
Committed: 0015
I skipped:
0002 (skipped as we should backpatch)
0005 (unsure if the proposed patch is better)
0010 (I can't follow this change)
0011 (Could do with input from Robert and Joe)
and also skipped:
0016 (unsure if we should change these of pgindent is not touching it)
0017 (unsure if we should change these of pgindent is not touching it)
0019 (pgindent will get these when the time comes)
I'll wait for feedback on the ones I didn't use.
Are you able to rebase the remainder? Probably with the exception of 0019.
Thanks for finding all these!
David
Re: typos
On Mon, Apr 11, 2022 at 04:39:30PM +1200, David Rowley wrote:
I'm not entirely certain this is an improvement. Your commit message
I'd say is not true going by git grep "compression algorithm". There
are 3 matches in the docs and take [1], for example. I'd say in that
one it's better to use "algorithm". In that case, "method" could be
talking about client or server.
I am not wedded to this change; but, for context, I wrote this patch before
basebackup supported multiple compression ... "things". I didn't touch
basebackup here, since Robert defended that choice of words in another thread
(starting at 20220320194050.GX28503@telsasoft.com).
This change is for pg_column_compression(), and the only other use of
"compression algorithm" in the docs is in pgcrypto (which is in contrib). That
the docs consistently use "method" suggests continuing to use that rather than
something else. It could be described in some central place (like if we
support common syntax between interfaces which expose compression).
0010:
I don't understand this change.
The commit message mentions 959f6d6a1, which makes newbindir optional. But the
documentation wasn't updated, and seems to indicate that it's still required.
https://www.postgresql.org/docs/devel/pgupgrade.html
0011:
I can't quite parse the original. I might not have enough context
here. Robert, Joe? (new to master)
See the link in the commit message where someone else reported the same
problem.
0019:
-1. pgindent will fix these.
But two of those are from 2016.
Thanks for amending and pushing those. There's some more less obvious ones
attached.
Amit or Masahiko may want to comment on 0012 (doc review: Add ALTER
SUBSCRIPTION ... SKIP).
Attachments:
0008-doc-fixes-productname.patchtext/x-diff; charset=us-asciiDownload
From 79ca2f61e6ab0b04cfb75430a3dadb25711a20d5 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 12:53:01 -0500
Subject: [PATCH 08/13] doc fixes: productname
v15 only
e9537321a74a2b062c8f7a452314b4570913f780
backpatch to v13
ed10f32e37e9a16814c25e400d7826745ae3c797
backpatch to v10
6f9192df61e183826211ad2eaf325c6de5cf3656
507447b5855d4c362706aef9f8885bc5e4d9b4e8
8dc8f44f588d683ab0af8abb130a7711221f5e21
b2aab424675f85799c08d637a71365aeb377fffe
---
doc/src/sgml/catalogs.sgml | 2 +-
doc/src/sgml/client-auth.sgml | 4 ++--
doc/src/sgml/ecpg.sgml | 2 +-
doc/src/sgml/install-windows.sgml | 2 +-
doc/src/sgml/installation.sgml | 2 +-
doc/src/sgml/sources.sgml | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index 6f285871b64..a533a2153e2 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -12962,7 +12962,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
<para>
The <structname>pg_shmem_allocations</structname> view shows allocations
made from the server's main shared memory segment. This includes both
- memory allocated by <productname>postgres</productname> itself and memory
+ memory allocated by <productname>PostgreSQL</productname> itself and memory
allocated by extensions using the mechanisms detailed in
<xref linkend="xfunc-shared-addin" />.
</para>
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 142b0affcb6..28c51d72613 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -1523,7 +1523,7 @@ omicron bryanh guest1
</note>
<para>
- The following configuration options are supported for <productname>ident</productname>:
+ The following configuration options are supported for <literal>ident</literal>:
<variablelist>
<varlistentry>
<term><literal>map</literal></term>
@@ -1597,7 +1597,7 @@ omicron bryanh guest1
</para>
<para>
- The following configuration options are supported for <productname>peer</productname>:
+ The following configuration options are supported for <literal>peer</literal>:
<variablelist>
<varlistentry>
<term><literal>map</literal></term>
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index cdc4761c602..7f8b4dd5c02 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -8233,7 +8233,7 @@ $COMMIT;
you functions that have the same name and the same basic behavior but it is
no drop-in replacement if you are using <productname>Informix</productname> at the moment. Moreover,
some of the data types are different. For example,
- <productname>PostgreSQL's</productname> datetime and interval types do not
+ <productname>PostgreSQL</productname>'s datetime and interval types do not
know about ranges like for example <literal>YEAR TO MINUTE</literal> so you won't
find support in ECPG for that either.
</para>
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 18101e7a701..43cc5f6f5b2 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -370,7 +370,7 @@ $ENV{MSBFLAGS}="/m";
</para>
<para>
- To use a server-side third party library such as <productname>python</productname> or
+ To use a server-side third party library such as <productname>Python</productname> or
<productname>OpenSSL</productname>, this library <emphasis>must</emphasis> also be
64-bit. There is no support for loading a 32-bit library in a 64-bit
server. Several of the third party libraries that PostgreSQL supports may
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index df32025a86f..4a7327cc408 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -273,7 +273,7 @@ su - postgres
<listitem>
<para>
- You need <productname>zstd</productname>, if you want to support
+ You need <productname>ZSTD</productname>, if you want to support
compression of data with that method; see
<xref linkend="guc-wal-compression"/>.
The minimum required version is 1.4.0.
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index 1b77efb0879..2d01efc950c 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -63,7 +63,7 @@
<para>
The <filename>src/tools/editors</filename> directory contains sample settings
- files that can be used with the <productname>emacs</productname>,
+ files that can be used with the <productname>Emacs</productname>,
<productname>xemacs</productname> or <productname>vim</productname>
editors to help ensure that they format code according to these
conventions.
--
2.17.1
0009-doc-review-locales.patchtext/x-diff; charset=us-asciiDownload
From f3012f0085131c39ff32e9aeb8911f59dbcad7cb Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 13:04:48 -0500
Subject: [PATCH 09/13] doc review: locales
f2553d43060edb210b36c63187d52a632448e1d2
---
doc/src/sgml/charset.sgml | 12 ++++++------
doc/src/sgml/ref/initdb.sgml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index d60d3207fd4..b95303fb893 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -314,7 +314,7 @@ initdb --locale=sv_SE
A locale can be selected separately for each database. The SQL command
<command>CREATE DATABASE</command> and its command-line equivalent
<command>createdb</command> have options for that. Use this for example
- if a database cluster houses databases for multiple tennants with
+ if a database cluster houses databases for multiple tenants with
different requirements.
</para>
</listitem>
@@ -346,7 +346,7 @@ initdb --locale=sv_SE
providers</firstterm>. This specifies which library supplies the locale
data. One standard provider name is <literal>libc</literal>, which uses
the locales provided by the operating system C library. These are the
- locales that most tools provided by the operating system use. Another
+ locales used by most tools provided by the operating system. Another
provider is <literal>icu</literal>, which uses the external
ICU<indexterm><primary>ICU</primary></indexterm> library. ICU locales can
only be used if support for ICU was configured when PostgreSQL was built.
@@ -361,8 +361,8 @@ initdb --locale=sv_SE
<programlisting>
initdb --locale-provider=icu --icu-locale=en
</programlisting>
- See the description of the respective commands and programs for the
- respective details. Note that you can mix locale providers on different
+ See the description of the respective commands and programs for
+ details. Note that you can mix locale providers at different
granularities, for example use <literal>libc</literal> by default for the
cluster but have one database that uses the <literal>icu</literal>
provider, and then have collation objects using either provider within
@@ -610,8 +610,8 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
definition has a <firstterm>provider</firstterm> that specifies which
library supplies the locale data. One standard provider name
is <literal>libc</literal>, which uses the locales provided by the
- operating system C library. These are the locales that most tools
- provided by the operating system use. Another provider
+ operating system C library. These are the locales used by most tools
+ provided by the operating system. Another provider
is <literal>icu</literal>, which uses the external
ICU<indexterm><primary>ICU</primary></indexterm> library. ICU locales can only be
used if support for ICU was configured when PostgreSQL was built.
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index f5d633b0afa..c9ffaaecfb9 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -108,7 +108,7 @@ PostgreSQL documentation
Alternatively, the ICU library can be used to provide locale services.
(Again, this only sets the default for subsequently created databases.) To
select this option, specify <literal>--locale-provider=icu</literal>.
- To chose the specific ICU locale ID to apply, use the option
+ To choose the specific ICU locale ID to apply, use the option
<option>--icu-locale</option>. Note that
for implementation reasons and to support legacy code,
<command>initdb</command> will still select and initialize libc locale
--
2.17.1
0001-doc-Remove-synchronized-from-no-sync.patchtext/x-diff; charset=us-asciiDownload
From 98778834b8c762a6cd76d8680191a7c866397d8b Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Wed, 16 Feb 2022 21:07:53 -0600
Subject: [PATCH 01/13] doc: Remove 'synchronized' from --no-sync
Since it would be more accurate to say "unsynchronized".
The corresponding change was made for pgupgrade.sgml in commit 410aa248
---
doc/src/sgml/ref/pg_rewind.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index e808239aa5b..3231f67845a 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -210,7 +210,7 @@ PostgreSQL documentation
to be written safely to disk. This option causes
<command>pg_rewind</command> to return without waiting, which is
faster, but means that a subsequent operating system crash can leave
- the synchronized data directory corrupt. Generally, this option is
+ the data directory corrupt. Generally, this option is
useful for testing but should not be used on a production
installation.
</para>
--
2.17.1
0002-doc-pg_column_compression-we-say-method-not-algorith.patchtext/x-diff; charset=us-asciiDownload
From d4bde4e9acf6375d8894af0a6d5a1557a29174b3 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 19 Feb 2022 11:47:35 -0600
Subject: [PATCH 02/13] doc: pg_column_compression(): we say method not
algorithm everywhere else
could backpatch to v14
---
doc/src/sgml/func.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 2ecf0482d84..a34eb8b43e0 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -29285,7 +29285,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset((pg_backup_stop()).lsn);
<returnvalue>text</returnvalue>
</para>
<para>
- Shows the compression algorithm that was used to compress
+ Shows the compression method that was used to compress
an individual variable-length value. Returns <literal>NULL</literal>
if the value is not compressed.
</para></entry>
--
2.17.1
0003-doc-review-update-synopsis-pg_upgrade-optional-newbi.patchtext/x-diff; charset=us-asciiDownload
From fb28ed4be7f82337a8e4aa92140bdafc78ee2278 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 20 Dec 2021 19:13:29 -0600
Subject: [PATCH 03/13] doc review: update synopsis: pg_upgrade optional
newbindir
See also: 959f6d6a1821b7d9068244f500dd80953e768d16
---
doc/src/sgml/ref/pgupgrade.sgml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index f024c3ef259..8cda8d16d17 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -24,8 +24,7 @@ PostgreSQL documentation
<command>pg_upgrade</command>
<arg choice="plain"><option>-b</option></arg>
<arg choice="plain"><replaceable>oldbindir</replaceable></arg>
- <arg choice="plain"><option>-B</option></arg>
- <arg choice="plain"><replaceable>newbindir</replaceable></arg>
+ <arg choice="opt"><option>-B</option> <replaceable>newbindir</replaceable></arg>
<arg choice="plain"><option>-d</option></arg>
<arg choice="plain"><replaceable>oldconfigdir</replaceable></arg>
<arg choice="plain"><option>-D</option></arg>
--
2.17.1
0004-doc-review-basebackup_to_shell.required_role.patchtext/x-diff; charset=us-asciiDownload
From cc2480bbdf667369d920459bea0d497e7b7255dc Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Thu, 7 Apr 2022 09:04:23 -0500
Subject: [PATCH 04/13] doc review: basebackup_to_shell.required_role
c6306db24bd913375f99494e38ab315befe44e11
See also:
https://www.postgresql.org/message-id/CA%2BTgmoaBQ5idAh7OsQGAbLY166SVkj7KkKROkTyN5sOF6QDuww%40mail.gmail.com
---
doc/src/sgml/basebackup-to-shell.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/basebackup-to-shell.sgml b/doc/src/sgml/basebackup-to-shell.sgml
index 9f44071d502..15231ef3939 100644
--- a/doc/src/sgml/basebackup-to-shell.sgml
+++ b/doc/src/sgml/basebackup-to-shell.sgml
@@ -65,8 +65,8 @@
</term>
<listitem>
<para>
- A role which replication whose privileges users are required to possess
- in order to make use of the <literal>shell</literal> backup target.
+ The role required in order to
+ make use of the <literal>shell</literal> backup target.
If this is not set, any replication user may make use of the
<literal>shell</literal> backup target.
</para>
--
2.17.1
0005-Extraneous-blank-lines.patchtext/x-diff; charset=us-asciiDownload
From 4bcdd17e0bfaa8cd632ed647007e1a681095eb9f Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 2 Apr 2022 11:58:06 -0500
Subject: [PATCH 05/13] Extraneous blank lines
I noticed some left behind by d61a361d1, and searched for the others like:
git grep -nB1 '^}' '*.c' |less
... \.c-[0-9]*-$
I've omitted some that involved structures or conditional compilation.
---
contrib/btree_gist/btree_bit.c | 1 -
contrib/btree_gist/btree_cash.c | 1 -
contrib/btree_gist/btree_float4.c | 1 -
contrib/btree_gist/btree_float8.c | 1 -
contrib/btree_gist/btree_inet.c | 1 -
contrib/btree_gist/btree_interval.c | 2 --
contrib/btree_gist/btree_macaddr.c | 1 -
contrib/btree_gist/btree_macaddr8.c | 1 -
contrib/btree_gist/btree_ts.c | 1 -
contrib/dblink/dblink.c | 2 --
contrib/pg_stat_statements/pg_stat_statements.c | 1 -
contrib/postgres_fdw/connection.c | 1 -
src/backend/access/nbtree/nbtutils.c | 1 -
src/backend/access/rmgrdesc/gistdesc.c | 1 -
src/backend/access/spgist/spgutils.c | 1 -
src/backend/access/table/tableam.c | 1 -
src/backend/commands/tablecmds.c | 1 -
src/backend/executor/nodeMergejoin.c | 1 -
src/backend/optimizer/geqo/geqo_erx.c | 1 -
src/backend/optimizer/geqo/geqo_ox1.c | 1 -
src/backend/optimizer/geqo/geqo_ox2.c | 1 -
src/backend/optimizer/geqo/geqo_px.c | 1 -
src/backend/replication/logical/snapbuild.c | 1 -
src/backend/replication/pgoutput/pgoutput.c | 1 -
src/backend/statistics/dependencies.c | 1 -
src/backend/storage/sync/sync.c | 1 -
src/backend/tcop/postgres.c | 1 -
src/backend/tsearch/to_tsany.c | 1 -
src/backend/utils/adt/acl.c | 1 -
src/backend/utils/adt/json.c | 1 -
src/backend/utils/adt/jsonfuncs.c | 1 -
src/backend/utils/cache/catcache.c | 1 -
src/backend/utils/resowner/resowner.c | 1 -
src/bin/initdb/initdb.c | 2 --
src/interfaces/ecpg/ecpglib/misc.c | 1 -
src/interfaces/ecpg/pgtypeslib/numeric.c | 1 -
src/interfaces/ecpg/pgtypeslib/timestamp.c | 4 +---
src/interfaces/libpq/fe-connect.c | 1 -
.../modules/ssl_passphrase_callback/ssl_passphrase_func.c | 1 -
39 files changed, 1 insertion(+), 44 deletions(-)
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index 2225244ded5..5b246bcde4b 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -104,7 +104,6 @@ gbt_bit_l2n(GBT_VARKEY *leaf, FmgrInfo *flinfo)
pfree(o);
return out;
-
}
static const gbtree_vinfo tinfo =
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index dfa23224b6f..6ac97e2b12a 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -195,7 +195,6 @@ gbt_cash_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_float4.c b/contrib/btree_gist/btree_float4.c
index b5d9175e6d5..3cbd9a06dcc 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -190,7 +190,6 @@ gbt_float4_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_float8.c b/contrib/btree_gist/btree_float8.c
index 8fe1fedeef8..b95a08e228b 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -197,7 +197,6 @@ gbt_float8_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index e4b3a946b27..2fb952dca83 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -165,7 +165,6 @@ gbt_inet_penalty(PG_FUNCTION_ARGS)
penalty_num(result, origentry->lower, origentry->upper, newentry->lower, newentry->upper);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index a4b3b2b1e6f..c2bf82086df 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -173,7 +173,6 @@ gbt_intv_compress(PG_FUNCTION_ARGS)
}
PG_RETURN_POINTER(retval);
-
}
Datum
@@ -276,7 +275,6 @@ gbt_intv_penalty(PG_FUNCTION_ARGS)
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_macaddr.c b/contrib/btree_gist/btree_macaddr.c
index 7f0e9e9c912..17290529c02 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -174,7 +174,6 @@ gbt_macad_penalty(PG_FUNCTION_ARGS)
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_macaddr8.c b/contrib/btree_gist/btree_macaddr8.c
index ab4bca5d50d..796cc4efee3 100644
--- a/contrib/btree_gist/btree_macaddr8.c
+++ b/contrib/btree_gist/btree_macaddr8.c
@@ -174,7 +174,6 @@ gbt_macad8_penalty(PG_FUNCTION_ARGS)
penalty_num(result, iorg[0], iorg[1], inew[0], inew[1]);
PG_RETURN_POINTER(result);
-
}
Datum
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 2671ba961cd..a51900941e5 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -377,7 +377,6 @@ gbt_ts_penalty(PG_FUNCTION_ARGS)
penalty_num(result, orgdbl[0], orgdbl[1], newdbl[0], newdbl[1]);
PG_RETURN_POINTER(result);
-
}
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index a06d4bd12db..a561d1d6524 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -1004,7 +1004,6 @@ materializeResult(FunctionCallInfo fcinfo, PGconn *conn, PGresult *res)
/* clean up GUC settings, if we changed any */
restoreLocalGucs(nestlevel);
-
}
}
PG_FINALLY();
@@ -2635,7 +2634,6 @@ deleteConnection(const char *name)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_OBJECT),
errmsg("undefined connection name")));
-
}
static void
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index 1ca67ef6234..df2ce63790b 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -1849,7 +1849,6 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,
if (qbuffer)
free(qbuffer);
-
}
/* Number of output arguments (columns) for pg_stat_statements_info */
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index 129ca792214..f9b8c01f3b9 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -1734,7 +1734,6 @@ postgres_fdw_get_connections(PG_FUNCTION_ARGS)
tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls);
}
-
PG_RETURN_VOID();
}
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 96c72fc4324..5361b147e30 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -2123,7 +2123,6 @@ btoptions(Datum reloptions, bool validate)
RELOPT_KIND_BTREE,
sizeof(BTOptions),
tab, lengthof(tab));
-
}
/*
diff --git a/src/backend/access/rmgrdesc/gistdesc.c b/src/backend/access/rmgrdesc/gistdesc.c
index 9cab4fa1580..d0c8e247c1d 100644
--- a/src/backend/access/rmgrdesc/gistdesc.c
+++ b/src/backend/access/rmgrdesc/gistdesc.c
@@ -38,7 +38,6 @@ out_gistxlogDelete(StringInfo buf, gistxlogDelete *xlrec)
{
appendStringInfo(buf, "delete: latestRemovedXid %u, nitems: %u",
xlrec->latestRemovedXid, xlrec->ntodelete);
-
}
static void
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 1ae7492216a..a171ca8a08a 100644
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -747,7 +747,6 @@ spgoptions(Datum reloptions, bool validate)
RELOPT_KIND_SPGIST,
sizeof(SpGistOptions),
tab, lengthof(tab));
-
}
/*
diff --git a/src/backend/access/table/tableam.c b/src/backend/access/table/tableam.c
index 4f20c6ac12a..b3d1a6c3f8f 100644
--- a/src/backend/access/table/tableam.c
+++ b/src/backend/access/table/tableam.c
@@ -381,7 +381,6 @@ simple_table_tuple_update(Relation rel, ItemPointer otid,
elog(ERROR, "unrecognized table_tuple_update status: %u", result);
break;
}
-
}
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 90edd0bb97d..2840bc527bc 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -3773,7 +3773,6 @@ RenameConstraint(RenameStmt *stmt)
stmt->relation->inh), /* recursive? */
false, /* recursing? */
0 /* expected inhcount */ );
-
}
/*
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index edb8972c5bf..864e3baf86b 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -1674,5 +1674,4 @@ ExecReScanMergeJoin(MergeJoinState *node)
ExecReScan(node->js.ps.lefttree);
if (node->js.ps.righttree->chgParam == NULL)
ExecReScan(node->js.ps.righttree);
-
}
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index 3b92f420e0a..d98c0a59e71 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -226,7 +226,6 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene)
} /* for (i=1; i<num_gene; i++) */
return edge_failures;
-
}
/* remove_gene
diff --git a/src/backend/optimizer/geqo/geqo_ox1.c b/src/backend/optimizer/geqo/geqo_ox1.c
index 10d2d0a33ae..ede7abb4177 100644
--- a/src/backend/optimizer/geqo/geqo_ox1.c
+++ b/src/backend/optimizer/geqo/geqo_ox1.c
@@ -89,7 +89,6 @@ ox1(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
}
p = (p + 1) % num_gene; /* increment tour2-index */
}
-
}
#endif /* defined(OX1) */
diff --git a/src/backend/optimizer/geqo/geqo_ox2.c b/src/backend/optimizer/geqo/geqo_ox2.c
index 72b9b0fb871..080dbc076cc 100644
--- a/src/backend/optimizer/geqo/geqo_ox2.c
+++ b/src/backend/optimizer/geqo/geqo_ox2.c
@@ -106,7 +106,6 @@ ox2(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
/* city isn't used yet, so inherit from tour2 */
offspring[k] = tour2[k];
}
-
}
#endif /* defined(OX2) */
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index ad5ad3f1e57..0346554bc09 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -104,7 +104,6 @@ px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
}
}
-
}
#endif /* defined(PX) */
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index 83fca8a77d9..1119a12db9e 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -1380,7 +1380,6 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
* records so incremental cleanup can be performed.
*/
return true;
-
}
/* ---
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index fe5accca576..8b55ebdd4d2 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -1066,7 +1066,6 @@ pgoutput_column_list_init(PGOutputData *data, List *publications,
ReleaseSysCache(cftuple);
} /* loop all subscribed publications */
-
}
/*
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 34326d55619..b6f31849616 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -199,7 +199,6 @@ DependencyGenerator_free(DependencyGenerator state)
{
pfree(state->dependencies);
pfree(state);
-
}
/* generate next combination */
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index c695d816fc6..e1fb6310038 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -162,7 +162,6 @@ InitSync(void)
HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
pendingUnlinks = NIL;
}
-
}
/*
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 95dc2e2c835..304cce135aa 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -2636,7 +2636,6 @@ exec_describe_statement_message(const char *stmt_name)
}
else
pq_putemptymessage('n'); /* NoData */
-
}
/*
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 1b0a1e244b8..6053a9e31f2 100644
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -720,5 +720,4 @@ websearch_to_tsquery(PG_FUNCTION_ARGS)
PG_RETURN_DATUM(DirectFunctionCall2(websearch_to_tsquery_byid,
ObjectIdGetDatum(cfgId),
PointerGetDatum(in)));
-
}
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 8bdba1c42a5..772c04155c3 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -3094,7 +3094,6 @@ convert_database_priv_string(text *priv_type_text)
};
return convert_any_priv_string(priv_type_text, database_priv_map);
-
}
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index 4cf01300d8b..18f19014d0a 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -1501,7 +1501,6 @@ json_object(PG_FUNCTION_ARGS)
pfree(result.data);
PG_RETURN_TEXT_P(rval);
-
}
/*
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index a682d9c9734..d1356d64166 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -4168,7 +4168,6 @@ json_strip_nulls(PG_FUNCTION_ARGS)
PG_RETURN_TEXT_P(cstring_to_text_with_len(state->strval->data,
state->strval->len));
-
}
/*
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index ec073e1ed06..233bcb63180 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -1962,7 +1962,6 @@ CatCacheCopyKeys(TupleDesc tupdesc, int nkeys, int *attnos,
att->attbyval,
att->attlen);
}
-
}
/*
diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index 3236b1b9195..ceb4b0e3f75 100644
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -896,7 +896,6 @@ CreateAuxProcessResourceOwner(void)
* owner. (This needs to run after, e.g., ShutdownXLOG.)
*/
on_shmem_exit(ReleaseAuxProcessResourcesCallback, 0);
-
}
/*
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index ab826da6505..1cb4a5b0d21 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -2407,7 +2407,6 @@ setup_locale_encoding(void)
if (!check_locale_encoding(lc_ctype, encodingid) ||
!check_locale_encoding(lc_collate, encodingid))
exit(1); /* check_locale_encoding printed the error */
-
}
@@ -2486,7 +2485,6 @@ setup_text_search(void)
printf(_("The default text search configuration will be set to \"%s\".\n"),
default_text_search_config);
-
}
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index b8dbe5e7f3b..1eef1ec044c 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -191,7 +191,6 @@ ECPGtransactionStatus(const char *connection_name)
}
return PQtransactionStatus(con->connection);
-
}
bool
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index dbe4eb21e27..34efc9045f3 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -1308,7 +1308,6 @@ PGTYPESnumeric_cmp(numeric *var1, numeric *var2)
errno = PGTYPES_NUM_BAD_NUMERIC;
return INT_MAX;
-
}
int
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 3f82ee54a5f..9aff95cf5e3 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -863,8 +863,6 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout
{
if (TIMESTAMP_NOT_FINITE(*tin))
*tout = *tin;
-
-
else
{
if (span->month != 0)
@@ -902,8 +900,8 @@ PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout
*tin += span->time;
*tout = *tin;
}
- return 0;
+ return 0;
}
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index cf554d389fa..4c12f1411f7 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -664,7 +664,6 @@ PQconnectdbParams(const char *const *keywords,
(void) connectDBComplete(conn);
return conn;
-
}
/*
diff --git a/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c b/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c
index 7c469fd57e8..b5bb5580a0f 100644
--- a/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c
+++ b/src/test/modules/ssl_passphrase_callback/ssl_passphrase_func.c
@@ -89,5 +89,4 @@ rot13_passphrase(char *buf, int size, int rwflag, void *userdata)
}
return strlen(buf);
-
}
--
2.17.1
0006-f-blanks-which-involve-tabs.patchtext/x-diff; charset=us-asciiDownload
From 8a7a8c331a91d353779500994bc6d3eb2d43d494 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 2 Apr 2022 16:28:41 -0500
Subject: [PATCH 06/13] f!blanks which involve tabs
I excluded things involving conditional compilation and do{}while statements
---
contrib/intarray/_int_bool.c | 1 -
contrib/ltree/ltxtquery_io.c | 1 -
contrib/spi/refint.c | 2 --
src/backend/access/gin/ginbtree.c | 1 -
src/backend/access/heap/heapam.c | 1 -
src/backend/access/heap/vacuumlazy.c | 1 -
src/backend/access/nbtree/nbtutils.c | 2 --
src/backend/access/transam/xlogrecovery.c | 1 -
src/backend/catalog/objectaddress.c | 2 --
src/backend/catalog/pg_attrdef.c | 1 -
src/backend/commands/subscriptioncmds.c | 1 -
src/backend/commands/tablecmds.c | 2 --
src/backend/executor/execParallel.c | 1 -
src/backend/executor/execReplication.c | 1 -
src/backend/executor/nodeAgg.c | 1 -
src/backend/jit/llvm/llvmjit_deform.c | 2 --
src/backend/jit/llvm/llvmjit_expr.c | 1 -
src/backend/libpq/hba.c | 1 -
src/backend/optimizer/geqo/geqo_cx.c | 1 -
src/backend/optimizer/geqo/geqo_erx.c | 2 --
src/backend/optimizer/geqo/geqo_pmx.c | 6 ------
src/backend/optimizer/geqo/geqo_px.c | 2 --
src/backend/optimizer/plan/planner.c | 1 -
src/backend/postmaster/postmaster.c | 1 -
src/backend/replication/logical/worker.c | 1 -
src/backend/replication/walsender.c | 1 -
src/backend/storage/buffer/bufmgr.c | 2 --
src/backend/storage/buffer/freelist.c | 1 -
src/backend/storage/ipc/procarray.c | 1 -
src/backend/storage/page/bufpage.c | 2 --
src/backend/tcop/utility.c | 1 -
src/backend/tsearch/to_tsany.c | 1 -
src/backend/tsearch/ts_parse.c | 2 --
src/backend/utils/adt/jsonb.c | 1 -
src/backend/utils/adt/multirangetypes.c | 2 --
src/backend/utils/adt/oracle_compat.c | 1 -
src/backend/utils/adt/ruleutils.c | 1 -
src/backend/utils/adt/selfuncs.c | 1 -
src/backend/utils/adt/timestamp.c | 2 --
src/backend/utils/adt/tsvector_op.c | 1 -
src/backend/utils/cache/catcache.c | 1 -
src/backend/utils/error/elog.c | 2 --
src/backend/utils/sort/tuplesort.c | 1 -
src/bin/pg_dump/pg_dumpall.c | 1 -
src/bin/pg_rewind/parsexlog.c | 1 -
src/bin/pg_verifybackup/pg_verifybackup.c | 2 --
src/bin/psql/describe.c | 2 --
src/bin/psql/prompt.c | 1 -
src/common/jsonapi.c | 3 ---
src/fe_utils/print.c | 1 -
src/interfaces/ecpg/ecpglib/connect.c | 1 -
src/interfaces/ecpg/ecpglib/data.c | 1 -
src/interfaces/ecpg/ecpglib/execute.c | 1 -
src/interfaces/ecpg/pgtypeslib/dt_common.c | 1 -
src/interfaces/ecpg/pgtypeslib/interval.c | 1 -
src/interfaces/libpq/fe-secure-openssl.c | 1 -
src/pl/tcl/pltcl.c | 1 -
src/port/chklocale.c | 1 -
58 files changed, 80 deletions(-)
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index 4b6a31080e4..3ed88af76d7 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -210,7 +210,6 @@ makepol(WORKSTATE *state)
(errcode(ERRCODE_SYNTAX_ERROR),
errmsg("syntax error")));
return ERR;
-
}
}
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index d967f92110f..3eca5cb8ff3 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -260,7 +260,6 @@ makepol(QPRS_STATE *state)
errmsg("syntax error")));
return ERR;
-
}
}
while (lenstack)
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 6fbfef2b121..18062eb1cff 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -497,12 +497,10 @@ check_foreign_key(PG_FUNCTION_ARGS)
nv, (is_char_type > 0) ? "'" : "", (k < nkeys) ? ", " : "");
}
strcat(sql, " where ");
-
}
else
/* DELETE */
snprintf(sql, sizeof(sql), "delete from %s where ", relname);
-
}
/*
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 8df45478f10..cc6d4e63382 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -527,7 +527,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
BufferGetBlockNumber(stack->buffer),
BufferGetBlockNumber(rbuffer));
}
-
}
else
{
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index a03122df8d6..4f33245670f 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8481,7 +8481,6 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
{
xlrec.cmin = InvalidCommandId;
xlrec.cmax = HeapTupleHeaderGetRawCommandId(hdr);
-
}
xlrec.combocid = InvalidCommandId;
}
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index e1cac74e620..a3c8ccdbe5c 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -2073,7 +2073,6 @@ lazy_scan_noprune(LVRelState *vacrel,
elog(ERROR, "unexpected HeapTupleSatisfiesVacuum result");
break;
}
-
}
vacrel->offnum = InvalidOffsetNumber;
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index 5361b147e30..9daf57d4038 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -2116,7 +2116,6 @@ btoptions(Datum reloptions, bool validate)
offsetof(BTOptions, vacuum_cleanup_index_scale_factor)},
{"deduplicate_items", RELOPT_TYPE_BOOL,
offsetof(BTOptions, deduplicate_items)}
-
};
return (bytea *) build_reloptions(reloptions, validate,
@@ -2590,7 +2589,6 @@ _bt_check_natts(Relation rel, bool heapkeyspace, Page page, OffsetNumber offnum)
/* Use generic heapkeyspace pivot tuple handling */
}
-
}
/* Handle heapkeyspace pivot tuples (excluding minus infinity items) */
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 4ee29182ac8..5c002359ed6 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -1790,7 +1790,6 @@ PerformWalRecovery(void)
/* there are no WAL records following the checkpoint */
ereport(LOG,
(errmsg("redo is not required")));
-
}
/*
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index ac6043514f1..8377b4f7d4d 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -1007,7 +1007,6 @@ get_object_address(ObjectType objtype, Node *object,
address.objectId = get_domain_constraint_oid(domaddr.objectId,
constrname, missing_ok);
address.objectSubId = 0;
-
}
break;
case OBJECT_DATABASE:
@@ -5621,7 +5620,6 @@ getObjectIdentityParts(const ObjectAddress *object,
systable_endscan(rcscan);
table_close(defaclrel, AccessShareLock);
break;
-
}
defacl = (Form_pg_default_acl) GETSTRUCT(tup);
diff --git a/src/backend/catalog/pg_attrdef.c b/src/backend/catalog/pg_attrdef.c
index 2d63c6e62a3..c5d4a9912ea 100644
--- a/src/backend/catalog/pg_attrdef.c
+++ b/src/backend/catalog/pg_attrdef.c
@@ -167,7 +167,6 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
if (!missingIsNull)
pfree(DatumGetPointer(missingval));
-
}
table_close(attrrel, RowExclusiveLock);
heap_freetuple(atttup);
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 2e8d8afead8..b94236f74d3 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -1570,7 +1570,6 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
*/
if (slotname)
ReplicationSlotDropAtPubNode(wrconn, slotname, false);
-
}
PG_FINALLY();
{
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 2840bc527bc..23e572dd227 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -945,7 +945,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("specifying a table access method is not supported on a partitioned table")));
-
}
else if (RELKIND_HAS_TABLE_AM(relkind))
accessMethod = default_table_access_method;
@@ -17450,7 +17449,6 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
errmsg("data type %s has no default operator class for access method \"%s\"",
format_type_be(atttype), "btree"),
errhint("You must specify a btree operator class or define a default btree operator class for the data type.")));
-
}
}
else
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index 9a0d5d59ef6..f1fd7f7e8b2 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -1439,7 +1439,6 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
paramexec_space = dsa_get_address(area, fpes->param_exec);
RestoreParamExecParams(paramexec_space, queryDesc->estate);
-
}
pwcxt.toc = toc;
pwcxt.seg = seg;
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 27989bd723d..b000645d48b 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -548,7 +548,6 @@ ExecSimpleRelationDelete(ResultRelInfo *resultRelInfo,
{
skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
tid, NULL, NULL);
-
}
if (!skip_tuple)
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 23030a32a59..3223d9b24e5 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -4119,7 +4119,6 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
2,
InvalidOid,
(void *) aggstate, NULL);
-
}
/*
diff --git a/src/backend/jit/llvm/llvmjit_deform.c b/src/backend/jit/llvm/llvmjit_deform.c
index a3355860c3e..661f15272b7 100644
--- a/src/backend/jit/llvm/llvmjit_deform.c
+++ b/src/backend/jit/llvm/llvmjit_deform.c
@@ -192,7 +192,6 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
v_tupleheaderp =
l_load_struct_gep(b, v_heapslot, FIELDNO_HEAPTUPLETABLESLOT_TUPLE,
"tupleheader");
-
}
else if (ops == &TTSOpsMinimalTuple)
{
@@ -357,7 +356,6 @@ slot_compile_deform(LLVMJitContext *context, TupleDesc desc,
LLVMAddCase(v_switch, v_attno, attcheckattnoblocks[attnum]);
}
-
}
else
{
diff --git a/src/backend/jit/llvm/llvmjit_expr.c b/src/backend/jit/llvm/llvmjit_expr.c
index 9c8f341d966..b6b6512ef1f 100644
--- a/src/backend/jit/llvm/llvmjit_expr.c
+++ b/src/backend/jit/llvm/llvmjit_expr.c
@@ -2173,7 +2173,6 @@ llvm_compile_expr(ExprState *state)
"");
LLVMBuildBr(b, opblocks[opno + 1]);
-
}
LLVMPositionBuilderAtEnd(b, b_no_init);
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index cbd17b790d8..327a4b42af7 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1775,7 +1775,6 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
hbaline->pam_use_hostname = true;
else
hbaline->pam_use_hostname = false;
-
}
else if (strcmp(name, "ldapurl") == 0)
{
diff --git a/src/backend/optimizer/geqo/geqo_cx.c b/src/backend/optimizer/geqo/geqo_cx.c
index 3b8d2fe5601..34cc53af53e 100644
--- a/src/backend/optimizer/geqo/geqo_cx.c
+++ b/src/backend/optimizer/geqo/geqo_cx.c
@@ -115,7 +115,6 @@ cx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring,
for (i = 0; i < num_gene; i++)
if (tour1[i] != offspring[i])
num_diffs++;
-
}
return num_diffs;
diff --git a/src/backend/optimizer/geqo/geqo_erx.c b/src/backend/optimizer/geqo/geqo_erx.c
index d98c0a59e71..cc0661365f6 100644
--- a/src/backend/optimizer/geqo/geqo_erx.c
+++ b/src/backend/optimizer/geqo/geqo_erx.c
@@ -222,7 +222,6 @@ gimme_tour(PlannerInfo *root, Edge *edge_table, Gene *new_gene, int num_gene)
/* mark this node as incorporated */
edge_table[(int) new_gene[i - 1]].unused_edges = -1;
-
} /* for (i=1; i<num_gene; i++) */
return edge_failures;
@@ -336,7 +335,6 @@ gimme_gene(PlannerInfo *root, Edge edge, Edge *edge_table)
elog(ERROR, "minimum_count not set");
else if (edge_table[(int) friend].unused_edges == minimum_edges)
minimum_count++;
-
} /* for (i=0; i<edge.unused_edges; i++) */
diff --git a/src/backend/optimizer/geqo/geqo_pmx.c b/src/backend/optimizer/geqo/geqo_pmx.c
index ddbc78172c0..e44fd0bae5a 100644
--- a/src/backend/optimizer/geqo/geqo_pmx.c
+++ b/src/backend/optimizer/geqo/geqo_pmx.c
@@ -131,7 +131,6 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
j++;
}
-
}
if (!(found))
@@ -140,7 +139,6 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
indx[mx_fail] = k;
mx_fail++;
}
-
} /* ... for */
@@ -172,9 +170,7 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
j++;
}
-
} /* ... for */
-
} /* ... if */
@@ -206,12 +202,10 @@ pmx(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene)
j++;
}
-
} /* ... if */
i++;
} /* end while */
-
}
} /* ... for */
diff --git a/src/backend/optimizer/geqo/geqo_px.c b/src/backend/optimizer/geqo/geqo_px.c
index 0346554bc09..914296b53d2 100644
--- a/src/backend/optimizer/geqo/geqo_px.c
+++ b/src/backend/optimizer/geqo/geqo_px.c
@@ -96,13 +96,11 @@ px(PlannerInfo *root, Gene *tour1, Gene *tour2, Gene *offspring, int num_gene,
{ /* next city in tour2 has been used */
tour2_index++;
}
-
}
else
{ /* next position in offspring is filled */
offspring_index++;
}
-
}
}
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index b090b087e95..9a4accb4d9d 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -6848,7 +6848,6 @@ create_partial_grouping_paths(PlannerInfo *root,
dNumPartialGroups));
}
}
-
}
if (can_sort && cheapest_partial_path != NULL)
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 3535e9e47d2..3fceda8cff9 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -5851,7 +5851,6 @@ bgworker_should_start_now(BgWorkerStartTime start_time)
if (start_time == BgWorkerStart_PostmasterStart)
return true;
/* fall through */
-
}
return false;
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 9181d3e8636..4171371296f 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -600,7 +600,6 @@ slot_fill_defaults(LogicalRepRelMapEntry *rel, EState *estate,
defmap[num_defaults] = attnum;
num_defaults++;
}
-
}
for (i = 0; i < num_defaults; i++)
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 75400a53f2f..be402613936 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -1000,7 +1000,6 @@ parseCreateReplSlotOptions(CreateReplicationSlotCmd *cmd,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized value for CREATE_REPLICATION_SLOT option \"%s\": \"%s\"",
defel->defname, action)));
-
}
else if (strcmp(defel->defname, "reserve_wal") == 0)
{
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index c12028ca0fe..e02ea3a977c 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -2676,7 +2676,6 @@ CheckForBufferLeaks(void)
PrintBufferLeakWarning(res->buffer);
RefCountErrors++;
}
-
}
Assert(RefCountErrors == 0);
@@ -3652,7 +3651,6 @@ FlushRelationsAllBuffers(SMgrRelation *smgrs, int nrels)
break;
}
}
-
}
else
{
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 3b98e68d50f..990e081aaec 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -308,7 +308,6 @@ StrategyGetBuffer(BufferAccessStrategy strategy, uint32 *buf_state)
return buf;
}
UnlockBufHdr(buf, local_buf_state);
-
}
}
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index e184a3552c8..beef69eab22 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -1848,7 +1848,6 @@ ComputeXidHorizons(ComputeXidHorizonsResult *h)
/* Catalog tables need to consider all backends in this db */
h->catalog_oldest_nonremovable =
TransactionIdOlder(h->catalog_oldest_nonremovable, xmin);
-
}
}
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 366d57ea7ac..cc15396789b 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -563,7 +563,6 @@ compactify_tuples(itemIdCompact itemidbase, int nitems, Page page, bool presorte
/* update the line pointer to reference the new offset */
lp->lp_off = upper;
-
}
/* move the remaining tuples. */
@@ -669,7 +668,6 @@ compactify_tuples(itemIdCompact itemidbase, int nitems, Page page, bool presorte
/* update the line pointer to reference the new offset */
lp->lp_off = upper;
-
}
/* Copy the remaining chunk */
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index f364a9b88a9..0e7b7b31384 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -3741,7 +3741,6 @@ GetCommandLogLevel(Node *parsetree)
lev = LOGSTMT_ALL;
break;
}
-
}
break;
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 6053a9e31f2..edeffacc2d7 100644
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -569,7 +569,6 @@ pushval_morph(Datum opaque, TSQueryParserState state, char *strval, int lenval,
}
pfree(prs.words);
-
}
else
pushStop(state);
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
index fe469881612..27b2cca2dfb 100644
--- a/src/backend/tsearch/ts_parse.c
+++ b/src/backend/tsearch/ts_parse.c
@@ -584,7 +584,6 @@ hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int bu
else
addHLParsedLex(prs, query, lexs, NULL);
} while (norms);
-
} while (type > 0);
FunctionCall1(&(prsobj->prsend), PointerGetDatum(prsdata));
@@ -629,7 +628,6 @@ generateHeadline(HeadlineParsedText *prs)
memcpy(ptr, prs->fragdelim, prs->fragdelimlen);
ptr += prs->fragdelimlen;
}
-
}
if (wrd->replace)
{
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 2043f2e74af..56c588bbabd 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -851,7 +851,6 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
sem.object_field_start = jsonb_in_object_field_start;
pg_parse_json_or_ereport(lex, &sem);
-
}
break;
case JSONBTYPE_JSONB:
diff --git a/src/backend/utils/adt/multirangetypes.c b/src/backend/utils/adt/multirangetypes.c
index efd8584a3d8..67d7d67fb83 100644
--- a/src/backend/utils/adt/multirangetypes.c
+++ b/src/backend/utils/adt/multirangetypes.c
@@ -1181,7 +1181,6 @@ multirange_minus_internal(Oid mltrngtypoid, TypeCacheEntry *rangetyp,
*/
range_count3++;
r2 = ++i2 >= range_count2 ? NULL : ranges2[i2];
-
}
else if (range_overlaps_internal(rangetyp, r1, r2))
{
@@ -1200,7 +1199,6 @@ multirange_minus_internal(Oid mltrngtypoid, TypeCacheEntry *rangetyp,
break;
else
r2 = ++i2 >= range_count2 ? NULL : ranges2[i2];
-
}
else
{
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index f1673cc1456..a6e043c32c5 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -868,7 +868,6 @@ translate(PG_FUNCTION_ARGS)
target += len;
retlen += len;
}
-
}
else
{
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 3296ad070ed..7e08d7fe6c2 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -9440,7 +9440,6 @@ get_rule_expr(Node *node, deparse_context *context,
get_rule_expr_paren((Node *) xexpr->args, context, false, node);
break;
}
-
}
if (xexpr->op == IS_XMLSERIALIZE)
appendStringInfo(buf, " AS %s",
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index fb4fb987e7f..71cbc1c3d80 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -3628,7 +3628,6 @@ estimate_num_groups_incremental(PlannerInfo *root, List *groupExprs,
*/
if (estinfo != NULL && varinfo2->isdefault)
estinfo->flags |= SELFLAG_USED_DEFAULT;
-
}
/* we're done with this relation */
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 70937eaa461..da73796eac8 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -4898,7 +4898,6 @@ timestamp_part_common(PG_FUNCTION_ARGS, bool retnumeric)
lowunits, format_type_be(TIMESTAMPOID))));
intresult = 0;
}
-
}
else
{
@@ -5123,7 +5122,6 @@ timestamptz_part_common(PG_FUNCTION_ARGS, bool retnumeric)
lowunits, format_type_be(TIMESTAMPTZOID))));
intresult = 0;
}
-
}
else if (type == RESERV)
{
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 8ba9ef22f56..addc3491518 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -2196,7 +2196,6 @@ insertStatEntry(MemoryContext persistentContext, TSVectorStat *stat, TSVector tx
else
pnode->right = node;
}
-
}
else
{
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index 233bcb63180..6ae7c1f50b8 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -1710,7 +1710,6 @@ SearchCatCacheList(CatCache *cache,
* we'd better do so before we start marking the members as belonging
* to the list.
*/
-
}
PG_CATCH();
{
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 72778b896a2..55ee5423afb 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -2683,7 +2683,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
appendStringInfo(buf, "%*s", padding, psdisp);
else
appendBinaryStringInfo(buf, psdisp, displen);
-
}
else if (padding != 0)
appendStringInfoSpaces(buf,
@@ -2722,7 +2721,6 @@ log_line_prefix(StringInfo buf, ErrorData *edata)
appendStringInfo(buf, "(%s)",
MyProcPort->remote_port);
}
-
}
else if (padding != 0)
appendStringInfoSpaces(buf,
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 571fb955327..1174e1a31c9 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -3186,7 +3186,6 @@ mergeonerun(Tuplesortstate *state)
{
stup.srctape = srcTapeIndex;
tuplesort_heap_replace_top(state, &stup);
-
}
else
{
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 6ef3d614211..79a723885ed 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -1373,7 +1373,6 @@ dumpDatabases(PGconn *conn)
pg_fatal("could not re-open the output file \"%s\": %m",
filename);
}
-
}
PQclear(res);
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index dfa836d1561..7e7346c79a1 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -98,7 +98,6 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex,
}
extractPageInfo(xlogreader);
-
} while (xlogreader->EndRecPtr < endpoint);
/*
diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c
index 6671a841502..bd18b4491d5 100644
--- a/src/bin/pg_verifybackup/pg_verifybackup.c
+++ b/src/bin/pg_verifybackup/pg_verifybackup.c
@@ -740,8 +740,6 @@ verify_file_checksum(verifier_context *context, manifest_file *m,
close(fd);
return;
}
-
-
}
if (rc < 0)
report_backup_error(context, "could not read file \"%s\": %m",
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d04ba2b0290..b0aa0cf2466 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -2622,7 +2622,6 @@ describeOneTableDetails(const char *schemaname,
PQgetvalue(result, i, 4));
printTableAddFooter(&cont, buf.data);
-
}
PQclear(result);
}
@@ -3172,7 +3171,6 @@ describeOneTableDetails(const char *schemaname,
case 4:
printfPQExpBuffer(&buf, _("Triggers firing on replica only:"));
break;
-
}
printTableAddFooter(&cont, buf.data);
have_heading = true;
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 10ab390531b..509e6422b7e 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -316,7 +316,6 @@ get_prompt(promptStatus_t status, ConditionalStack cstack)
buf[0] = *p;
buf[1] = '\0';
break;
-
}
esc = false;
}
diff --git a/src/common/jsonapi.c b/src/common/jsonapi.c
index 6666077a934..98e4ef09426 100644
--- a/src/common/jsonapi.c
+++ b/src/common/jsonapi.c
@@ -658,7 +658,6 @@ json_lex(JsonLexContext *lex)
lex->token_type = JSON_TOKEN_FALSE;
else
return JSON_INVALID_TOKEN;
-
}
} /* end of switch */
}
@@ -856,7 +855,6 @@ json_lex_string(JsonLexContext *lex)
lex->token_terminator = s + pg_encoding_mblen_bounded(lex->input_encoding, s);
return JSON_ESCAPING_INVALID;
}
-
}
else if (lex->strval != NULL)
{
@@ -865,7 +863,6 @@ json_lex_string(JsonLexContext *lex)
appendStringInfoChar(lex->strval, *s);
}
-
}
if (hi_surrogate != -1)
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index dcdb2e0d0cb..fe676a971b9 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -1173,7 +1173,6 @@ print_aligned_text(const printTableContent *cont, FILE *fout, bool is_pager)
if (opt_border == 2)
fputs(dformat->rightvrule, fout);
fputc('\n', fout);
-
} while (more_lines);
}
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index a2166b1e12f..8dfcabe3b50 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -315,7 +315,6 @@ ECPGconnect(int lineno, int c, const char *name, const char *user, const char *p
ecpg_free(dbname);
dbname = ecpg_strdup(envname, lineno);
}
-
}
if (dbname == NULL && connection_name == NULL)
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 6bc91ef7eb6..a1bba42bb8f 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -564,7 +564,6 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
}
pval += size;
-
}
break;
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 930b6adbe4f..6a7ef0bbf67 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1392,7 +1392,6 @@ ecpg_build_params(struct statement *stmt)
if (sqlda->sqln == desc_counter)
desc_counter = 0;
}
-
}
else
{
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index e8a8a0f0ed3..e0fae3d5f1d 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -1740,7 +1740,6 @@ ParseDateTime(char *timestr, char *lowstr,
{
(*endstr)++;
continue;
-
}
/* otherwise, something is not right... */
else
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index a7e530cb5d2..73bde94aaf0 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -947,7 +947,6 @@ interval2tm(interval span, struct tm *tm, fsec_t *fsec)
{
tm->tm_year = span.month / MONTHS_PER_YEAR;
tm->tm_mon = span.month % MONTHS_PER_YEAR;
-
}
else
{
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index 24a598b6e41..42d8d4616e7 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -1432,7 +1432,6 @@ initialize_SSL(PGconn *conn)
}
SSLerrfree(err);
-
}
}
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 68c9bd1970e..0dd6d8ab2c2 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -1243,7 +1243,6 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
for (i = 0; i < trigdata->tg_trigger->tgnargs; i++)
Tcl_ListObjAppendElement(NULL, tcl_cmd,
Tcl_NewStringObj(utf_e2u(trigdata->tg_trigger->tgargs[i]), -1));
-
}
PG_CATCH();
{
diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index 3e777253524..c85d8da3c8b 100644
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@ -278,7 +278,6 @@ win32_langinfo(const char *ctype)
strcpy(r, codepage);
}
}
-
}
#endif
--
2.17.1
0007-comment-spaces.patchtext/x-diff; charset=us-asciiDownload
From 2de156e4ad64ac63eee9284adfb440e7e5a5db5f Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 12 Mar 2022 14:55:18 -0600
Subject: [PATCH 07/13] comment spaces
---
src/backend/storage/file/fd.c | 2 +-
src/include/replication/message.h | 2 +-
src/include/tsearch/ts_type.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 14b77f28617..24704b6a023 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -912,7 +912,7 @@ InitFileAccess(void)
void
InitTemporaryFileAccess(void)
{
- Assert(SizeVfdCache != 0); /* InitFileAccess() needs to have run*/
+ Assert(SizeVfdCache != 0); /* InitFileAccess() needs to have run */
Assert(!temporary_files_allowed); /* call me only once */
/*
diff --git a/src/include/replication/message.h b/src/include/replication/message.h
index 7d7785292f1..b9686c28550 100644
--- a/src/include/replication/message.h
+++ b/src/include/replication/message.h
@@ -32,7 +32,7 @@ typedef struct xl_logical_message
extern XLogRecPtr LogLogicalMessage(const char *prefix, const char *message,
size_t size, bool transactional);
-/* RMGR API*/
+/* RMGR API */
#define XLOG_LOGICAL_MESSAGE 0x00
void logicalmsg_redo(XLogReaderState *record);
void logicalmsg_desc(StringInfo buf, XLogReaderState *record);
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index a2008f5504b..689b2d1cfb6 100644
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -171,7 +171,7 @@ typedef struct
extern PGDLLIMPORT const int tsearch_op_priority[OP_COUNT];
-/* get operation priority by its code*/
+/* get operation priority by its code */
#define OP_PRIORITY(x) ( tsearch_op_priority[(x) - 1] )
/* get QueryOperator priority */
#define QO_PRIORITY(x) OP_PRIORITY(((QueryOperator *) (x))->oper)
--
2.17.1
0010-doc-review-compute_query_id-regress.patchtext/x-diff; charset=us-asciiDownload
From 717eba8e114a835b434cb3c61d3d7d1d9cd13f4f Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 12:20:37 -0500
Subject: [PATCH 10/13] doc review: compute_query_id = regress
ebf6c5249b7db525e59563fb149642665c88f747
---
doc/src/sgml/config.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 81cacdcbe40..4ddfa2a19a6 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -8095,8 +8095,8 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
which lets modules such as <xref linkend="pgstatstatements"/>
automatically enable it, and <literal>regress</literal> which
has the same effect as <literal>auto</literal>, except that the
- query identifier is hidden in the <literal>EXPLAIN</literal> output
- to facilitate automated regression testing.
+ query identifier is not shown in the <literal>EXPLAIN</literal> output
+ in order to facilitate automated regression testing.
The default is <literal>auto</literal>.
</para>
<note>
--
2.17.1
0011-doc-review-row-filters-for-logical-replication.patchtext/x-diff; charset=us-asciiDownload
From 6363fa0035aded2bbe088ab2cc639d63eabaf529 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 12:22:58 -0500
Subject: [PATCH 11/13] doc review: row filters for logical replication
52e4f0cd472d39d07732b99559989ea3b615be78
---
doc/src/sgml/ref/create_publication.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/ref/create_publication.sgml b/doc/src/sgml/ref/create_publication.sgml
index fb2d013393b..f4b44d99a88 100644
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@ -252,8 +252,8 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
system columns.
If your publication contains a partitioned table, the publication parameter
<literal>publish_via_partition_root</literal> determines if it uses the
- partition's row filter (if the parameter is false, the default) or the root
- partitioned table's row filter.
+ partition's row filter (when the parameter is false, which is the default)
+ or the root partitioned table's row filter.
</para>
<para>
--
2.17.1
0012-doc-review-Add-ALTER-SUBSCRIPTION-.-SKIP.patchtext/x-diff; charset=us-asciiDownload
From 99e8c10faaa919167bc8c47a6f4c6048db1f3c49 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 26 Mar 2022 00:11:01 -0500
Subject: [PATCH 12/13] doc review: Add ALTER SUBSCRIPTION ... SKIP.
208c5d65bbd60e33e272964578cb74182ac726a8
---
doc/src/sgml/logical-replication.sgml | 6 +++---
doc/src/sgml/ref/alter_subscription.sgml | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml
index 555fbd749cc..f0d02c2d14c 100644
--- a/doc/src/sgml/logical-replication.sgml
+++ b/doc/src/sgml/logical-replication.sgml
@@ -363,13 +363,13 @@ CONTEXT: processing remote data for replication origin "pg_16395" during "INSER
The LSN of the transaction that contains the change violating the constraint and
the replication origin name can be found from the server log (LSN 0/14C0378 and
replication origin <literal>pg_16395</literal> in the above case). The
- transaction that produces conflict can be skipped by using
+ transaction that produced the conflict can be skipped by using
<command>ALTER SUBSCRIPTION ... SKIP</command> with the finish LSN
(i.e., LSN 0/14C0378). The finish LSN could be an LSN at which the transaction
is committed or prepared on the publisher. Alternatively, the transaction can
also be skipped by calling the <link linkend="pg-replication-origin-advance">
<function>pg_replication_origin_advance()</function></link> function
- transaction. Before using this function, the subscription needs to be disabled
+ XXX? transaction. Before using this function, the subscription needs to be disabled
temporarily either by <command>ALTER SUBSCRIPTION ... DISABLE</command> or, the
subscription can be used with the <literal>disable_on_error</literal> option.
Then, you can use <function>pg_replication_origin_advance()</function> function
@@ -377,7 +377,7 @@ CONTEXT: processing remote data for replication origin "pg_16395" during "INSER
and the next LSN of the finish LSN (i.e., 0/14C0379). The current position of
origins can be seen in the <link linkend="view-pg-replication-origin-status">
<structname>pg_replication_origin_status</structname></link> system view.
- Please note that skipping the whole transaction include skipping changes that
+ Please note that skipping the whole transaction includes skipping changes that
might not violate any constraint. This can easily make the subscriber
inconsistent.
</para>
diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgml
index 7c5203b6d3b..353ea5def23 100644
--- a/doc/src/sgml/ref/alter_subscription.sgml
+++ b/doc/src/sgml/ref/alter_subscription.sgml
@@ -219,13 +219,13 @@ ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <
<para>
Skips applying all changes of the remote transaction. If incoming data
violates any constraints, logical replication will stop until it is
- resolved. By using <command>ALTER SUBSCRIPTION ... SKIP</command> command,
+ resolved. By using the <command>ALTER SUBSCRIPTION ... SKIP</command> command,
the logical replication worker skips all data modification changes within
the transaction. This option has no effect on the transactions that are
already prepared by enabling <literal>two_phase</literal> on
subscriber.
- After logical replication worker successfully skips the transaction or
- finishes a transaction, LSN (stored in
+ After the logical replication worker successfully skips the transaction or
+ finishes a transaction, the LSN (stored in
<structname>pg_subscription</structname>.<structfield>subskiplsn</structfield>)
is cleared. See <xref linkend="logical-replication-conflicts"/> for
the details of logical replication conflicts. Using this command requires
@@ -244,7 +244,7 @@ ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <
Specifies the finish LSN of the remote transaction whose changes
are to be skipped by the logical replication worker. The finish LSN
is the LSN at which the transaction is either committed or prepared.
- Skipping individual subtransaction is not supported. Setting
+ Skipping individual subtransactions is not supported. Setting
<literal>NONE</literal> resets the LSN.
</para>
</listitem>
--
2.17.1
0013-doc-comma.patchtext/x-diff; charset=us-asciiDownload
From 4eaed5e78c3482ce1810a9354370cd7d5a622a70 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Tue, 22 Feb 2022 07:44:06 -0600
Subject: [PATCH 13/13] doc: comma
---
doc/src/sgml/ref/create_subscription.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml
index 203bb41844f..b09dc50bd25 100644
--- a/doc/src/sgml/ref/create_subscription.sgml
+++ b/doc/src/sgml/ref/create_subscription.sgml
@@ -350,7 +350,7 @@ CREATE SUBSCRIPTION <replaceable class="parameter">subscription_name</replaceabl
<literal>FOR ALL TABLES IN SCHEMA</literal>, rows are always published
regardless of the definition of the other expressions.
If the subscriber is a <productname>PostgreSQL</productname> version before
- 15 then any row filtering is ignored during the initial data synchronization
+ 15, then any row filtering is ignored during the initial data synchronization
phase. For this case, the user might want to consider deleting any initially
copied data that would be incompatible with subsequent filtering.
</para>
--
2.17.1
Re: typos
On Mon, Apr 11, 2022 at 7:10 PM Justin Pryzby <pryzby@telsasoft.com> wrote:
On Mon, Apr 11, 2022 at 04:39:30PM +1200, David Rowley wrote:
I'm not entirely certain this is an improvement. Your commit message
I'd say is not true going by git grep "compression algorithm". There
are 3 matches in the docs and take [1], for example. I'd say in that
one it's better to use "algorithm". In that case, "method" could be
talking about client or server.I am not wedded to this change; but, for context, I wrote this patch before
basebackup supported multiple compression ... "things". I didn't touch
basebackup here, since Robert defended that choice of words in another thread
(starting at 20220320194050.GX28503@telsasoft.com).This change is for pg_column_compression(), and the only other use of
"compression algorithm" in the docs is in pgcrypto (which is in contrib). That
the docs consistently use "method" suggests continuing to use that rather than
something else. It could be described in some central place (like if we
support common syntax between interfaces which expose compression).0010:
I don't understand this change.The commit message mentions 959f6d6a1, which makes newbindir optional. But the
documentation wasn't updated, and seems to indicate that it's still required.
https://www.postgresql.org/docs/devel/pgupgrade.html0011:
I can't quite parse the original. I might not have enough context
here. Robert, Joe? (new to master)See the link in the commit message where someone else reported the same
problem.0019:
-1. pgindent will fix these.But two of those are from 2016.
Thanks for amending and pushing those. There's some more less obvious ones
attached.Amit or Masahiko may want to comment on 0012 (doc review: Add ALTER
SUBSCRIPTION ... SKIP).
Thank you for the patch! I've looked at 0012 patch. Regarding the
following part:
<function>pg_replication_origin_advance()</function></link> function
- transaction. Before using this function, the subscription needs
to be disabled
+ XXX? transaction. Before using this function, the subscription
needs to be disabled
temporarily either by <command>ALTER SUBSCRIPTION ...
DISABLE</command> or, thewe can remove "transaction", it seems a typo. The rest looks good to me.
Regards,
--
Masahiko Sawada
EDB: https://www.enterprisedb.com/
Re: typos
On Mon, Apr 11, 2022 at 3:55 PM Masahiko Sawada <sawada.mshk@gmail.com> wrote:
On Mon, Apr 11, 2022 at 7:10 PM Justin Pryzby <pryzby@telsasoft.com> wrote:
Amit or Masahiko may want to comment on 0012 (doc review: Add ALTER
SUBSCRIPTION ... SKIP).Thank you for the patch! I've looked at 0012 patch. Regarding the
following part:<function>pg_replication_origin_advance()</function></link> function - transaction. Before using this function, the subscription needs to be disabled + XXX? transaction. Before using this function, the subscription needs to be disabled temporarily either by <command>ALTER SUBSCRIPTION ... DISABLE</command> or, thewe can remove "transaction", it seems a typo.
Right.
The rest looks good to me.
+1. I'll take care of pushing this one tomorrow unless we have more
comments on this part.
--
With Regards,
Amit Kapila.
Re: typos
On Mon, Apr 11, 2022 at 4:56 AM David Rowley <dgrowleyml@gmail.com> wrote:
0011 (Could do with input from Robert and Joe)
Seems like a reasonable change to me.
--
Robert Haas
EDB: http://www.enterprisedb.com
Re: typos
On Mon, Apr 11, 2022 at 4:15 PM Amit Kapila <amit.kapila16@gmail.com> wrote:
On Mon, Apr 11, 2022 at 3:55 PM Masahiko Sawada <sawada.mshk@gmail.com> wrote:
On Mon, Apr 11, 2022 at 7:10 PM Justin Pryzby <pryzby@telsasoft.com> wrote:
Amit or Masahiko may want to comment on 0012 (doc review: Add ALTER
SUBSCRIPTION ... SKIP).+1. I'll take care of pushing this one tomorrow unless we have more
comments on this part.
I have pushed this one.
--
With Regards,
Amit Kapila.
Re: typos
On 2022-Apr-11, David Rowley wrote:
and also skipped:
0016 (unsure if we should change these of pgindent is not touching it)
0017 (unsure if we should change these of pgindent is not touching it)
I verified that pgindent will indeed not touch these changes by running
before and after. (I accepted one comment placement from that run that
touched a neighboring line.)
I think pgindent is right not to modify vertical space very much, since
in many cases it amounts to a subjective decision. The patch seemed a
(small) improvement, and it seems hard to make too much of a fuss about
such things. Pushed them as a single commit.
I hadn't noticed that Justin had posted a refreshed patch series, so I
don't know if the new ones match what I pushed.
--
Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/
"Postgres is bloatware by design: it was built to house
PhD theses." (Joey Hellerstein, SIGMOD annual conference 2002)
Re: typos
On Wed, Apr 13, 2022 at 07:29:34PM +0200, Alvaro Herrera wrote:
On 2022-Apr-11, David Rowley wrote:
and also skipped:
0016 (unsure if we should change these of pgindent is not touching it)
0017 (unsure if we should change these of pgindent is not touching it)I verified that pgindent will indeed not touch these changes by running
before and after. (I accepted one comment placement from that run that
touched a neighboring line.)I think pgindent is right not to modify vertical space very much, since
in many cases it amounts to a subjective decision. The patch seemed a
(small) improvement, and it seems hard to make too much of a fuss about
such things. Pushed them as a single commit.I hadn't noticed that Justin had posted a refreshed patch series, so I
don't know if the new ones match what I pushed.
There were no changes - I had resent the patches that removed blank lines so it
was apparent that they were "outstanding" / under discussion.
There's (only) a few remaining.
Attachments:
0001-comment-spaces.patchtext/x-diff; charset=us-asciiDownload
From 543b9d77763da814cf1a99938252eb16a0a7d131 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Sat, 12 Mar 2022 14:55:18 -0600
Subject: [PATCH 1/4] comment spaces
---
src/backend/storage/file/fd.c | 2 +-
src/include/replication/message.h | 2 +-
src/include/tsearch/ts_type.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 14b77f28617..24704b6a023 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -912,7 +912,7 @@ InitFileAccess(void)
void
InitTemporaryFileAccess(void)
{
- Assert(SizeVfdCache != 0); /* InitFileAccess() needs to have run*/
+ Assert(SizeVfdCache != 0); /* InitFileAccess() needs to have run */
Assert(!temporary_files_allowed); /* call me only once */
/*
diff --git a/src/include/replication/message.h b/src/include/replication/message.h
index 7d7785292f1..b9686c28550 100644
--- a/src/include/replication/message.h
+++ b/src/include/replication/message.h
@@ -32,7 +32,7 @@ typedef struct xl_logical_message
extern XLogRecPtr LogLogicalMessage(const char *prefix, const char *message,
size_t size, bool transactional);
-/* RMGR API*/
+/* RMGR API */
#define XLOG_LOGICAL_MESSAGE 0x00
void logicalmsg_redo(XLogReaderState *record);
void logicalmsg_desc(StringInfo buf, XLogReaderState *record);
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index a2008f5504b..689b2d1cfb6 100644
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -171,7 +171,7 @@ typedef struct
extern PGDLLIMPORT const int tsearch_op_priority[OP_COUNT];
-/* get operation priority by its code*/
+/* get operation priority by its code */
#define OP_PRIORITY(x) ( tsearch_op_priority[(x) - 1] )
/* get QueryOperator priority */
#define QO_PRIORITY(x) OP_PRIORITY(((QueryOperator *) (x))->oper)
--
2.17.1
0002-doc-review-locales.patchtext/x-diff; charset=us-asciiDownload
From e84373bd78d6634781536a96a083cf26c87aa53e Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 13:04:48 -0500
Subject: [PATCH 3/4] doc review: locales
f2553d43060edb210b36c63187d52a632448e1d2
---
doc/src/sgml/charset.sgml | 12 ++++++------
doc/src/sgml/ref/initdb.sgml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index d60d3207fd4..b95303fb893 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -314,7 +314,7 @@ initdb --locale=sv_SE
A locale can be selected separately for each database. The SQL command
<command>CREATE DATABASE</command> and its command-line equivalent
<command>createdb</command> have options for that. Use this for example
- if a database cluster houses databases for multiple tennants with
+ if a database cluster houses databases for multiple tenants with
different requirements.
</para>
</listitem>
@@ -346,7 +346,7 @@ initdb --locale=sv_SE
providers</firstterm>. This specifies which library supplies the locale
data. One standard provider name is <literal>libc</literal>, which uses
the locales provided by the operating system C library. These are the
- locales that most tools provided by the operating system use. Another
+ locales used by most tools provided by the operating system. Another
provider is <literal>icu</literal>, which uses the external
ICU<indexterm><primary>ICU</primary></indexterm> library. ICU locales can
only be used if support for ICU was configured when PostgreSQL was built.
@@ -361,8 +361,8 @@ initdb --locale=sv_SE
<programlisting>
initdb --locale-provider=icu --icu-locale=en
</programlisting>
- See the description of the respective commands and programs for the
- respective details. Note that you can mix locale providers on different
+ See the description of the respective commands and programs for
+ details. Note that you can mix locale providers at different
granularities, for example use <literal>libc</literal> by default for the
cluster but have one database that uses the <literal>icu</literal>
provider, and then have collation objects using either provider within
@@ -610,8 +610,8 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
definition has a <firstterm>provider</firstterm> that specifies which
library supplies the locale data. One standard provider name
is <literal>libc</literal>, which uses the locales provided by the
- operating system C library. These are the locales that most tools
- provided by the operating system use. Another provider
+ operating system C library. These are the locales used by most tools
+ provided by the operating system. Another provider
is <literal>icu</literal>, which uses the external
ICU<indexterm><primary>ICU</primary></indexterm> library. ICU locales can only be
used if support for ICU was configured when PostgreSQL was built.
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index f5d633b0afa..c9ffaaecfb9 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -108,7 +108,7 @@ PostgreSQL documentation
Alternatively, the ICU library can be used to provide locale services.
(Again, this only sets the default for subsequently created databases.) To
select this option, specify <literal>--locale-provider=icu</literal>.
- To chose the specific ICU locale ID to apply, use the option
+ To choose the specific ICU locale ID to apply, use the option
<option>--icu-locale</option>. Note that
for implementation reasons and to support legacy code,
<command>initdb</command> will still select and initialize libc locale
--
2.17.1
0003-doc-review-row-filters-for-logical-replication.patchtext/x-diff; charset=us-asciiDownload
From 7ebb9ee1761df8a9379e128e2d899a75d28ad2a7 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Fri, 25 Mar 2022 12:22:58 -0500
Subject: [PATCH 4/4] doc review: row filters for logical replication
52e4f0cd472d39d07732b99559989ea3b615be78
---
doc/src/sgml/ref/create_publication.sgml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/src/sgml/ref/create_publication.sgml b/doc/src/sgml/ref/create_publication.sgml
index fb2d013393b..f4b44d99a88 100644
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@ -252,8 +252,8 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
system columns.
If your publication contains a partitioned table, the publication parameter
<literal>publish_via_partition_root</literal> determines if it uses the
- partition's row filter (if the parameter is false, the default) or the root
- partitioned table's row filter.
+ partition's row filter (when the parameter is false, which is the default)
+ or the root partitioned table's row filter.
</para>
<para>
--
2.17.1
Re: typos
On Mon, 11 Apr 2022 at 22:10, Justin Pryzby <pryzby@telsasoft.com> wrote:
Thanks for amending and pushing those. There's some more less obvious ones
attached.
Here are my notes from yesterday that I made when reviewing and
pushing many of the 2nd batch of patches.
0001: Pushed and back patched to v12
0002: Didn't push. Compression method/algorithm.
0003: Pushed and backpatched to v13
0004: Pushed (reviewed by Robert)
0005: Alvaro Pushed
0006: Alvaro Pushed
0007: Not pushed. No space after comment and closing */ pgindent
fixed one of these but not the other 2. I've not looked into why
pgindent does 1 and not the other 2.
0008: Pushed
I've left out the following change as it does not seem to be bringing
any sort of consistency to the docs overall. It only brings
consistency to a single source file in the docs.
- You need <productname>zstd</productname>, if you want to support
+ You need <productname>ZSTD</productname>, if you want to supportSee: git grep -i ">zstd<"
0009:
This contains a few fixes that look correct. Not sure if the following
has any use as a change:
- See the description of the respective commands and programs for the
- respective details. Note that you can mix locale providers on different
+ See the description of the respective commands and programs for
+ details. Note that you can mix locale providers at different0010: Pushed
0011: Not pushed. Not sure if this is worth the change.
0012: Amit Pushed
0013: Not pushed. Adds a missing comma.
David
Re: typos
(For the future, just to make discussions easier, it would be good if
you could have git format-patch -v N to give a unique version number
to these patches)
On Thu, 14 Apr 2022 at 05:40, Justin Pryzby <pryzby@telsasoft.com> wrote:
There's (only) a few remaining.
I've pushed 0001 and 0002 of the 3rd batch of patches. I left 0003 as
I just didn't feel it was a meaningful enough improvement.
From docs/, if I do:
$ git grep ", which is the default" | wc -l
9
$ git grep ", the default" | wc -l
64
You're proposing to make the score 10, 63. I'm not sure if that's a
good direction to go in.
David
Re: typos
On Thu, Apr 14, 2022 at 09:39:42AM +1200, David Rowley wrote:
On Thu, 14 Apr 2022 at 05:40, Justin Pryzby <pryzby@telsasoft.com> wrote:
There's (only) a few remaining.
I've pushed 0001 and 0002 of the 3rd batch of patches. I left 0003 as
Thanks
I just didn't feel it was a meaningful enough improvement.
From docs/, if I do:
$ git grep ", which is the default" | wc -l
9$ git grep ", the default" | wc -l
64You're proposing to make the score 10, 63. I'm not sure if that's a
good direction to go in.
Well, I'm proposing to change the only instance of this:
$ git grep -F ", the default)"
doc/src/sgml/ref/create_publication.sgml: partition's row filter (if the parameter is false, the default) or the root
Maybe what's needed is more like this.
If the publication contains a partitioned table, and the publication parameter
<literal>publish_via_partition_root</literal> is false (the default), then the
row filter is taken from the partition; otherwise, the row filter is taken
from the root partitioned table.
I'll plan to keep this around and may come back to it later.
On Thu, Apr 14, 2022 at 08:56:22AM +1200, David Rowley wrote:
I've left out the following change as it does not seem to be bringing
any sort of consistency to the docs overall. It only brings
consistency to a single source file in the docs.- You need <productname>zstd</productname>, if you want to support + You need <productname>ZSTD</productname>, if you want to supportSee: git grep -i ">zstd<"
It may not be worth changing just this one line, but the reason I included it
here is for consistency:
$ git grep 'zstd.*product' doc
doc/src/sgml/config.sgml: <literal>zstd</literal> (if <productname>PostgreSQL</productname>
$ git grep 'ZSTD.*product' doc
doc/src/sgml/install-windows.sgml: <term><productname>ZSTD</productname></term>
doc/src/sgml/install-windows.sgml: Required for supporting <productname>ZSTD</productname> compression
doc/src/sgml/installation.sgml: You need <productname>ZSTD</productname>, if you want to support
doc/src/sgml/installation.sgml: Build with <productname>ZSTD</productname> compression support.
If we were to change it, maybe they should all say "Zstandard (zstd)". ZSTD
looks like an acronym, which I think it is not, and Zstandard indicates how to
pronounce it.
Re: typos
CCing Amit K, because I propose a few relatively minor changes to
logical rep docs.
On 2022-Apr-13, Justin Pryzby wrote:
$ git grep -F ", the default)"
doc/src/sgml/ref/create_publication.sgml: partition's row filter (if the parameter is false, the default) or the rootMaybe what's needed is more like this.
If the publication contains a partitioned table, and the publication parameter
<literal>publish_via_partition_root</literal> is false (the default), then the
row filter is taken from the partition; otherwise, the row filter is taken
from the root partitioned table.
Yeah, more invasive rewording seems called for. I propose this:
For publications containing partitioned tables, the row filter for each
partition is taken from the published partitioned table if the
publication parameter <literal>publish_via_partition_root</literal> is true,
or from the partition itself if it is false (the default).
I think we should also mention that this parameter affects row filters,
in the <varlistentry> for the WITH clause. Currently it has
<term><literal>publish_via_partition_root</literal> (<type>boolean</type>)</term>
<listitem>
<para>
This parameter determines whether changes in a partitioned table (or
on its partitions) contained in the publication will be published
using the identity and schema of the partitioned table rather than
that of the individual partitions that are actually changed; the
latter is the default. Enabling this allows the changes to be
replicated into a non-partitioned table or a partitioned table
consisting of a different set of partitions.
</para>
I propose to add
<term><literal>publish_via_partition_root</literal> (<type>boolean</type>)</term>
<listitem>
<para>
This parameter determines whether changes in a partitioned table (or
on its partitions) contained in the publication will be published
using the identity and schema of the partitioned table rather than
that of the individual partitions that are actually changed; the
latter is the default. Enabling this allows the changes to be
replicated into a non-partitioned table or a partitioned table
consisting of a different set of partitions.
</para>
<para>
This parameter also affects how row filters are chosen for partitions;
see below for details.
</para>
More generally, I think we need to connect the WHERE keyword with "row
filters" more explicitly. Right now, the parameter reference says
If the optional <literal>WHERE</literal> clause is specified, rows for
which the <replaceable class="parameter">expression</replaceable>
evaluates to false or null will not be published. Note that parentheses
are required around the expression. It has no effect on
<literal>TRUNCATE</literal> commands.
I propose to make it "If the optional WHERE clause is specified, it
defines a <firstterm>row filter</firstterm> expression. Rows for which
the row filter expression evaluates to false ..."
$ git grep 'zstd.*product' doc
doc/src/sgml/config.sgml: <literal>zstd</literal> (if <productname>PostgreSQL</productname>
$ git grep 'ZSTD.*product' doc
doc/src/sgml/install-windows.sgml: <term><productname>ZSTD</productname></term>
doc/src/sgml/install-windows.sgml: Required for supporting <productname>ZSTD</productname> compression
doc/src/sgml/installation.sgml: You need <productname>ZSTD</productname>, if you want to support
doc/src/sgml/installation.sgml: Build with <productname>ZSTD</productname> compression support.
I don't see any official sources calling it all-uppercase ZSTD. In a
quick non-scientific survey, most seem to use Zstd or zstd. The
non-abbreviated official name is Zstandard, but it's hard to find any
places using that spelling, and I don't think our docs are a place to
educate people on what the official name or pronunciation is.
I propose we standardize on <productname>Zstd</productname> everywhere.
Users can look it up if they're really interested.
--
Álvaro Herrera PostgreSQL Developer — https://www.EnterpriseDB.com/
Re: typos
On Tue, Apr 19, 2022 at 4:35 PM Alvaro Herrera <alvherre@alvh.no-ip.org> wrote:
Yeah, more invasive rewording seems called for. I propose this:
For publications containing partitioned tables, the row filter for each
partition is taken from the published partitioned table if the
publication parameter <literal>publish_via_partition_root</literal> is true,
or from the partition itself if it is false (the default).I think we should also mention that this parameter affects row filters,
in the <varlistentry> for the WITH clause. Currently it has<term><literal>publish_via_partition_root</literal> (<type>boolean</type>)</term>
<listitem>
<para>
This parameter determines whether changes in a partitioned table (or
on its partitions) contained in the publication will be published
using the identity and schema of the partitioned table rather than
that of the individual partitions that are actually changed; the
latter is the default. Enabling this allows the changes to be
replicated into a non-partitioned table or a partitioned table
consisting of a different set of partitions.
</para>I propose to add
<term><literal>publish_via_partition_root</literal> (<type>boolean</type>)</term>
<listitem>
<para>
This parameter determines whether changes in a partitioned table (or
on its partitions) contained in the publication will be published
using the identity and schema of the partitioned table rather than
that of the individual partitions that are actually changed; the
latter is the default. Enabling this allows the changes to be
replicated into a non-partitioned table or a partitioned table
consisting of a different set of partitions.
</para><para>
This parameter also affects how row filters are chosen for partitions;
see below for details.
</para>
Your proposed changes look good to me but I think all these places
need to mention 'column list' as well because the behavior is the same
for it.
More generally, I think we need to connect the WHERE keyword with "row
filters" more explicitly. Right now, the parameter reference saysIf the optional <literal>WHERE</literal> clause is specified, rows for
which the <replaceable class="parameter">expression</replaceable>
evaluates to false or null will not be published. Note that parentheses
are required around the expression. It has no effect on
<literal>TRUNCATE</literal> commands.I propose to make it "If the optional WHERE clause is specified, it
defines a <firstterm>row filter</firstterm> expression. Rows for which
the row filter expression evaluates to false ..."
Looks good to me.
--
With Regards,
Amit Kapila.
Re: typos
On 2022-Apr-20, Amit Kapila wrote:
Your proposed changes look good to me but I think all these places
need to mention 'column list' as well because the behavior is the same
for it.
Hmm, you're right. Added that, and changed the wording somewhat because
some things read awkwardly. Here's the result in patch form.
Column lists seems not mentioned in logical-replication.sgml, either.
--
Álvaro Herrera Breisgau, Deutschland — https://www.EnterpriseDB.com/
"La verdad no siempre es bonita, pero el hambre de ella sí"
Attachments:
rowfilter-doc.patchtext/x-diff; charset=utf-8Download
diff --git a/doc/src/sgml/ref/create_publication.sgml b/doc/src/sgml/ref/create_publication.sgml
index 23d883c158..c58478e8f8 100644
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@ -79,7 +79,8 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
</para>
<para>
- If the optional <literal>WHERE</literal> clause is specified, rows for
+ If the optional <literal>WHERE</literal> clause is specified, it defines a
+ <firstterm>row filter</firstterm> expression. Rows for
which the <replaceable class="parameter">expression</replaceable>
evaluates to false or null will not be published. Note that parentheses
are required around the expression. It has no effect on
@@ -192,6 +193,11 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
consisting of a different set of partitions.
</para>
+ <para>
+ This parameter also affects how row filters and column lists are
+ chosen for partitions; see below for details.
+ </para>
+
<para>
If this is enabled, <literal>TRUNCATE</literal> operations performed
directly on partitions are not replicated.
@@ -241,21 +247,28 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
</para>
<para>
- A <literal>WHERE</literal> (i.e. row filter) expression must contain only
+ A row filter expression (i.e., the <literal>WHERE</literal> clause) must contain only
columns that are covered by the <literal>REPLICA IDENTITY</literal>, in
order for <command>UPDATE</command> and <command>DELETE</command> operations
to be published. For publication of <command>INSERT</command> operations,
any column may be used in the <literal>WHERE</literal> expression. The
- <literal>WHERE</literal> clause allows simple expressions that don't have
+ row filter allows simple expressions that don't have
user-defined functions, user-defined operators, user-defined types,
user-defined collations, non-immutable built-in functions, or references to
system columns.
- If your publication contains a partitioned table, the publication parameter
- <literal>publish_via_partition_root</literal> determines if it uses the
- partition's row filter (if the parameter is false, the default) or the root
- partitioned table's row filter.
+ </para>
+
+ <para>
+ For published partitioned tables, the row filter for each
+ partition is taken from the published partitioned table if the
+ publication parameter <literal>publish_via_partition_root</literal> is true,
+ or from the partition itself if it is false (the default).
See <xref linkend="logical-replication-row-filter"/> for details about row
filters.
+ Similarly, for published partitioned tables, the column list for each
+ partition is taken from the published partitioned table if the
+ publication parameter <literal>publish_via_partition_root</literal> is true,
+ or from the partition itself if it is false.
</para>
<para>
Re: typos
On 2022-Apr-19, Alvaro Herrera wrote:
I propose we standardize on <productname>Zstd</productname> everywhere.
Users can look it up if they're really interested.
So the attached.
There are other uses of <literal>zstd</literal>, but those are referring to the
executable program.
--
Álvaro Herrera PostgreSQL Developer — https://www.EnterpriseDB.com/
"No necesitamos banderas
No reconocemos fronteras" (Jorge González)
Attachments:
0001-Zstd.patchtext/x-diff; charset=utf-8Download
From 256904cc5a8718ac081dbf51f6263ab022e503f6 Mon Sep 17 00:00:00 2001
From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Wed, 20 Apr 2022 23:26:28 +0200
Subject: [PATCH] Zstd
---
doc/src/sgml/install-windows.sgml | 6 +++---
doc/src/sgml/installation.sgml | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 43cc5f6f5b..104670d295 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -307,9 +307,9 @@ $ENV{MSBFLAGS}="/m";
</varlistentry>
<varlistentry>
- <term><productname>ZSTD</productname></term>
+ <term><productname>Zstd</productname></term>
<listitem><para>
- Required for supporting <productname>ZSTD</productname> compression
+ Required for supporting <productname>Zstd</productname> compression
method. Binaries and source can be downloaded from
<ulink url="https://github.com/facebook/zstd/releases"></ulink>.
</para></listitem>
@@ -560,7 +560,7 @@ $ENV{PROVE_TESTS}='t/020*.pl t/010*.pl'
<varlistentry>
<term><varname>ZSTD</varname></term>
<listitem><para>
- Path to a <application>zstd</application> command. The default is
+ Path to a <application>Zstd</application> command. The default is
<literal>zstd</literal>, which will search for a command by that
name in the configured <envar>PATH</envar>.
</para></listitem>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index df32025a86..c60484e221 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -273,7 +273,7 @@ su - postgres
<listitem>
<para>
- You need <productname>zstd</productname>, if you want to support
+ You need <productname>Zstd</productname>, if you want to support
compression of data with that method; see
<xref linkend="guc-wal-compression"/>.
The minimum required version is 1.4.0.
@@ -996,7 +996,7 @@ build-postgresql:
<term><option>--with-zstd</option></term>
<listitem>
<para>
- Build with <productname>ZSTD</productname> compression support.
+ Build with <productname>Zstd</productname> compression support.
</para>
</listitem>
</varlistentry>
--
2.30.2
Re: typos
On Wed, Apr 20, 2022 at 11:32:08PM +0200, Alvaro Herrera wrote:
On 2022-Apr-19, Alvaro Herrera wrote:
I propose we standardize on <productname>Zstd</productname> everywhere.
Users can look it up if they're really interested.So the attached.
There are other uses of <literal>zstd</literal>, but those are referring to the
executable program.
This one shouldn't be changed, or not like this?
@@ -560,7 +560,7 @@ $ENV{PROVE_TESTS}='t/020*.pl t/010*.pl' <varlistentry> <term><varname>ZSTD</varname></term> <listitem><para> - Path to a <application>zstd</application> command. The default is + Path to a <application>Zstd</application> command. The default is <literal>zstd</literal>, which will search for a command by that name in the configured <envar>PATH</envar>. </para></listitem>
Maybe it should say s/a/the/, like:
- Path to a <application>zstd</application> command. The default is
+ Path to the <application>zstd</application> command. The default isRe: typos
On Wed, Apr 20, 2022 at 5:31 PM Alvaro Herrera <alvherre@alvh.no-ip.org> wrote:
On 2022-Apr-20, Amit Kapila wrote:
Your proposed changes look good to me but I think all these places
need to mention 'column list' as well because the behavior is the same
for it.Hmm, you're right. Added that, and changed the wording somewhat because
some things read awkwardly. Here's the result in patch form.
LGTM.
--
With Regards,
Amit Kapila.
Re: typos
On Wed, Apr 20, 2022 at 11:32:08PM +0200, Alvaro Herrera wrote:
So the attached.
--- a/doc/src/sgml/install-windows.sgml +++ b/doc/src/sgml/install-windows.sgml @@ -307,9 +307,9 @@ $ENV{MSBFLAGS}="/m"; </varlistentry><varlistentry> - <term><productname>ZSTD</productname></term> + <term><productname>Zstd</productname></term> <listitem><para> - Required for supporting <productname>ZSTD</productname> compression + Required for supporting <productname>Zstd</productname> compression
Looking at the zstd project itself for reference or just wiki-sensei,
I don't think that this is correct:
https://github.com/facebook/zstd
https://en.wikipedia.org/wiki/Zstd
Their README uses "zstd" in lower-case, while "Zstd" (first letter
upper-case) is used at the beginning of a sentence.
--
Michael
Re: typos
On 21.04.22 06:36, Michael Paquier wrote:
On Wed, Apr 20, 2022 at 11:32:08PM +0200, Alvaro Herrera wrote:
So the attached.
--- a/doc/src/sgml/install-windows.sgml +++ b/doc/src/sgml/install-windows.sgml @@ -307,9 +307,9 @@ $ENV{MSBFLAGS}="/m"; </varlistentry><varlistentry> - <term><productname>ZSTD</productname></term> + <term><productname>Zstd</productname></term> <listitem><para> - Required for supporting <productname>ZSTD</productname> compression + Required for supporting <productname>Zstd</productname> compressionLooking at the zstd project itself for reference or just wiki-sensei,
I don't think that this is correct:
https://github.com/facebook/zstd
https://en.wikipedia.org/wiki/ZstdTheir README uses "zstd" in lower-case, while "Zstd" (first letter
upper-case) is used at the beginning of a sentence.
It is referred to as "Zstandard" at both of those places. Maybe we
should use that. That is also easier to pronounce.
Re: typos
On 2022-Apr-21, Peter Eisentraut wrote:
It is referred to as "Zstandard" at both of those places. Maybe we should
use that. That is also easier to pronounce.
Yeah, I looked at other places (such as Yann Collet's blog) and I agree
that Zstandard seems to be the accepted spelling of the product. Pushed
that way.
--
Álvaro Herrera Breisgau, Deutschland — https://www.EnterpriseDB.com/
Tom: There seems to be something broken here.
Teodor: I'm in sackcloth and ashes... Fixed.
http://archives.postgresql.org/message-id/482D1632.8010507@sigaev.ru
Re: typos
I found a bunch more typos; a couple from codespell, and several which are the
result of looking for previously-reported typos, like:
time git log origin --grep '[tT]ypo' --word-diff -U1 |grep -Eo '\[-[[:lower:]]+-\]' |sed 's/^\[-//; s/-\]$//' |sort -u |grep -Fxvwf /usr/share/dict/words >badwords.txt
time grep -rhoFwf badwords.txt doc |sort -u >not-badwords.txt
time grep -Fxvwf not-badwords.txt ./badwords.txt >./badwords.txt.new
time grep -rhoIFwf ./badwords.txt.new src --incl='*.[chly]' --incl='*.p[lm]' |sort |uniq -c |sort -nr |less
Attachments:
v2022051001-0001-doc-ANDed-and-ORed.patchtext/x-diff; charset=us-asciiDownload
From 2166aa51840094f4b738f4a9af1ad6bd94a97cff Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Mon, 18 Apr 2022 10:13:09 -0500
Subject: [PATCH v2022051001 1/2] doc: ANDed and ORed
---
doc/src/sgml/indexam.sgml | 2 +-
doc/src/sgml/indices.sgml | 4 ++--
doc/src/sgml/logical-replication.sgml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index d4163c96e9f..16669f4086a 100644
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -843,7 +843,7 @@ amparallelrescan (IndexScanDesc scan);
<replaceable>constant</replaceable>, where the index key is one of the columns of the
index and the operator is one of the members of the operator family
associated with that index column. An index scan has zero or more scan
- keys, which are implicitly ANDed — the returned tuples are expected
+ keys, which are implicitly AND-ed — the returned tuples are expected
to satisfy all the indicated conditions.
</para>
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index 023157d8884..890c6d3451c 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -597,7 +597,7 @@ CREATE INDEX test3_desc_index ON test3 (id DESC NULLS LAST);
a query like <literal>WHERE x = 42 OR x = 47 OR x = 53 OR x = 99</literal>
could be broken down into four separate scans of an index on <literal>x</literal>,
each scan using one of the query clauses. The results of these scans are
- then ORed together to produce the result. Another example is that if we
+ then OR-ed together to produce the result. Another example is that if we
have separate indexes on <literal>x</literal> and <literal>y</literal>, one possible
implementation of a query like <literal>WHERE x = 5 AND y = 6</literal> is to
use each index with the appropriate query clause and then AND together
@@ -608,7 +608,7 @@ CREATE INDEX test3_desc_index ON test3 (id DESC NULLS LAST);
To combine multiple indexes, the system scans each needed index and
prepares a <firstterm>bitmap</firstterm> in memory giving the locations of
table rows that are reported as matching that index's conditions.
- The bitmaps are then ANDed and ORed together as needed by the query.
+ The bitmaps are then AND-ed and OR-ed together as needed by the query.
Finally, the actual table rows are visited and returned. The table rows
are visited in physical order, because that is how the bitmap is laid
out; this means that any ordering of the original indexes is lost, and
diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml
index 145ea71d61b..d2939fec71c 100644
--- a/doc/src/sgml/logical-replication.sgml
+++ b/doc/src/sgml/logical-replication.sgml
@@ -477,7 +477,7 @@
<para>
If the subscription has several publications in which the same table has
been published with different row filters (for the same <literal>publish</literal>
- operation), those expressions get ORed together, so that rows satisfying
+ operation), those expressions get OR-ed together, so that rows satisfying
<emphasis>any</emphasis> of the expressions will be replicated. This means all
the other row filters for the same table become redundant if:
<itemizedlist>
--
2.17.1
v2022051001-0002-typos.patchtext/x-diff; charset=us-asciiDownload
From a566141ebb01fc48cb766339553b600755ca4dca Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Tue, 10 May 2022 19:02:02 -0500
Subject: [PATCH v2022051001 2/2] typos
---
contrib/citext/expected/citext.out | 2 +-
contrib/citext/expected/citext_1.out | 2 +-
contrib/citext/sql/citext.sql | 2 +-
src/backend/executor/execGrouping.c | 2 +-
src/backend/parser/parse_expr.c | 2 +-
src/backend/replication/basebackup_target.c | 2 +-
src/backend/utils/adt/int8.c | 2 +-
src/bin/pg_basebackup/bbstreamer_tar.c | 2 +-
src/bin/pg_rewind/t/007_standby_source.pl | 2 +-
src/bin/pg_rewind/t/009_growing_files.pl | 2 +-
src/test/regress/expected/psql.out | 2 +-
src/test/regress/sql/psql.sql | 2 +-
src/test/ssl/t/SSL/Backend/OpenSSL.pm | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out
index 5afcc50920e..1c555981363 100644
--- a/contrib/citext/expected/citext.out
+++ b/contrib/citext/expected/citext.out
@@ -2270,7 +2270,7 @@ SELECT COUNT(*) = 8::bigint AS t FROM try;
INSERT INTO try
VALUES ( to_char( now()::timestamp, 'HH12:MI:SS') ),
- ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timetamptz
+ ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timestamptz
( to_char( '15h 2m 12s'::interval, 'HH24:MI:SS') ),
( to_char( current_date, '999') ),
( to_char( 125::int, '999') ),
diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out
index 8aa2b9e1dbc..4a979d7a0d9 100644
--- a/contrib/citext/expected/citext_1.out
+++ b/contrib/citext/expected/citext_1.out
@@ -2270,7 +2270,7 @@ SELECT COUNT(*) = 8::bigint AS t FROM try;
INSERT INTO try
VALUES ( to_char( now()::timestamp, 'HH12:MI:SS') ),
- ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timetamptz
+ ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timestamptz
( to_char( '15h 2m 12s'::interval, 'HH24:MI:SS') ),
( to_char( current_date, '999') ),
( to_char( 125::int, '999') ),
diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql
index 8c87be6b1d2..b329253d379 100644
--- a/contrib/citext/sql/citext.sql
+++ b/contrib/citext/sql/citext.sql
@@ -696,7 +696,7 @@ SELECT to_timestamp('05 Dec 2000', 'DD Mon YYYY'::citext)
SELECT COUNT(*) = 8::bigint AS t FROM try;
INSERT INTO try
VALUES ( to_char( now()::timestamp, 'HH12:MI:SS') ),
- ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timetamptz
+ ( to_char( now() + '1 sec'::interval, 'HH12:MI:SS') ), -- timestamptz
( to_char( '15h 2m 12s'::interval, 'HH24:MI:SS') ),
( to_char( current_date, '999') ),
( to_char( 125::int, '999') ),
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 5da4b375300..0cc54a3449e 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -246,7 +246,7 @@ BuildTupleHashTableExt(PlanState *parent,
}
/*
- * BuildTupleHashTable is a backwards-compatibilty wrapper for
+ * BuildTupleHashTable is a backwards-compatibility wrapper for
* BuildTupleHashTableExt(), that allocates the hashtable's metadata in
* tablecxt. Note that hashtables created this way cannot be reset leak-free
* with ResetTupleHashTable().
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 33eb19a33fc..c1f194cc5b0 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -4536,7 +4536,7 @@ transformJsonParseExpr(ParseState *pstate, JsonParseExpr *jsexpr)
else
{
/*
- * Coerce argument to target type using CAST for compatibilty with PG
+ * Coerce argument to target type using CAST for compatibility with PG
* function-like CASTs.
*/
arg = transformJsonValueExprExt(pstate, jsexpr->expr, JS_FORMAT_JSON,
diff --git a/src/backend/replication/basebackup_target.c b/src/backend/replication/basebackup_target.c
index cff65611ef6..faa80b2f2ec 100644
--- a/src/backend/replication/basebackup_target.c
+++ b/src/backend/replication/basebackup_target.c
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
*
* basebackup_target.c
- * Base backups can be "targetted," which means that they can be sent
+ * Base backups can be "targeted," which means that they can be sent
* somewhere other than to the client which requested the backup.
* Furthermore, new targets can be defined by extensions. This file
* contains code to support that functionality.
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index 98d43237556..c7448ec565e 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -1171,7 +1171,7 @@ int28div(PG_FUNCTION_ARGS)
PG_RETURN_INT64((int64) arg1 / arg2);
}
-/* Binary arithmetics
+/* Binary arithmetic
*
* int8and - returns arg1 & arg2
* int8or - returns arg1 | arg2
diff --git a/src/bin/pg_basebackup/bbstreamer_tar.c b/src/bin/pg_basebackup/bbstreamer_tar.c
index fcbad579df1..ef5586c488f 100644
--- a/src/bin/pg_basebackup/bbstreamer_tar.c
+++ b/src/bin/pg_basebackup/bbstreamer_tar.c
@@ -423,7 +423,7 @@ bbstreamer_tar_archiver_content(bbstreamer *streamer,
data = buffer;
len = pad_bytes;
- /* Don't do this agian unless we replace another header. */
+ /* Don't do this again unless we replace another header. */
mystreamer->rearchive_member = false;
}
else if (context == BBSTREAMER_ARCHIVE_TRAILER)
diff --git a/src/bin/pg_rewind/t/007_standby_source.pl b/src/bin/pg_rewind/t/007_standby_source.pl
index 47320ea5a67..f89a4df09d9 100644
--- a/src/bin/pg_rewind/t/007_standby_source.pl
+++ b/src/bin/pg_rewind/t/007_standby_source.pl
@@ -141,7 +141,7 @@ move(
# Restart the node.
$node_c->start;
-# set RewindTest::node_primary to point to the rewinded node, so that we can
+# set RewindTest::node_primary to point to the rewound node, so that we can
# use check_query()
$node_primary = $node_c;
diff --git a/src/bin/pg_rewind/t/009_growing_files.pl b/src/bin/pg_rewind/t/009_growing_files.pl
index 2c81406cc07..a5a58dbe060 100644
--- a/src/bin/pg_rewind/t/009_growing_files.pl
+++ b/src/bin/pg_rewind/t/009_growing_files.pl
@@ -47,7 +47,7 @@ mkdir "$standby_pgdata/tst_both_dir";
append_to_file "$standby_pgdata/tst_both_dir/file1", 'a';
# Run pg_rewind and pipe the output from the run into the extra file we want
-# to copy. This will ensure that the file is continously growing during the
+# to copy. This will ensure that the file is continuously growing during the
# copy operation and the result will be an error.
my $ret = run_log(
[
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 1c5b5d2763d..2a38a93a3b3 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -5481,7 +5481,7 @@ INSERT INTO bla VALUES ('Susie'); -- succeeds
INSERT INTO bla VALUES ('Rosalyn') \; -- will rollback
SELECT 'before error' AS show \; -- will show nevertheless!
SELECT psql_error('boum!') \; -- failure
- SELECT 'after error' AS noshow; -- hidden by preceeding error
+ SELECT 'after error' AS noshow; -- hidden by preceding error
show
--------------
before error
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 6fc0ac6bd17..1149c6a839e 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -1432,7 +1432,7 @@ INSERT INTO bla VALUES ('Susie'); -- succeeds
INSERT INTO bla VALUES ('Rosalyn') \; -- will rollback
SELECT 'before error' AS show \; -- will show nevertheless!
SELECT psql_error('boum!') \; -- failure
- SELECT 'after error' AS noshow; -- hidden by preceeding error
+ SELECT 'after error' AS noshow; -- hidden by preceding error
INSERT INTO bla(s) VALUES ('Moe') \; -- will rollback
SELECT psql_error('bam!');
INSERT INTO bla VALUES ('Miss Wormwood'); -- succeeds
diff --git a/src/test/ssl/t/SSL/Backend/OpenSSL.pm b/src/test/ssl/t/SSL/Backend/OpenSSL.pm
index 1546b5081ba..d6d99fa636a 100644
--- a/src/test/ssl/t/SSL/Backend/OpenSSL.pm
+++ b/src/test/ssl/t/SSL/Backend/OpenSSL.pm
@@ -135,7 +135,7 @@ sub get_sslkey
=item $backend->set_server_cert(params)
Change the configuration to use given server cert, key and crl file(s). The
-following paramters are supported:
+following parameters are supported:
=over
--
2.17.1
Re: typos
On Tue, May 10, 2022 at 09:03:34PM -0500, Justin Pryzby wrote:
I found a bunch more typos; a couple from codespell, and several which are the
result of looking for previously-reported typos, like:
Thanks, applied 0002.
Regarding 0001, I don't really know which one of {AND,OR}ed or
{AND,OR}-ed is better. Note that the code prefers the former, but
your patch changes the docs to use the latter.
--
Michael
Re: typos
On Thu, Apr 14, 2022 at 08:56:22AM +1200, David Rowley wrote:
0007: Not pushed. No space after comment and closing */ pgindent
fixed one of these but not the other 2. I've not looked into why
pgindent does 1 and not the other 2.
-/* get operation priority by its code*/ +/* get operation priority by its code */
pgindent never touches comments that start in column zero. (That's why many
column-0 comments are wrapped to widths other than the standard 78.)