Skip to content

Commit 8128b0c

Browse files
committed
Fix collection of typos and grammar mistakes in the tree, volume 2
This fixes some comments and documentation new as of Postgres 13, and is a follow-up of the work done in dd0f37e. Author: Justin Pryzby Discussion: https://postgr.es/m/[email protected]
1 parent f762b2f commit 8128b0c

File tree

11 files changed

+31
-31
lines changed

11 files changed

+31
-31
lines changed

doc/src/sgml/auto-explain.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ LOAD 'auto_explain';
200200
<listitem>
201201
<para>
202202
<varname>auto_explain.log_settings</varname> controls whether information
203-
about modified configuration options are printed when execution plan is logged.
203+
about modified configuration options is printed when execution plan is logged.
204204
Only options affecting query planning with value different from the built-in
205205
default value are included in the output. This parameter is off by default.
206206
Only superusers can change this setting.

doc/src/sgml/monitoring.sgml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2596,14 +2596,14 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
25962596
<row>
25972597
<entry><structfield>datname</structfield></entry>
25982598
<entry><type>name</type></entry>
2599-
<entry>Name of this database, or <literal>NULL</literal> for the shared
2599+
<entry>Name of this database, or <literal>NULL</literal> for shared
26002600
objects.</entry>
26012601
</row>
26022602
<row>
26032603
<entry><structfield>numbackends</structfield></entry>
26042604
<entry><type>integer</type></entry>
26052605
<entry>Number of backends currently connected to this database, or
2606-
<literal>NULL</literal> for the shared objects. This is the only column
2606+
<literal>NULL</literal> for shared objects. This is the only column
26072607
in this view that returns a value reflecting current state; all other
26082608
columns return the accumulated values since the last reset.</entry>
26092609
</row>
@@ -2725,7 +2725,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
27252725

27262726
<para>
27272727
The <structname>pg_stat_database</structname> view will contain one row
2728-
for each database in the cluster, plus one for the shared objects, showing
2728+
for each database in the cluster, plus one for shared objects, showing
27292729
database-wide statistics.
27302730
</para>
27312731

@@ -4483,7 +4483,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
44834483
is taking a base backup, the
44844484
<structname>pg_stat_progress_basebackup</structname>
44854485
view will contain a row for each WAL sender process that is currently
4486-
running <command>BASE_BACKUP</command> replication command
4486+
running the <command>BASE_BACKUP</command> replication command
44874487
and streaming the backup. The tables below describe the information
44884488
that will be reported and provide information about how to interpret it.
44894489
</para>

doc/src/sgml/perform.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ EXPLAIN SELECT * FROM tenk1 ORDER BY unique1;
311311
-> Seq Scan on tenk1 (cost=0.00..445.00 rows=10000 width=244)
312312
</screen>
313313

314-
If the a part of the plan guarantess an ordering on a prefix of the
314+
If a part of the plan guarantees an ordering on a prefix of the
315315
required sort keys, then the planner may instead decide to use an
316316
<literal>incremental sort</literal> step:
317317

doc/src/sgml/ref/create_publication.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
132132
on its partitions) contained in the publication will be published
133133
using the identity and schema of the partitioned table rather than
134134
that of the individual partitions that are actually changed; the
135-
latter is the default. Enablings this allows the changes to be
135+
latter is the default. Enabling this allows the changes to be
136136
replicated into a non-partitioned table or a partitioned table
137137
consisting of a different set of partitions.
138138
</para>

doc/src/sgml/ref/pg_verifybackup.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ PostgreSQL documentation
4141
</para>
4242

4343
<para>
44-
It is important to note that that the validation which is performed by
44+
It is important to note that the validation which is performed by
4545
<application>pg_verifybackup</application> does not and can not include
4646
every check which will be performed by a running server when attempting
4747
to make use of the backup. Even if you use this tool, you should still

