From db26a880b770bfc1cb804943d777563a9616f621 Mon Sep 17 00:00:00 2001
From: wlwilliamx <wlwilliamx@gmail.com>
Date: Mon, 23 Dec 2024 12:04:05 +0800
Subject: [PATCH] ddl_puller.go: resolve conflicts

---
 cdc/puller/ddl_puller.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cdc/puller/ddl_puller.go b/cdc/puller/ddl_puller.go
index e552bb2ba78..e514411e290 100644
--- a/cdc/puller/ddl_puller.go
+++ b/cdc/puller/ddl_puller.go
@@ -195,7 +195,7 @@ func (p *ddlJobPullerImpl) handleRawKVEntry(ctx context.Context, ddlRawKV *model
 		}
 	}
 
-	job, err := p.unmarshalDDL(ctx, ddlRawKV)
+	job, err := p.unmarshalDDL(ddlRawKV)
 	if err != nil {
 		return errors.Trace(err)
 	}
@@ -232,12 +232,12 @@ func (p *ddlJobPullerImpl) handleRawKVEntry(ctx context.Context, ddlRawKV *model
 	return nil
 }
 
-func (p *ddlJobPullerImpl) unmarshalDDL(ctx context.Context, rawKV *model.RawKVEntry) (*timodel.Job, error) {
+func (p *ddlJobPullerImpl) unmarshalDDL(rawKV *model.RawKVEntry) (*timodel.Job, error) {
 	if rawKV.OpType != model.OpTypePut {
 		return nil, nil
 	}
 	if p.ddlTableInfo == nil && !entry.IsLegacyFormatJob(rawKV) {
-		err := p.initDDLTableInfo(ctx)
+		err := p.initDDLTableInfo()
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
@@ -254,7 +254,7 @@ func (p *ddlJobPullerImpl) setResolvedTs(ts uint64) {
 	atomic.StoreUint64(&p.resolvedTs, ts)
 }
 
-func (p *ddlJobPullerImpl) initDDLTableInfo(ctx context.Context) error {
+func (p *ddlJobPullerImpl) initDDLTableInfo() error {
 	version, err := p.kvStorage.CurrentVersion(tidbkv.GlobalTxnScope)
 	if err != nil {
 		return errors.Trace(err)
@@ -271,7 +271,7 @@ func (p *ddlJobPullerImpl) initDDLTableInfo(ctx context.Context) error {
 		return errors.Trace(err)
 	}
 
-	tbls, err := snap.ListTables(ctx, db.ID)
+	tbls, err := snap.ListTables(db.ID)
 	if err != nil {
 		return errors.Trace(err)
 	}