diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 4cd9818acf..692d8a2a17 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -8442,8 +8442,8 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
This parameter specifies the default table access method to use when
creating tables or materialized views if the CREATE
command does not explicitly specify an access method, or when
- SELECT ... INTO is used, which does not allow to
- specify a table access method. The default is heap.
+ SELECT ... INTO is used, which does not allow
+ specifying a table access method. The default is heap.
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 22f6c5c7ab..7cf0f0da3b 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1071,7 +1071,7 @@ CREATE TABLE order_items (
represent independent objects, then RESTRICT or
NO ACTION is more appropriate; an application that
actually wants to delete both objects would then have to be explicit about
- this and run two delete options. In the above example, order items are
+ this and run two delete commands. In the above example, order items are
part of an order, and it is convenient if they are deleted automatically
if an order is deleted. But products and orders are different things, and
so making a deletion of a product automatically cause the deletion of some
@@ -4044,7 +4044,7 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
holding an ACCESS EXCLUSIVE lock on that partition.
It is recommended to drop the now-redundant CHECK
constraint after the ATTACH PARTITION is complete. If
- the table being attached is itself a partitioned table then each of its
+ the table being attached is itself a partitioned table, then each of its
sub-partitions will be recursively locked and scanned until either a
suitable CHECK constraint is encountered or the leaf
partitions are reached.
@@ -4059,7 +4059,7 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
the partition being attached. This operation will be performed whilst
holding an ACCESS EXCLUSIVE lock on the
DEFAULT partition. If the DEFAULT partition
- is itself a partitioned table then each of its partitions will be
+ is itself a partitioned table, then each of its partitions will be
recursively checked in the same way as the table being attached, as
mentioned above.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 034fecc3a1..0ee6974f1c 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -27367,6 +27367,79 @@ SELECT pg_size_pretty(sum(pg_relation_size(relid))) AS total_size
+
+
+
+ pg_ls_logicalmapdir
+
+ pg_ls_logicalmapdir ()
+ setof record
+ ( nametext,
+ sizebigint,
+ modificationtimestamp with time zone )
+
+
+ Returns the name, size, and last modification time (mtime) of each
+ ordinary file in the server's pg_logical/mappings
+ directory. Filenames beginning with a dot, directories, and other
+ special files are excluded.
+
+
+ This function is restricted to superusers and members of
+ the pg_monitor role by default, but other users can
+ be granted EXECUTE to run the function.
+
+
+
+
+
+
+ pg_ls_logicalsnapdir
+
+ pg_ls_logicalsnapdir ()
+ setof record
+ ( nametext,
+ sizebigint,
+ modificationtimestamp with time zone )
+
+
+ Returns the name, size, and last modification time (mtime) of each
+ ordinary file in the server's pg_logical/snapshots
+ directory. Filenames beginning with a dot, directories, and other
+ special files are excluded.
+
+
+ This function is restricted to superusers and members of
+ the pg_monitor role by default, but other users can
+ be granted EXECUTE to run the function.
+
+
+
+
+
+
+ pg_ls_replslotdir
+
+ pg_ls_replslotdir ( slot_nametext )
+ setof record
+ ( nametext,
+ sizebigint,
+ modificationtimestamp with time zone )
+
+
+ Returns the name, size, and last modification time (mtime) of each
+ ordinary file in the server's pg_replslot/slot_name
+ directory, where slot_name is the name of the
+ replication slot provided as input of the function. Filenames beginning
+ with a dot, directories, and other special files are excluded.
+
+
+ This function is restricted to superusers and members of
+ the pg_monitor role by default, but other users can
+ be granted EXECUTE to run the function.
+
+
+
@@ -27498,78 +27571,6 @@ SELECT convert_from(pg_read_binary_file('file_in_utf8.txt'), 'UTF8');
-
-
-
- pg_ls_logicalsnapdir
-
- pg_ls_logicalsnapdir ()
- setof record
- ( nametext,
- sizebigint,
- modificationtimestamp with time zone )
-
-
- Returns the name, size, and last modification time (mtime) of each
- ordinary file in the server's pg_logical/snapshots
- directory. Filenames beginning with a dot, directories, and other
- special files are excluded.
-
-
- This function is restricted to superusers and members of
- the pg_monitor role by default, but other users can
- be granted EXECUTE to run the function.
-
-
-
-
-
-
- pg_ls_logicalmapdir
-
- pg_ls_logicalmapdir ()
- setof record
- ( nametext,
- sizebigint,
- modificationtimestamp with time zone )
-
-
- Returns the name, size, and last modification time (mtime) of each
- ordinary file in the server's pg_logical/mappings
- directory. Filenames beginning with a dot, directories, and other
- special files are excluded.
-
-
- This function is restricted to superusers and members of
- the pg_monitor role by default, but other users can
- be granted EXECUTE to run the function.
-
-
-
-
-
-
- pg_ls_replslotdir
-
- pg_ls_replslotdir ( slot_nametext )
- setof record
- ( nametext,
- sizebigint,
- modificationtimestamp with time zone )
-
-
- Returns the name, size, and last modification time (mtime) of each
- ordinary file in the server's pg_replslot/slot_name
- directory, where slot_name is the name of the
- replication slot provided as input of the function. Filenames beginning
- with a dot, directories, and other special files are excluded.
-
-
- This function is restricted to superusers and members of
- the pg_monitor role by default, but other users can
- be granted EXECUTE to run the function.
-
-
diff --git a/doc/src/sgml/glossary.sgml b/doc/src/sgml/glossary.sgml
index f23f78c00e..1835d0e65a 100644
--- a/doc/src/sgml/glossary.sgml
+++ b/doc/src/sgml/glossary.sgml
@@ -1489,22 +1489,6 @@
-
- Startup process
-
-
- An auxiliary process
- that replays WAL during crash recovery and in a
- physical replica.
-
-
- (The name is historical: the startup process was named before
- replication was implemented; the name refers to its task as it
- relates to the server startup following a crash.)
-
-
-
-
SQL object
@@ -1563,6 +1547,22 @@
+
+ Startup process
+
+
+ An auxiliary process
+ that replays WAL during crash recovery and in a
+ physical replica.
+
+
+ (The name is historical: the startup process was named before
+ replication was implemented; the name refers to its task as it
+ relates to the server startup following a crash.)
+
+
+
+
Stats collector (process)
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index 84de931071..d4163c96e9 100644
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -253,7 +253,7 @@ typedef struct IndexAmRoutine
access method blocks HOT when an indexed attribute is
updated. Access methods without pointers to individual tuples (like
BRIN) may allow HOT even in this
- case. This does not apply to attributes referenced in index predicates,
+ case. This does not apply to attributes referenced in index predicates;
an update of such attribute always disables HOT.
diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index 89ff58338e..9cf8ebea80 100644
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -1337,7 +1337,7 @@ nd | {"1, 2": 33178, "1, 5": 33178, "2, 5": 27435, "1, 2, 5": 33178}
Multivariate MCV Lists
- Another type of statistics stored for each column are most-common value
+ Another type of statistic stored for each column are most-common value
lists. This allows very accurate estimates for individual columns, but
may result in significant misestimates for queries with conditions on
multiple columns.
diff --git a/doc/src/sgml/postgres-fdw.sgml b/doc/src/sgml/postgres-fdw.sgml
index 41cdb9ea1b..2bb31f1125 100644
--- a/doc/src/sgml/postgres-fdw.sgml
+++ b/doc/src/sgml/postgres-fdw.sgml
@@ -955,8 +955,8 @@ postgres=# SELECT postgres_fdw_disconnect_all();
of any length and contain even non-ASCII characters. However when
it's passed to and used as application_name
in a foreign server, note that it will be truncated to less than
- NAMEDATALEN characters and any characters other
- than printable ASCII ones in it will be replaced with question
+ NAMEDATALEN characters and anything other than
+ than printable ASCII characters will be replaced with question
marks (?).
See for details.
@@ -981,19 +981,19 @@ postgres=# SELECT postgres_fdw_disconnect_all();
%a
- Application name in local server
+ Application name on local server%u
- User name in local server
+ User name on local server%d
- Database name in local server
+ Database name on local server%p
- Process ID of backend in local server
+ Process ID of backend on local server%%
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 2d63e0132c..68908dcb7b 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -2101,7 +2101,7 @@ The commands accepted in replication mode are:
- Read some information associated to a replication slot. Returns a tuple
+ Read some information associated with a replication slot. Returns a tuple
with NULL values if the replication slot does not
exist. This command is currently only supported for physical replication
slots.
@@ -2133,7 +2133,7 @@ The commands accepted in replication mode are:
restart_tli (int8)
- The timeline ID associated to restart_lsn,
+ The timeline ID associated with restart_lsn,
following the current timeline history.
@@ -2155,7 +2155,7 @@ The commands accepted in replication mode are:
streaming starts on timeline tli;
otherwise, the server's current timeline is selected. The server can
reply with an error, for example if the requested section of WAL has already
- been recycled. On success, server responds with a CopyBothResponse
+ been recycled. On success, the server responds with a CopyBothResponse
message, and then starts to stream WAL to the frontend.
@@ -2516,7 +2516,7 @@ The commands accepted in replication mode are:
The server can reply with an error, for example if the
- slot does not exist. On success, server responds with a CopyBothResponse
+ slot does not exist. On success, the server responds with a CopyBothResponse
message, and then starts to stream WAL to the frontend.
@@ -6680,7 +6680,7 @@ not line breaks.
This section describes the detailed format of each logical replication
message. These messages are either returned by the replication slot SQL
-interface or are sent by a walsender. In the case of a walsender they are
+interface or are sent by a walsender. In the case of a walsender, they are
encapsulated inside replication protocol WAL messages as described in
, and generally obey the same message
flow as physical replication.
diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml
index bb4ef5e5e2..7c7c27bf7c 100644
--- a/doc/src/sgml/ref/alter_publication.sgml
+++ b/doc/src/sgml/ref/alter_publication.sgml
@@ -50,7 +50,7 @@ ALTER PUBLICATION name RENAME TO ADD and DROP clauses will add and
remove one or more tables/schemas from the publication. Note that adding
- tables/schemas to a publication that is already subscribed to will require a
+ tables/schemas to a publication that is already subscribed to will require an
ALTER SUBSCRIPTION ... REFRESH PUBLICATION action on the
subscribing side in order to become effective.
@@ -82,7 +82,7 @@ ALTER PUBLICATION name RENAME TO
Adding/Setting a table that is part of schema specified in
ALL TABLES IN SCHEMA, adding/setting a schema to a
- publication that already has a table that is part of specified schema or
+ publication that already has a table that is part of the specified schema or
adding/setting a table to a publication that already has a table's schema as
part of the specified schema is not supported.
diff --git a/doc/src/sgml/ref/create_publication.sgml b/doc/src/sgml/ref/create_publication.sgml
index d805e8e77a..385975bfad 100644
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@ -131,9 +131,9 @@ CREATE PUBLICATION name
When a partitioned table is published via schema level publication, all
- of its existing and future partitions irrespective of it being from the
- publication schema or not are implicitly considered to be part of the
- publication. So, even operations that are performed directly on a
+ of its existing and future partitions are implicitly considered to be part of the
+ publication, regardless of whether they are from the publication schema or not.
+ So, even operations that are performed directly on a
partition are also published via publications that its ancestors are
part of.
@@ -195,7 +195,7 @@ CREATE PUBLICATION name
If FOR TABLE, FOR ALL TABLES or
- FOR ALL TABLES IN SCHEMA is not specified, then the
+ FOR ALL TABLES IN SCHEMA are not specified, then the
publication starts out with an empty set of tables. That is useful if
tables or schemas are to be added later.
diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml
index 5de80f8c64..b2e41ea814 100644
--- a/doc/src/sgml/ref/pg_receivewal.sgml
+++ b/doc/src/sgml/ref/pg_receivewal.sgml
@@ -82,9 +82,8 @@ PostgreSQL documentation
First, scan the directory where the WAL segment files are written and
- find the newest completed segment file, using as starting point the
- beginning of the next WAL segment file. This is calculated independently
- on the compression method used to compress each segment.
+ find the newest completed segment file, using as the starting point the
+ beginning of the next WAL segment file.
@@ -93,7 +92,7 @@ PostgreSQL documentation
If a starting point cannot be calculated with the previous method,
and if a replication slot is used, an extra
READ_REPLICATION_SLOT command is issued to retrieve
- the slot's restart_lsn to use as starting point.
+ the slot's restart_lsn to use as the starting point.
This option is only available when streaming write-ahead logs from
PostgreSQL 15 and up.
@@ -103,7 +102,7 @@ PostgreSQL documentation
If a starting point cannot be calculated with the previous method,
the latest WAL flush location is used as reported by the server from
- a IDENTIFY_SYSTEM command.
+ an IDENTIFY_SYSTEM command.
@@ -268,7 +267,7 @@ PostgreSQL documentation
Enables compression of write-ahead logs using the specified method.
- Supported values gzip, lz4
+ Supported values are gzip, lz4
(if PostgreSQL was compiled with
), and none.
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index c71dab644c..be1896fa99 100644
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -220,8 +220,8 @@ pgbench optionsd
data is generated in pgbench client and then
sent to the server. This uses the client/server bandwidth
extensively through a COPY.
- pgbench uses the FREEZE option with 14 or later
- versions of PostgreSQL to speed up
+ pgbench uses the FREEZE option with version 14 or later
+ of PostgreSQL to speed up
subsequent VACUUM, unless partitions are enabled.
Using g causes logging to print one message
every 100,000 rows while generating data for the
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index c5ce732ee9..a1745a2642 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -139,7 +139,7 @@ PostgreSQL documentation
of the upgraded cluster to be written safely to disk. This option
causes pg_upgrade 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.
diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml
index acc6401485..82a77784b9 100644
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
@@ -107,7 +107,7 @@ SELECT [ ALL | DISTINCT [ ON ( expression
In contrast to CREATE TABLE AS, SELECT
- INTO does not allow to specify properties like a table's access
+ INTO does not allow specifying properties like a table's access
method with or the table's
tablespace with . Use
CREATE TABLE AS if necessary. Therefore, the default table
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index a1751c86cc..fc85ba99ac 100644
--- a/src/backend/access/gin/ginget.c
+++ b/src/backend/access/gin/ginget.c
@@ -1319,7 +1319,7 @@ scanGetItem(IndexScanDesc scan, ItemPointerData advancePast,
GinScanKey key = so->keys + i;
/*
- * If we're considering a lossy page, skip excludeOnly keys, They
+ * If we're considering a lossy page, skip excludeOnly keys. They
* can't exclude the whole page anyway.
*/
if (ItemPointerIsLossyPage(item) && key->excludeOnly)
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 6ec57f3d8b..98230aac49 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -8354,7 +8354,7 @@ log_heap_new_cid(Relation relation, HeapTuple tup)
/*
* Build a heap tuple representing the configured REPLICA IDENTITY to represent
- * the old tuple in a UPDATE or DELETE.
+ * the old tuple in an UPDATE or DELETE.
*
* Returns NULL if there's no need to log an identity or if there's no suitable
* key defined.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index c9d4cbf3ff..58922f7ede 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -2706,7 +2706,6 @@ XLogWrite(XLogwrtRqst WriteRqst, TimeLineID tli, bool flexible)
*/
if (LogwrtResult.Flush < WriteRqst.Flush &&
LogwrtResult.Flush < LogwrtResult.Write)
-
{
/*
* Could get here without iterating above loop, in which case we might
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index cf0700f8ba..e14ca2f563 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * pg_publication.c
+ * src/backend/catalog/pg_publication.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 61853e6dec..2e8efe4f8f 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -906,7 +906,7 @@ copy_table_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
RelationGetRelationName(OldHeap))));
/*
- * Hand of the actual copying to AM specific function, the generic code
+ * Hand off the actual copying to AM specific function, the generic code
* cannot know how to deal with visibility across AMs. Note that this
* routine is allowed to set FreezeXid / MultiXactCutoff to different
* values (e.g. because the AM doesn't use freezing).
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index e5cf1bde13..42aacc8f0a 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -2219,7 +2219,7 @@ makeObjectName(const char *name1, const char *name2, const char *label)
Assert(availchars > 0); /* else caller chose a bad label */
/*
- * If we must truncate, preferentially truncate the longer name. This
+ * If we must truncate, preferentially truncate the longer name. This
* logic could be expressed without a loop, but it's simple and obvious as
* a loop.
*/
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 3ab1bdeae1..0e4bb97fb7 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * publicationcmds.c
+ * src/backend/commands/publicationcmds.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index f5eba450ce..3ef6607d24 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * subscriptioncmds.c
+ * src/backend/commands/subscriptioncmds.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/optimizer/util/appendinfo.c b/src/backend/optimizer/util/appendinfo.c
index b8039c323b..2f06fa743c 100644
--- a/src/backend/optimizer/util/appendinfo.c
+++ b/src/backend/optimizer/util/appendinfo.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * src/backend/optimizer/path/appendinfo.c
+ * src/backend/optimizer/util/appendinfo.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.c
index 8c5dc65947..7e134822f3 100644
--- a/src/backend/optimizer/util/inherit.c
+++ b/src/backend/optimizer/util/inherit.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * src/backend/optimizer/path/inherit.c
+ * src/backend/optimizer/util/inherit.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index 4f633888b4..4d71e71f68 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -9,7 +9,7 @@
* Copyright (c) 2012-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/logicalfuncs.c
+ * src/backend/replication/logical/logicalfuncs.c
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
index d317a626e1..19b2ba2000 100644
--- a/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * src/backend/replication/reorderbuffer.c
+ * src/backend/replication/logical/reorderbuffer.c
*
* NOTES
* This module gets handed individual pieces of transactions in the order
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index ab04e946bc..83fca8a77d 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -110,7 +110,7 @@
* Copyright (c) 2012-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * src/backend/replication/snapbuild.c
+ * src/backend/replication/logical/snapbuild.c
*
*-------------------------------------------------------------------------
*/
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index c9af775bc1..d77bb32bb9 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -2368,7 +2368,7 @@ apply_dispatch(StringInfo s)
/*
* Set the current command being applied. Since this function can be
- * called recusively when applying spooled changes, save the current
+ * called recursively when applying spooled changes, save the current
* command.
*/
saved_command = apply_error_callback_arg.command;
@@ -2587,8 +2587,8 @@ LogicalRepApplyLoop(XLogRecPtr last_received)
pgstat_report_activity(STATE_IDLE, NULL);
/*
- * Push apply error context callback. Fields will be filled during
- * applying a change.
+ * Push apply error context callback. Fields will be filled while applying
+ * a change.
*/
errcallback.callback = apply_error_callback;
errcallback.previous = error_context_stack;
@@ -3608,7 +3608,7 @@ ApplyWorkerMain(Datum main_arg)
}
ereport(DEBUG1,
- (errmsg("logical replication apply worker for subscription \"%s\" two_phase is %s.",
+ (errmsg("logical replication apply worker for subscription \"%s\" two_phase is %s",
MySubscription->name,
MySubscription->twophasestate == LOGICALREP_TWOPHASE_STATE_DISABLED ? "DISABLED" :
MySubscription->twophasestate == LOGICALREP_TWOPHASE_STATE_PENDING ? "PENDING" :
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index 87fe82ed11..ca48395d5c 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -958,7 +958,7 @@ compare_datums_simple(Datum a, Datum b, SortSupport ssup)
* build_attnums_array
* Transforms a bitmap into an array of AttrNumber values.
*
- * This is used for extended statistics only, so all the attribute must be
+ * This is used for extended statistics only, so all the attributes must be
* user-defined. That means offsetting by FirstLowInvalidHeapAttributeNumber
* is not necessary here (and when querying the bitmap).
*/
diff --git a/src/backend/statistics/mcv.c b/src/backend/statistics/mcv.c
index bad1787cfb..1ef3034428 100644
--- a/src/backend/statistics/mcv.c
+++ b/src/backend/statistics/mcv.c
@@ -134,7 +134,7 @@ static int count_distinct_groups(int numrows, SortItem *items,
* This bound is at most 25, and approaches 0 as n approaches 0 or N. The
* case where n approaches 0 cannot happen in practice, since the sample
* size is at least 300. The case where n approaches N corresponds to
- * sampling the whole the table, in which case it is reasonable to keep
+ * sampling the whole table, in which case it is reasonable to keep
* the whole MCV list (have no lower bound), so it makes sense to apply
* this formula for all inputs, even though the above derivation is
* technically only valid when the right hand side is at least around 10.
@@ -295,7 +295,7 @@ statext_mcv_build(StatsBuildData *data, double totalrows, int stattarget)
/* Copy the first chunk of groups into the result. */
for (i = 0; i < nitems; i++)
{
- /* just pointer to the proper place in the list */
+ /* just point to the proper place in the list */
MCVItem *item = &mcvlist->items[i];
item->values = (Datum *) palloc(sizeof(Datum) * numattrs);
@@ -556,7 +556,7 @@ build_column_frequencies(SortItem *groups, int ngroups,
/*
* statext_mcv_load
- * Load the MCV list for the indicated pg_statistic_ext tuple.
+ * Load the MCV list for the indicated pg_statistic_ext_data tuple.
*/
MCVList *
statext_mcv_load(Oid mvoid, bool inh)
@@ -1620,7 +1620,7 @@ mcv_get_match_bitmap(PlannerInfo *root, List *clauses,
Assert(mcvlist->nitems <= STATS_MCVLIST_MAX_ITEMS);
matches = palloc(sizeof(bool) * mcvlist->nitems);
- memset(matches, !is_or, sizeof(bool) * mcvlist->nitems);
+ memset(matches, !is_or, sizeof(bool) * mcvlist->nitems);
/*
* Loop through the list of clauses, and for each of them evaluate all the
diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
index 11fa17ddea..543f691f2d 100644
--- a/src/backend/storage/sync/sync.c
+++ b/src/backend/storage/sync/sync.c
@@ -274,7 +274,6 @@ SyncPostCheckpoint(void)
}
/*
-
* ProcessSyncRequests() -- Process queued fsync requests.
*/
void
diff --git a/src/backend/utils/activity/backend_progress.c b/src/backend/utils/activity/backend_progress.c
index e5958fa77c..f29199725b 100644
--- a/src/backend/utils/activity/backend_progress.c
+++ b/src/backend/utils/activity/backend_progress.c
@@ -1,11 +1,11 @@
/* ----------
- * progress.c
+ * backend_progress.c
*
* Command progress reporting infrastructure.
*
* Copyright (c) 2001-2022, PostgreSQL Global Development Group
*
- * src/backend/postmaster/progress.c
+ * src/backend/utils/activity/backend_progress.c
* ----------
*/
#include "postgres.h"
diff --git a/src/backend/utils/activity/backend_status.c b/src/backend/utils/activity/backend_status.c
index 2fecf26a2c..c7ed1e6d7a 100644
--- a/src/backend/utils/activity/backend_status.c
+++ b/src/backend/utils/activity/backend_status.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * src/backend/postmaster/backend_status.c
+ * src/backend/utils/activity/backend_status.c
* ----------
*/
#include "postgres.h"
diff --git a/src/backend/utils/activity/wait_event.c b/src/backend/utils/activity/wait_event.c
index 021b83de7a..60972c3a75 100644
--- a/src/backend/utils/activity/wait_event.c
+++ b/src/backend/utils/activity/wait_event.c
@@ -6,7 +6,7 @@
*
*
* IDENTIFICATION
- * src/backend/postmaster/wait_event.c
+ * src/backend/utils/activity/wait_event.c
*
* NOTES
*
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 40433e32fa..346cd92793 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -2652,8 +2652,8 @@ describeOneTableDetails(const char *schemaname,
/*
* When printing kinds we ignore expression statistics,
- * which is used only internally and can't be specified by
- * user. We don't print the kinds when either none are
+ * which are used only internally and can't be specified
+ * by user. We don't print the kinds when none are
* specified (in which case it has to be statistics on a
* single expr) or when all are specified (in which case
* we assume it's expanded by CREATE STATISTICS).
diff --git a/src/include/replication/pgoutput.h b/src/include/replication/pgoutput.h
index fe1d0892aa..78aa9151ef 100644
--- a/src/include/replication/pgoutput.h
+++ b/src/include/replication/pgoutput.h
@@ -6,7 +6,7 @@
* Copyright (c) 2015-2022, PostgreSQL Global Development Group
*
* IDENTIFICATION
- * pgoutput.h
+ * src/include/replication/pgoutput.h
*
*-------------------------------------------------------------------------
*/
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index 28fa58a662..4564fb2467 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -1,13 +1,14 @@
/*-------------------------------------------------------------------------
*
- * dynahash
+ * dynahash.h
* POSTGRES dynahash.h file definitions
*
*
* Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * src/include/utils/dynahash.h
+ * IDENTIFICATION
+ * src/include/utils/dynahash.h
*
*-------------------------------------------------------------------------
*/
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 1c77211ac4..1ae8195e02 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -334,7 +334,7 @@ hek2cstr(HE *he)
SAVETMPS;
/*-------------------------
- * Unfortunately, while HeUTF8 is true for most things > 256, for values
+ * Unfortunately, while HeUTF8 is true for most things > 256, for values
* 128..255 it's not, but perl will treat them as unicode code points if
* the utf8 flag is not set ( see The "Unicode Bug" in perldoc perlunicode
* for more)
diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c
index 75dbb147d7..6c09cf2981 100644
--- a/src/port/pgcheckdir.c
+++ b/src/port/pgcheckdir.c
@@ -1,6 +1,6 @@
/*-------------------------------------------------------------------------
*
- * src/port/pgcheckdir.c
+ * pgcheckdir.c
*
* A simple subroutine to check whether a directory exists and is empty or not.
* Useful in both initdb and the backend.
@@ -8,6 +8,8 @@
* Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
+ * IDENTIFICATION
+ * src/port/pgcheckdir.c
*-------------------------------------------------------------------------
*/
diff --git a/src/test/modules/unsafe_tests/expected/alter_system_table.out b/src/test/modules/unsafe_tests/expected/alter_system_table.out
index 4b2f63a95e..be0559503b 100644
--- a/src/test/modules/unsafe_tests/expected/alter_system_table.out
+++ b/src/test/modules/unsafe_tests/expected/alter_system_table.out
@@ -53,7 +53,7 @@ ERROR: permission denied: "pg_description" is a system catalog
CREATE TABLE foo (a oid, b oid, c int, FOREIGN KEY (a, b, c) REFERENCES pg_description);
ERROR: permission denied: "pg_description" is a system catalog
-- RangeVarCallbackOwnsRelation()
-CREATE INDEX pg_descripton_test_index ON pg_description (description);
+CREATE INDEX pg_description_test_index ON pg_description (description);
ERROR: permission denied: "pg_description" is a system catalog
-- RangeVarCallbackForAlterRelation()
ALTER TABLE pg_description RENAME TO pg_comment;
@@ -151,7 +151,7 @@ CREATE TABLE foo (a oid, b oid, c int, FOREIGN KEY (a, b, c) REFERENCES pg_descr
ROLLBACK;
-- RangeVarCallbackOwnsRelation()
BEGIN;
-CREATE INDEX pg_descripton_test_index ON pg_description (description);
+CREATE INDEX pg_description_test_index ON pg_description (description);
ROLLBACK;
-- RangeVarCallbackForAlterRelation()
BEGIN;
diff --git a/src/test/modules/unsafe_tests/sql/alter_system_table.sql b/src/test/modules/unsafe_tests/sql/alter_system_table.sql
index 6bfc896ef9..b77b68c946 100644
--- a/src/test/modules/unsafe_tests/sql/alter_system_table.sql
+++ b/src/test/modules/unsafe_tests/sql/alter_system_table.sql
@@ -55,7 +55,7 @@ ALTER TABLE pg_description ALTER COLUMN description SET STATISTICS -1;
CREATE TABLE foo (a oid, b oid, c int, FOREIGN KEY (a, b, c) REFERENCES pg_description);
-- RangeVarCallbackOwnsRelation()
-CREATE INDEX pg_descripton_test_index ON pg_description (description);
+CREATE INDEX pg_description_test_index ON pg_description (description);
-- RangeVarCallbackForAlterRelation()
ALTER TABLE pg_description RENAME TO pg_comment;
@@ -161,7 +161,7 @@ ROLLBACK;
-- RangeVarCallbackOwnsRelation()
BEGIN;
-CREATE INDEX pg_descripton_test_index ON pg_description (description);
+CREATE INDEX pg_description_test_index ON pg_description (description);
ROLLBACK;
-- RangeVarCallbackForAlterRelation()
diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out
index 2088857615..442eeb1e3f 100644
--- a/src/test/regress/expected/sysviews.out
+++ b/src/test/regress/expected/sysviews.out
@@ -20,7 +20,7 @@ select count(*) >= 0 as ok from pg_available_extensions;
(1 row)
-- The entire output of pg_backend_memory_contexts is not stable,
--- we test only the existance and basic condition of TopMemoryContext.
+-- we test only the existence and basic condition of TopMemoryContext.
select name, ident, parent, level, total_bytes >= free_bytes
from pg_backend_memory_contexts where level = 0;
name | ident | parent | level | ?column?
diff --git a/src/test/regress/sql/sysviews.sql b/src/test/regress/sql/sysviews.sql
index b24816e3d5..4980f07be2 100644
--- a/src/test/regress/sql/sysviews.sql
+++ b/src/test/regress/sql/sysviews.sql
@@ -13,7 +13,7 @@ select count(*) >= 0 as ok from pg_available_extension_versions;
select count(*) >= 0 as ok from pg_available_extensions;
-- The entire output of pg_backend_memory_contexts is not stable,
--- we test only the existance and basic condition of TopMemoryContext.
+-- we test only the existence and basic condition of TopMemoryContext.
select name, ident, parent, level, total_bytes >= free_bytes
from pg_backend_memory_contexts where level = 0;
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 6dcd742fa6..ddce4680a9 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -538,7 +538,6 @@ sub recoverycheck
$ENV{REGRESS_OUTPUTDIR} = "$topdir/src/test/recovery/tmp_check";
- my $mstat = 0;
my $dir = "$topdir/src/test/recovery";
my $status = tap_check($dir);
exit $status if $status;
@@ -717,7 +716,6 @@ sub fetchRegressOpts
# list is returned if the module does not need to run anything.
sub fetchTests
{
-
my $handle;
open($handle, '<', "GNUmakefile")
|| open($handle, '<', "Makefile")
@@ -783,7 +781,7 @@ sub InstallTemp
sub usage
{
print STDERR
- "Usage: vcregress.pl [ ]\n\n",
+ "Usage: vcregress.pl []\n\n",
"Options for :\n",
" bincheck run tests of utilities in src/bin/\n",
" check deploy instance and run regression tests on it\n",