From: Justin Pryzby <pryzby@telsasoft.com>
To: Amit Kapila <amit.kapila16@gmail.com>
Cc: Michael Paquier <michael@paquier.xyz>
Cc: pgsql-hackers <pgsql-hackers@postgresql.org>
Subject: Re: typos in comments and user docs
Date: Thu, 6 Feb 2020 22:17:06 -0600
Message-ID: <20200207041706.GO403@telsasoft.com> (raw)
In-Reply-To: <CAA4eK1JXPcNLiQ+cWQt6-0U5F+2vSy7EjQ8R+qukioypeneu-Q@mail.gmail.com>
References: <20200206021432.GA24549@telsasoft.com>
<CAA4eK1+-O-Qg_3s0Sae6Yb64npTNgZUJB2UDcc5UA_b9VOm9Xw@mail.gmail.com>
<20200206051502.GG23913@paquier.xyz>
<CAA4eK1+pNaW+bpj65Y1aXr6zfxDCqK58K=6XFpuspR6fa9s3QQ@mail.gmail.com>
<20200206135640.GG403@telsasoft.com>
<CAA4eK1J9QhAK8NmZmSdBSA9Cci1tz3XfEiv4u3QnmRJTL0tTrQ@mail.gmail.com>
<20200207031126.GN403@telsasoft.com>
<CAA4eK1JXPcNLiQ+cWQt6-0U5F+2vSy7EjQ8R+qukioypeneu-Q@mail.gmail.com>
On Fri, Feb 07, 2020 at 09:26:04AM +0530, Amit Kapila wrote:
> On Fri, Feb 7, 2020 at 8:41 AM Justin Pryzby <pryzby@telsasoft.com> wrote:
> >
> > On Fri, Feb 07, 2020 at 08:33:40AM +0530, Amit Kapila wrote:
> > > On Thu, Feb 6, 2020 at 7:26 PM Justin Pryzby <pryzby@telsasoft.com> wrote:
> > > >
> > > > On Thu, Feb 06, 2020 at 04:43:18PM +0530, Amit Kapila wrote:
> > > > > On Thu, Feb 6, 2020 at 10:45 AM Michael Paquier <michael@paquier.xyz> wrote:
> > > > > >
> > > > > > On Thu, Feb 06, 2020 at 08:47:14AM +0530, Amit Kapila wrote:
> > > > > > > Your changes look fine to me on the first read. I will push this to
> > > > > > > HEAD unless there are any objections. If we want them in
> > > > > > > back-branches, we might want to probably segregate the changes based
> > > > > > > on the branch until those apply.
> > > > > >
> > > > > > +1. It would be nice to back-patch the user-visible changes in the
> > > > > > docs.
> > > > > >
> > > > >
> > > > > Fair enough, Justin, is it possible for you to segregate the changes
> > > > > that can be backpatched?
> > > >
> > > > Looks like the whole patch can be applied to master and v12 [0].
> > >
>
> I tried your patch master and it failed to apply.
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file doc/src/sgml/bloom.sgml
> (Stripping trailing CRs from patch; use --binary to disable.)
> patching file doc/src/sgml/config.sgml
> Hunk #1 FAILED at 4318.
> 1 out of 1 hunk FAILED -- saving rejects to file doc/src/sgml/config.sgml.rej
I think you applied the first patch, which I corrected here.
https://www.postgresql.org/message-id/20200206135640.GG403%40telsasoft.com
Just rechecked it works for master and v12.
$ git checkout -b test2 origin/master
Branch test2 set up to track remote branch master from origin.
Switched to a new branch 'test2'
$ patch -p1 <0001-spelling-and-typos.patch
patching file doc/src/sgml/bloom.sgml
patching file doc/src/sgml/ref/alter_table.sgml
patching file doc/src/sgml/sources.sgml
patching file src/backend/access/transam/README.parallel
patching file src/backend/storage/buffer/bufmgr.c
patching file src/backend/storage/sync/sync.c
patching file src/include/access/tableam.h
$ patch -p1 <0001-spelling-and-typos.patch
patching file doc/src/sgml/bloom.sgml
patching file doc/src/sgml/ref/alter_table.sgml
Hunk #1 succeeded at 220 (offset -2 lines).
patching file doc/src/sgml/sources.sgml
patching file src/backend/access/transam/README.parallel
patching file src/backend/storage/buffer/bufmgr.c
Hunk #1 succeeded at 4268 (offset -23 lines).
patching file src/backend/storage/sync/sync.c
patching file src/include/access/tableam.h
Hunk #1 succeeded at 1167 (offset -18 lines).
The bloom patch there works for v11.
Attached now another version for v10-.
Attachments:0001-Bloom-patch-for-v10-and-v9.6.patch (text/x-diff, 875B) download
From 43c6b9ec80d26a858387ac657043988b8b52e812 Mon Sep 17 00:00:00 2001
From: Justin Pryzby <pryzbyj@telsasoft.com>
Date: Thu, 6 Feb 2020 22:14:20 -0600
Subject: [PATCH] Bloom patch for v10 and v9.6
---
doc/src/sgml/bloom.sgml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/src/sgml/bloom.sgml b/doc/src/sgml/bloom.sgmlindex 87d0ad7..84da235 100644--- a/doc/src/sgml/bloom.sgml+++ b/doc/src/sgml/bloom.sgml@@ -65,7 +65,7 @@
<para>
Number of bits generated for each index column. Each parameter's name
refers to the number of the index column that it controls. The default
- is <literal>2</> bits and maximum is <literal>4095</>. Parameters for+ is <literal>2</> bits and the maximum is <literal>4095</>. Parameters for
index columns not actually used are ignored.
</para>
</listitem>
--
2.7.4
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: pryzby@telsasoft.com, amit.kapila16@gmail.com, michael@paquier.xyz
Subject: Re: typos in comments and user docs
In-Reply-To: <20200207041706.GO403@telsasoft.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox