This is an automated cherry-pick of pingcap#10897

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Apr 26, 2024 · 92498aa · 92498aa
1 parent 986ebf7
commit 92498aa
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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{}),
 	}