From: Michael Paquier Date: Tue, 3 Jan 2023 07:26:14 +0000 (+0900) Subject: Fix typos in comments, code and documentation X-Git-Url: http://git.postgresql.org/gitweb/-?a=commitdiff_plain;h=33ab0a2a527e3af5beee3a98fc07201e555d6e45;p=users%2Frhaas%2Fpostgres.git 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 --- diff --git a/.cirrus.yml b/.cirrus.yml index 354102613d..69837bcd5a 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -11,7 +11,7 @@ env: CONTAINER_REPO: us-docker.pkg.dev/${GCP_PROJECT}/ci # 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 # Useful to be able to analyse what in a script takes long 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 # 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 # conversion script, but ... meson_log_artifacts: @@ -160,7 +160,7 @@ task: ccache_cache: 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 create_user_script: | pw useradd postgres @@ -251,7 +251,7 @@ task: DEBUGINFOD_URLS: "https://debuginfod.debian.net" # 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. # # The overhead of alignment sanitizer is low, undefined behaviour has @@ -600,7 +600,7 @@ task: CCACHE_MAXSIZE: "500M" CCACHE_SLOPPINESS: pch_defines,time_macros 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 # prevents MSYS bash from resetting error mode MSYS: winjitdebug diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml index 394fec94e8..0899e55e4c 100644 --- a/doc/src/sgml/auto-explain.sgml +++ b/doc/src/sgml/auto-explain.sgml @@ -73,7 +73,7 @@ LOAD 'auto_explain'; auto_explain.log_parameter_max_length controls the - logging of query parameter values. A value of-1 (the + logging of query parameter values. A value of -1 (the default) logs the parameter values in full. 0 disables logging of parameter values. A value greater than zero truncates each parameter value to that many bytes. Only superusers can change this diff --git a/doc/src/sgml/parallel.sgml b/doc/src/sgml/parallel.sgml index e556786e2b..5acc9537d6 100644 --- a/doc/src/sgml/parallel.sgml +++ b/doc/src/sgml/parallel.sgml @@ -128,7 +128,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%'; In addition, the system must not be running in single-user mode. Since - the entire database system is running in single process in this situation, + the entire database system is running as a single process in this situation, no background workers will be available. diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 43d782fea9..892df57f70 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1005,7 +1005,7 @@ WITH ( MODULUS numeric_literal, REM constraint. This does not work, however, if any of the partition keys is an expression and the partition does not accept NULL values. If attaching a list partition that will - not accept NULL values, also add + not accept NULL values, also add a NOT NULL constraint to the partition key column, unless it's an expression. @@ -1377,7 +1377,7 @@ WITH ( MODULUS numeric_literal, REM 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 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. However, in the absence of a collation change, a column can be changed from text to varchar (or vice versa) without diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml index f9a1776380..90bd70050d 100644 --- a/doc/src/sgml/ref/create_subscription.sgml +++ b/doc/src/sgml/ref/create_subscription.sgml @@ -383,7 +383,7 @@ CREATE SUBSCRIPTION subscription_nameFOR TABLES IN SCHEMA, rows are always published regardless of the definition of the other expressions. If the subscriber is a PostgreSQL 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. Because initial data synchronization does not take into account the publication diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index c8ca2b1d64..518bdb32d8 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -253,7 +253,7 @@ GRANT role_name [, ...] TO diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index 5186d75d61..e0a6f775b6 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -935,8 +935,8 @@ BETTER: unrecognized node type: 42 Function-Like Macros and Inline Functions - Both, macros with arguments and static inline - functions, may be used. The latter are preferable if there are + Both macros with arguments and static inline + functions may be used. The latter are preferable if there are multiple-evaluation hazards when written as a macro, as e.g., the case with diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml index 956182e7c6..0ccddea310 100644 --- a/doc/src/sgml/syntax.sgml +++ b/doc/src/sgml/syntax.sgml @@ -722,7 +722,7 @@ $function$ - Nondecimal integer constants are currently only supported in the range + Non-decimal integer constants are currently only supported in the range of the bigint type (see ). diff --git a/meson.build b/meson.build index eb64cda7e0..8999170b4d 100644 --- a/meson.build +++ b/meson.build @@ -21,7 +21,7 @@ project('postgresql', 'buildtype=release', # 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 - # d:/sompath it'll install to d:/usr/local/pgsql) + # d:/somepath it'll install to d:/usr/local/pgsql) 'prefix=/usr/local/pgsql', ] ) @@ -1078,7 +1078,7 @@ if not get_option('readline').disabled() if not at_least_one_header_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. Use -Dreadline=false to disable readline support.'''.format(readline_dep)) endif diff --git a/src/backend/access/common/bufmask.c b/src/backend/access/common/bufmask.c index e3ca644bd6..5e392dab1e 100644 --- a/src/backend/access/common/bufmask.c +++ b/src/backend/access/common/bufmask.c @@ -78,7 +78,7 @@ mask_unused_space(Page page) if (pd_lower > pd_upper || pd_special < pd_upper || pd_lower < SizeOfPageHeaderData || pd_special > BLCKSZ) { - elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u\n", + elog(ERROR, "invalid page pd_lower %u pd_upper %u pd_special %u", pd_lower, pd_upper, pd_special); } diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c index 9fd0531589..3761f2c193 100644 --- a/src/backend/access/spgist/spgutils.c +++ b/src/backend/access/spgist/spgutils.c @@ -1301,7 +1301,7 @@ spgproperty(Oid index_oid, int attno, /* * Currently, SP-GiST distance-ordered scans require that there be a * distance operator in the opclass with the default types. So we assume - * that if such a operator exists, then there's a reason for it. + * that if such an operator exists, then there's a reason for it. */ /* First we need to know the column's opclass. */ diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c index 1c10c1a55a..312612115c 100644 --- a/src/backend/jit/llvm/llvmjit.c +++ b/src/backend/jit/llvm/llvmjit.c @@ -816,7 +816,7 @@ llvm_session_initialize(void) if (LLVMGetTargetFromTriple(llvm_triple, &llvm_targetref, &error) != 0) { - elog(FATAL, "failed to query triple %s\n", error); + elog(FATAL, "failed to query triple %s", error); } /* diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index 4d95ffbddb..c672b338c0 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -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 * PathTargets and the other an integer list of bool flags indicating - * whether the corresponding PathTarget contains any evaluatable SRFs. + * whether the corresponding PathTarget contains any evaluable SRFs. * The lists are given in the order they'd need to be evaluated in, with * the "lowest" PathTarget first. So the last list entry is always the * originally given PathTarget, and any entries before it indicate evaluation diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 82f87511a1..9ac42efdbc 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -11391,7 +11391,7 @@ get_opclass_name(Oid opclass, Oid actual_datatype, /* * generate_opclass_name - * Compute the name to display for a opclass specified by OID + * Compute the name to display for an opclass specified by OID * * The result includes all necessary quoting and schema-prefixing. */ diff --git a/src/backend/utils/misc/guc_internal.h b/src/backend/utils/misc/guc_internal.h index 8d93d347a7..608c8ae478 100644 --- a/src/backend/utils/misc/guc_internal.h +++ b/src/backend/utils/misc/guc_internal.h @@ -1,16 +1,16 @@ /*-------------------------------------------------------------------- - * guc_internals.h + * guc_internal.h * * Declarations shared between backend/utils/misc/guc.c and * backend/utils/misc/guc-file.l * * Copyright (c) 2000-2023, PostgreSQL Global Development Group * - * src/include/utils/guc_internals.h + * src/include/utils/guc_internal.h *-------------------------------------------------------------------- */ -#ifndef GUC_INTERNALS_H -#define GUC_INTERNALS_H +#ifndef GUC_INTERNAL_H +#define GUC_INTERNAL_H #include "utils/guc.h" @@ -23,4 +23,4 @@ extern void record_config_file_error(const char *errmsg, ConfigVariable **head_p, ConfigVariable **tail_p); -#endif /* GUC_INTERNALS_H */ +#endif /* GUC_INTERNAL_H */ diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c index f26a53b286..fbd1c6fc85 100644 --- a/src/bin/pg_dump/pg_dumpall.c +++ b/src/bin/pg_dump/pg_dumpall.c @@ -1034,7 +1034,7 @@ dumpRoleMembership(PGconn *conn) 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. */ while (remaining > 0) diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c index 47d0bfd110..c1399c09b9 100644 --- a/src/bin/pg_upgrade/info.c +++ b/src/bin/pg_upgrade/info.c @@ -408,11 +408,10 @@ get_rel_infos(ClusterInfo *cluster, DbInfo *dbinfo) query[0] = '\0'; /* initialize query string to empty */ /* - * Create a CTE that collects OIDs of regular user tables, including - * matviews and sequences, but excluding toast tables and indexes. We - * assume that relations with OIDs >= FirstNormalObjectId belong to the - * user. (That's probably redundant with the namespace-name exclusions, - * but let's be safe.) + * Create a CTE that collects OIDs of regular user tables and matviews, + * but excluding toast tables and indexes. We assume that relations with + * OIDs >= FirstNormalObjectId belong to the user. (That's probably + * redundant with the namespace-name exclusions, but let's be safe.) * * pg_largeobject contains user data that does not appear in pg_dump * output, so we have to copy that system table. It's easiest to do that diff --git a/src/include/lib/ilist.h b/src/include/lib/ilist.h index 9ff21bd41d..3a9209d1c1 100644 --- a/src/include/lib/ilist.h +++ b/src/include/lib/ilist.h @@ -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 * dclist variant thereof). diff --git a/src/test/regress/expected/copy.out b/src/test/regress/expected/copy.out index 3fad1c52d1..8a8bf43fde 100644 --- a/src/test/regress/expected/copy.out +++ b/src/test/regress/expected/copy.out @@ -182,7 +182,7 @@ create table header_copytest ( b int, 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 add column c text; copy header_copytest to stdout with (header match); diff --git a/src/test/regress/expected/expressions.out b/src/test/regress/expected/expressions.out index df432d4c92..2d5342ab28 100644 --- a/src/test/regress/expected/expressions.out +++ b/src/test/regress/expected/expressions.out @@ -86,7 +86,7 @@ WARNING: TIMESTAMP(7) precision reduced to maximum allowed, 6 t (1 row) --- current_role/user/user is tested in rolnames.sql +-- current_role/user/user is tested in rolenames.sql -- current database / catalog SELECT current_catalog = current_database(); ?column? diff --git a/src/test/regress/sql/copy.sql b/src/test/regress/sql/copy.sql index 285022e07c..f9da7b1508 100644 --- a/src/test/regress/sql/copy.sql +++ b/src/test/regress/sql/copy.sql @@ -204,7 +204,7 @@ create table header_copytest ( b int, 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 add column c text; copy header_copytest to stdout with (header match); diff --git a/src/test/regress/sql/expressions.sql b/src/test/regress/sql/expressions.sql index fea5358d25..d315ef5af5 100644 --- a/src/test/regress/sql/expressions.sql +++ b/src/test/regress/sql/expressions.sql @@ -29,7 +29,7 @@ SELECT current_timestamp = current_timestamp(7); SELECT localtime = localtime(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 SELECT current_catalog = current_database(); diff --git a/src/test/ssl/t/SSL/Server.pm b/src/test/ssl/t/SSL/Server.pm index 0bc209bbd4..b6344b936a 100644 --- a/src/test/ssl/t/SSL/Server.pm +++ b/src/test/ssl/t/SSL/Server.pm @@ -257,7 +257,7 @@ The certificate file to use. Implementation is SSL backend specific. =item keyfile => B -The private key to use. Implementation is SSL backend specific. +The private key file to use. Implementation is SSL backend specific. =item crlfile => B