From 640178c92e3f6c74d275369b291b507834f1309e Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Thu, 29 Aug 2024 09:12:12 +0530 Subject: Rename the conflict types for the origin differ cases. 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 --- doc/src/sgml/logical-replication.sgml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/src') diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml index bc095d01c00..46917f9f94f 100644 --- a/doc/src/sgml/logical-replication.sgml +++ b/doc/src/sgml/logical-replication.sgml @@ -1599,7 +1599,7 @@ test_sub=# SELECT * FROM t1 ORDER BY id; - update_differ + update_origin_differs Updating a row that was previously modified by another origin. @@ -1637,7 +1637,7 @@ test_sub=# SELECT * FROM t1 ORDER BY id; - delete_differ + delete_origin_differs Deleting a row that was previously modified by another origin. Note that @@ -1723,7 +1723,7 @@ DETAIL: detailed_explanation. The existing local tuple section includes the local tuple if its origin differs from the remote tuple for - update_differ or delete_differ + update_origin_differs or delete_origin_differs conflicts, or if the key value conflicts with the remote tuple for insert_exists or update_exists conflicts. -- cgit v1.2.3