Skip to content

Commit a42fc1c

Browse files
committed
Fix an assortment of typos
Author: Alexander Lakhin Discussion: https://postgr.es/m/[email protected]
1 parent 4a044b9 commit a42fc1c

File tree

25 files changed

+25
-28
lines changed

25 files changed

+25
-28
lines changed

contrib/amcheck/verify_nbtree.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1086,7 +1086,7 @@ bt_entry_unique_check(BtreeCheckState *state, IndexTuple itup,
10861086

10871087
/*
10881088
* Current tuple has no posting list. If TID is visible save info about it
1089-
* for the next comparisons in the loop in bt_page_check(). Report
1089+
* for the next comparisons in the loop in bt_target_page_check(). Report
10901090
* duplicate if lVis_tid is already valid.
10911091
*/
10921092
else
@@ -1953,7 +1953,7 @@ bt_target_page_check(BtreeCheckState *state)
19531953
* Note that !readonly callers must reverify that target page has not
19541954
* been concurrently deleted.
19551955
*
1956-
* Save rightfirstdataoffset for detailed error message.
1956+
* Save rightfirstoffset for detailed error message.
19571957
*/
19581958
static BTScanInsert
19591959
bt_right_page_check_scankey(BtreeCheckState *state, OffsetNumber *rightfirstoffset)

doc/src/sgml/regress.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ make check-world PG_TEST_EXTRA='kerberos ldap ssl load_balance libpq_encryption'
331331
<term><literal>xid_wraparound</literal></term>
332332
<listitem>
333333
<para>
334-
Runs the test suite under <filename>src/test/module/xid_wrapround</filename>.
334+
Runs the test suite under <filename>src/test/modules/xid_wraparound</filename>.
335335
Not enabled by default because it is resource intensive.
336336
</para>
337337
</listitem>

doc/src/sgml/targets-meson.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Code Targets:
1111
backend Build backend and related modules
1212
bin Build frontend binaries
1313
contrib Build contrib modules
14-
pl Build procedual languages
14+
pl Build procedural languages
1515

1616
Developer Targets:
1717
reformat-dat-files Rewrite catalog data files into standard format

src/backend/access/brin/brin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2598,7 +2598,7 @@ _brin_parallel_heapscan(BrinBuildState *state)
25982598
*
25992599
* After waiting for all workers to finish, merge the per-worker results into
26002600
* the complete index. The results from each worker are sorted by block number
2601-
* (start of the page range). While combinig the per-worker results we merge
2601+
* (start of the page range). While combining the per-worker results we merge
26022602
* summaries for the same page range, and also fill-in empty summaries for
26032603
* ranges without any tuples.
26042604
*

src/backend/access/transam/slru.c

-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ SimpleLruAutotuneBuffers(int divisor, int max)
228228
* name: name of SLRU. (This is user-visible, pick with care!)
229229
* nslots: number of page slots to use.
230230
* nlsns: number of LSN groups per page (set to zero if not relevant).
231-
* ctllock: LWLock to use to control access to the shared control structure.
232231
* subdir: PGDATA-relative subdirectory that will contain the files.
233232
* buffer_tranche_id: tranche ID to use for the SLRU's per-buffer LWLocks.
234233
* bank_tranche_id: tranche ID to use for the bank LWLocks.

src/backend/access/transam/xlog.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8507,7 +8507,7 @@ xlog_redo(XLogReaderState *record)
85078507

85088508
/*
85098509
* Return the extra open flags used for opening a file, depending on the
8510-
* value of the GUCs wal_sync_method, fsync and io_direct.
8510+
* value of the GUCs wal_sync_method, fsync and debug_io_direct.
85118511
*/
85128512
static int
85138513
get_sync_bit(int method)

src/backend/catalog/heap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2465,7 +2465,7 @@ AddRelationNewConstraints(Relation rel,
24652465
* Check against pre-existing constraints. If we are allowed
24662466
* to merge with an existing constraint, there's no more to do
24672467
* here. (We omit the duplicate constraint from the result,
2468-
* which is what ATAddCheckConstraint wants.)
2468+
* which is what ATAddCheckNNConstraint wants.)
24692469
*/
24702470
if (MergeWithExistingConstraint(rel, ccname, expr,
24712471
allow_merge, is_local,

src/backend/executor/nodeValuesscan.c

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* ExecValuesScan scans a values list.
1919
* ExecValuesNext retrieve next tuple in sequential order.
2020
* ExecInitValuesScan creates and initializes a valuesscan node.
21-
* ExecEndValuesScan releases any storage allocated.
2221
* ExecReScanValuesScan rescans the values list
2322
*/
2423
#include "postgres.h"

src/backend/nodes/queryjumblefuncs.c

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ static void RecordConstLocation(JumbleState *jstate, int location);
5757
static void _jumbleNode(JumbleState *jstate, Node *node);
5858
static void _jumbleA_Const(JumbleState *jstate, Node *node);
5959
static void _jumbleList(JumbleState *jstate, Node *node);
60-
static void _jumbleRangeTblEntry(JumbleState *jstate, Node *node);
6160

6261
/*
6362
* Given a possibly multi-statement source string, confine our attention to the

src/backend/replication/logical/slotsync.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1041,8 +1041,8 @@ ValidateSlotSyncParams(int elevel)
10411041
/*
10421042
* Logical slot sync/creation requires wal_level >= logical.
10431043
*
1044-
* Sincle altering the wal_level requires a server restart, so error out
1045-
* in this case regardless of elevel provided by caller.
1044+
* Since altering the wal_level requires a server restart, so error out in
1045+
* this case regardless of elevel provided by caller.
10461046
*/
10471047
if (wal_level < WAL_LEVEL_LOGICAL)
10481048
ereport(ERROR,

src/backend/utils/adt/ruleutils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -11632,7 +11632,7 @@ get_xmltable(TableFunc *tf, deparse_context *context, bool showimplicit)
1163211632
}
1163311633

1163411634
/*
11635-
* get_json_nested_columns - Parse back nested JSON_TABLE columns
11635+
* get_json_table_nested_columns - Parse back nested JSON_TABLE columns
1163611636
*/
1163711637
static void
1163811638
get_json_table_nested_columns(TableFunc *tf, JsonTablePlan *plan,

src/backend/utils/adt/varlena.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6284,7 +6284,7 @@ unicode_norm_form_from_string(const char *formstr)
62846284
/*
62856285
* Returns version of Unicode used by Postgres in "major.minor" format (the
62866286
* same format as the Unicode version reported by ICU). The third component
6287-
* ("update version") never involves additions to the character repertiore and
6287+
* ("update version") never involves additions to the character repertoire and
62886288
* is unimportant for most purposes.
62896289
*
62906290
* See: https://unicode.org/versions/

src/bin/pg_combinebackup/pg_combinebackup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ process_directory_recursively(Oid tsoid,
844844
* files requiring reconstruction. If such files occur outside these
845845
* directories, we want to just copy them straight to the output
846846
* directory. This is to protect against a user creating a file with a
847-
* strange name like INCREMENTAL.config and then compaining that
847+
* strange name like INCREMENTAL.config and then complaining that
848848
* incremental backups don't work properly. The test here is a bit tricky:
849849
* incremental files occur in subdirectories of base, in pg_global itself,
850850
* and in subdirectories of pg_tblspc only if in-place tablespaces are

src/bin/pg_dump/filter.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ filter_get_keyword(const char **line, int *size)
204204
}
205205

206206
/*
207-
* read_quoted_pattern - read quoted possibly multi line string
207+
* read_quoted_string - read quoted possibly multi line string
208208
*
209209
* Reads a quoted string which can span over multiple lines and returns a
210210
* pointer to next char after ending double quotes; it will exit on errors.

src/bin/pg_upgrade/check.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1945,7 +1945,7 @@ check_old_cluster_subscription_state(void)
19451945
" ON o.roname = 'pg_' || s.oid "
19461946
"INNER JOIN pg_catalog.pg_database d "
19471947
" ON d.oid = s.subdbid "
1948-
"WHERE o.roname iS NULL;");
1948+
"WHERE o.roname IS NULL;");
19491949

19501950
ntup = PQntuples(res);
19511951
for (int i = 0; i < ntup; i++)

src/fe_utils/recovery_gen.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static char *escape_quotes(const char *src);
2020
* return it.
2121
*
2222
* This accepts the dbname which will be appended to the primary_conninfo.
23-
* The dbname will be ignored by walreciever process but slotsync worker uses
23+
* The dbname will be ignored by walreceiver process but slotsync worker uses
2424
* it to connect to the primary server.
2525
*/
2626
PQExpBuffer

src/include/catalog/heap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ extern List *AddRelationNewConstraints(Relation rel,
116116
const char *queryString);
117117
extern List *AddRelationNotNullConstraints(Relation rel,
118118
List *constraints,
119-
List *additional_notnulls);
119+
List *old_notnulls);
120120

121121
extern void RelationClearMissing(Relation rel);
122122
extern void SetAttrMissing(Oid relid, char *attname, char *value);

src/include/common/blkreftable.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ typedef struct BlockRefTableWriter BlockRefTableWriter;
4444
* report_error_fn should not return.
4545
*/
4646
typedef int (*io_callback_fn) (void *callback_arg, void *data, int length);
47-
typedef void (*report_error_fn) (void *calblack_arg, char *msg,...) pg_attribute_printf(2, 3);
47+
typedef void (*report_error_fn) (void *callback_arg, char *msg,...) pg_attribute_printf(2, 3);
4848

4949

5050
/*

src/include/nodes/pathnodes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ typedef struct ForeignPath
18671867
*
18681868
* We provide a set of hooks here - which the provider must take care to set
18691869
* up correctly - to allow extensions to supply their own methods of scanning
1870-
* a relation or joing relations. For example, a provider might provide GPU
1870+
* a relation or join relations. For example, a provider might provide GPU
18711871
* acceleration, a cache-based scan, or some other kind of logic we haven't
18721872
* dreamed up yet.
18731873
*

src/include/nodes/primnodes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1641,7 +1641,7 @@ typedef struct JsonReturning
16411641
*
16421642
* The actual value is obtained by evaluating formatted_expr. raw_expr is
16431643
* only there for displaying the original user-written expression and is not
1644-
* evaluated by ExecInterpExpr() and eval_const_exprs_mutator().
1644+
* evaluated by ExecInterpExpr() and eval_const_expressions_mutator().
16451645
*/
16461646
typedef struct JsonValueExpr
16471647
{

src/interfaces/libpq/t/005_negotiate_encryption.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ BEGIN
395395
# The expected events and outcomes above assume that SSL support
396396
# is enabled. When libpq is compiled without SSL support, all
397397
# attempts to connect with sslmode=require or
398-
# sslnegotition=direct/requiredirectwould fail immediately without
398+
# sslnegotiation=direct/requiredirect would fail immediately without
399399
# even connecting to the server. Skip those, because we tested
400400
# them earlier already.
401401
my ($sslmodes, $sslnegotiations);
@@ -552,7 +552,7 @@ BEGIN
552552

553553
### Helper functions
554554

555-
# Test the cube of parameters: user, gssencmode, sslmode, and sslnegotitation
555+
# Test the cube of parameters: user, gssencmode, sslmode, and sslnegotiation
556556
sub test_matrix
557557
{
558558
local $Test::Builder::Level = $Test::Builder::Level + 1;

src/test/authentication/t/006_login_trigger.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ BEGIN
143143
log_exact => '2',
144144
err_like => [qr/You are welcome/]);
145145

146-
# Try to login as allowed Alice. We don't check the Mallroy login, because
146+
# Try to login as allowed Alice. We don't check the Mallory login, because
147147
# FATAL error could cause a timing-dependant panic of IPC::Run.
148148
psql_command(
149149
$node, 'SELECT 1;', 0, 'try regress_alice',

src/test/modules/test_json_parser/t/004_test_parser_perf.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Test the JSON parser performance tester. Here we are just checking that
55
# the performance tester can run, both with the standard parser and the
66
# incremental parser. An actual performance test will run with thousands
7-
# of iterations onstead of just one.
7+
# of iterations instead of just one.
88

99
use strict;
1010
use warnings;

src/test/modules/worker_spi/t/001_worker_spi.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
my $log_offset = -s $node->logfile;
116116

117117
# worker_spi_launch() may be able to detect that the worker has been
118-
# stopped, so do not rely on psql_safe().
118+
# stopped, so do not rely on safe_psql().
119119
$node->psql('postgres',
120120
qq[SELECT worker_spi_launch(12, $noconndb_id, $myrole_id);]);
121121
$node->wait_for_log(

src/test/modules/worker_spi/worker_spi.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ _PG_init(void)
384384
/*
385385
* Now fill in worker-specific data, and do the actual registrations.
386386
*
387-
* bgw_extra can optionally include a dabatase OID, a role OID and a set
387+
* bgw_extra can optionally include a database OID, a role OID and a set
388388
* of flags. This is left empty here to fallback to the related GUCs at
389389
* startup (0 for the bgworker flags).
390390
*/

0 commit comments

Comments
 (0)