From 66dab4059c010435d41fa7b548e7d4cf43e6e1be Mon Sep 17 00:00:00 2001 From: Hou Zhijie Date: Thu, 20 Mar 2025 18:52:59 +0800 Subject: [PATCH] cosmetic changes --- doc/src/sgml/logical-replication.sgml | 12 ++++++------ src/backend/executor/execReplication.c | 12 ++++++------ src/backend/replication/logical/conflict.c | 8 ++++---- src/include/replication/conflict.h | 6 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml index 4817206af7d..518520d3ff4 100644 --- a/doc/src/sgml/logical-replication.sgml +++ b/doc/src/sgml/logical-replication.sgml @@ -1881,12 +1881,12 @@ test_sub=# SELECT * from tab_gen_to_gen; multiple_unique_conflicts - Inserting a row or updating values of a row violates more than one - NOT DEFERRABLE unique constraint. Note that to log - the origin and commit timestamp details of the conflicting key, - track_commit_timestamp - should be enabled on the subscriber. In this case, an error will be - raised until the conflict is resolved manually. + Inserting or updating a row violates multiple + NOT DEFERRABLE unique constraints. Note that to log + the origin and commit timestamp details of conflicting keys, ensure + that track_commit_timestamp + is enabled on the subscriber. In this case, an error will be raised until + the conflict is resolved manually. diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index efd93cda69a..a2a0ab90ab0 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -494,8 +494,8 @@ CheckAndReportConflict(ResultRelInfo *resultRelInfo, EState *estate, TupleTableSlot *searchslot, TupleTableSlot *remoteslot) { int conflicts = 0; - List *conflictSlots = NIL; - List *conflictIndexes = NIL; + List *conflictslots = NIL; + List *conflictindexes = NIL; List *localxmins = NIL; List *localorigins = NIL; List *localts = NIL; @@ -518,8 +518,8 @@ CheckAndReportConflict(ResultRelInfo *resultRelInfo, EState *estate, * Add the conflict slot, index, and the transaction info to the * respective lists. */ - conflictSlots = lappend(conflictSlots, conflictslot); - conflictIndexes = lappend_oid(conflictIndexes, uniqueidx); + conflictslots = lappend(conflictslots, conflictslot); + conflictindexes = lappend_oid(conflictindexes, uniqueidx); localxmins = lappend_xid(localxmins, xmin); localorigins = lappend_int(localorigins, origin); localts = lappend(localts, DatumGetPointer(Int64GetDatum(committs))); @@ -532,8 +532,8 @@ CheckAndReportConflict(ResultRelInfo *resultRelInfo, EState *estate, if (conflicts) ReportApplyConflict(estate, resultRelInfo, ERROR, conflicts > 1 ? CT_MULTIPLE_UNIQUE_CONFLICTS : type, - searchslot, conflictSlots, remoteslot, - conflictIndexes, localxmins, localorigins, localts); + searchslot, conflictslots, remoteslot, + conflictindexes, localxmins, localorigins, localts); } /* diff --git a/src/backend/replication/logical/conflict.c b/src/backend/replication/logical/conflict.c index 2074ef17321..4b50467373d 100644 --- a/src/backend/replication/logical/conflict.c +++ b/src/backend/replication/logical/conflict.c @@ -91,13 +91,13 @@ GetTupleTransactionInfo(TupleTableSlot *localslot, TransactionId *xmin, * 'searchslot' should contain the tuple used to search the local tuple to be * updated or deleted. * - * 'conflictSlots' list contain the existing local tuples, if any, that + * 'conflictslots' list contains the existing local tuples, if any, that * conflicts with the remote tuple. 'localxmins', 'localorigins', and 'localts' * provide the transaction information related to the existing local tuples. * * 'remoteslot' should contain the remote new tuple, if any. * - * The 'conflictIndexes' list represents the OIDs of the unique index that + * The 'conflictindexes' list represents the OIDs of the unique index that * triggered the constraint violation error. We use this to report the key * values for conflicting tuple. * @@ -107,8 +107,8 @@ GetTupleTransactionInfo(TupleTableSlot *localslot, TransactionId *xmin, void ReportApplyConflict(EState *estate, ResultRelInfo *relinfo, int elevel, ConflictType type, TupleTableSlot *searchslot, - List *conflictSlots, TupleTableSlot *remoteslot, - List *conflictIndexes, List *localxmins, + List *conflictslots, TupleTableSlot *remoteslot, + List *conflictindexes, List *localxmins, List *localorigins, List *localts) { int conflictNum = 0; diff --git a/src/include/replication/conflict.h b/src/include/replication/conflict.h index bba7f7156b5..f32c3266719 100644 --- a/src/include/replication/conflict.h +++ b/src/include/replication/conflict.h @@ -60,9 +60,9 @@ extern bool GetTupleTransactionInfo(TupleTableSlot *localslot, extern void ReportApplyConflict(EState *estate, ResultRelInfo *relinfo, int elevel, ConflictType type, TupleTableSlot *searchslot, - List *conflictSlots, + List *conflictslots, TupleTableSlot *remoteslot, - List *conflictIndexes, List *localxmin, - List *localorigin, List *localts); + List *conflictindexes, List *localxmins, + List *localorigins, List *localts); extern void InitConflictIndexes(ResultRelInfo *relInfo); #endif -- 2.30.0.windows.2