-
Notifications
You must be signed in to change notification settings - Fork 5.9k
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.
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
ddl: improve ddl test #1387
Merged
Merged
ddl: improve ddl test #1387
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,270 @@ | ||
| package ddl | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/juju/errors" | ||
| . "github.com/pingcap/check" | ||
| "github.com/pingcap/tidb/ast" | ||
| "github.com/pingcap/tidb/context" | ||
| "github.com/pingcap/tidb/kv" | ||
| "github.com/pingcap/tidb/meta" | ||
| "github.com/pingcap/tidb/meta/autoid" | ||
| "github.com/pingcap/tidb/model" | ||
| "github.com/pingcap/tidb/table" | ||
| "github.com/pingcap/tidb/util/testleak" | ||
| "github.com/pingcap/tidb/util/testutil" | ||
| "github.com/pingcap/tidb/util/types" | ||
| ) | ||
|
|
||
| var _ = Suite(&testColumnChangeSuite{}) | ||
|
|
||
| type testColumnChangeSuite struct { | ||
| store kv.Storage | ||
| dbInfo *model.DBInfo | ||
| } | ||
|
|
||
| func (s *testColumnChangeSuite) SetUpSuite(c *C) { | ||
| s.store = testCreateStore(c, "test_column_change") | ||
| s.dbInfo = &model.DBInfo{ | ||
| Name: model.NewCIStr("test_column_change"), | ||
| ID: 1, | ||
| } | ||
| err := kv.RunInNewTxn(s.store, true, func(txn kv.Transaction) error { | ||
| t := meta.NewMeta(txn) | ||
| return errors.Trace(t.CreateDatabase(s.dbInfo)) | ||
| }) | ||
| c.Check(err, IsNil) | ||
| } | ||
|
|
||
| func (s *testColumnChangeSuite) TestColumnChange(c *C) { | ||
| defer testleak.AfterTest(c)() | ||
| d := newDDL(s.store, nil, nil, testLease) | ||
| // create table t (c1 int, c2 int); | ||
| tblInfo := testTableInfo(c, d, "t", 2) | ||
| ctx := testNewContext(c, d) | ||
| _, err := ctx.GetTxn(true) | ||
| c.Assert(err, IsNil) | ||
| testCreateTable(c, ctx, d, s.dbInfo, tblInfo) | ||
| // insert t values (1, 2); | ||
| originTable := testGetTable(c, d, s.dbInfo.ID, tblInfo.ID) | ||
| row := types.MakeDatums(1, 2) | ||
| _, err = originTable.AddRecord(ctx, row) | ||
| c.Assert(err, IsNil) | ||
| err = ctx.CommitTxn() | ||
| c.Assert(err, IsNil) | ||
|
|
||
| tc := &testDDLCallback{} | ||
| // set up hook | ||
| prevState := model.StateNone | ||
| var ( | ||
| deleteOnlyTable table.Table | ||
| writeOnlyTable table.Table | ||
| publicTable table.Table | ||
| ) | ||
| var checkErr error | ||
| tc.onJobUpdated = func(job *model.Job) { | ||
| if job.SchemaState == prevState { | ||
| return | ||
| } | ||
| prevState = job.SchemaState | ||
| var err error | ||
| switch job.SchemaState { | ||
| case model.StateDeleteOnly: | ||
| deleteOnlyTable, err = getCurrentTable(d, s.dbInfo.ID, tblInfo.ID) | ||
| if err != nil { | ||
| checkErr = errors.Trace(err) | ||
| } | ||
| case model.StateWriteOnly: | ||
| writeOnlyTable, err = getCurrentTable(d, s.dbInfo.ID, tblInfo.ID) | ||
| if err != nil { | ||
| checkErr = errors.Trace(err) | ||
| } | ||
| err = s.checkAddWriteOnly(d, ctx, deleteOnlyTable, writeOnlyTable) | ||
| if err != nil { | ||
| checkErr = errors.Trace(err) | ||
| } | ||
| case model.StatePublic: | ||
| publicTable, err = getCurrentTable(d, s.dbInfo.ID, tblInfo.ID) | ||
| if err != nil { | ||
| checkErr = errors.Trace(err) | ||
| } | ||
| err = s.checkAddPublic(d, ctx, writeOnlyTable, publicTable) | ||
| if err != nil { | ||
| checkErr = errors.Trace(err) | ||
| } | ||
| } | ||
| } | ||
| d.hook = tc | ||
| defaultValue := int64(3) | ||
| job := testCreateColumn(c, ctx, d, s.dbInfo, tblInfo, "c3", &ast.ColumnPosition{Tp: ast.ColumnPositionNone}, defaultValue) | ||
| c.Assert(errors.ErrorStack(checkErr), Equals, "") | ||
| testCheckJobDone(c, d, job, true) | ||
| s.testColumnDrop(c, ctx, d, publicTable) | ||
| d.close() | ||
| } | ||
|
|
||
| func (s *testColumnChangeSuite) testColumnDrop(c *C, ctx context.Context, d *ddl, tbl table.Table) { | ||
| d.close() | ||
| dropCol := tbl.Cols()[0] | ||
| tc := &testDDLCallback{} | ||
| // set up hook | ||
| prevState := model.StateNone | ||
| var checkErr error | ||
| tc.onJobUpdated = func(job *model.Job) { | ||
| if job.SchemaState == prevState { | ||
| return | ||
| } | ||
| prevState = job.SchemaState | ||
| currentTbl, err := getCurrentTable(d, s.dbInfo.ID, tbl.Meta().ID) | ||
| if err != nil { | ||
| checkErr = errors.Trace(err) | ||
| } | ||
| for _, col := range currentTbl.Cols() { | ||
| if col.ID == dropCol.ID { | ||
| checkErr = errors.Errorf("column is not dropped") | ||
| } | ||
| } | ||
| } | ||
| d.hook = tc | ||
| d.start() | ||
| testDropColumn(c, ctx, d, s.dbInfo, tbl.Meta(), dropCol.Name.L, false) | ||
| } | ||
|
|
||
| func (s *testColumnChangeSuite) checkAddWriteOnly(d *ddl, ctx context.Context, deleteOnlyTable, writeOnlyTable table.Table) error { | ||
| // WriteOnlyTable: insert t values (2, 3) | ||
| _, err := writeOnlyTable.AddRecord(ctx, types.MakeDatums(2, 3)) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = ctx.CommitTxn() | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = checkResult(ctx, writeOnlyTable, testutil.RowsWithSep(" ", "1 2 <nil>", "2 3 3")) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // DeleteOnlyTable: select * from t | ||
| err = checkResult(ctx, deleteOnlyTable, testutil.RowsWithSep(" ", "1 2", "2 3")) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // WriteOnlyTable: update t set c1 = 2 where c1 = 1 | ||
| h, _, err := writeOnlyTable.Seek(ctx, 0) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = writeOnlyTable.UpdateRecord(ctx, h, types.MakeDatums(1, 2), types.MakeDatums(2, 2), touchedMap(writeOnlyTable)) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = ctx.CommitTxn() | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // After we update the first row, its default value is also set. | ||
| err = checkResult(ctx, writeOnlyTable, testutil.RowsWithSep(" ", "2 2 3", "2 3 3")) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // DeleteOnlyTable: delete from t where c2 = 2 | ||
| err = deleteOnlyTable.RemoveRecord(ctx, h, types.MakeDatums(2, 2)) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = ctx.CommitTxn() | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // After delete table has deleted the first row, check the WriteOnly table records. | ||
| err = checkResult(ctx, writeOnlyTable, testutil.RowsWithSep(" ", "2 3 3")) | ||
| return errors.Trace(err) | ||
| } | ||
|
|
||
| func touchedMap(t table.Table) map[int]bool { | ||
| touched := make(map[int]bool) | ||
| for _, col := range t.Cols() { | ||
| touched[col.Offset] = true | ||
| } | ||
| return touched | ||
| } | ||
|
|
||
| func (s *testColumnChangeSuite) checkAddPublic(d *ddl, ctx context.Context, writeOnlyTable, publicTable table.Table) error { | ||
| // publicTable Insert t values (4, 4, 4) | ||
| h, err := publicTable.AddRecord(ctx, types.MakeDatums(4, 4, 4)) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = ctx.CommitTxn() | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // writeOnlyTable update t set c1 = 3 where c1 = 4 | ||
| oldRow, err := writeOnlyTable.RowWithCols(ctx, h, writeOnlyTable.WritableCols()) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| if len(oldRow) != 3 { | ||
| return errors.Errorf("%v", oldRow) | ||
| } | ||
| newRow := types.MakeDatums(3, 4, oldRow[2].GetValue()) | ||
| err = writeOnlyTable.UpdateRecord(ctx, h, oldRow, newRow, touchedMap(writeOnlyTable)) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| err = ctx.CommitTxn() | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| // publicTable select * from t, make sure the new c3 value 4 is not overwritten to default value 3. | ||
| err = checkResult(ctx, publicTable, testutil.RowsWithSep(" ", "2 3 3", "3 4 4")) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func getCurrentTable(d *ddl, schemaID, tableID int64) (table.Table, error) { | ||
| var tblInfo *model.TableInfo | ||
| err := kv.RunInNewTxn(d.store, false, func(txn kv.Transaction) error { | ||
| t := meta.NewMeta(txn) | ||
| var err error | ||
| tblInfo, err = t.GetTable(schemaID, tableID) | ||
| if err != nil { | ||
| return errors.Trace(err) | ||
| } | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| return nil, errors.Trace(err) | ||
| } | ||
| alloc := autoid.NewAllocator(d.store, schemaID) | ||
| tbl, err := table.TableFromMeta(alloc, tblInfo) | ||
| if err != nil { | ||
| return nil, errors.Trace(err) | ||
| } | ||
| return tbl, err | ||
| } | ||
|
|
||
| func checkResult(ctx context.Context, t table.Table, rows [][]interface{}) error { | ||
| var gotRows [][]interface{} | ||
| t.IterRecords(ctx, t.FirstKey(), t.WritableCols(), func(h int64, data []types.Datum, cols []*table.Column) (bool, error) { | ||
| gotRows = append(gotRows, datumsToInterfaces(data)) | ||
| return true, nil | ||
| }) | ||
| got := fmt.Sprintf("%v", gotRows) | ||
| expect := fmt.Sprintf("%v", rows) | ||
| if got != expect { | ||
| return errors.Errorf("expect %v, got %v", expect, got) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func datumsToInterfaces(datums []types.Datum) []interface{} { | ||
| var ifs []interface{} | ||
| for _, d := range datums { | ||
| ifs = append(ifs, d.GetValue()) | ||
| } | ||
| return ifs | ||
| } | ||
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Miss StateReorg?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Write only reorg has the same operation rule as write only.