1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 23:56:58 +03:00

Fix typos in comments, code and documentation

While on it, newlines are removed from the end of two elog() strings.
The others are simple grammar mistakes.  One comment in pg_upgrade
referred incorrectly to sequences since a7e5457.

Author: Justin Pryzby
Discussion: https://postgr.es/m/20221230231257.GI1153@telsasoft.com
Backpatch-through: 11
This commit is contained in:
Michael Paquier 2023-01-03 16:26:14 +09:00
parent 92957ed98c
commit 33ab0a2a52
23 changed files with 37 additions and 38 deletions

View File

@ -11,7 +11,7 @@ env:
CONTAINER_REPO: us-docker.pkg.dev/${GCP_PROJECT}/ci CONTAINER_REPO: us-docker.pkg.dev/${GCP_PROJECT}/ci
# The lower depth accelerates git clone. Use a bit of depth so that # The lower depth accelerates git clone. Use a bit of depth so that
# concurrent tasks and retrying older jobs has a chance of working. # concurrent tasks and retrying older jobs have a chance of working.
CIRRUS_CLONE_DEPTH: 500 CIRRUS_CLONE_DEPTH: 500
# Useful to be able to analyse what in a script takes long # Useful to be able to analyse what in a script takes long
CIRRUS_LOG_TIMESTAMP: true CIRRUS_LOG_TIMESTAMP: true
@ -47,7 +47,7 @@ on_failure_meson: &on_failure_meson
# In theory it'd be nice to upload the junit files meson generates, so that # In theory it'd be nice to upload the junit files meson generates, so that
# cirrus will nicely annotate the commit. Unfortunately the files don't # cirrus will nicely annotate the commit. Unfortunately the files don't
# contain identifieable file + line numbers right now, so the annotations # contain identifiable file + line numbers right now, so the annotations
# don't end up useful. We could probably improve on that with a some custom # don't end up useful. We could probably improve on that with a some custom
# conversion script, but ... # conversion script, but ...
meson_log_artifacts: meson_log_artifacts:
@ -160,7 +160,7 @@ task:
ccache_cache: ccache_cache:
folder: $CCACHE_DIR folder: $CCACHE_DIR
# Workaround around performance issues due to 32KB block size # Work around performance issues due to 32KB block size
repartition_script: src/tools/ci/gcp_freebsd_repartition.sh repartition_script: src/tools/ci/gcp_freebsd_repartition.sh
create_user_script: | create_user_script: |
pw useradd postgres pw useradd postgres
@ -251,7 +251,7 @@ task:
DEBUGINFOD_URLS: "https://debuginfod.debian.net" DEBUGINFOD_URLS: "https://debuginfod.debian.net"
# Enable a reasonable set of sanitizers. Use the linux task for that, as # Enable a reasonable set of sanitizers. Use the linux task for that, as
# it one of the fastest tasks (without sanitizers). Also several of the # it's one of the fastest tasks (without sanitizers). Also several of the
# sanitizers work best on linux. # sanitizers work best on linux.
# #
# The overhead of alignment sanitizer is low, undefined behaviour has # The overhead of alignment sanitizer is low, undefined behaviour has
@ -600,7 +600,7 @@ task:
CCACHE_MAXSIZE: "500M" CCACHE_MAXSIZE: "500M"
CCACHE_SLOPPINESS: pch_defines,time_macros CCACHE_SLOPPINESS: pch_defines,time_macros
CCACHE_DEPEND: 1 CCACHE_DEPEND: 1
# for some reason mingw plpython cannot find it's installation without this # for some reason mingw plpython cannot find its installation without this
PYTHONHOME: C:/msys64/ucrt64 PYTHONHOME: C:/msys64/ucrt64
# prevents MSYS bash from resetting error mode # prevents MSYS bash from resetting error mode
MSYS: winjitdebug MSYS: winjitdebug

View File

@ -73,7 +73,7 @@ LOAD 'auto_explain';
<listitem> <listitem>
<para> <para>
<varname>auto_explain.log_parameter_max_length</varname> controls the <varname>auto_explain.log_parameter_max_length</varname> controls the
logging of query parameter values. A value of<literal>-1</literal> (the logging of query parameter values. A value of <literal>-1</literal> (the
default) logs the parameter values in full. <literal>0</literal> disables default) logs the parameter values in full. <literal>0</literal> disables
logging of parameter values. A value greater than zero truncates each logging of parameter values. A value greater than zero truncates each
parameter value to that many bytes. Only superusers can change this parameter value to that many bytes. Only superusers can change this

