Skip to content

Commit

Permalink
ddl_puller.go: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
wlwilliamx committed Dec 23, 2024
1 parent 5181af3 commit db26a88
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions cdc/puller/ddl_puller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
Expand All @@ -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)
}
Expand Down

0 comments on commit db26a88

Please sign in to comment.