make build

Signed-off-by: joccau <zak.zhao@pingcap.cn>
pingcap · Sep 20, 2024 · 6ceb370 · 6ceb370
1 parent 9cb1723
commit 6ceb370
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/pkg/ddl/executor.go b/pkg/ddl/executor.go
@@ -2157,11 +2157,13 @@ func (e *executor) RebaseAutoID(ctx sessionctx.Context, ident ast.Ident, newBase
 		CDCWriteSource: ctx.GetSessionVars().CDCWriteSource,
 		SQLMode:        ctx.GetSessionVars().SQLMode,
 	}
-	job.FillArgs(&model.RebaseAutoIDArgs{
+	args := &model.RebaseAutoIDArgs{
 		NewBase: newBase,
 		Force:   force,
-	})
-	err = e.DoDDLJob(ctx, job)
+	}
+	// need fill args, the job will be pushed subjob.
+	job.FillArgs(args)
+	err = e.doDDLJob2(ctx, job, args)
 	return errors.Trace(err)
 }
 

diff --git a/pkg/meta/model/job_args.go b/pkg/meta/model/job_args.go
@@ -18,7 +18,6 @@ import (
 	"encoding/json"
 
 	"github.com/pingcap/errors"
-	"github.com/pingcap/tidb/pkg/parser/model"
 	pmodel "github.com/pingcap/tidb/pkg/parser/model"
 	"github.com/pingcap/tidb/pkg/util/intest"
 )
@@ -558,10 +557,8 @@ type ModifyTableCharsetAndCollateArgs struct {
 
 func (a *ModifyTableCharsetAndCollateArgs) fillJob(job *Job) {
 	intest.Assert(job.Version == JobVersion1 || job.Version == JobVersion2, "job version is invalid")
-
 	if job.Version == JobVersion1 {
 		job.Args = []any{a.ToCharset, a.ToCollate, a.NeedsOverwriteCols}
-
 	} else {
 		job.Args = []any{a}
 	}
@@ -583,7 +580,7 @@ func GetModifyTableCharsetAndCollateArgs(job *Job) (*ModifyTableCharsetAndCollat
 
 // AlterIndexVisibilityArgs is the arguments for ActionAlterIndexVisibility ddl.
 type AlterIndexVisibilityArgs struct {
-	IndexName model.CIStr
+	IndexName pmodel.CIStr
 	Invisible bool
 }
 
@@ -601,7 +598,7 @@ func (a *AlterIndexVisibilityArgs) fillJob(job *Job) {
 func GetAlterIndexVisibilityArgs(job *Job) (*AlterIndexVisibilityArgs, error) {
 	if job.Version == JobVersion1 {
 		var (
-			indexName model.CIStr
+			indexName pmodel.CIStr
 			invisible bool
 		)
 		if err := job.DecodeArgs(&indexName, &invisible); err != nil {