fix: issues; feat: caching uuid

yandex · Mar 20, 2024 · afab05f · afab05f
1 parent 98bfdbf
commit afab05f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/internal/app/util.go b/internal/app/util.go
@@ -235,9 +235,11 @@ func isGTIDLessOrEqual(slaveGtidSet, masterGtidSet gtids.GTIDSet) bool {
 	return masterGtidSet.Contain(slaveGtidSet) || masterGtidSet.Equal(slaveGtidSet)
 }
 
-func isSplitBrained(slaveGtidSet, masterGtidSet *gomysql.MysqlGTIDSet, masterUUID uuid.UUID) bool {
-	for _, masterSet := range masterGtidSet.Sets {
-		slaveSet, ok := slaveGtidSet.Sets[masterSet.SID.String()]
+func isSplitBrained(slaveGtidSet, masterGtidSet gtids.GTIDSet, masterUUID uuid.UUID) bool {
+	mysqlSlaveGtidSet := slaveGtidSet.(*gomysql.MysqlGTIDSet)
+	mysqlMasterGtidSet := masterGtidSet.(*gomysql.MysqlGTIDSet)
+	for _, masterSet := range mysqlMasterGtidSet.Sets {
+		slaveSet, ok := mysqlSlaveGtidSet.Sets[masterSet.SID.String()]
 		if !ok {
 			continue
 		}
@@ -252,8 +254,8 @@ func isSplitBrained(slaveGtidSet, masterGtidSet *gomysql.MysqlGTIDSet, masterUUI
 		return true
 	}
 
-	for _, slaveSet := range slaveGtidSet.Sets {
-		if _, ok := masterGtidSet.Sets[slaveSet.SID.String()]; !ok {
+	for _, slaveSet := range mysqlSlaveGtidSet.Sets {
+		if _, ok := mysqlMasterGtidSet.Sets[slaveSet.SID.String()]; !ok {
 			return true
 		}
 	}

diff --git a/internal/mysql/gtids/wrapper.go b/internal/mysql/gtids/wrapper.go
@@ -6,10 +6,10 @@ import (
 
 type GTIDSet = mysql.GTIDSet
 
-func ParseGtidSet(gtidset string) *mysql.MysqlGTIDSet {
-	parsed, err := mysql.ParseMysqlGTIDSet(gtidset)
+func ParseGtidSet(gtidset string) mysql.GTIDSet {
+	parsed, err := mysql.ParseGTIDSet(mysql.MySQLFlavor, gtidset)
 	if err != nil {
 		panic(err)
 	}
-	return parsed.(*mysql.MysqlGTIDSet)
+	return parsed
 }
diff --git a/internal/mysql/node.go b/internal/mysql/node.go
@@ -17,7 +17,6 @@ import (
 	"syscall"
 	"time"
 
-	mysql2 "github.com/go-mysql-org/go-mysql/mysql"
 	"github.com/go-sql-driver/mysql"
 	"github.com/google/uuid"
 	"github.com/jmoiron/sqlx"
@@ -35,6 +34,7 @@ type Node struct {
 	db      *sqlx.DB
 	version *Version
 	host    string
+	uuid    uuid.UUID
 }
 
 var (
@@ -579,7 +579,7 @@ func (n *Node) GTIDExecuted() (*GTIDExecuted, error) {
 }
 
 // GTIDExecuted returns global transaction id executed
-func (n *Node) GTIDExecutedParsed() (*mysql2.MysqlGTIDSet, error) {
+func (n *Node) GTIDExecutedParsed() (gtids.GTIDSet, error) {
 	gtid, err := n.GTIDExecuted()
 	if err != nil {
 		return nil, err
@@ -605,6 +605,9 @@ func (n *Node) GetBinlogs() ([]Binlog, error) {
 
 // UUID returns server_uuid
 func (n *Node) UUID() (uuid.UUID, error) {
+	if n.uuid.ID() != 0 {
+		return n.uuid, nil
+	}
 	var r ServerUUIDResult
 	err := n.queryRow(queryGetUUID, nil, &r)
 	if err != nil {