From 26ede032677fc35ec3201d8038ef4abfc128e641 Mon Sep 17 00:00:00 2001 From: joccau Date: Mon, 16 Sep 2024 12:08:50 +0800 Subject: [PATCH] deal comments in pr Signed-off-by: joccau --- pkg/ddl/table_test.go | 1 - pkg/meta/model/job_args.go | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/ddl/table_test.go b/pkg/ddl/table_test.go index e3006a3ade29f..08121b207eeb4 100644 --- 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 index 9aabd96e7d767..b21fae9f6fa8b 100644 --- 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.