Received: from malur.postgresql.org ([217.196.149.56])
	by arkaria.postgresql.org with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <pgsql-docs-owner+archive@lists.postgresql.org>)
	id 1qBhz7-0003Pi-GI
	for pgsql-docs@arkaria.postgresql.org; Tue, 20 Jun 2023 20:29:53 +0000
Received: from localhost ([127.0.0.1] helo=malur.postgresql.org)
	by malur.postgresql.org with esmtp (Exim 4.92)
	(envelope-from <pgsql-docs-owner+archive@lists.postgresql.org>)
	id 1qBhz6-0005nh-GC
	for pgsql-docs@arkaria.postgresql.org; Tue, 20 Jun 2023 20:29:52 +0000
Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29])
	by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256)
	(Exim 4.92)
	(envelope-from <bruce@momjian.us>)
	id 1qBhw3-0000tC-Th
	for pgsql-docs@lists.postgresql.org; Tue, 20 Jun 2023 20:26:43 +0000
Received: from momjian.us ([72.94.173.45])
	by magus.postgresql.org with esmtps  (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <bruce@momjian.us>)
	id 1qBhw1-003geo-3V
	for pgsql-docs@lists.postgresql.org; Tue, 20 Jun 2023 20:26:43 +0000
Received: from bruce by momjian.us with local (Exim 4.94.2)
	(envelope-from <bruce@momjian.us>)
	id 1qBhvz-008xeN-U1; Tue, 20 Jun 2023 16:26:39 -0400
Date: Tue, 20 Jun 2023 16:26:39 -0400
From: Bruce Momjian <bruce@momjian.us>
To: Will Mortensen <will@extrahop.com>
Cc: pgsql-docs@lists.postgresql.org
Subject: Re: [PATCH] two minor fixes to MVCC docs
Message-ID: <ZJILf8VGxxprQafq@momjian.us>
References: 
 <CAMpnoC4_WsY3gsY+ud-Z0GDbafR=K7t7cXn2gatEqFnsRNY3yQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: 
 <CAMpnoC4_WsY3gsY+ud-Z0GDbafR=K7t7cXn2gatEqFnsRNY3yQ@mail.gmail.com>
List-Id: <pgsql-docs.lists.postgresql.org>
List-Help: <https://lists.postgresql.org/manage/>
List-Subscribe: <https://lists.postgresql.org/manage/>
List-Post: <mailto:pgsql-docs@lists.postgresql.org>
List-Owner: <mailto:pgsql-docs-owner@lists.postgresql.org>
List-Archive: <https://www.postgresql.org/list/pgsql-docs>
Archived-At: 
 <https://www.postgresql.org/message-id/ZJILf8VGxxprQafq%40momjian.us>
Precedence: bulk


My apologies for not processing your December patch earlier, and I just
saw your partial patch post today.  Applied to master and PG 15 where
MERGE was added.

---------------------------------------------------------------------------

On Wed, Dec 28, 2022 at 04:02:58PM -0800, Will Mortensen wrote:
> Fix markup indentation and add a mention of MERGE.

> From 46977fbe5fa0a26ef77938a8fe30b9def062e8f8 Mon Sep 17 00:00:00 2001
> From: Will Mortensen <will@extrahop.com>
> Date: Sat, 27 Aug 2022 17:07:11 -0700
> Subject: [PATCH 1/6] doc: fix markup indentation in MVCC
> 
> ---
>  doc/src/sgml/mvcc.sgml | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
> index 337f6dd429..69b01d01b9 100644
> --- a/doc/src/sgml/mvcc.sgml
> +++ b/doc/src/sgml/mvcc.sgml
> @@ -109,8 +109,8 @@
>         dirty read
>         <indexterm><primary>dirty read</primary></indexterm>
>        </term>
> -     <listitem>
> -      <para>
> +      <listitem>
> +       <para>
>          A transaction reads data written by a concurrent uncommitted transaction.
>         </para>
>        </listitem>
> @@ -121,8 +121,8 @@
>         nonrepeatable read
>         <indexterm><primary>nonrepeatable read</primary></indexterm>
>        </term>
> -     <listitem>
> -      <para>
> +      <listitem>
> +       <para>
>          A transaction re-reads data it has previously read and finds that data
>          has been modified by another transaction (that committed since the
>          initial read).
> @@ -135,8 +135,8 @@
>         phantom read
>         <indexterm><primary>phantom read</primary></indexterm>
>        </term>
> -     <listitem>
> -      <para>
> +      <listitem>
> +       <para>
>          A transaction re-executes a query returning a set of rows that satisfy a
>          search condition and finds that the set of rows satisfying the condition
>          has changed due to another recently-committed transaction.
> @@ -149,8 +149,8 @@
>         serialization anomaly
>         <indexterm><primary>serialization anomaly</primary></indexterm>
>        </term>
> -     <listitem>
> -      <para>
> +      <listitem>
> +       <para>
>          The result of successfully committing a group of transactions
>          is inconsistent with all possible orderings of running those
>          transactions one at a time.
> -- 
> 2.25.1
> 

> From 7eaec62fd8665ba761114e8238f95f0f47924a21 Mon Sep 17 00:00:00 2001
> From: Will Mortensen <will@extrahop.com>
> Date: Sat, 27 Aug 2022 17:54:11 -0700
> Subject: [PATCH 2/6] doc: add mention of MERGE in MVCC
> 
> ---
>  doc/src/sgml/mvcc.sgml | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
> index 69b01d01b9..512e8b710d 100644
> --- a/doc/src/sgml/mvcc.sgml
> +++ b/doc/src/sgml/mvcc.sgml
> @@ -1750,9 +1750,9 @@ SELECT pg_advisory_lock(q.id) FROM
>       changes in the table.  A repeatable read transaction's snapshot is actually
>       frozen at the start of its first query or data-modification command
>       (<literal>SELECT</literal>, <literal>INSERT</literal>,
> -     <literal>UPDATE</literal>, or <literal>DELETE</literal>), so
> -     it is possible to obtain locks explicitly before the snapshot is
> -     frozen.
> +     <literal>UPDATE</literal>, <literal>DELETE</literal>, or
> +     <literal>MERGE</literal>), so it is possible to obtain locks explicitly
> +     before the snapshot is frozen.
>      </para>
>     </sect2>
>    </sect1>
> -- 
> 2.25.1
> 


-- 
  Bruce Momjian  <bruce@momjian.us>        https://momjian.us
  EDB                                      https://enterprisedb.com

  Only you can decide what is important to you.