Skip to content

EventHandlerV2 support handle event with replication.EventHeader #740

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

Merged
merged 5 commits into from
Nov 30, 2022
Merged

EventHandlerV2 support handle event with replication.EventHeader #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
71573d3
EventHandlerV2 support handle event with replication.EventHeader
BLAZZ Nov 25, 2022
68d659f
fix sytanx error
BLAZZ Nov 25, 2022
e98e767
change EventHandlerV2 to EventHandler
BLAZZ Nov 29, 2022
986b50f
change test case handler impl
BLAZZ Nov 30, 2022
778f99e
Merge branch 'master' into master
lance6716 Nov 30, 2022
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
2 changes: 1 addition & 1 deletion canal/canal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ func (c *Canal) Close() {
c.conn = nil
c.connLock.Unlock()

_ = c.eventHandler.OnPosSynced(c.master.Position(), c.master.GTIDSet(), true)
_ = c.eventHandler.OnPosSynced(nil, c.master.Position(), c.master.GTIDSet(), true)
}

func (c *Canal) WaitDumpDone() <-chan struct{} {
Expand Down
2 changes: 1 addition & 1 deletion canal/canal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func (h *testEventHandler) String() string {
return "testEventHandler"
}

func (h *testEventHandler) OnPosSynced(p mysql.Position, set mysql.GTIDSet, f bool) error {
func (h *testEventHandler) OnPosSynced(header *replication.EventHeader, p mysql.Position, set mysql.GTIDSet, f bool) error {
return nil
}

Expand Down
2 changes: 1 addition & 1 deletion canal/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (c *Canal) dump() error {
pos := mysql.Position{Name: h.name, Pos: uint32(h.pos)}
c.master.Update(pos)
c.master.UpdateGTIDSet(h.gset)
if err := c.eventHandler.OnPosSynced(pos, c.master.GTIDSet(), true); err != nil {
if err := c.eventHandler.OnPosSynced(nil, pos, c.master.GTIDSet(), true); err != nil {
return errors.Trace(err)
}
var startPos fmt.Stringer = pos
Expand Down
32 changes: 19 additions & 13 deletions canal/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,38 @@ import (
)

type EventHandler interface {
OnRotate(rotateEvent *replication.RotateEvent) error
OnRotate(header *replication.EventHeader, rotateEvent *replication.RotateEvent) error
// OnTableChanged is called when the table is created, altered, renamed or dropped.
// You need to clear the associated data like cache with the table.
// It will be called before OnDDL.
OnTableChanged(schema string, table string) error
OnDDL(nextPos mysql.Position, queryEvent *replication.QueryEvent) error
OnTableChanged(header *replication.EventHeader, schema string, table string) error
OnDDL(header *replication.EventHeader, nextPos mysql.Position, queryEvent *replication.QueryEvent) error
OnRow(e *RowsEvent) error
OnXID(nextPos mysql.Position) error
OnGTID(gtid mysql.GTIDSet) error
OnXID(header *replication.EventHeader, nextPos mysql.Position) error
OnGTID(header *replication.EventHeader, gtid mysql.GTIDSet) error
// OnPosSynced Use your own way to sync position. When force is true, sync position immediately.
OnPosSynced(pos mysql.Position, set mysql.GTIDSet, force bool) error
OnPosSynced(header *replication.EventHeader, pos mysql.Position, set mysql.GTIDSet, force bool) error
String() string
}

type DummyEventHandler struct {
}

func (h *DummyEventHandler) OnRotate(*replication.RotateEvent) error { return nil }
func (h *DummyEventHandler) OnTableChanged(schema string, table string) error { return nil }
func (h *DummyEventHandler) OnDDL(nextPos mysql.Position, queryEvent *replication.QueryEvent) error {
func (h *DummyEventHandler) OnRotate(*replication.EventHeader, *replication.RotateEvent) error {
return nil
}
func (h *DummyEventHandler) OnTableChanged(*replication.EventHeader, string, string) error {
return nil
}
func (h *DummyEventHandler) OnDDL(*replication.EventHeader, mysql.Position, *replication.QueryEvent) error {
return nil
}
func (h *DummyEventHandler) OnRow(*RowsEvent) error { return nil }
func (h *DummyEventHandler) OnXID(*replication.EventHeader, mysql.Position) error { return nil }
func (h *DummyEventHandler) OnGTID(*replication.EventHeader, mysql.GTIDSet) error { return nil }
func (h *DummyEventHandler) OnPosSynced(*replication.EventHeader, mysql.Position, mysql.GTIDSet, bool) error {
return nil
}
func (h *DummyEventHandler) OnRow(*RowsEvent) error { return nil }
func (h *DummyEventHandler) OnXID(mysql.Position) error { return nil }
func (h *DummyEventHandler) OnGTID(mysql.GTIDSet) error { return nil }
func (h *DummyEventHandler) OnPosSynced(mysql.Position, mysql.GTIDSet, bool) error { return nil }

func (h *DummyEventHandler) String() string { return "DummyEventHandler" }

Expand Down
18 changes: 9 additions & 9 deletions canal/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (c *Canal) runSyncBinlog() error {
c.cfg.Logger.Infof("rotate binlog to %s", pos)
savePos = true
force = true
if err = c.eventHandler.OnRotate(e); err != nil {
if err = c.eventHandler.OnRotate(ev.Header, e); err != nil {
return errors.Trace(err)
}
case *replication.RowsEvent:
Expand All @@ -115,7 +115,7 @@ func (c *Canal) runSyncBinlog() error {
case *replication.XIDEvent:
savePos = true
// try to save the position later
if err := c.eventHandler.OnXID(pos); err != nil {
if err := c.eventHandler.OnXID(ev.Header, pos); err != nil {
return errors.Trace(err)
}
if e.GSet != nil {
Expand All @@ -127,7 +127,7 @@ func (c *Canal) runSyncBinlog() error {
if err != nil {
return errors.Trace(err)
}
if err := c.eventHandler.OnGTID(gtid); err != nil {
if err := c.eventHandler.OnGTID(ev.Header, gtid); err != nil {
return errors.Trace(err)
}
case *replication.GTIDEvent:
Expand All @@ -136,7 +136,7 @@ func (c *Canal) runSyncBinlog() error {
if err != nil {
return errors.Trace(err)
}
if err := c.eventHandler.OnGTID(gtid); err != nil {
if err := c.eventHandler.OnGTID(ev.Header, gtid); err != nil {
return errors.Trace(err)
}
case *replication.QueryEvent:
Expand All @@ -151,15 +151,15 @@ func (c *Canal) runSyncBinlog() error {
if node.db == "" {
node.db = string(e.Schema)
}
if err = c.updateTable(node.db, node.table); err != nil {
if err = c.updateTable(ev.Header, node.db, node.table); err != nil {
return errors.Trace(err)
}
}
if len(nodes) > 0 {
savePos = true
force = true
// Now we only handle Table Changed DDL, maybe we will support more later.
if err = c.eventHandler.OnDDL(pos, e); err != nil {
if err = c.eventHandler.OnDDL(ev.Header, pos, e); err != nil {
return errors.Trace(err)
}
}
Expand All @@ -176,7 +176,7 @@ func (c *Canal) runSyncBinlog() error {
c.master.UpdateTimestamp(ev.Header.Timestamp)
fakeRotateLogName = ""

if err := c.eventHandler.OnPosSynced(pos, c.master.GTIDSet(), force); err != nil {
if err := c.eventHandler.OnPosSynced(ev.Header, pos, c.master.GTIDSet(), force); err != nil {
return errors.Trace(err)
}
}
Expand Down Expand Up @@ -228,10 +228,10 @@ func parseStmt(stmt ast.StmtNode) (ns []*node) {
return ns
}

func (c *Canal) updateTable(db, table string) (err error) {
func (c *Canal) updateTable(header *replication.EventHeader, db, table string) (err error) {
c.ClearTableCache([]byte(db), []byte(table))
c.cfg.Logger.Infof("table structure changed, clear table cache: %s.%s\n", db, table)
if err = c.eventHandler.OnTableChanged(db, table); err != nil && errors.Cause(err) != schema.ErrTableNotExist {
if err = c.eventHandler.OnTableChanged(header, db, table); err != nil && errors.Cause(err) != schema.ErrTableNotExist {
return errors.Trace(err)
}
return
Expand Down