Skip to content

Commit

Permalink
This is an automated cherry-pick of #10205
Browse files Browse the repository at this point in the history
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
dveeden authored and ti-chi-bot committed Oct 15, 2024
1 parent 8958811 commit 2b6aea3
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions dm/syncer/syncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -2363,6 +2363,42 @@ func (s *Syncer) Run(ctx context.Context) (err error) {
if err2 != nil {
return err2
}
<<<<<<< HEAD

Check failure on line 2366 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64)

syntax error: unexpected <<, expected case or default or }

Check failure on line 2366 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

syntax error: unexpected <<, expected case or default or }
=======
case *replication.TransactionPayloadEvent:

Check failure on line 2368 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64)

syntax error: unexpected case, expected :

Check failure on line 2368 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

syntax error: unexpected case, expected :
for _, tpev := range ev.Events {
switch tpevt := tpev.Event.(type) {
case *replication.RowsEvent:
eventIndex++
s.metricsProxies.Metrics.BinlogEventRowHistogram.Observe(float64(len(tpevt.Rows)))
ec.header.EventType = tpev.Header.EventType
sourceTable, err2 = s.handleRowsEvent(tpevt, ec)
if sourceTable != nil && err2 == nil && s.cfg.EnableGTID {
if _, ok := affectedSourceTables[sourceTable.Schema]; !ok {
affectedSourceTables[sourceTable.Schema] = make(map[string]struct{})
}
affectedSourceTables[sourceTable.Schema][sourceTable.Name] = struct{}{}
}
case *replication.QueryEvent:
originSQL = strings.TrimSpace(string(tpevt.Query))
err2 = s.ddlWorker.HandleQueryEvent(tpevt, ec, originSQL)
case *replication.XIDEvent:
eventType = "XID"
needContinue, err2 = funcCommit()
case *replication.TableMapEvent:
case *replication.FormatDescriptionEvent:
default:
s.tctx.L().Warn("unhandled event from transaction payload", zap.String("type", fmt.Sprintf("%T", tpevt)))
}
}
if needContinue {
continue
}
case *replication.TableMapEvent:
case *replication.FormatDescriptionEvent:
default:
s.tctx.L().Warn("unhandled event", zap.String("type", fmt.Sprintf("%T", ev)))
>>>>>>> 1fa2752c10 (syncer(dm): Improve logging of ignored TableMap/FormatDesc (#10205))

Check failure on line 2401 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64)

syntax error: unexpected >>, expected case or default or }

Check failure on line 2401 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Arm Build (ARM64)

invalid character U+0023 '#'

Check failure on line 2401 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

syntax error: unexpected >>, expected case or default or }

Check failure on line 2401 in dm/syncer/syncer.go

View workflow job for this annotation

GitHub Actions / Mac OS Build

invalid character U+0023 '#'
}
if err2 != nil {
if err := s.handleEventError(err2, startLocation, endLocation, e.Header.EventType == replication.QUERY_EVENT, originSQL); err != nil {
Expand Down

0 comments on commit 2b6aea3

Please sign in to comment.