Skip to content

Commit 641f0ae

Browse files
author
joccau
committed
maintain ut
Signed-off-by: joccau <[email protected]>
1 parent e258be2 commit 641f0ae

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkg/ddl/ddl_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,13 @@ func TestBuildJobDependence(t *testing.T) {
208208
}()
209209
ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnDDL)
210210
// Add some non-add-index jobs.
211-
job1 := &model.Job{ID: 1, TableID: 1, Type: model.ActionAddColumn}
212-
job2 := &model.Job{ID: 2, TableID: 1, Type: model.ActionCreateTable}
213-
job3 := &model.Job{ID: 3, TableID: 2, Type: model.ActionDropColumn}
214-
job6 := &model.Job{ID: 6, TableID: 1, Type: model.ActionDropTable}
215-
job7 := &model.Job{ID: 7, TableID: 2, Type: model.ActionModifyColumn}
216-
job9 := &model.Job{ID: 9, SchemaID: 111, Type: model.ActionDropSchema}
217-
job11 := &model.Job{ID: 11, TableID: 2, Type: model.ActionRenameTable, Args: []any{int64(111), "old db name"}}
211+
job1 := &model.Job{ID: 1, TableID: 1, Version: model.JobVersion1, Type: model.ActionAddColumn}
212+
job2 := &model.Job{ID: 2, TableID: 1, Version: model.JobVersion1, Type: model.ActionCreateTable}
213+
job3 := &model.Job{ID: 3, TableID: 2, Version: model.JobVersion1, Type: model.ActionDropColumn}
214+
job6 := &model.Job{ID: 6, TableID: 1, Version: model.JobVersion1, Type: model.ActionDropTable}
215+
job7 := &model.Job{ID: 7, TableID: 2, Version: model.JobVersion1, Type: model.ActionModifyColumn}
216+
job9 := &model.Job{ID: 9, SchemaID: 111, Version: model.JobVersion1, Type: model.ActionDropSchema}
217+
job11 := &model.Job{ID: 11, TableID: 2, Version: model.JobVersion1, Type: model.ActionRenameTable, Args: []any{int64(111), "old db name"}}
218218
err := kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
219219
m := meta.NewMeta(txn)
220220
require.NoError(t, m.EnQueueDDLJob(job1))

pkg/meta/model/job_args.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ type DropColumnArgs struct {
269269
}
270270

271271
func (a *DropColumnArgs) fillJob(job *Job) {
272-
if job.Version == JobVersion1 {
272+
if job.Version <= JobVersion1 {
273273
job.Args = []any{a.ColName, a.IfExists, a.IndexIDs, a.PartitionIDs}
274274
} else {
275275
job.Args = []any{a}

0 commit comments

Comments
 (0)