Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ddl: support add indexes for multi-schema change #35989

Merged
merged 13 commits into from
Jul 7, 2022
Merged

ddl: support add indexes for multi-schema change #35989

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f774e5f
ddl: support add indexes for multi-schema change
tangenta Jul 6, 2022
8679027
ignore static check
tangenta Jul 6, 2022
a307caa
fix linter
tangenta Jul 6, 2022
47ab5e7
fix typo
tangenta Jul 7, 2022
186e3c7
Merge branch 'master' into master-msc-add-idx
ti-chi-bot Jul 7, 2022
b516e0a
Update ddl/index.go
tangenta Jul 7, 2022
6f1a909
address comment
tangenta Jul 7, 2022
c0d5e47
skip the hook if checkErr is not nil
tangenta Jul 7, 2022
921005a
make fmt
tangenta Jul 7, 2022
dd1f957
Merge remote-tracking branch 'upstream/master' into master-msc-add-idx
tangenta Jul 7, 2022
14701ac
Merge branch 'master' into master-msc-add-idx
ti-chi-bot Jul 7, 2022
d36117a
Merge branch 'master' into master-msc-add-idx
ti-chi-bot Jul 7, 2022
57c4365
Merge branch 'master' into master-msc-add-idx
ti-chi-bot Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions ddl/multi_schema_change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/parser/model"
"github.com/pingcap/tidb/testkit"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

Expand Down Expand Up @@ -308,12 +309,14 @@ func TestMultiSchemaChangeAddIndexes(t *testing.T) {
tk.MustExec("drop table if exists t")
tk.MustExec("create table t (a int, b int, c int)")
tk.MustGetErrCode("alter table t add index t(a), add index t(b)", errno.ErrUnsupportedDDLOperation)
tangenta marked this conversation as resolved.
Show resolved Hide resolved
tk.MustQuery("show index from t;").Check(testkit.Rows( /* no index */ ))

// Test add indexes with drop column.
tk.MustExec("drop table if exists t")
tk.MustExec("create table t (a int, b int, c int)")
tk.MustGetErrCode("alter table t add index t(a), drop column a", errno.ErrUnsupportedDDLOperation)
tk.MustGetErrCode("alter table t add index t(a, b), drop column a", errno.ErrUnsupportedDDLOperation)
tk.MustQuery("show index from t;").Check(testkit.Rows( /* no index */ ))

// Test add index failed.
tk.MustExec("drop table if exists t;")
Expand Down Expand Up @@ -477,6 +480,46 @@ func TestMultiSchemaChangeAddDropIndexes(t *testing.T) {
tk.MustExec("admin check table t;")
}

func TestMultiSchemaChangeWithExpressionIndex(t *testing.T) {
store, dom, clean := testkit.CreateMockStoreAndDomain(t)
defer clean()
tk := testkit.NewTestKit(t, store)
tk.MustExec("use test;")
tk.MustExec("create table t (a int, b int);")
tk.MustExec("insert into t values (1, 2), (2, 1);")
tk.MustGetErrCode("alter table t drop column a, add unique index idx((a + b));", errno.ErrUnsupportedDDLOperation)
tk.MustGetErrCode("alter table t add column c int, change column a d bigint, add index idx((a + a));", errno.ErrUnsupportedDDLOperation)
tk.MustGetErrCode("alter table t add column c int default 10, add index idx1((a + b)), add unique index idx2((a + b));",
errno.ErrDupEntry)
tk.MustQuery("select * from t;").Check(testkit.Rows("1 2", "2 1"))

originHook := dom.DDL().GetHook()
hook := &ddl.TestDDLCallback{Do: dom}
var checkErr error
hook.OnJobRunBeforeExported = func(job *model.Job) {
assert.Equal(t, model.ActionMultiSchemaChange, job.Type)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If checkErr isn't nil, we needn't do next logic, otherwise, the value of checkErr will be overwritten.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. Thanks!

if job.MultiSchemaInfo.SubJobs[1].SchemaState == model.StateWriteOnly {
tk2 := testkit.NewTestKit(t, store)
tk2.MustExec("use test;")
_, checkErr = tk2.Exec("update t set a = 3 where a = 1;")
if checkErr != nil {
return
}
_, checkErr = tk2.Exec("insert into t values (10, 10);")
}
}
dom.DDL().SetHook(hook)
tk.MustExec("alter table t add column c int default 10, add index idx1((a + b)), add unique index idx2((a + b));")
require.NoError(t, checkErr)
dom.DDL().SetHook(originHook)

tk.MustExec("drop table if exists t;")
tk.MustExec("create table t (a int, b int);")
tk.MustExec("insert into t values (1, 2), (2, 1);")
tk.MustExec("alter table t add column c int default 10, add index idx1((a + b)), add unique index idx2((a*10 + b));")
tk.MustQuery("select * from t use index(idx1, idx2);").Check(testkit.Rows("1 2 10", "2 1 10"))
}

type cancelOnceHook struct {
store kv.Storage
triggered bool
Expand Down