From d717d1de3e4010d0188b7e16bfe413e23aa4f884 Mon Sep 17 00:00:00 2001 From: wlwilliamx Date: Tue, 19 Nov 2024 16:17:48 +0800 Subject: [PATCH] ddl puller: resolve merge conflicts --- cdc/puller/ddl_puller.go | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/cdc/puller/ddl_puller.go b/cdc/puller/ddl_puller.go index 2759ff76023..4e7fd940550 100644 --- a/cdc/puller/ddl_puller.go +++ b/cdc/puller/ddl_puller.go @@ -337,23 +337,6 @@ func (p *ddlJobPullerImpl) handleJob(job *timodel.Job) (skip bool, err error) { return false, nil } -<<<<<<< HEAD -======= - if job.BinlogInfo.FinishedTS <= p.getResolvedTs() { - log.Info("ddl job finishedTs less than puller resolvedTs,"+ - "discard the ddl job", - zap.String("namespace", p.changefeedID.Namespace), - zap.String("changefeed", p.changefeedID.ID), - zap.String("schema", job.SchemaName), - zap.String("table", job.TableName), - zap.Uint64("startTs", job.StartTS), - zap.Uint64("finishedTs", job.BinlogInfo.FinishedTS), - zap.String("query", job.Query), - zap.Uint64("pullerResolvedTs", p.getResolvedTs())) - return true, nil - } - ->>>>>>> b38183b086 (ddl_puller.go(ticdc): fix DDLs are ignored when schema versions are out of order (#11733)) defer func() { if skip && err == nil { log.Info("ddl job schema or table does not match, discard it", @@ -379,8 +362,7 @@ func (p *ddlJobPullerImpl) handleJob(job *timodel.Job) (skip bool, err error) { errors.Trace(err), job.Query, job.StartTS, job.StartTS) } - if job.BinlogInfo.FinishedTS <= p.getResolvedTs() || - job.BinlogInfo.SchemaVersion <= p.schemaVersion { + if job.BinlogInfo.FinishedTS <= p.getResolvedTs() { log.Info("ddl job finishedTs less than puller resolvedTs,"+ "discard the ddl job", zap.Uint64("jobFinishedTS", job.BinlogInfo.FinishedTS),