Skip to content

Add MysqlGTIDSet.Add() and Minus() methods #662

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 2 commits into from
Jan 12, 2022
+140 −0
Merged

Add MysqlGTIDSet.Add() and Minus() methods #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8824e1
Add MysqlGTIDSet.Add() and Minus() methods, so it will help users to …
ostinru Dec 30, 2021
24e41d5
Code review fixes: clean code and better tests
ostinru Jan 11, 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
81 changes: 81 additions & 0 deletions mysql/mysql_gtid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,57 @@ func (s *UUIDSet) AddInterval(in IntervalSlice) {
s.Intervals = s.Intervals.Normalize()
}

func (s *UUIDSet) MinusInterval(in IntervalSlice) {
var n IntervalSlice
in = in.Normalize()

i, j := 0, 0
var minuend Interval
var subtrahend Interval
for j < len(in) && i < len(s.Intervals) {
if minuend.Stop != s.Intervals[i].Stop { // `i` changed?
minuend = s.Intervals[i]
}
subtrahend = in[j]

if minuend.Stop <= subtrahend.Start {
// no overlapping
n = append(n, minuend)
i++
} else if minuend.Start >= subtrahend.Stop {
// no overlapping
j++
} else {
if minuend.Start < subtrahend.Start && minuend.Stop < subtrahend.Stop {
n = append(n, Interval{minuend.Start, subtrahend.Start})
i++
} else if minuend.Start > subtrahend.Start && minuend.Stop > subtrahend.Stop {
minuend = Interval{subtrahend.Stop, minuend.Stop}
j++
} else if minuend.Start >= subtrahend.Start && minuend.Stop <= subtrahend.Stop {
// minuend is completely removed
i++
} else {
n = append(n, Interval{minuend.Start, subtrahend.Start})
minuend = Interval{subtrahend.Stop, minuend.Stop}
j++
}
}
}

lastSub := in[len(in)-1]
for ; i < len(s.Intervals); i++ {
minuend = s.Intervals[i]
if minuend.Start < lastSub.Stop {
n = append(n, Interval{lastSub.Stop, minuend.Stop})
} else {
n = append(n, s.Intervals[i])
}
}

s.Intervals = n.Normalize()
}

func (s *UUIDSet) String() string {
return hack.String(s.Bytes())
}
Expand Down Expand Up @@ -304,6 +355,8 @@ type MysqlGTIDSet struct {
Sets map[string]*UUIDSet
}

var _ GTIDSet = &MysqlGTIDSet{}

func ParseMysqlGTIDSet(str string) (GTIDSet, error) {
s := new(MysqlGTIDSet)
s.Sets = make(map[string]*UUIDSet)
Expand Down Expand Up @@ -362,6 +415,20 @@ func (s *MysqlGTIDSet) AddSet(set *UUIDSet) {
}
}

func (s *MysqlGTIDSet) MinusSet(set *UUIDSet) {
if set == nil {
return
}
sid := set.SID.String()
uuidSet, ok := s.Sets[sid]
if ok {
uuidSet.MinusInterval(set.Intervals)
if uuidSet.Intervals == nil {
delete(s.Sets, sid)
}
}
}

func (s *MysqlGTIDSet) Update(GTIDStr string) error {
gtidSet, err := ParseMysqlGTIDSet(GTIDStr)
if err != nil {
Expand All @@ -373,6 +440,20 @@ func (s *MysqlGTIDSet) Update(GTIDStr string) error {
return nil
}

func (s *MysqlGTIDSet) Add(addend MysqlGTIDSet) error {
for _, uuidSet := range addend.Sets {
s.AddSet(uuidSet)
}
return nil
}

func (s *MysqlGTIDSet) Minus(subtrahend MysqlGTIDSet) error {
for _, uuidSet := range subtrahend.Sets {
s.MinusSet(uuidSet)
}
return nil
}

func (s *MysqlGTIDSet) Contain(o GTIDSet) bool {
sub, ok := o.(*MysqlGTIDSet)
if !ok {
Expand Down
59 changes: 59 additions & 0 deletions mysql/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package mysql

import (
"fmt"
"strings"
"testing"

Expand Down Expand Up @@ -142,6 +143,57 @@ func (t *mysqlTestSuite) TestMysqlGTIDContain(c *check.C) {
c.Assert(g1.Contain(g2), check.Equals, false)
}

func (t *mysqlTestSuite) TestMysqlGTIDAdd(c *check.C) {
testCases := []struct {
left, right, expected string
}{
// simple cases works:
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23:28-57"},
// summ is associative operation
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23:28-57"},
// merge intervals:
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:23-27", "3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23-57"},
}

for _, tc := range testCases {
m1 := t.mysqlGTIDfromString(c, tc.left)
m2 := t.mysqlGTIDfromString(c, tc.right)
err := m1.Add(m2)
c.Assert(err, check.IsNil)
c.Assert(
fmt.Sprintf("%s + %s = %s", tc.left, tc.right, strings.ToUpper(m1.String())),
check.Equals,
fmt.Sprintf("%s + %s = %s", tc.left, tc.right, tc.expected))
}
}

func (t *mysqlTestSuite) TestMysqlGTIDMinus(c *check.C) {
testCases := []struct {
left, right, expected string
}{
// Minuses that doesn't affect original value:
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23"},
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57"},
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:1-22:24-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23"},
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "ABCDEF12-1234-5678-9012-345678901234:1-1000", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23"},
// Minuses that change original value:
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:20-57:60-90", "3E11FA47-71CA-11E1-9E33-C80AA9429562:23", "3E11FA47-71CA-11E1-9E33-C80AA9429562:20-22:24-57:60-90"},
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:20-57:60-90", "3E11FA47-71CA-11E1-9E33-C80AA9429562:22-70", "3E11FA47-71CA-11E1-9E33-C80AA9429562:20-21:71-90"},
{"3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", "3E11FA47-71CA-11E1-9E33-C80AA9429562:28-57", ""},
}

for _, tc := range testCases {
m1 := t.mysqlGTIDfromString(c, tc.left)
m2 := t.mysqlGTIDfromString(c, tc.right)
err := m1.Minus(m2)
c.Assert(err, check.IsNil)
c.Assert(
fmt.Sprintf("%s - %s = %s", tc.left, tc.right, strings.ToUpper(m1.String())),
check.Equals,
fmt.Sprintf("%s - %s = %s", tc.left, tc.right, tc.expected))
}
}

func (t *mysqlTestSuite) TestMysqlParseBinaryInt8(c *check.C) {
i8 := ParseBinaryInt8([]byte{128})
c.Assert(i8, check.Equals, int8(-128))
Expand Down Expand Up @@ -229,3 +281,10 @@ func (t *mysqlTestSuite) TestMysqlEmptyDecode(c *check.C) {
c.Assert(isNull, check.IsTrue)
c.Assert(n, check.Equals, 0)
}

func (t *mysqlTestSuite) mysqlGTIDfromString(c *check.C, gtidStr string) MysqlGTIDSet {
gtid, err := ParseMysqlGTIDSet(gtidStr)
c.Assert(err, check.IsNil)

return *gtid.(*MysqlGTIDSet)
}