View File

@ -128,7 +128,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
<para> <para>
In addition, the system must not be running in single-user mode. Since In addition, the system must not be running in single-user mode. Since
the entire database system is running in single process in this situation, the entire database system is running as a single process in this situation,
no background workers will be available. no background workers will be available.
</para> </para>

View File

@ -1005,7 +1005,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
constraint. This does not work, however, if any of the partition keys constraint. This does not work, however, if any of the partition keys
is an expression and the partition does not accept is an expression and the partition does not accept
<literal>NULL</literal> values. If attaching a list partition that will <literal>NULL</literal> values. If attaching a list partition that will
not accept <literal>NULL</literal> values, also add not accept <literal>NULL</literal> values, also add a
<literal>NOT NULL</literal> constraint to the partition key column, <literal>NOT NULL</literal> constraint to the partition key column,
unless it's an expression. unless it's an expression.
</para> </para>
@ -1377,7 +1377,7 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM
type or an unconstrained domain over the new type, a table rewrite is not type or an unconstrained domain over the new type, a table rewrite is not
needed. However, indexes must always be rebuilt unless the system can needed. However, indexes must always be rebuilt unless the system can
verify that the new index would be logically equivalent to the existing verify that the new index would be logically equivalent to the existing
one. For example, if the collation for a column has been changed an index one. For example, if the collation for a column has been changed, an index
rebuild is always required because the new sort order might be different. rebuild is always required because the new sort order might be different.
However, in the absence of a collation change, a column can be changed However, in the absence of a collation change, a column can be changed
from <type>text</type> to <type>varchar</type> (or vice versa) without from <type>text</type> to <type>varchar</type> (or vice versa) without

View File

@ -383,7 +383,7 @@ CREATE SUBSCRIPTION <replaceable class="parameter">subscription_name</replaceabl
<literal>FOR TABLES IN SCHEMA</literal>, rows are always published <literal>FOR TABLES IN SCHEMA</literal>, rows are always published
regardless of the definition of the other expressions. regardless of the definition of the other expressions.
If the subscriber is a <productname>PostgreSQL</productname> version before 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 phase. For this case, the user might want to consider deleting any initially
copied data that would be incompatible with subsequent filtering. copied data that would be incompatible with subsequent filtering.
Because initial data synchronization does not take into account the publication Because initial data synchronization does not take into account the publication

View File

@ -253,7 +253,7 @@ GRANT <replaceable class="parameter">role_name</replaceable> [, ...] TO <replace
in a role to one or more other roles. Membership in a role is significant in a role to one or more other roles. Membership in a role is significant
because it potentially allows access to the privileges granted to a role because it potentially allows access to the privileges granted to a role
to each of its members, and potentially also the ability to make changes to each of its members, and potentially also the ability to make changes
to the role itself. However, the actual permisions conferred depend on to the role itself. However, the actual permissions conferred depend on
the options associated with the grant. the options associated with the grant.
</para> </para>

View File

@ -935,8 +935,8 @@ BETTER: unrecognized node type: 42
<simplesect> <simplesect>
<title>Function-Like Macros and Inline Functions</title> <title>Function-Like Macros and Inline Functions</title>
<para> <para>
Both, macros with arguments and <literal>static inline</literal> Both macros with arguments and <literal>static inline</literal>
functions, may be used. The latter are preferable if there are functions may be used. The latter are preferable if there are
multiple-evaluation hazards when written as a macro, as e.g., the multiple-evaluation hazards when written as a macro, as e.g., the
case with case with
<programlisting> <programlisting>

View File

@ -722,7 +722,7 @@ $function$
<note> <note>
<para> <para>
Nondecimal integer constants are currently only supported in the range Non-decimal integer constants are currently only supported in the range
of the <type>bigint</type> type (see <xref of the <type>bigint</type> type (see <xref
linkend="datatype-numeric-table"/>). linkend="datatype-numeric-table"/>).
</para> </para>

View File

