From 530f87d6cd1afdffbeeeced835411a7e7bbe636b Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Sun, 1 Aug 2021 23:02:08 +0800 Subject: [PATCH] Resolve conflicts --- cdc/processor/pipeline/sink.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cdc/processor/pipeline/sink.go b/cdc/processor/pipeline/sink.go index 912199f5faa..ffd3d10fdb6 100644 --- a/cdc/processor/pipeline/sink.go +++ b/cdc/processor/pipeline/sink.go @@ -142,9 +142,6 @@ func (n *sinkNode) flushSink(ctx pipeline.NodeContext, resolvedTs model.Ts) (err } func (n *sinkNode) emitEvent(ctx pipeline.NodeContext, event *model.PolymorphicEvent) error { -<<<<<<< HEAD - n.eventBuffer = append(n.eventBuffer, event) -======= if event == nil || event.Row == nil { return nil } @@ -173,7 +170,6 @@ func (n *sinkNode) emitEvent(ctx pipeline.NodeContext, event *model.PolymorphicE n.eventBuffer = append(n.eventBuffer, event) } ->>>>>>> f2526c1e (sink(refactor): Refine functions and improve event splitting code (#2367)) if len(n.eventBuffer) >= defaultSyncResolvedBatch { if err := n.flushRow2Sink(ctx); err != nil { return errors.Trace(err)