From b38183b086110e54888ead12b2e2bb6f305949da Mon Sep 17 00:00:00 2001
From: wlwilliamx <53336371+wlwilliamx@users.noreply.github.com>
Date: Fri, 15 Nov 2024 20:08:08 +0800
Subject: [PATCH] ddl_puller.go(ticdc): fix DDLs are ignored when schema
 versions are out of order (#11733)

close pingcap/tiflow#11714
---
 cdc/puller/ddl_puller.go | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cdc/puller/ddl_puller.go b/cdc/puller/ddl_puller.go
index f4b9e456a62..f9fc521f3d8 100644
--- a/cdc/puller/ddl_puller.go
+++ b/cdc/puller/ddl_puller.go
@@ -73,7 +73,6 @@ type ddlJobPullerImpl struct {
 	kvStorage     tidbkv.Storage
 	schemaStorage entry.SchemaStorage
 	resolvedTs    uint64
-	schemaVersion int64
 	filter        filter.Filter
 	// ddlTableInfo is initialized when receive the first concurrent DDL job.
 	ddlTableInfo *entry.DDLTableInfo
@@ -317,8 +316,7 @@ func (p *ddlJobPullerImpl) handleJob(job *timodel.Job) (skip bool, err error) {
 		return false, nil
 	}
 
-	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.String("namespace", p.changefeedID.Namespace),
@@ -480,7 +478,6 @@ func (p *ddlJobPullerImpl) handleJob(job *timodel.Job) (skip bool, err error) {
 			errors.Trace(err), job.Query, job.StartTS, job.StartTS)
 	}
 	p.setResolvedTs(job.BinlogInfo.FinishedTS)
-	p.schemaVersion = job.BinlogInfo.SchemaVersion
 
 	return p.checkIneligibleTableDDL(snap, job)
 }