Skip to content
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.

Sign up for GitHub

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

Jump to bottom

drainer: if all DML is filtered, return true ignore #1318

Open
wants to merge 4 commits into
base: release-5.4
Choose a base branch
from
+4 −2
Open

drainer: if all DML is filtered, return true ignore #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb4035e
--wip-- [skip ci]
lance6716 Sep 6, 2024
e60032a
Merge branch 'release-5.4' into v5.4.3-fix1317
ti-chi-bot Sep 6, 2024
70308f0
try to fix UT
lance6716 Sep 6, 2024
c049689
Merge branch 'v5.4.3-fix1317' of ssh://github.com/pingcap/tidb-binlog…
lance6716 Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drainer/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,9 @@ func skipDMLEvent(pv *pb.PrewriteValue, schema *Schema, filter *filter.Filter, b
mutation.DeletedRows = mutation.DeletedRows[0:filteredDeleteIdx]
}

muts = append(muts, mutation)
if len(mutation.Sequence) > 0 {
muts = append(muts, mutation)
}
}

pv.Mutations = muts
Expand Down
2 changes: 1 addition & 1 deletion drainer/syncer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func (s *syncerSuite) TestFilterTable(c *check.C) {
// append one mutation that will not be dropped
var keepID int64 = 2
schema.tableIDToName[keepID] = TableName{Schema: "keep", Table: "keep"}
pv.Mutations = append(pv.Mutations, pb.TableMutation{TableId: keepID})
pv.Mutations = append(pv.Mutations, pb.TableMutation{TableId: keepID, Sequence: []pb.MutationType{pb.MutationType_Insert}})

ignore, err = skipDMLEvent(pv, schema, filter, nil)
c.Assert(err, check.IsNil)
Expand Down