From 92498aa8ba7641bdf79ee230577b86eb277e8849 Mon Sep 17 00:00:00 2001 From: CharlesCheung <61726649+CharlesCheung96@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:31:52 +0800 Subject: [PATCH] This is an automated cherry-pick of #10897 Signed-off-by: ti-chi-bot --- pkg/causality/conflict_detector.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/causality/conflict_detector.go b/pkg/causality/conflict_detector.go index 0ad209c5106..849bb1ed296 100644 --- a/pkg/causality/conflict_detector.go +++ b/pkg/causality/conflict_detector.go @@ -57,8 +57,13 @@ func NewConflictDetector[Worker worker[Txn], Txn txnEvent]( workers: workers, slots: internal.NewSlots[*internal.Node](numSlots), numSlots: numSlots, +<<<<<<< HEAD notifiedNodes: chann.NewDrainableChann[func()](), garbageNodes: chann.NewDrainableChann[txnFinishedEvent](), +======= + notifiedNodes: chann.NewAutoDrainChann[func()](), + garbageNodes: chann.NewAutoDrainChann[txnFinishedEvent](), +>>>>>>> e47549bd72 (sink(ticdc): Revert changes related to the conflict detector (#10897)) closeCh: make(chan struct{}), }