From 0e8e57e243a8375040c1b827e269313dfe260059 Mon Sep 17 00:00:00 2001 From: Hangjie Mo Date: Wed, 23 Mar 2022 17:18:04 +0800 Subject: [PATCH] ddl: fix `TestCancelJob` and `TestShowIndex` tests (#53) --- ddl/cancel_ddl_test.go | 2 +- ddl/index.go | 3 ++- ddl/multi_schema_change_test.go | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ddl/cancel_ddl_test.go b/ddl/cancel_ddl_test.go index ce6bbba83ac20..30c0b55a088c1 100644 --- a/ddl/cancel_ddl_test.go +++ b/ddl/cancel_ddl_test.go @@ -758,7 +758,7 @@ func buildDropColumnJob(dbInfo *model.DBInfo, tblInfo *model.TableInfo, colName Type: model.ActionDropColumn, BinlogInfo: &model.HistoryInfo{}, MultiSchemaInfo: &model.MultiSchemaInfo{}, - Args: []interface{}{model.NewCIStr(colName)}, + Args: []interface{}{model.NewCIStr(colName), false}, } } diff --git a/ddl/index.go b/ddl/index.go index 977de19d7009d..c95536b54557a 100644 --- a/ddl/index.go +++ b/ddl/index.go @@ -558,7 +558,8 @@ func (w *worker) onCreateIndex(d *ddlCtx, t *meta.Meta, job *model.Job, isPK boo job.SnapshotVer = 0 job.SchemaState = model.StateWriteReorganization case model.StateWriteReorganization: - done, ver, err := multiSchemaChangeOnCreateIndexFinish(t, job, tblInfo, indexInfo) + var done bool + done, ver, err = multiSchemaChangeOnCreateIndexFinish(t, job, tblInfo, indexInfo) if done { return ver, err } diff --git a/ddl/multi_schema_change_test.go b/ddl/multi_schema_change_test.go index 71ed68fb414c0..28f580d8c4562 100644 --- a/ddl/multi_schema_change_test.go +++ b/ddl/multi_schema_change_test.go @@ -751,7 +751,6 @@ func (i *idxIDExt) IndexID(name string) int64 { type cancelOnceHook struct { store kv.Storage - dom *domain.Domain triggered bool cancelErr error pred func(job *model.Job) bool