doc/src/sgml/ref/psql-ref.sgml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1242,9 +1242,9 @@ testdb=&gt;
12421242
<para>
12431243
Lists operator classes
12441244
(see <xref linkend="catalog-pg-opclass"/>).
1245-
If <replaceable class="parameter">access-method-patttern</replaceable>
1245+
If <replaceable class="parameter">access-method-pattern</replaceable>
12461246
is specified, only operator classes associated with access methods whose
1247-
names match pattern are listed.
1247+
names match the pattern are listed.
12481248
If <replaceable class="parameter">input-type-pattern</replaceable>
12491249
is specified, only operator classes associated with input types whose
12501250
names match the pattern are listed.
@@ -1265,9 +1265,9 @@ testdb=&gt;
12651265
<para>
12661266
Lists operator families
12671267
(see <xref linkend="catalog-pg-opfamily"/>).
1268-
If <replaceable class="parameter">access-method-patttern</replaceable>
1268+
If <replaceable class="parameter">access-method-pattern</replaceable>
12691269
is specified, only operator families associated with access methods whose
1270-
names match pattern are listed.
1270+
names match the pattern are listed.
12711271
If <replaceable class="parameter">input-type-pattern</replaceable>
12721272
is specified, only operator families associated with input types whose
12731273
names match the pattern are listed.
@@ -1289,9 +1289,9 @@ testdb=&gt;
12891289
<para>
12901290
Lists operators associated with operator families
12911291
(<xref linkend="catalog-pg-amop"/>).
1292-
If <replaceable class="parameter">access-method-patttern</replaceable>
1292+
If <replaceable class="parameter">access-method-pattern</replaceable>
12931293
is specified, only members of operator families associated with access
1294-
methods whose names match pattern are listed.
1294+
methods whose names match the pattern are listed.
12951295
If <replaceable class="parameter">input-type-pattern</replaceable>
12961296
is specified, only members of operator families whose names match the
12971297
pattern are listed.
@@ -1312,9 +1312,9 @@ testdb=&gt;
13121312
<para>
13131313
Lists procedures associated with operator families
13141314
(<xref linkend="catalog-pg-amproc"/>).
1315-
If <replaceable class="parameter">access-method-patttern</replaceable>
1315+
If <replaceable class="parameter">access-method-pattern</replaceable>
13161316
is specified, only members of operator families associated with access
1317-
methods whose names match pattern are listed.
1317+
methods whose names match the pattern are listed.
13181318
If <replaceable class="parameter">input-type-pattern</replaceable>
13191319
is specified, only members of operator families whose names match the
13201320
pattern are listed.

