maintain ut

Signed-off-by: joccau <[email protected]>
pingcap · Sep 14, 2024 · eb5bad5 · eb5bad5
1 parent e258be2
commit eb5bad5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/pkg/ddl/ddl_test.go b/pkg/ddl/ddl_test.go
@@ -208,13 +208,13 @@ func TestBuildJobDependence(t *testing.T) {
 	}()
 	ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnDDL)
 	// Add some non-add-index jobs.
-	job1 := &model.Job{ID: 1, TableID: 1, Type: model.ActionAddColumn}
-	job2 := &model.Job{ID: 2, TableID: 1, Type: model.ActionCreateTable}
-	job3 := &model.Job{ID: 3, TableID: 2, Type: model.ActionDropColumn}
-	job6 := &model.Job{ID: 6, TableID: 1, Type: model.ActionDropTable}
-	job7 := &model.Job{ID: 7, TableID: 2, Type: model.ActionModifyColumn}
-	job9 := &model.Job{ID: 9, SchemaID: 111, Type: model.ActionDropSchema}
-	job11 := &model.Job{ID: 11, TableID: 2, Type: model.ActionRenameTable, Args: []any{int64(111), "old db name"}}
+	job1 := &model.Job{ID: 1, TableID: 1, Version: model.JobVersion1, Type: model.ActionAddColumn}
+	job2 := &model.Job{ID: 2, TableID: 1, Version: model.JobVersion1, Type: model.ActionCreateTable}
+	job3 := &model.Job{ID: 3, TableID: 2, Version: model.JobVersion1, Type: model.ActionDropColumn}
+	job6 := &model.Job{ID: 6, TableID: 1, Version: model.JobVersion1, Type: model.ActionDropTable}
+	job7 := &model.Job{ID: 7, TableID: 2, Version: model.JobVersion1, Type: model.ActionModifyColumn}
+	job9 := &model.Job{ID: 9, SchemaID: 111, Version: model.JobVersion1, Type: model.ActionDropSchema}
+	job11 := &model.Job{ID: 11, TableID: 2, Version: model.JobVersion1, Type: model.ActionRenameTable, Args: []any{int64(111), "old db name"}}
 	err := kv.RunInNewTxn(ctx, store, false, func(ctx context.Context, txn kv.Transaction) error {
 		m := meta.NewMeta(txn)
 		require.NoError(t, m.EnQueueDDLJob(job1))

diff --git a/pkg/meta/model/job_args.go b/pkg/meta/model/job_args.go
@@ -261,21 +261,22 @@ func getTruncateTableArgs(job *Job, argsOfFinished bool) (*TruncateTableArgs, er
 
 // DropColumnArgs is the arguments of dropping column job.
 type DropColumnArgs struct {
-	ColName  model.CIStr
-	IfExists bool
+	ColName  model.CIStr `json:"column_name,omitempty"`
+	IfExists bool        `json:"if_exists,omitempty"`
 	// indexIDs is used to make sure we don't truncate args when decoding the rawArgs.
-	IndexIDs     []int64
-	PartitionIDs []int64
+	IndexIDs     []int64 `json:"index_ids,omitempty"`
+	PartitionIDs []int64 `json:"partition_ids,omitempty"`
 }
 
 func (a *DropColumnArgs) fillJob(job *Job) {
-	if job.Version == JobVersion1 {
+	if job.Version <= JobVersion1 {
 		job.Args = []any{a.ColName, a.IfExists, a.IndexIDs, a.PartitionIDs}
 	} else {
 		job.Args = []any{a}
 	}
 }
 
+// GetDropColumnArgs gets the args for drop column ddl.
 func GetDropColumnArgs(job *Job) (*DropColumnArgs, error) {
 	var (
 		colName      model.CIStr