@ -21,7 +21,7 @@ project('postgresql',
'buildtype=release', 'buildtype=release',
# For compatibility with the autoconf build, set a default prefix. This # For compatibility with the autoconf build, set a default prefix. This
# works even on windows, where it's a drive-relative path (i.e. when on # works even on windows, where it's a drive-relative path (i.e. when on
# d:/sompath it'll install to d:/usr/local/pgsql) # d:/somepath it'll install to d:/usr/local/pgsql)
'prefix=/usr/local/pgsql', 'prefix=/usr/local/pgsql',
] ]
) )
@ -1078,7 +1078,7 @@ if not get_option('readline').disabled()
if not at_least_one_header_found if not at_least_one_header_found
error('''readline header not found error('''readline header not found
If you have @0@ already installed, see see meson-log/meson-log.txt for details on the If you have @0@ already installed, see meson-log/meson-log.txt for details on the
failure. It is possible the compiler isn't looking in the proper directory. failure. It is possible the compiler isn't looking in the proper directory.
Use -Dreadline=false to disable readline support.'''.format(readline_dep)) Use -Dreadline=false to disable readline support.'''.format(readline_dep))
endif endif

View File

@ -78,7 +78,7 @@ mask_unused_space(Page page)
if (pd_lower > pd_upper || pd_special < pd_upper || if (pd_lower > pd_upper || pd_special < pd_upper ||
pd_lower < SizeOfPageHeaderData || pd_special > BLCKSZ) pd_lower < SizeOfPageHeaderData || pd_special > BLCKSZ)
{ {
elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u\n", elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u",
pd_lower, pd_upper, pd_special); pd_lower, pd_upper, pd_special);
} }

View File

@ -1301,7 +1301,7 @@ spgproperty(Oid index_oid, int attno,
/* /*
* Currently, SP-GiST distance-ordered scans require that there be a * Currently, SP-GiST distance-ordered scans require that there be a
* distance operator in the opclass with the default types. So we assume * distance operator in the opclass with the default types. So we assume
* that if such a operator exists, then there's a reason for it. * that if such an operator exists, then there's a reason for it.
*/ */
/* First we need to know the column's opclass. */ /* First we need to know the column's opclass. */

View File

@ -816,7 +816,7 @@ llvm_session_initialize(void)
if (LLVMGetTargetFromTriple(llvm_triple, &llvm_targetref, &error) != 0) if (LLVMGetTargetFromTriple(llvm_triple, &llvm_targetref, &error) != 0)
{ {
elog(FATAL, "failed to query triple %s\n", error); elog(FATAL, "failed to query triple %s", error);
} }
/* /*

View File

@ -865,7 +865,7 @@ apply_pathtarget_labeling_to_tlist(List *tlist, PathTarget *target)
* *
* The outputs of this function are two parallel lists, one a list of * The outputs of this function are two parallel lists, one a list of
* PathTargets and the other an integer list of bool flags indicating * PathTargets and the other an integer list of bool flags indicating
* whether the corresponding PathTarget contains any evaluatable SRFs. * whether the corresponding PathTarget contains any evaluable SRFs.
* The lists are given in the order they'd need to be evaluated in, with * The lists are given in the order they'd need to be evaluated in, with
* the "lowest" PathTarget first. So the last list entry is always the * the "lowest" PathTarget first. So the last list entry is always the
* originally given PathTarget, and any entries before it indicate evaluation * originally given PathTarget, and any entries before it indicate evaluation

View File

@ -11391,7 +11391,7 @@ get_opclass_name(Oid opclass, Oid actual_datatype,
/* /*
* generate_opclass_name * generate_opclass_name
* Compute the name to display for a opclass specified by OID * Compute the name to display for an opclass specified by OID
* *
* The result includes all necessary quoting and schema-prefixing. * The result includes all necessary quoting and schema-prefixing.
*/ */

View File

@ -1,16 +1,16 @@
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* guc_internals.h * guc_internal.h
* *
* Declarations shared between backend/utils/misc/guc.c and * Declarations shared between backend/utils/misc/guc.c and
* backend/utils/misc/guc-file.l * backend/utils/misc/guc-file.l
* *
* Copyright (c) 2000-2023, PostgreSQL Global Development Group * Copyright (c) 2000-2023, PostgreSQL Global Development Group
* *
* src/include/utils/guc_internals.h * src/include/utils/guc_internal.h
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
#ifndef GUC_INTERNALS_H #ifndef GUC_INTERNAL_H
#define GUC_INTERNALS_H #define GUC_INTERNAL_H
#include "utils/guc.h" #include "utils/guc.h"
@ -23,4 +23,4 @@ extern void record_config_file_error(const char *errmsg,
ConfigVariable **head_p, ConfigVariable **head_p,
ConfigVariable **tail_p); ConfigVariable **tail_p);
#endif /* GUC_INTERNALS_H */ #endif /* GUC_INTERNAL_H */

