DM: Extend MySQL and MariaDB support for newer versions #12628
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -730,32 +730,27 @@ func GenMariaDBGTIDListEvent(header *replication.EventHeader, latestPos uint32, | |
| payload := new(bytes.Buffer) | ||
|
|
||
| // Number of GTIDs, 4 bytes | ||
| numOfGTIDs := uint32(len(mariaDBGSet.Sets)) | ||
| err := binary.Write(payload, binary.LittleEndian, numOfGTIDs) | ||
| if err != nil { | ||
| return nil, terror.ErrBinlogWriteBinaryData.AnnotateDelegate(err, "write Number of GTIDs %d", numOfGTIDs) | ||
| } | ||
|
|
||
| for _, mGTID := range mariaDBGSet.Sets { | ||
| // Replication Domain ID, 4 bytes | ||
| err = binary.Write(payload, binary.LittleEndian, mGTID.DomainID) | ||
| if err != nil { | ||
| return nil, terror.ErrBinlogWriteBinaryData.AnnotateDelegate(err, "write Replication Domain ID %d", mGTID.DomainID) | ||
| } | ||
| // Server_ID, 4 bytes | ||
| err = binary.Write(payload, binary.LittleEndian, mGTID.ServerID) | ||
| if err != nil { | ||
| return nil, terror.ErrBinlogWriteBinaryData.AnnotateDelegate(err, "write Server_ID %d", mGTID.ServerID) | ||
| } | ||
| // GTID sequence, 8 bytes | ||
| err = binary.Write(payload, binary.LittleEndian, mGTID.SequenceNumber) | ||
| if err != nil { | ||
| return nil, terror.ErrBinlogWriteBinaryData.AnnotateDelegate(err, "write GTID sequence %d", mGTID.SequenceNumber) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -663,10 +663,10 @@ func TestGenMariaDBGTIDListEvent(t *testing.T) { | |
| require.True(t, ok) | ||
| require.NotNil(t, gtidListEvBody) | ||
| require.Len(t, gtidListEvBody.GTIDs, 1) | ||
| require.Equal(t, *mGSet.Sets[gtidListEvBody.GTIDs[0].DomainID], gtidListEvBody.GTIDs[0]) | ||
|
|
||
| // valid gSet with multi GTIDs | ||
| gSet, err = gtid.ParserGTID(gmysql.MariaDBFlavor, "1-2-12,2-2-3,3-3-8,4-4-4") | ||
| require.Nil(t, err) | ||
| require.NotNil(t, gSet) | ||
| mGSet, ok = gSet.(*gmysql.MariadbGTIDSet) | ||
|
|
@@ -683,9 +683,7 @@ func TestGenMariaDBGTIDListEvent(t *testing.T) { | |
| require.NotNil(t, gtidListEvBody) | ||
| require.Len(t, gtidListEvBody.GTIDs, 4) | ||
| for _, mGTID := range gtidListEvBody.GTIDs { | ||
| mGTID2, ok := mGSet.Sets[mGTID.DomainID] | ||
| require.True(t, ok) | ||
| require.Equal(t, *mGTID2, mGTID) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import ( | |
| "github.com/coreos/go-semver/semver" | ||
| gmysql "github.com/go-mysql-org/go-mysql/mysql" | ||
| "github.com/go-mysql-org/go-mysql/replication" | ||
| "github.com/google/uuid" | ||
| "github.com/pingcap/tiflow/dm/pkg/gtid" | ||
| "github.com/pingcap/tiflow/dm/pkg/terror" | ||
| ) | ||
|
|
@@ -56,14 +57,30 @@ func newGenerator(flavor, version string, serverID uint32, latestPos uint32, lat | |
| var anonymousGTID bool | ||
| switch flavor { | ||
| case gmysql.MySQLFlavor: | ||
| mSet := singleGTID.(*gmysql.MysqlGTIDSet) | ||
| prevGSet, ok := previousGTIDs.(*gmysql.MysqlGTIDSet) | ||
| if !ok || prevGSet == nil { | ||
| return nil, terror.ErrBinlogGTIDMySQLNotValid.Generate(previousGTIDs) | ||
| } | ||
|
|
||
| var sid uuid.UUID | ||
| var tag gmysql.Tag | ||
| var intervals gmysql.IntervalSlice | ||
| for u, tags := range *mSet { | ||
| sid = u | ||
| for t, i := range tags { | ||
| tag = t | ||
| intervals = i | ||
| } | ||
| } | ||
|
|
||
| // latestGTID should be one of the latest previousGTIDs | ||
| prevTags, ok := (*prevGSet)[sid] | ||
| if !ok { | ||
| return nil, terror.ErrBinlogLatestGTIDNotInPrev.Generate(latestGTID, previousGTIDs) | ||
| } | ||
| prevIntervals, ok := prevTags[tag] | ||
| if !ok || len(prevIntervals) != 1 || prevIntervals[0].Stop != intervals[0].Stop { | ||
| return nil, terror.ErrBinlogLatestGTIDNotInPrev.Generate(latestGTID, previousGTIDs) | ||
| } | ||
|
|
||
|
|
@@ -86,11 +103,7 @@ func newGenerator(flavor, version string, serverID uint32, latestPos uint32, lat | |
| if !ok || prevGSet == nil { | ||
| return nil, terror.ErrBinlogGTIDMariaDBNotValid.Generate(previousGTIDs) | ||
| } | ||
| prevGTID, ok := prevGSet.Sets[mariaGTID.DomainID] | ||
| if !ok || prevGTID.ServerID != mariaGTID.ServerID || prevGTID.SequenceNumber != mariaGTID.SequenceNumber { | ||
| return nil, terror.ErrBinlogLatestGTIDNotInPrev.Generate(latestGTID, previousGTIDs) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -429,7 +429,7 @@ func TestAddGSetWithPurged(t *testing.T) { | |
| getGSetFromString(t, "3ccc475b-2343-11e7-be21-6c0b84d59f30:6-14"), | ||
| mariaGTID, | ||
| nil, | ||
| errors.New("invalid GTID format, must UUID[:tag]:interval[[:tag]:interval]"), | ||
| }, | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -813,7 +813,7 @@ var ( | |
| ErrBinlogGTIDMariaDBNotValid = New(codeBinlogGTIDMariaDBNotValid, ClassFunctional, ScopeInternal, LevelHigh, "GTID set string %s for MariaDB not valid", "") | ||
| ErrBinlogMariaDBServerIDMismatch = New(codeBinlogMariaDBServerIDMismatch, ClassFunctional, ScopeInternal, LevelHigh, "server_id mismatch, in GTID (%d), in event header/server_id (%d)", "") | ||
| ErrBinlogOnlyOneGTIDSupport = New(codeBinlogOnlyOneGTIDSupport, ClassFunctional, ScopeInternal, LevelHigh, "only one GTID in set is supported, but got %d (%s)", "") | ||
| ErrBinlogOnlyOneIntervalInUUID = New(codeBinlogOnlyOneIntervalInUUID, ClassFunctional, ScopeInternal, LevelHigh, "only one Interval in MysqlGTIDSet is supported, but got %d (%s)", "") | ||
| ErrBinlogIntervalValueNotValid = New(codeBinlogIntervalValueNotValid, ClassFunctional, ScopeInternal, LevelHigh, "Interval's Stop should equal to Start+1, but got %+v (%s)", "") | ||
| ErrBinlogEmptyQuery = New(codeBinlogEmptyQuery, ClassFunctional, ScopeInternal, LevelHigh, "empty query not valid", "") | ||
| ErrBinlogTableMapEvNotValid = New(codeBinlogTableMapEvNotValid, ClassFunctional, ScopeInternal, LevelHigh, "empty schema (% X) or table (% X) or column type (% X)", "") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -532,7 +532,7 @@ func (r *Relay) preprocessEvent(e *replication.BinlogEvent, parser2 *parser.Pars | |
| // when RawModeEnabled not true, XIDEvent will be parsed. | ||
| result.GTIDSet = ev.GSet | ||
| result.CanSaveGTID = true // need save GTID for XID | ||
| case *replication.GenericEvent, *replication.HeartbeatEvent: | ||
| // handle some un-parsed events | ||
| if e.Header.EventType == replication.HEARTBEAT_EVENT { | ||
| // ignore artificial heartbeat event | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -722,7 +722,9 @@ func (v *DataValidator) doValidate() { | |
| v.sendError(terror.ErrValidatorPersistData.Delegate(err)) | ||
| return | ||
| } | ||
| case *replication.GenericEvent, *replication.HeartbeatEvent: | ||
| // go-mysql v1.15+ decodes upstream heartbeats as HeartbeatEvent; | ||
| // DM's own injected heartbeats still arrive as GenericEvent. | ||
| if e.Header.EventType == replication.HEARTBEAT_EVENT { | ||
| if err = v.checkAndPersistCheckpointAndData(locationForFlush); err != nil { | ||
| v.sendError(terror.ErrValidatorPersistData.Delegate(err)) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The logic for extracting the single SID and Interval from a
MysqlGTIDSetis repeated here and innewGenerator(ingenerator.go). Since DM requires these sets to have exactly one entry (as enforced byverifySingleGTID), consider moving this extraction logic into a helper function to improve code reuse and maintainability.