database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Rename the conflict types for the origin differ cases.

Browse Source 
The conflict types 'update_differ' and 'delete_differ' indicate that a row
to be modified was previously altered by another origin. Rename those to
'update_origin_differs' and 'delete_origin_differs' to clarify their
meaning.

Author: Hou Zhijie
Reviewed-by: Shveta Malik, Peter Smith
Discussion: https://postgr.es/m/CAA4eK1+HEKwG_UYt4Zvwh5o_HoCKCjEGesRjJX38xAH3OxuuYA@mail.gmail.com
This commit is contained in:
Amit Kapila
2024-08-29 09:12:12 +05:30
parent 9d90e2bdaf
commit 640178c92e
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/logical-replication.sgml
View File

@@ -1599,7 +1599,7 @@ test_sub=# SELECT * FROM t1 ORDER BY id;
</listitem>
</varlistentry>
<varlistentry>
<term><literal>update_differ</literal></term>
<term><literal>update_origin_differs</literal></term>
<listitem>
<para>
Updating a row that was previously modified by another origin.
@@ -1637,7 +1637,7 @@ test_sub=# SELECT * FROM t1 ORDER BY id;
</listitem>
</varlistentry>
<varlistentry>
<term><literal>delete_differ</literal></term>
<term><literal>delete_origin_differs</literal></term>
<listitem>
<para>
Deleting a row that was previously modified by another origin. Note that
@@ -1723,7 +1723,7 @@ DETAIL: <replaceable class="parameter">detailed_explanation</replaceable>.
<para>
The <literal>existing local tuple</literal> section includes the local
tuple if its origin differs from the remote tuple for
<literal>update_differ</literal> or <literal>delete_differ</literal>
<literal>update_origin_differs</literal> or <literal>delete_origin_differs</literal>
conflicts, or if the key value conflicts with the remote tuple for
<literal>insert_exists</literal> or <literal>update_exists</literal>
conflicts.