Re: Conflict detection for multiple_unique_conflicts in logical replication

[vignesh C]

On Fri, 21 Mar 2025 at 16:44, Nisha Moond <nisha.moond...@gmail.com> wrote:
>
> On Fri, Mar 21, 2025 at 3:38 PM Amit Kapila <amit.kapil...@gmail.com> wrote:
> >
> > On Fri, Mar 21, 2025 at 1:48 PM Zhijie Hou (Fujitsu)
> > <houzj.f...@fujitsu.com> wrote:
> > >
> > > On Fri, Mar 21, 2025 at 12:50 PM Nisha Moond wrote:
> > >
> > > > Thanks, Hou-san, for the review and fix patches. I’ve incorporated
> > > > your suggestions.
> > > > Attached are the v7 patches, including patch 002, which implements
> > > > stats collection for 'multiple_unique_conflicts' in 
> > > > pg_stat_subscription_stats.
> > >
> > > Thanks for updating the patches.
> > >
> > > Here are some more comments:
> > >
> > > 1.
> > >
> > > The comments atop of ReportApplyConflict() should be updated to reflect 
> > > the
> > > updates made to the input parameters.
> > >
> >
> > Right, I also noticed this and updated it in the attached. Apart from
> > this, I have made a number of cosmetic changes in the attached. Please
> > review and include it in the next version unless you see any problem
> > with it.
> >
>
> Thanks for the review.
>
> I’ve incorporated the changes and also addressed Hou-san’s comments
> from [1] with suggested changes.
>
> Attached are the v8 patches.

Shouldn't these statements be the other way:
pass('multiple_unique_conflicts detected during update');
should have been:
pass('multiple_unique_conflicts detected during insert');

and
pass('multiple_unique_conflicts detected during insert');
should have been:
pass('multiple_unique_conflicts detected during update');

if you are ok with above change, the attached patch has the change for the same.

Regards,
Vignesh

diff --git a/src/test/subscription/t/035_conflicts.pl b/src/test/subscription/t/035_conflicts.pl
index f9778db7cc9..3a4d44e1d0e 100644
--- a/src/test/subscription/t/035_conflicts.pl
+++ b/src/test/subscription/t/035_conflicts.pl
@@ -76,7 +76,7 @@ $node_subscriber->wait_for_log(
 .*Key \(c\)=\(4\); existing local tuple \(4, 4, 4\); remote tuple \(2, 3, 4\)./,
 	$log_offset);
 
-pass('multiple_unique_conflicts detected during update');
+pass('multiple_unique_conflicts detected during insert');
 
 # Truncate table to get rid of the error
 $node_subscriber->safe_psql('postgres', "TRUNCATE conf_tab;");
@@ -108,6 +108,6 @@ $node_subscriber->wait_for_log(
 .*Key \(c\)=\(8\); existing local tuple \(8, 8, 8\); remote tuple \(6, 7, 8\)./,
 	$log_offset);
 
-pass('multiple_unique_conflicts detected during insert');
+pass('multiple_unique_conflicts detected during update');
 
 done_testing();