doc/src/sgml/ref/select.sgml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ FETCH { FIRST | NEXT } [ <replaceable class="parameter">count</replaceable> ] {
14501450
omitted in a <literal>FETCH</literal> clause, it defaults to 1.
14511451
The <literal>WITH TIES</literal> option is used to return any additional
14521452
rows that tie for the last place in the result set according to
1453-
<literal>ORDER BY</literal> clause; <literal>ORDER BY</literal>
1453+
the <literal>ORDER BY</literal> clause; <literal>ORDER BY</literal>
14541454
is mandatory in this case.
14551455
<literal>ROW</literal> and <literal>ROWS</literal> as well as
14561456
<literal>FIRST</literal> and <literal>NEXT</literal> are noise

src/backend/executor/nodeIncrementalSort.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ isCurrentGroup(IncrementalSortState *node, TupleTableSlot *pivot, TupleTableSlot
270270
* verify they're all part of the same prefix key group before sorting them
271271
* solely by unsorted suffix keys.
272272
*
273-
* While it's likely that all already fetch tuples are all part of a single
273+
* While it's likely that all tuples already fetched are all part of a single
274274
* prefix group, we also have to handle the possibility that there is at least
275275
* one different prefix key group before the large prefix key group.
276276
* ----------------------------------------------------------------
@@ -381,7 +381,7 @@ switchToPresortedPrefixMode(PlanState *pstate)
381381
* node->transfer_tuple slot, and, even though that slot
382382
* points to memory inside the full sort tuplesort, we can't
383383
* reset that tuplesort anyway until we've fully transferred
384-
* out of its tuples, so this reference is safe. We do need to
384+
* out its tuples, so this reference is safe. We do need to
385385
* reset the group pivot tuple though since we've finished the
386386
* current prefix key group.
387387
*/
@@ -603,7 +603,7 @@ ExecIncrementalSort(PlanState *pstate)
603603
/*
604604
* Initialize presorted column support structures for
605605
* isCurrentGroup(). It's correct to do this along with the
606-
* initial intialization for the full sort state (and not for the
606+
* initial initialization for the full sort state (and not for the
607607
* prefix sort state) since we always load the full sort state
608608
* first.
609609
*/
@@ -723,7 +723,7 @@ ExecIncrementalSort(PlanState *pstate)
723723
nTuples++;
724724

725725
/*
726-
* If we've reach our minimum group size, then we need to
726+
* If we've reached our minimum group size, then we need to
727727
* store the most recent tuple as a pivot.
728728
*/
729729
if (nTuples == minGroupSize)
@@ -752,7 +752,7 @@ ExecIncrementalSort(PlanState *pstate)
752752
{
753753
/*
754754
* Since the tuple we fetched isn't part of the current
755-
* prefix key group we don't want to sort it as part of
755+
* prefix key group we don't want to sort it as part of
756756
* the current batch. Instead we use the group_pivot slot
757757
* to carry it over to the next batch (even though we
758758
* won't actually treat it as a group pivot).
@@ -792,12 +792,12 @@ ExecIncrementalSort(PlanState *pstate)
792792
}
793793

794794
/*
795-
* Unless we've alrady transitioned modes to reading from the full
795+
* Unless we've already transitioned modes to reading from the full
796796
* sort state, then we assume that having read at least
797797
* DEFAULT_MAX_FULL_SORT_GROUP_SIZE tuples means it's likely we're
798798
* processing a large group of tuples all having equal prefix keys
799799
* (but haven't yet found the final tuple in that prefix key
800-
* group), so we need to transition in to presorted prefix mode.
800+
* group), so we need to transition into presorted prefix mode.
801801
*/
802802
if (nTuples > DEFAULT_MAX_FULL_SORT_GROUP_SIZE &&
803803
node->execution_status != INCSORT_READFULLSORT)
@@ -849,7 +849,7 @@ ExecIncrementalSort(PlanState *pstate)
849849

850850
/*
851851
* We might have multiple prefix key groups in the full sort
852-
* state, so the mode transition function needs to know the it
852+
* state, so the mode transition function needs to know that it
853853
* needs to move from the fullsort to presorted prefix sort.
854854
*/
855855
node->n_fullsort_remaining = nTuples;
@@ -913,7 +913,7 @@ ExecIncrementalSort(PlanState *pstate)
913913
/*
914914
* If the tuple's prefix keys match our pivot tuple, we're not
915915
* done yet and can load it into the prefix sort state. If not, we
916-
* don't want to sort it as part of the current batch. Instead we
916+
* don't want to sort it as part of the current batch. Instead we
917917
* use the group_pivot slot to carry it over to the next batch
918918
* (even though we won't actually treat it as a group pivot).
919919
*/
@@ -1121,14 +1121,14 @@ ExecReScanIncrementalSort(IncrementalSortState *node)
11211121
PlanState *outerPlan = outerPlanState(node);
11221122

11231123
/*
1124-
* Incremental sort doesn't support efficient rescan even when paramters
1124+
* Incremental sort doesn't support efficient rescan even when parameters
11251125
* haven't changed (e.g., rewind) because unlike regular sort we don't
11261126
* store all tuples at once for the full sort.
11271127
*
11281128
* So even if EXEC_FLAG_REWIND is set we just reset all of our state and
11291129
* reexecute the sort along with the child node below us.
11301130
*
1131-
* In theory if we've only fill the full sort with one batch (and haven't
1131+
* In theory if we've only filled the full sort with one batch (and haven't
11321132
* reset it for a new batch yet) then we could efficiently rewind, but
11331133
* that seems a narrow enough case that it's not worth handling specially
11341134
* at this time.

src/backend/replication/logical/relation.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ logicalrep_partmap_init(void)
575575
* Returned entry reuses most of the values of the root table's entry, save
576576
* the attribute map, which can be different for the partition.
577577
*
578-
* Note there's no logialrep_partition_close, because the caller closes the
578+
* Note there's no logicalrep_partition_close, because the caller closes the
579579
* the component relation.
580580
*/
581581
LogicalRepRelMapEntry *

src/backend/utils/sort/tuplesort.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ tuplesort_begin_common(int workMem, SortCoordinate coordinate,
808808
*
809809
* Setup, or reset, all state need for processing a new set of tuples with this
810810
* sort state. Called both from tuplesort_begin_common (the first time sorting
811-
* with this sort state) and tuplesort_reseti (for subsequent usages).
811+
* with this sort state) and tuplesort_reset (for subsequent usages).
812812
*/
813813
static void
814814
tuplesort_begin_batch(Tuplesortstate *state)

src/include/utils/tuplesort.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ typedef struct SortCoordinateData *SortCoordinate;
6363
* sometimes put it in shared memory.
6464
*
6565
* The parallel-sort infrastructure relies on having a zero TuplesortMethod
66-
* indicate that a worker never did anything, so we assign zero to
66+
* to indicate that a worker never did anything, so we assign zero to
6767
* SORT_TYPE_STILL_IN_PROGRESS. The other values of this enum can be
6868
* OR'ed together to represent a situation where different workers used
6969
* different methods, so we need a separate bit for each one. Keep the

0 commit comments

Comments
 (0)