-
Notifications
You must be signed in to change notification settings - Fork 5.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'pingcap/release-6.5' into cherry-pick-3…
…8738-6.5
- Loading branch information
Showing
109 changed files
with
2,179 additions
and
970 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,208 @@ | ||
| // Copyright 2023 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package gluetidb | ||
|
|
||
| import ( | ||
| "context" | ||
| "strconv" | ||
| "testing" | ||
|
|
||
| "github.com/pingcap/failpoint" | ||
| "github.com/pingcap/tidb/ddl" | ||
| "github.com/pingcap/tidb/kv" | ||
| "github.com/pingcap/tidb/meta" | ||
| "github.com/pingcap/tidb/parser/model" | ||
| "github.com/pingcap/tidb/sessionctx" | ||
| "github.com/pingcap/tidb/testkit" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| // batch create table with table id reused | ||
| func TestSplitBatchCreateTableWithTableId(t *testing.T) { | ||
| store, dom := testkit.CreateMockStoreAndDomain(t) | ||
| tk := testkit.NewTestKit(t, store) | ||
| tk.MustExec("use test") | ||
| tk.MustExec("drop table if exists table_id_resued1") | ||
| tk.MustExec("drop table if exists table_id_resued2") | ||
| tk.MustExec("drop table if exists table_id_new") | ||
|
|
||
| d := dom.DDL() | ||
| require.NotNil(t, d) | ||
|
|
||
| infos1 := []*model.TableInfo{} | ||
| infos1 = append(infos1, &model.TableInfo{ | ||
| ID: 124, | ||
| Name: model.NewCIStr("table_id_resued1"), | ||
| }) | ||
| infos1 = append(infos1, &model.TableInfo{ | ||
| ID: 125, | ||
| Name: model.NewCIStr("table_id_resued2"), | ||
| }) | ||
|
|
||
| se := &tidbSession{se: tk.Session()} | ||
|
|
||
| // keep/reused table id verification | ||
| tk.Session().SetValue(sessionctx.QueryString, "skip") | ||
| err := se.SplitBatchCreateTable(model.NewCIStr("test"), infos1, ddl.AllocTableIDIf(func(ti *model.TableInfo) bool { | ||
| return false | ||
| })) | ||
| require.NoError(t, err) | ||
|
|
||
| tk.MustQuery("select tidb_table_id from information_schema.tables where table_name = 'table_id_resued1'").Check(testkit.Rows("124")) | ||
| tk.MustQuery("select tidb_table_id from information_schema.tables where table_name = 'table_id_resued2'").Check(testkit.Rows("125")) | ||
| ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnOthers) | ||
|
|
||
| // allocate new table id verification | ||
| // query the global id | ||
| var id int64 | ||
| err = kv.RunInNewTxn(ctx, store, true, func(_ context.Context, txn kv.Transaction) error { | ||
| m := meta.NewMeta(txn) | ||
| var err error | ||
| id, err = m.GenGlobalID() | ||
| return err | ||
| }) | ||
|
|
||
| require.NoError(t, err) | ||
|
|
||
| infos2 := []*model.TableInfo{} | ||
| infos2 = append(infos2, &model.TableInfo{ | ||
| ID: 124, | ||
| Name: model.NewCIStr("table_id_new"), | ||
| }) | ||
|
|
||
| tk.Session().SetValue(sessionctx.QueryString, "skip") | ||
| err = se.SplitBatchCreateTable(model.NewCIStr("test"), infos2, ddl.AllocTableIDIf(func(ti *model.TableInfo) bool { | ||
| return true | ||
| })) | ||
| require.NoError(t, err) | ||
|
|
||
| idGen, ok := tk.MustQuery("select tidb_table_id from information_schema.tables where table_name = 'table_id_new'").Rows()[0][0].(string) | ||
| require.True(t, ok) | ||
| idGenNum, err := strconv.ParseInt(idGen, 10, 64) | ||
| require.NoError(t, err) | ||
| require.Greater(t, idGenNum, id) | ||
|
|
||
| // a empty table info with len(info3) = 0 | ||
| infos3 := []*model.TableInfo{} | ||
|
|
||
| err = se.SplitBatchCreateTable(model.NewCIStr("test"), infos3, ddl.AllocTableIDIf(func(ti *model.TableInfo) bool { | ||
| return false | ||
| })) | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| // batch create table with table id reused | ||
| func TestSplitBatchCreateTable(t *testing.T) { | ||
| store, dom := testkit.CreateMockStoreAndDomain(t) | ||
| tk := testkit.NewTestKit(t, store) | ||
| tk.MustExec("use test") | ||
| tk.MustExec("drop table if exists table_1") | ||
| tk.MustExec("drop table if exists table_2") | ||
| tk.MustExec("drop table if exists table_3") | ||
|
|
||
| d := dom.DDL() | ||
| require.NotNil(t, d) | ||
|
|
||
| infos := []*model.TableInfo{} | ||
| infos = append(infos, &model.TableInfo{ | ||
| ID: 1234, | ||
| Name: model.NewCIStr("tables_1"), | ||
| }) | ||
| infos = append(infos, &model.TableInfo{ | ||
| ID: 1235, | ||
| Name: model.NewCIStr("tables_2"), | ||
| }) | ||
| infos = append(infos, &model.TableInfo{ | ||
| ID: 1236, | ||
| Name: model.NewCIStr("tables_3"), | ||
| }) | ||
|
|
||
| se := &tidbSession{se: tk.Session()} | ||
|
|
||
| // keep/reused table id verification | ||
| tk.Session().SetValue(sessionctx.QueryString, "skip") | ||
| require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/RestoreBatchCreateTableEntryTooLarge", "return(1)")) | ||
| err := se.SplitBatchCreateTable(model.NewCIStr("test"), infos, ddl.AllocTableIDIf(func(ti *model.TableInfo) bool { | ||
| return false | ||
| })) | ||
|
|
||
| require.NoError(t, err) | ||
| tk.MustQuery("show tables like '%tables_%'").Check(testkit.Rows("tables_1", "tables_2", "tables_3")) | ||
| jobs := tk.MustQuery("admin show ddl jobs").Rows() | ||
| require.Greater(t, len(jobs), 3) | ||
| // check table_1 | ||
| job1 := jobs[0] | ||
| require.Equal(t, "test", job1[1]) | ||
| require.Equal(t, "tables_3", job1[2]) | ||
| require.Equal(t, "create tables", job1[3]) | ||
| require.Equal(t, "public", job1[4]) | ||
|
|
||
| // check table_2 | ||
| job2 := jobs[1] | ||
| require.Equal(t, "test", job2[1]) | ||
| require.Equal(t, "tables_2", job2[2]) | ||
| require.Equal(t, "create tables", job2[3]) | ||
| require.Equal(t, "public", job2[4]) | ||
|
|
||
| // check table_3 | ||
| job3 := jobs[2] | ||
| require.Equal(t, "test", job3[1]) | ||
| require.Equal(t, "tables_1", job3[2]) | ||
| require.Equal(t, "create tables", job3[3]) | ||
| require.Equal(t, "public", job3[4]) | ||
|
|
||
| // check reused table id | ||
| tk.MustQuery("select tidb_table_id from information_schema.tables where table_name = 'tables_1'").Check(testkit.Rows("1234")) | ||
| tk.MustQuery("select tidb_table_id from information_schema.tables where table_name = 'tables_2'").Check(testkit.Rows("1235")) | ||
| tk.MustQuery("select tidb_table_id from information_schema.tables where table_name = 'tables_3'").Check(testkit.Rows("1236")) | ||
|
|
||
| require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/RestoreBatchCreateTableEntryTooLarge")) | ||
| } | ||
|
|
||
| // batch create table with table id reused | ||
| func TestSplitBatchCreateTableFailWithEntryTooLarge(t *testing.T) { | ||
| store, dom := testkit.CreateMockStoreAndDomain(t) | ||
| tk := testkit.NewTestKit(t, store) | ||
| tk.MustExec("use test") | ||
| tk.MustExec("drop table if exists table_1") | ||
| tk.MustExec("drop table if exists table_2") | ||
| tk.MustExec("drop table if exists table_3") | ||
|
|
||
| d := dom.DDL() | ||
| require.NotNil(t, d) | ||
|
|
||
| infos := []*model.TableInfo{} | ||
| infos = append(infos, &model.TableInfo{ | ||
| Name: model.NewCIStr("tables_1"), | ||
| }) | ||
| infos = append(infos, &model.TableInfo{ | ||
| Name: model.NewCIStr("tables_2"), | ||
| }) | ||
| infos = append(infos, &model.TableInfo{ | ||
| Name: model.NewCIStr("tables_3"), | ||
| }) | ||
|
|
||
| se := &tidbSession{se: tk.Session()} | ||
|
|
||
| tk.Session().SetValue(sessionctx.QueryString, "skip") | ||
| require.NoError(t, failpoint.Enable("github.com/pingcap/tidb/ddl/RestoreBatchCreateTableEntryTooLarge", "return(0)")) | ||
| err := se.SplitBatchCreateTable(model.NewCIStr("test"), infos, ddl.AllocTableIDIf(func(ti *model.TableInfo) bool { | ||
| return true | ||
| })) | ||
|
|
||
| require.True(t, kv.ErrEntryTooLarge.Equal(err)) | ||
|
|
||
| require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/RestoreBatchCreateTableEntryTooLarge")) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.