-
Notifications
You must be signed in to change notification settings - Fork 197
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sync-diff-inspector: fix index fields not taking effect (#624)
close #623
- Loading branch information
Showing
5 changed files
with
311 additions
and
9 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| // Copyright 2022 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, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package splitter | ||
|
|
||
| import ( | ||
| "sort" | ||
| "strings" | ||
|
|
||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/log" | ||
| "github.com/pingcap/tidb-tools/sync_diff_inspector/utils" | ||
| "github.com/pingcap/tidb/parser/model" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| // indexFields wraps the column info for the user config "index-fields". | ||
| type indexFields struct { | ||
| cols []*model.ColumnInfo | ||
| tableInfo *model.TableInfo | ||
| empty bool | ||
| } | ||
|
|
||
| func indexFieldsFromConfigString(strFields string, tableInfo *model.TableInfo) (*indexFields, error) { | ||
| if len(strFields) == 0 { | ||
| // Empty option | ||
| return &indexFields{empty: true}, nil | ||
| } | ||
|
|
||
| if tableInfo == nil { | ||
| log.Panic("parsing index fields with empty tableInfo", | ||
| zap.String("index-fields", strFields)) | ||
| } | ||
|
|
||
| splitFieldArr := strings.Split(strFields, ",") | ||
| for i := range splitFieldArr { | ||
| splitFieldArr[i] = strings.TrimSpace(splitFieldArr[i]) | ||
| } | ||
|
|
||
| fields, err := GetSplitFields(tableInfo, splitFieldArr) | ||
| if err != nil { | ||
| return nil, errors.Trace(err) | ||
| } | ||
|
|
||
| // Sort the columns to help with comparison. | ||
| sortColsInPlace(fields) | ||
|
|
||
| return &indexFields{ | ||
| cols: fields, | ||
| tableInfo: tableInfo, | ||
| }, nil | ||
| } | ||
|
|
||
| func (f *indexFields) MatchesIndex(index *model.IndexInfo) bool { | ||
| if f.empty { | ||
| // Default config matches all. | ||
| return true | ||
| } | ||
|
|
||
| // Sanity checks. | ||
| if index == nil { | ||
| log.Panic("matching with empty index") | ||
| } | ||
| if len(f.cols) == 0 { | ||
| log.Panic("unexpected cols with length 0") | ||
| } | ||
|
|
||
| if len(index.Columns) != len(f.cols) { | ||
| // We need an exact match. | ||
| // Lengths not matching eliminates the possibility. | ||
| return false | ||
| } | ||
|
|
||
| indexCols := utils.GetColumnsFromIndex(index, f.tableInfo) | ||
| // Sort for comparison | ||
| sortColsInPlace(indexCols) | ||
|
|
||
| for i := 0; i < len(indexCols); i++ { | ||
| if f.cols[i].ID != indexCols[i].ID { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| return true | ||
| } | ||
|
|
||
| func (f *indexFields) Cols() []*model.ColumnInfo { | ||
| return f.cols | ||
| } | ||
|
|
||
| // IsEmpty returns true if the struct represents an empty | ||
| // user-configured "index-fields" option. | ||
| func (f *indexFields) IsEmpty() bool { | ||
| return f.empty | ||
| } | ||
|
|
||
| func sortColsInPlace(cols []*model.ColumnInfo) { | ||
| sort.SliceStable(cols, func(i, j int) bool { | ||
| return cols[i].ID < cols[j].ID | ||
| }) | ||
| } |
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,106 @@ | ||
| // Copyright 2022 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, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package splitter | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/pingcap/tidb-tools/pkg/dbutil" | ||
| "github.com/pingcap/tidb/parser" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestIndexFieldsSimple(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| createTableSQL1 := "CREATE TABLE `sbtest1` " + | ||
| "(`id` int(11) NOT NULL AUTO_INCREMENT, " + | ||
| " `k` int(11) NOT NULL DEFAULT '0', " + | ||
| "`c` char(120) NOT NULL DEFAULT '', " + | ||
| "PRIMARY KEY (`id`), KEY `k_1` (`k`))" | ||
|
|
||
| tableInfo, err := dbutil.GetTableInfoBySQL(createTableSQL1, parser.New()) | ||
| require.NoError(t, err) | ||
|
|
||
| fields, err := indexFieldsFromConfigString("k", tableInfo) | ||
| require.NoError(t, err) | ||
| require.False(t, fields.IsEmpty()) | ||
| require.Len(t, fields.Cols(), 1) | ||
|
|
||
| for _, index := range tableInfo.Indices { | ||
| switch index.Name.String() { | ||
| case "PRIMARY": | ||
| require.False(t, fields.MatchesIndex(index)) | ||
| case "k_1": | ||
| require.True(t, fields.MatchesIndex(index)) | ||
| default: | ||
| require.FailNow(t, "unreachable") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestIndexFieldsComposite(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| createTableSQL1 := "CREATE TABLE `sbtest1` " + | ||
| "(`id` int(11) NOT NULL AUTO_INCREMENT, " + | ||
| " `k` int(11) NOT NULL DEFAULT '0', " + | ||
| "`c` char(120) NOT NULL DEFAULT '', " + | ||
| "PRIMARY KEY (`id`, `k`)," + | ||
| "KEY `k_1` (`k`)," + | ||
| "UNIQUE INDEX `c_1` (`c`))" | ||
|
|
||
| tableInfo, err := dbutil.GetTableInfoBySQL(createTableSQL1, parser.New()) | ||
| require.NoError(t, err) | ||
|
|
||
| fields, err := indexFieldsFromConfigString("id, k", tableInfo) | ||
| require.NoError(t, err) | ||
| require.False(t, fields.IsEmpty()) | ||
| require.Len(t, fields.Cols(), 2) | ||
|
|
||
| for _, index := range tableInfo.Indices { | ||
| switch index.Name.String() { | ||
| case "PRIMARY": | ||
| require.True(t, fields.MatchesIndex(index)) | ||
| case "k_1": | ||
| require.False(t, fields.MatchesIndex(index)) | ||
| case "c_1": | ||
| require.False(t, fields.MatchesIndex(index)) | ||
| default: | ||
| require.FailNow(t, "unreachable") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestIndexFieldsEmpty(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| createTableSQL1 := "CREATE TABLE `sbtest1` " + | ||
| "(`id` int(11) NOT NULL AUTO_INCREMENT, " + | ||
| " `k` int(11) NOT NULL DEFAULT '0', " + | ||
| "`c` char(120) NOT NULL DEFAULT '', " + | ||
| "PRIMARY KEY (`id`), KEY `k_1` (`k`))" | ||
|
|
||
| tableInfo, err := dbutil.GetTableInfoBySQL(createTableSQL1, parser.New()) | ||
| require.NoError(t, err) | ||
|
|
||
| fields, err := indexFieldsFromConfigString("", tableInfo) | ||
| require.NoError(t, err) | ||
| require.True(t, fields.IsEmpty()) | ||
|
|
||
| for _, index := range tableInfo.Indices { | ||
| // Expected to match all. | ||
| require.True(t, fields.MatchesIndex(index)) | ||
| } | ||
| } |
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