Merge remote-tracking branch 'upstream/master' into issue36194

pingcap · Jul 13, 2022 · ee63c3d · ee63c3d
2 parents be23caf + d93bc7a
commit ee63c3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/util/table-filter/parser.go b/util/table-filter/parser.go
@@ -58,7 +58,7 @@ func (p *tableRulesParser) parse(line string, canImport bool) error {
 		return err
 	}
 	if len(line) == 0 {
-		return p.errorf("missing table pattern")
+		return p.errorf("wrong table pattern")
 	}
 	if line[0] != '.' {
 		return p.errorf("syntax error: missing '.' between schema and table patterns")

diff --git a/util/table-filter/table_filter_test.go b/util/table-filter/table_filter_test.go
@@ -265,8 +265,8 @@ func TestMatchTables(t *testing.T) {
 		require.NoError(t, err)
 		fci := filter.CaseInsensitive(fcs)
 		for i, tbl := range tc.tables {
-			require.Equalf(t, fcs.MatchTable(tbl.Schema, tbl.Name), tc.acceptedCS[i], "cs tbl %v", tbl)
-			require.Equalf(t, fci.MatchTable(tbl.Schema, tbl.Name), tc.acceptedCI[i], "ci tbl %v", tbl)
+			require.Equalf(t, tc.acceptedCS[i], fcs.MatchTable(tbl.Schema, tbl.Name), "cs tbl %v", tbl)
+			require.Equalf(t, tc.acceptedCI[i], fci.MatchTable(tbl.Schema, tbl.Name), "ci tbl %v", tbl)
 		}
 	}
 }
@@ -383,7 +383,7 @@ func TestParseFailures2(t *testing.T) {
 		},
 		{
 			arg: "db",
-			msg: `.*: missing table pattern`,
+			msg: `.*: wrong table pattern`,
 		},
 		{
 			arg: "db.",