View File

@ -1034,7 +1034,7 @@ dumpRoleMembership(PGconn *conn)
ht = rolename_create(remaining, NULL); ht = rolename_create(remaining, NULL);
/* /*
* Make repeated passses over the grants for this role until all have * Make repeated passes over the grants for this role until all have
* been dumped. * been dumped.
*/ */
while (remaining > 0) while (remaining > 0)

View File

@ -408,11 +408,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo)
query[0] = '\0'; /* initialize query string to empty */ query[0] = '\0'; /* initialize query string to empty */
/* /*
* Create a CTE that collects OIDs of regular user tables, including * Create a CTE that collects OIDs of regular user tables and matviews,
* matviews and sequences, but excluding toast tables and indexes. We * but excluding toast tables and indexes. We assume that relations with
* assume that relations with OIDs >= FirstNormalObjectId belong to the * OIDs >= FirstNormalObjectId belong to the user. (That's probably
* user. (That's probably redundant with the namespace-name exclusions, * redundant with the namespace-name exclusions, but let's be safe.)
* but let's be safe.)
* *
* pg_largeobject contains user data that does not appear in pg_dump * pg_largeobject contains user data that does not appear in pg_dump
* output, so we have to copy that system table. It's easiest to do that * output, so we have to copy that system table. It's easiest to do that

View File

@ -162,7 +162,7 @@ typedef struct dlist_head
/* /*
* Doubly linked list iterator type for dlist_head and and dclist_head types. * Doubly linked list iterator type for dlist_head and dclist_head types.
* *
* Used as state in dlist_foreach() and dlist_reverse_foreach() (and the * Used as state in dlist_foreach() and dlist_reverse_foreach() (and the
* dclist variant thereof). * dclist variant thereof).

View File

@ -182,7 +182,7 @@ create table header_copytest (
b int, b int,
c text c text
); );
-- Make sure it works with with dropped columns -- Make sure it works with dropped columns
alter table header_copytest drop column c; alter table header_copytest drop column c;
alter table header_copytest add column c text; alter table header_copytest add column c text;
copy header_copytest to stdout with (header match); copy header_copytest to stdout with (header match);

View File

@ -86,7 +86,7 @@ WARNING: TIMESTAMP(7) precision reduced to maximum allowed, 6
t t
(1 row) (1 row)
-- current_role/user/user is tested in rolnames.sql -- current_role/user/user is tested in rolenames.sql
-- current database / catalog -- current database / catalog
SELECT current_catalog = current_database(); SELECT current_catalog = current_database();
?column? ?column?

View File

@ -204,7 +204,7 @@ create table header_copytest (
b int, b int,
c text c text
); );
-- Make sure it works with with dropped columns -- Make sure it works with dropped columns
alter table header_copytest drop column c; alter table header_copytest drop column c;
alter table header_copytest add column c text; alter table header_copytest add column c text;
copy header_copytest to stdout with (header match); copy header_copytest to stdout with (header match);

View File

@ -29,7 +29,7 @@ SELECT current_timestamp = current_timestamp(7);
SELECT localtime = localtime(7); SELECT localtime = localtime(7);
SELECT localtimestamp = localtimestamp(7); SELECT localtimestamp = localtimestamp(7);
-- current_role/user/user is tested in rolnames.sql -- current_role/user/user is tested in rolenames.sql
-- current database / catalog -- current database / catalog
SELECT current_catalog = current_database(); SELECT current_catalog = current_database();

View File

@ -257,7 +257,7 @@ The certificate file to use. Implementation is SSL backend specific.
=item keyfile => B<value> =item keyfile => B<value>
The private key to use. Implementation is SSL backend specific. The private key file to use. Implementation is SSL backend specific.
=item crlfile => B<value> =item crlfile => B<value>