Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1slem8-000QRk-1g for pgsql-hackers@arkaria.postgresql.org; Wed, 04 Sep 2024 01:25:36 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1slem6-0029H0-Jv for pgsql-hackers@arkaria.postgresql.org; Wed, 04 Sep 2024 01:25:35 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1slem6-0029Ge-1Z for pgsql-hackers@lists.postgresql.org; Wed, 04 Sep 2024 01:25:34 +0000 Received: from fout5-smtp.messagingengine.com ([103.168.172.148]) by makus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1slem2-0002BD-TJ for pgsql-hackers@lists.postgresql.org; Wed, 04 Sep 2024 01:25:33 +0000 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 833781380282; Tue, 3 Sep 2024 21:25:29 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Tue, 03 Sep 2024 21:25:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paquier.xyz; h= cc:cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm1; t=1725413129; x=1725499529; bh=xitnHuN9+7 Y8Bl2vL2Xa/xTodauOEZj5nTf2ILzwOsQ=; b=lBV4ZC0QNCEEEbcRxvGzzh+iMj r/8F+ZZZkiQNmJImwjW91MulE3I0UOszXOZUdUNVyZ7ZNTiKM28Ym9RqTqFdwYjM R8S1ekD18+x4u+STz80OqTeFddPRopcDwNPE2bLKTtHdMFhbYs3p37EvO6FTdNUc gKvZOYeQwvgalnlCwKh0QFMihtfwFj1Ls2NksQxGX7u3w0znCcNT7unKGYsrQbUk KliJB8zfRx0I/2R34H2NO0ezzlUqjUkc/4N3BJ7fuGv2PyWBp5Mmt+beZkx0W/1c HsLEZHuEBlbZQ8mLxayToQ+G54FCR33L7+q1XLsnibooEMopXa3+3VMqWjhQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1725413129; x=1725499529; bh=xitnHuN9+7Y8Bl2vL2Xa/xTodauO EZj5nTf2ILzwOsQ=; b=AngbPhqiHe9Pe+aWt3wJk2Wr6pKqmuRdAsOWZ15NtPmF Hf7q9A+23//yHRYp6RPLSoBRtke0zNOa5BRtRVBEWT60wTQm0ohUQAhOOHIs/LO3 couA0bu9GO/LB14vzA1sV93wqMkgzowKkptmknuDy+OrL0E4K8KZdXUJbkp+aCTB 7yPEjDAAiymGIbTWzp/anoKFWbmMeSoFkY3suXnBMjRHOFujNQ8V0f67631bL1sh cel8NzI3TuyU/IGkRo4q5ncqfpvj+c1ZP/Uucb78v3haj5deGHdMMqTF12tO8Qtz IA193emQ6+m/JFLRBL77J4Oyl/ChNUhrKMx/yyjuRw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudehiedggeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnegfrhhlucfvnfffucdljedtmdenucfjughrpeffhffvvefukfhf gggtuggjsehgtderredttddvnecuhfhrohhmpefoihgthhgrvghlucfrrghquhhivghruc eomhhitghhrggvlhesphgrqhhuihgvrhdrgiihiieqnecuggftrfgrthhtvghrnhepteel ieefudffhffhtdetleeggeegfffhkeeuveetiefgudduvedutefggeeivdejnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhhitghhrggvlhes phgrqhhuihgvrhdrgiihiidpnhgspghrtghpthhtohepkedpmhhouggvpehsmhhtphhouh htpdhrtghpthhtohepuggrnhhivghlseihvghsqhhlrdhsvgdprhgtphhtthhopegvgigt lhhushhiohhnsehgmhgrihhlrdgtohhmpdhrtghpthhtohepughgrhhofihlvgihmhhlse hgmhgrihhlrdgtohhmpdhrtghpthhtohepthhglhesshhsshdrphhghhdrphgrrdhushdp rhgtphhtthhopehrohgsvghrthhmhhgrrghssehgmhgrihhlrdgtohhmpdhrtghpthhtoh epsgihrghvuhiikedusehgmhgrihhlrdgtohhmpdhrtghpthhtohephhhlihhnnhgrkhgr sehikhhirdhfihdprhgtphhtthhopehpghhsqhhlqdhhrggtkhgvrhhssehlihhsthhsrd hpohhsthhgrhgvshhqlhdrohhrgh X-ME-Proxy: Feedback-ID: i0fe9450f:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 3 Sep 2024 21:25:26 -0400 (EDT) Date: Wed, 4 Sep 2024 10:25:17 +0900 From: Michael Paquier To: Daniel Gustafsson Cc: Alexander Lakhin , David Rowley , Tom Lane , Robert Haas , Nazir Bilal Yavuz , Heikki Linnakangas , PostgreSQL Developers Subject: Re: Typos in the code and README Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Fscc7ytYvmJg0hmO" Content-Disposition: inline In-Reply-To: List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --Fscc7ytYvmJg0hmO Content-Type: multipart/mixed; boundary="AvuXwgiAM1+wO/wh" Content-Disposition: inline --AvuXwgiAM1+wO/wh Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Sep 03, 2024 at 12:00:13PM +0200, Daniel Gustafsson wrote: > I see your v17 typo fixes, and raise you a few more. Commit 31a98934d169 from > just now contains 2 (out of 3) sets of typos introduced in v17 so they should > follow along when you push the ones mentioned here. Is that really mandatory? I tend to worry about back branches only when this stuff is user-visible, like in the docs or error messages. This opinion varies for each individual, of course. That's just my lazy opinion. CommitTSSLRU -> CommitTsSLRU is user-visible, showing up in pg_stat_activity. Fixed this one with 08b9b9e043bb, as the tag for 17rc1 has been pushed. Picking f747bc18f7f2 and 75c5231a00f3 on REL_17_STABLE leads to the attached, I think, without the conflicts. -- Michael --AvuXwgiAM1+wO/wh Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-Fix-typos-and-grammar-in-code-comments-and-docs.patch" Content-Transfer-Encoding: quoted-printable =46rom f747bc18f7f205795177cce6a93e19169bd0467f Mon Sep 17 00:00:00 2001 =46rom: Michael Paquier Date: Tue, 3 Sep 2024 14:49:04 +0900 Subject: [PATCH 1/2] Fix typos and grammar in code comments and docs Author: Alexander Lakhin Discussion: https://postgr.es/m/f7e514cf-2446-21f1-a5d2-8c089a6e2168@gmail.= com --- src/include/utils/injection_point.h | 2 +- src/backend/access/transam/multixact.c | 2 +- src/backend/executor/execExprInterp.c | 2 +- src/backend/replication/logical/slotsync.c | 2 +- src/backend/storage/aio/read_stream.c | 2 +- src/backend/storage/lmgr/lock.c | 2 +- src/bin/pg_combinebackup/t/008_promote.pl | 4 ++-- src/bin/psql/common.c | 2 +- src/interfaces/libpq/fe-connect.c | 2 +- src/test/subscription/t/021_twophase.pl | 2 +- contrib/test_decoding/specs/skip_snapshot_restore.spec | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/utils/injection_point.h b/src/include/utils/inject= ion_point.h index 6e417cedc6..8041e4fe0f 100644 --- a/src/include/utils/injection_point.h +++ b/src/include/utils/injection_point.h @@ -12,7 +12,7 @@ #define INJECTION_POINT_H =20 /* - * Injections points require --enable-injection-points. + * Injection points require --enable-injection-points. */ #ifdef USE_INJECTION_POINTS #define INJECTION_POINT(name) InjectionPointRun(name) diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/tr= ansam/multixact.c index b7b47ef076..42ea9ba5b4 100644 --- a/src/backend/access/transam/multixact.c +++ b/src/backend/access/transam/multixact.c @@ -2009,7 +2009,7 @@ check_multixact_offset_buffers(int *newval, void **ex= tra, GucSource source) } =20 /* - * GUC check_hook for multixact_member_buffer + * GUC check_hook for multixact_member_buffers */ bool check_multixact_member_buffers(int *newval, void **extra, GucSource source) diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/e= xecExprInterp.c index c32ac7c509..ff76e10bd3 100644 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@ -4626,7 +4626,7 @@ ExecEvalJsonCoercionFinish(ExprState *state, ExprEval= Step *op) if (SOFT_ERROR_OCCURRED(&jsestate->escontext)) { /* - * jsestate->error or jsetate->empty being set means that the error + * jsestate->error or jsestate->empty being set means that the error * occurred when coercing the JsonBehavior value. Throw the error in * that case with the actual coercion error message shown in the * DETAIL part. diff --git a/src/backend/replication/logical/slotsync.c b/src/backend/repli= cation/logical/slotsync.c index ebfbaebe16..fe0478e373 100644 --- a/src/backend/replication/logical/slotsync.c +++ b/src/backend/replication/logical/slotsync.c @@ -83,7 +83,7 @@ * this flag is set. Note that we don't need to reset this variable as aft= er * promotion the slot sync worker won't be restarted because the pmState * changes to PM_RUN from PM_HOT_STANDBY and we don't support demoting - * primary without restarting the server. See MaybeStartSlotSyncWorker. + * primary without restarting the server. See LaunchMissingBackgroundProce= sses. * * The 'syncing' flag is needed to prevent concurrent slot syncs to avoid = slot * overwrites. diff --git a/src/backend/storage/aio/read_stream.c b/src/backend/storage/ai= o/read_stream.c index a6c50b2ae2..f04c788a46 100644 --- a/src/backend/storage/aio/read_stream.c +++ b/src/backend/storage/aio/read_stream.c @@ -450,7 +450,7 @@ read_stream_begin_relation(int flags, queue_size =3D max_pinned_buffers + 1; =20 /* - * Allocate the object, the buffers, the ios and per_data_data space in + * Allocate the object, the buffers, the ios and per_buffer_data space in * one big chunk. Though we have queue_size buffers, we want to be able * to assume that all the buffers for a single read are contiguous (i.e. * don't wrap around halfway through), so we allow temporary overflows of diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/loc= k.c index 0400a50777..ba77c71baa 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -398,7 +398,7 @@ InitLocks(void) =20 /* * Compute init/max size to request for lock hashtables. Note these - * calculations must agree with LockShmemSize! + * calculations must agree with LockManagerShmemSize! */ max_table_size =3D NLOCKENTS(); init_table_size =3D max_table_size / 2; diff --git a/src/bin/pg_combinebackup/t/008_promote.pl b/src/bin/pg_combine= backup/t/008_promote.pl index 1154a5d8b2..0ee96ff037 100644 --- a/src/bin/pg_combinebackup/t/008_promote.pl +++ b/src/bin/pg_combinebackup/t/008_promote.pl @@ -54,7 +54,7 @@ recovery_target_action =3D 'pause' EOM $node2->start(); =20 -# Wait until recoveery pauses, then promote. +# Wait until recovery pauses, then promote. $node2->poll_query_until('postgres', "SELECT pg_get_wal_replay_pause_state= () =3D 'paused';"); $node2->safe_psql('postgres', "SELECT pg_promote()"); =20 @@ -65,7 +65,7 @@ INSERT INTO mytable VALUES (2, 'blackberry'); EOM =20 # Now take an incremental backup. If WAL summarization didn't follow the -# timeline cange correctly, something should break at this point. +# timeline change correctly, something should break at this point. my $backup2path =3D $node1->backup_dir . '/backup2'; $node2->command_ok( [ 'pg_basebackup', '-D', $backup2path, '--no-sync', '-cfast', diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c index fe8e049c4c..ba8244aba2 100644 --- a/src/bin/psql/common.c +++ b/src/bin/psql/common.c @@ -1680,7 +1680,7 @@ ExecQueryAndProcessResults(const char *query, { /* * Display the current chunk of results, unless the output - * stream stopped working or we got cancelled. We skip use of + * stream stopped working or we got canceled. We skip use of * PrintQueryResult and go directly to printQuery, so that we * can pass the correct is_pager value and because we don't * want PrintQueryStatus to happen yet. Above, we rejected diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-co= nnect.c index 360d9a4547..01bd48a675 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -947,7 +947,7 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions) * Copy over option values from srcConn to dstConn * * Don't put anything cute here --- intelligence should be in - * connectOptions2 ... + * pqConnectOptions2 ... * * Returns true on success. On failure, returns false and sets error messa= ge of * dstConn. diff --git a/src/test/subscription/t/021_twophase.pl b/src/test/subscriptio= n/t/021_twophase.pl index e635be74c6..0cdafc9791 100644 --- a/src/test/subscription/t/021_twophase.pl +++ b/src/test/subscription/t/021_twophase.pl @@ -76,7 +76,7 @@ $node_publisher->safe_psql( INSERT INTO tab_full VALUES (11); PREPARE TRANSACTION 'test_prepared_tab_full';"); =20 -# Confirm the ERROR is reported becasue max_prepared_transactions is zero +# Confirm the ERROR is reported because max_prepared_transactions is zero $node_subscriber->wait_for_log( qr/ERROR: ( [A-Z0-9]+:)? prepared transactions are disabled/); =20 diff --git a/contrib/test_decoding/specs/skip_snapshot_restore.spec b/contr= ib/test_decoding/specs/skip_snapshot_restore.spec index 3f1fb6f02c..7b35dbcc9f 100644 --- a/contrib/test_decoding/specs/skip_snapshot_restore.spec +++ b/contrib/test_decoding/specs/skip_snapshot_restore.spec @@ -39,7 +39,7 @@ step "s2_get_changes_slot0" { SELECT data FROM pg_logical= _slot_get_changes('slot # serializes consistent snapshots to the disk at LSNs where are before # s0-transaction's commit. After s0-transaction commits, "s1_init" resumes= but # must not restore any serialized snapshots and will reach the consistent = state -# when decoding a RUNNING_XACT record generated after s0-transaction's com= mit. +# when decoding a RUNNING_XACTS record generated after s0-transaction's co= mmit. # We check if the get_changes on 'slot1' will not return any s0-transactio= n's # changes as its confirmed_flush_lsn will be after the s0-transaction's co= mmit # record. --=20 2.45.2 --AvuXwgiAM1+wO/wh Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-Fix-typos-in-code-comments-and-test-data.patch" Content-Transfer-Encoding: quoted-printable =46rom 75c5231a00f3a1cb84a18320f15fa0284d9b1235 Mon Sep 17 00:00:00 2001 =46rom: Daniel Gustafsson Date: Tue, 3 Sep 2024 11:33:38 +0200 Subject: [PATCH 2/2] Fix typos in code comments and test data The typos in 005_negotiate_encryption.pl and pg_combinebackup.c shall be backported to v17 where they were introduced. Backpatch-through: v17 Discussion: https://postgr.es/m/Ztaj7BkN4658OMxF@paquier.xyz --- src/bin/pg_combinebackup/pg_combinebackup.c | 2 +- src/interfaces/libpq/t/005_negotiate_encryption.pl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combi= nebackup/pg_combinebackup.c index a29ed23f3e..ea47c0a369 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -849,7 +849,7 @@ process_directory_recursively(Oid tsoid, * * We set is_pg_wal for the toplevel WAL directory and all of its * subdirectories, because those files are not included in the backup - * manifest and hence need special treatement. (Since incremental backup + * manifest and hence need special treatment. (Since incremental backup * does not exist in pre-v10 versions, we don't have to worry about the * old pg_xlog naming.) * diff --git a/src/interfaces/libpq/t/005_negotiate_encryption.pl b/src/inter= faces/libpq/t/005_negotiate_encryption.pl index c3f70d31bc..294730e360 100644 --- a/src/interfaces/libpq/t/005_negotiate_encryption.pl +++ b/src/interfaces/libpq/t/005_negotiate_encryption.pl @@ -239,7 +239,7 @@ testuser disable disable postgres co= nnect, authok . . require postgres connect, sslreject = -> fail . . . direct connect, directsslrej= ect -> fail =20 -# sslnegotiation=3Ddirect is not acccepted unless sslmode=3Drequire or str= onger +# sslnegotiation=3Ddirect is not accepted unless sslmode=3Drequire or stro= nger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail @@ -302,7 +302,7 @@ nossluser . disable postgres co= nnect, authok . . require postgres connect, sslaccept, a= uthfail -> fail . . require direct connect, directsslacc= ept, authfail -> fail =20 -# sslnegotiation=3Ddirect is not acccepted unless sslmode=3Drequire or str= onger +# sslnegotiation=3Ddirect is not accepted unless sslmode=3Drequire or stro= nger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail @@ -376,7 +376,7 @@ nogssuser disable disable postgres co= nnect, authok . . require postgres connect, gssaccept, a= uthfail -> fail # If both GSSAPI and sslmode are required, and GSS is not= available -> fail . . . direct connect, gssaccept, a= uthfail -> fail # If both GSSAPI and sslmode are required, and GSS is not= available -> fail =20 -# sslnegotiation=3Ddirect is not acccepted unless sslmode=3Drequire or str= onger +# sslnegotiation=3Ddirect is not accepted unless sslmode=3Drequire or stro= nger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail @@ -501,7 +501,7 @@ nossluser disable disable postgres co= nnect, authok . require * postgres connect, gssaccept, a= uthok -> gss . . require direct connect, gssaccept, a= uthok -> gss =20 -# sslnegotiation=3Ddirect is not acccepted unless sslmode=3Drequire or str= onger +# sslnegotiation=3Ddirect is not accepted unless sslmode=3Drequire or stro= nger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail --=20 2.45.2 --AvuXwgiAM1+wO/wh-- --Fscc7ytYvmJg0hmO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmbXtv0ACgkQnvQgOdby QH26Fw/+P1my2klBf4MeBu48BipOo0nfFK93KcsKicONnEUC3cMKX5jjoCPYYg3H 0xja7t/+aDvc0jP5EXaaJyGY7lW/g+9HOiwdSwE3P3gIl+AthQdsaQ6S5KuEY1yG sAcOlcj7T5xLxevXiUL3mmMuPSmf/r5GCkuahLC6+M/9SEb1QEP3bweLywCE3jUh tAbwXoSNNQJoApIMasK7jxUDaFaAZGbFoWP641r9lMVUiH7xDOtBzM9S6R/1MVog YPZKjXCrdgaEK3orCz1CU5PtN5xkkAL9HnqcfWwFS1zfeSxHzgny3HEPVowRdzv0 zzYEuCvoDkG8Zo4XA6+kFLjVCFjpx8EDx29/nQXnpHqHgl1RO4nLY+sLkfvw28b+ K83QSV1S418N53y1mrYykkuFxJWeJH88l+HN5R9pRKaDIonw6To30MDHWyaj1SB4 TC7MAYeQsRxlbsCBy+0INuF+S9JSRgM1seNYCQ2KYkRFvmOngvG3d+McVO5E/sr4 xtL2EdFAJWG9/gIwEIkMGuU4NdSSZlPNcn3suVGFyiXZVFIgrHqxhPI4jY///eKM XYD2fcKDGnjzxLvj3b7xnIfk1QtAWBBPqOx7vNlJJilqegkgbrW8nHLOCBNMf7aE gR4sT8dgD69b31b/drRDTmSbfi9ferkMUwVcvPIsd8hg9R0iu78= =FhoR -----END PGP SIGNATURE----- --Fscc7ytYvmJg0hmO--