From: Michael Paquier Date: Wed, 24 Jun 2026 07:00:28 +0000 (+0900) Subject: Fix set of typos and grammar mistakes X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3a95566fc2505d4586680c09d4966dba836cb20;p=thirdparty%2Fpostgresql.git Fix set of typos and grammar mistakes This is similar to d3bba0415435, batching all the reports of this type received since the last batch. This covers typos and inconsistencies for the most part. The user-visible documentation change impacts only HEAD. --- diff --git a/contrib/pg_stash_advice/stashfuncs.c b/contrib/pg_stash_advice/stashfuncs.c index d7aa9f2223f..a70df60579b 100644 --- a/contrib/pg_stash_advice/stashfuncs.c +++ b/contrib/pg_stash_advice/stashfuncs.c @@ -266,9 +266,9 @@ pg_get_advice_stash_contents(PG_FUNCTION_ARGS) * SQL-callable function to update an advice stash entry for a particular * query ID * - * If the second argument is NULL, we delete any existing advice stash - * entry; otherwise, we either create an entry or update it with the new - * advice string. + * If the advice string (the third argument) is NULL, we delete any existing + * advice stash entry; otherwise, we either create an entry or update it with + * the new advice string. */ Datum pg_set_stashed_advice(PG_FUNCTION_ARGS) diff --git a/doc/src/sgml/oauth-validators.sgml b/doc/src/sgml/oauth-validators.sgml index d69b6cf98ad..6c4a4f94769 100644 --- a/doc/src/sgml/oauth-validators.sgml +++ b/doc/src/sgml/oauth-validators.sgml @@ -396,7 +396,7 @@ typedef struct ValidatorModuleResult field. Alternatively, result->authn_id may be set to NULL if the token is valid but the associated user identity cannot be determined. If the validator returns true and - set result->authn_id then the identity appears + sets result->authn_id then the identity appears in the server log when includes authentication. This happens before authorization and will log authentication even if the connection is later rejected due to diff --git a/doc/src/sgml/stylesheet-html-common.xsl b/doc/src/sgml/stylesheet-html-common.xsl index 9dcf96c02e5..f94fb9e1ccc 100644 --- a/doc/src/sgml/stylesheet-html-common.xsl +++ b/doc/src/sgml/stylesheet-html-common.xsl @@ -137,7 +137,7 @@ set toc,title

diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 5586fbe5b07..de4cf96eaa2 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -6223,10 +6223,10 @@ xact_redo_commit(xl_xact_parsed_commit *parsed, * If a transaction completion record arrives that has as-yet * unobserved subtransactions then this will not have been fully * handled by the call to RecordKnownAssignedTransactionIds() in the - * main recovery loop in xlog.c. So we need to do bookkeeping again to - * cover that case. This is confusing and it is easy to think this - * call is irrelevant, which has happened three times in development - * already. Leave it in. + * main recovery loop in PerformWalRecovery(). So we need to do + * bookkeeping again to cover that case. This is confusing and it is + * easy to think this call is irrelevant, which has happened three + * times in development already. Leave it in. */ RecordKnownAssignedTransactionIds(max_xid); @@ -6361,10 +6361,10 @@ xact_redo_abort(xl_xact_parsed_abort *parsed, TransactionId xid, * If a transaction completion record arrives that has as-yet * unobserved subtransactions then this will not have been fully * handled by the call to RecordKnownAssignedTransactionIds() in the - * main recovery loop in xlog.c. So we need to do bookkeeping again to - * cover that case. This is confusing and it is easy to think this - * call is irrelevant, which has happened three times in development - * already. Leave it in. + * main recovery loop in PerformWalRecovery(). So we need to do + * bookkeeping again to cover that case. This is confusing and it is + * easy to think this call is irrelevant, which has happened three + * times in development already. Leave it in. */ RecordKnownAssignedTransactionIds(max_xid); diff --git a/src/backend/access/transam/xlogprefetcher.c b/src/backend/access/transam/xlogprefetcher.c index 83a3f97a57c..dff57642ab4 100644 --- a/src/backend/access/transam/xlogprefetcher.c +++ b/src/backend/access/transam/xlogprefetcher.c @@ -804,13 +804,14 @@ XLogPrefetcherNextBlock(uintptr_t pgsr_private, XLogRecPtr *lsn) /* * Several callsites need to be able to read exactly one record - * without any internal readahead. Examples: xlog.c reading - * checkpoint records with emode set to PANIC, which might otherwise - * cause XLogPageRead() to panic on some future page, and xlog.c - * determining where to start writing WAL next, which depends on the - * contents of the reader's internal buffer after reading one record. - * Therefore, don't even think about prefetching until the first - * record after XLogPrefetcherBeginRead() has been consumed. + * without any internal readahead. Examples: PerformWalRecovery() + * trying to read the first record that follows a checkpoint has emode + * set to PANIC, which might otherwise cause XLogPageRead() to panic + * on some future page, and FinishWalRecovery() determining where to + * start writing WAL next, which depends on the contents of the + * reader's internal buffer after reading one record. Therefore, don't + * even think about prefetching until the first record after + * XLogPrefetcherBeginRead() has been consumed. */ if (prefetcher->reader->decode_queue_tail && prefetcher->reader->decode_queue_tail->lsn == prefetcher->begin_ptr) diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index 4d61795b483..c0ae4d3f63f 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -447,7 +447,7 @@ EnableStandbyMode(void) * the checkpoint record. On entry, the caller has already read the control * file into memory, and passes it as argument. This function updates it to * reflect the recovery state, and the caller is expected to write it back to - * disk does after initializing other subsystems, but before calling + * disk after initializing other subsystems, but before calling * PerformWalRecovery(). * * This initializes some global variables like ArchiveRecoveryRequested, and diff --git a/src/backend/postmaster/startup.c b/src/backend/postmaster/startup.c index b46bac681fe..d91b7caac01 100644 --- a/src/backend/postmaster/startup.c +++ b/src/backend/postmaster/startup.c @@ -118,8 +118,8 @@ StartupProcShutdownHandler(SIGNAL_ARGS) /* * Re-read the config file. * - * If one of the critical walreceiver options has changed, flag xlog.c - * to restart it. + * If one of the critical walreceiver options has changed, request the startup + * process to restart the walreceiver. */ static void StartupRereadConfig(void) diff --git a/src/backend/utils/activity/pgstat_relation.c b/src/backend/utils/activity/pgstat_relation.c index b2ca28f83ba..04f2eb21d0b 100644 --- a/src/backend/utils/activity/pgstat_relation.c +++ b/src/backend/utils/activity/pgstat_relation.c @@ -134,7 +134,7 @@ pgstat_assoc_relation(Relation rel) Assert(rel->pgstat_enabled); Assert(rel->pgstat_info == NULL); - /* Else find or make the PgStat_TableStatus entry, and update link */ + /* find or make the PgStat_TableStatus entry, and update link */ rel->pgstat_info = pgstat_prep_relation_pending(RelationGetRelid(rel), rel->rd_rel->relisshared); diff --git a/src/backend/utils/activity/pgstat_slru.c b/src/backend/utils/activity/pgstat_slru.c index f4dfe8697d7..1863169a0ec 100644 --- a/src/backend/utils/activity/pgstat_slru.c +++ b/src/backend/utils/activity/pgstat_slru.c @@ -133,9 +133,6 @@ pgstat_get_slru_index(const char *name) /* * Flush out locally pending SLRU stats entries * - * If nowait is true, this function returns false on lock failure. Otherwise - * this function always returns true. - * * If nowait is true, this function returns true if the lock could not be * acquired. Otherwise return false. */ diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c index 262ea2b73ba..4c2ccdfbf3f 100644 --- a/src/backend/utils/adt/float.c +++ b/src/backend/utils/adt/float.c @@ -3965,7 +3965,7 @@ float8_regr_r2(PG_FUNCTION_ARGS) * Despite all these precautions, this formula can yield results outside * [0, 1] due to roundoff error. Clamp it to the expected range. * - * Note that result is guaranteed to be non-negative becase Sxx and Syy + * Note that result is guaranteed to be non-negative because Sxx and Syy * are non-negative, so we only need to clamp the upper end of the range. */ if (result > 1) diff --git a/src/backend/utils/adt/pg_dependencies.c b/src/backend/utils/adt/pg_dependencies.c index 7441004909f..9c3db103d42 100644 --- a/src/backend/utils/adt/pg_dependencies.c +++ b/src/backend/utils/adt/pg_dependencies.c @@ -210,8 +210,7 @@ dependencies_object_end(void *state) /* * Assign attribute numbers to the attributes array, comparing each one - * against the dependency attribute to ensure that there there are no - * matches. + * against the dependency attribute to ensure that there are no matches. */ for (int i = 0; i < natts; i++) { diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h index f0c68d0638a..0226220e421 100644 --- a/src/include/tsearch/ts_type.h +++ b/src/include/tsearch/ts_type.h @@ -195,7 +195,7 @@ typedef struct { QueryItemType type; int8 oper; /* see above */ - int16 distance; /* distance between agrs for OP_PHRASE */ + int16 distance; /* distance between args for OP_PHRASE */ uint32 left; /* pointer to left operand. Right operand is * item + 1, left operand is placed * item+item->left */ diff --git a/src/port/pqsignal.c b/src/port/pqsignal.c index a8a1cd2074c..414d671e39f 100644 --- a/src/port/pqsignal.c +++ b/src/port/pqsignal.c @@ -204,8 +204,8 @@ pqsignal(int signo, pqsigfunc func) #else /* no USE_SIGACTION */ /* - * Forward to Windows native signal system, we need to send this though - * wrapper handler as it it needs to take single argument only. + * Forward to the native Windows signal handler through a wrapper, since + * it accepts only one argument. */ if (is_ign) wrapper_func_ptr = SIG_IGN;