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 2 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
7 changes: 6 additions & 1 deletion canal/canal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type Canal struct {
syncer *replication.BinlogSyncer

eventHandler EventHandler
eventHandlerV2 EventHandlerV2

connLock sync.Mutex
conn *client.Conn
Expand Down Expand Up @@ -248,7 +249,11 @@ func (c *Canal) Close() {
c.conn = nil
c.connLock.Unlock()

_ = c.eventHandler.OnPosSynced(c.master.Position(), c.master.GTIDSet(), true)
if c.eventHandlerV2 == nil {
_ = c.eventHandler.OnPosSynced(c.master.Position(), c.master.GTIDSet(), true)
} else {
_ = c.eventHandlerV2.OnPosSynced(nil, c.master.Position(), c.master.GTIDSet(), true)
}
}

func (c *Canal) WaitDumpDone() <-chan struct{} {
Expand Down
14 changes: 12 additions & 2 deletions canal/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ func (h *dumpParseHandler) Data(db string, table string, values []string) error
}

events := newRowsEvent(tableInfo, InsertAction, [][]interface{}{vs}, nil)
return h.c.eventHandler.OnRow(events)
if h.c.eventHandlerV2 == nil {
return h.c.eventHandler.OnRow(events)
} else {
return h.c.eventHandlerV2.OnRow(events)
}
}

func (c *Canal) AddDumpDatabases(dbs ...string) {
Expand Down Expand Up @@ -176,7 +180,13 @@ 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 {
var err error
if c.eventHandlerV2 == nil {
err = c.eventHandler.OnPosSynced(pos, c.master.GTIDSet(), true)
} else {
err = c.eventHandlerV2.OnPosSynced(nil, pos, c.master.GTIDSet(), true)
}
if err != nil {
return errors.Trace(err)
}
var startPos fmt.Stringer = pos
Expand Down
21 changes: 21 additions & 0 deletions canal/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,24 @@ func (h *DummyEventHandler) String() string { return "DummyEventHandler" }
func (c *Canal) SetEventHandler(h EventHandler) {
c.eventHandler = h
}

// EventHandlerV2 can process event with replication.EventHeader
type EventHandlerV2 interface {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry for my previous comments, now I think we can change the old EventHandler to this interface (will review more carefully later)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget this comment @BLAZZ

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have changed EventHandlerV2 to EventHandler

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(header *replication.EventHeader, schema string, table string) error
OnDDL(header *replication.EventHeader, nextPos mysql.Position, queryEvent *replication.QueryEvent) error
OnRow(e *RowsEvent) 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(header *replication.EventHeader, pos mysql.Position, set mysql.GTIDSet, force bool) error
String() string
}

// SetEventHandlerV2 to registers EventHandlerV2 handler replace the EventHandler
func (c *Canal) SetEventHandlerV2(h EventHandlerV2) {
c.eventHandlerV2 = h
}
59 changes: 48 additions & 11 deletions canal/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,12 @@ 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 {
return errors.Trace(err)
if c.eventHandlerV2 == nil {
err = c.eventHandler.OnRotate(e)
} else {
err = c.eventHandlerV2.OnRotate(ev.Header, e)
}
if err != nil {
case *replication.RowsEvent:
// we only focus row based event
err = c.handleRowsEvent(ev)
Expand All @@ -115,7 +118,12 @@ 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 c.eventHandlerV2 == nil {
err = c.eventHandler.OnXID(pos)
} else {
err = c.eventHandlerV2.OnXID(ev.Header, pos)
}
if err != nil {
return errors.Trace(err)
}
if e.GSet != nil {
Expand All @@ -127,7 +135,12 @@ func (c *Canal) runSyncBinlog() error {
if err != nil {
return errors.Trace(err)
}
if err := c.eventHandler.OnGTID(gtid); err != nil {
if c.eventHandlerV2 == nil {
err = c.eventHandler.OnGTID(gtid)
} else {
err = c.eventHandlerV2.OnGTID(ev.Header, gtid)
}
if err != nil {
return errors.Trace(err)
}
case *replication.GTIDEvent:
Expand All @@ -136,7 +149,12 @@ func (c *Canal) runSyncBinlog() error {
if err != nil {
return errors.Trace(err)
}
if err := c.eventHandler.OnGTID(gtid); err != nil {
if c.eventHandlerV2 == nil {
err = c.eventHandler.OnGTID(gtid)
} else {
err = c.eventHandlerV2.OnGTID(ev.Header, gtid)
}
if err != nil {
return errors.Trace(err)
}
case *replication.QueryEvent:
Expand All @@ -151,15 +169,20 @@ 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 c.eventHandlerV2 == nil {
err = c.eventHandler.OnDDL(pos, e)
} else {
err = c.eventHandlerV2.OnDDL(ev.Header, pos, e)
}
if err != nil {
return errors.Trace(err)
}
}
Expand All @@ -176,7 +199,12 @@ 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 c.eventHandlerV2 == nil {
err = c.eventHandler.OnPosSynced(pos, c.master.GTIDSet(), force)
} else {
err = c.eventHandlerV2.OnPosSynced(ev.Header, pos, c.master.GTIDSet(), force)
}
if err != nil {
return errors.Trace(err)
}
}
Expand Down Expand Up @@ -228,10 +256,15 @@ 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 c.eventHandlerV2 == nil {
err = c.eventHandler.OnTableChanged(db, table)
} else {
err = c.eventHandlerV2.OnTableChanged(header, db, table)
}
if err != nil && errors.Cause(err) != schema.ErrTableNotExist {
return errors.Trace(err)
}
return
Expand Down Expand Up @@ -268,7 +301,11 @@ func (c *Canal) handleRowsEvent(e *replication.BinlogEvent) error {
return errors.Errorf("%s not supported now", e.Header.EventType)
}
events := newRowsEvent(t, action, ev.Rows, e.Header)
return c.eventHandler.OnRow(events)
if c.eventHandlerV2 == nil {
return c.eventHandler.OnRow(events)
} else {
return c.eventHandlerV2.OnRow(events)
}
}

func (c *Canal) FlushBinlog() error {
Expand Down