deal comments in pr

Signed-off-by: joccau <[email protected]>
pingcap · Sep 16, 2024 · 26ede03 · 26ede03
1 parent a1d1233
commit 26ede03
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/pkg/ddl/table_test.go b/pkg/ddl/table_test.go
@@ -83,7 +83,6 @@ func testRenameTable(
 func testRenameTables(t *testing.T, ctx sessionctx.Context, d ddl.ExecutorForTest, oldSchemaIDs, newSchemaIDs []int64, newTableNames []*pmodel.CIStr, oldTableIDs []int64, oldSchemaNames, oldTableNames []*pmodel.CIStr) *model.Job {
 	job := &model.Job{
 		Type:       model.ActionRenameTables,
-		Version:    model.GetJobVerInUse(),
 		BinlogInfo: &model.HistoryInfo{},
 		Args:       []any{oldSchemaIDs, newSchemaIDs, newTableNames, oldTableIDs, oldSchemaNames, oldTableNames},
 		CtxVars:    []any{append(oldSchemaIDs, newSchemaIDs...), oldTableIDs},

diff --git a/pkg/meta/model/job_args.go b/pkg/meta/model/job_args.go
@@ -378,7 +378,7 @@ func GetRenameTableArgs(job *Job) (*RenameTableArgs, error) {
 		newTableName  pmodel.CIStr
 	)
 
-	if job.Version <= JobVersion1 {
+	if job.Version == JobVersion1 {
 		// decode args and cache in args.
 		if len(job.Args) == 0 {
 			err := job.DecodeArgs(&oldSchemaID, &newTableName, &oldSchemaName)
@@ -401,11 +401,7 @@ func GetRenameTableArgs(job *Job) (*RenameTableArgs, error) {
 	}
 
 	// for version V2
-	argsV2, err := getOrDecodeArgsV2[*RenameTableArgs](job)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	return argsV2, nil
+	return getOrDecodeArgsV2[*RenameTableArgs](job)
 }
 
 // UpdateRenameTableArgs updates the rename table args.