-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
VReplication: Enforce consistent order for table copies and diffs (#1…
…5152) Signed-off-by: Matt Lord <[email protected]>
- Loading branch information
Showing
13 changed files
with
413 additions
and
36 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /* | ||
| Copyright 2024 The Vitess Authors. | ||
| 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 protoutil | ||
|
|
||
| import ( | ||
| "slices" | ||
| "sort" | ||
| "strings" | ||
|
|
||
| binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata" | ||
| ) | ||
|
|
||
| // SortBinlogSourceTables sorts the table related contents of the | ||
| // BinlogSource struct lexicographically by table name in order to | ||
| // produce consistent results. | ||
| func SortBinlogSourceTables(bls *binlogdatapb.BinlogSource) { | ||
| if bls == nil { | ||
| return | ||
| } | ||
|
|
||
| // Sort the tables by name to ensure a consistent order. | ||
| slices.Sort(bls.Tables) | ||
|
|
||
| if bls.Filter == nil || len(bls.Filter.Rules) == 0 { | ||
| return | ||
| } | ||
| sort.Slice(bls.Filter.Rules, func(i, j int) bool { | ||
| // Exclude filters should logically be processed first. | ||
| if bls.Filter.Rules[i].Filter == "exclude" && bls.Filter.Rules[j].Filter != "exclude" { | ||
| return true | ||
| } | ||
| if bls.Filter.Rules[j].Filter == "exclude" && bls.Filter.Rules[i].Filter != "exclude" { | ||
| return false | ||
| } | ||
|
|
||
| // Remove preceding slash from the match string. | ||
| // That is used when the filter is a regular expression. | ||
| fi, _ := strings.CutPrefix(bls.Filter.Rules[i].Match, "/") | ||
| fj, _ := strings.CutPrefix(bls.Filter.Rules[j].Match, "/") | ||
| if fi != fj { | ||
| return fi < fj | ||
| } | ||
|
|
||
| return bls.Filter.Rules[i].Filter < bls.Filter.Rules[j].Filter | ||
| }) | ||
| } |
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,209 @@ | ||
| /* | ||
| Copyright 2024 The Vitess Authors. | ||
| 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 protoutil | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "google.golang.org/protobuf/proto" | ||
|
|
||
| binlogdatapb "vitess.io/vitess/go/vt/proto/binlogdata" | ||
| ) | ||
|
|
||
| func TestSortBinlogSourceTables(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| inSource *binlogdatapb.BinlogSource | ||
| outSource *binlogdatapb.BinlogSource | ||
| }{ | ||
| { | ||
| name: "Basic", | ||
| inSource: &binlogdatapb.BinlogSource{ | ||
| Tables: []string{"wuts1", "atable", "1table", "ztable2", "table3"}, | ||
| Filter: &binlogdatapb.Filter{ | ||
| Rules: []*binlogdatapb.Rule{ | ||
| { | ||
| Match: "ztable2", | ||
| }, | ||
| { | ||
| Match: "table3", | ||
| }, | ||
| { | ||
| Match: "/wuts", | ||
| }, | ||
| { | ||
| Match: "1table", | ||
| Filter: "a", | ||
| }, | ||
| { | ||
| Match: "1table", | ||
| }, | ||
| { | ||
| Match: "atable", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| outSource: &binlogdatapb.BinlogSource{ | ||
| Tables: []string{"1table", "atable", "table3", "wuts1", "ztable2"}, | ||
| Filter: &binlogdatapb.Filter{ | ||
| Rules: []*binlogdatapb.Rule{ | ||
| { | ||
| Match: "1table", | ||
| }, | ||
| { | ||
| Match: "1table", | ||
| Filter: "a", | ||
| }, | ||
| { | ||
| Match: "atable", | ||
| }, | ||
| { | ||
| Match: "table3", | ||
| }, | ||
| { | ||
| Match: "/wuts", | ||
| }, | ||
| { | ||
| Match: "ztable2", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "With excludes", | ||
| inSource: &binlogdatapb.BinlogSource{ | ||
| Filter: &binlogdatapb.Filter{ | ||
| Rules: []*binlogdatapb.Rule{ | ||
| { | ||
| Match: "./*", | ||
| }, | ||
| { | ||
| Match: "no4", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "no2", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "ztable2", | ||
| }, | ||
| { | ||
| Match: "atable2", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| outSource: &binlogdatapb.BinlogSource{ | ||
| Filter: &binlogdatapb.Filter{ | ||
| Rules: []*binlogdatapb.Rule{ | ||
| { | ||
| Match: "no2", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "no4", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "./*", | ||
| }, | ||
| { | ||
| Match: "atable2", | ||
| }, | ||
| { | ||
| Match: "ztable2", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "With excludes", | ||
| inSource: &binlogdatapb.BinlogSource{ | ||
| Filter: &binlogdatapb.Filter{ | ||
| Rules: []*binlogdatapb.Rule{ | ||
| { | ||
| Match: "no4", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "no2", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "./*", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| outSource: &binlogdatapb.BinlogSource{ | ||
| Filter: &binlogdatapb.Filter{ | ||
| Rules: []*binlogdatapb.Rule{ | ||
| { | ||
| Match: "no2", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "no4", | ||
| Filter: "exclude", | ||
| }, | ||
| { | ||
| Match: "./*", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Nil", | ||
| inSource: nil, | ||
| outSource: nil, | ||
| }, | ||
| { | ||
| name: "No filter", | ||
| inSource: &binlogdatapb.BinlogSource{ | ||
| Tables: []string{"wuts1", "atable", "1table", "ztable2", "table3"}, | ||
| Filter: nil, | ||
| }, | ||
| outSource: &binlogdatapb.BinlogSource{ | ||
| Tables: []string{"1table", "atable", "table3", "wuts1", "ztable2"}, | ||
| Filter: nil, | ||
| }, | ||
| }, | ||
| { | ||
| name: "No filter rules", | ||
| inSource: &binlogdatapb.BinlogSource{ | ||
| Tables: []string{"wuts1", "atable", "1table", "ztable2", "table3"}, | ||
| Filter: &binlogdatapb.Filter{}, | ||
| }, | ||
| outSource: &binlogdatapb.BinlogSource{ | ||
| Tables: []string{"1table", "atable", "table3", "wuts1", "ztable2"}, | ||
| Filter: &binlogdatapb.Filter{}, | ||
| }, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| SortBinlogSourceTables(tt.inSource) | ||
| require.True(t, proto.Equal(tt.inSource, tt.outSource), "got: %s, want: %s", tt.inSource.String(), tt.outSource.String()) | ||
| }) | ||
| } | ||
| } |
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
Oops, something went wrong.