Skip to content

ParseUUIDSet works unexpected #467 #1008

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

Draft
ljluestc wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

ParseUUIDSet works unexpected #467 #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae9811e
ParseUUIDSet
Mar 9, 2025
d77a6ec
Run gofumpt on the changed files
dveeden Dec 15, 2025
990e6fc
Merge remote-tracking branch 'upstream/master' into ParseUUIDSet
dveeden Dec 15, 2025
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: 54 additions & 27 deletions mysql/mysql_gtid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,31 +193,61 @@ type UUIDSet struct {
Intervals IntervalSlice
}

func ParseUUIDSet(str string) (*UUIDSet, error) {
str = strings.TrimSpace(str)
sep := strings.Split(str, ":")
if len(sep) < 2 {
return nil, errors.Errorf("invalid GTID format, must UUID:interval[:interval]")
// ParseUUIDSet parses a GTID set string into a map of UUIDSet structs keyed by their SID.
// Supports multi-UUID sets like "uuid1:1-10,uuid2:5-15".
func ParseUUIDSet(s string) (map[string]*UUIDSet, error) {
if s == "" {
return nil, nil
}

var err error
s := new(UUIDSet)
if s.SID, err = uuid.Parse(sep[0]); err != nil {
return nil, errors.Trace(err)
uuidSets := strings.Split(strings.TrimSpace(s), ",")
if len(uuidSets) == 0 {
return nil, fmt.Errorf("empty UUID set")
}

// Handle interval
for i := 1; i < len(sep); i++ {
if in, err := parseInterval(sep[i]); err != nil {
return nil, errors.Trace(err)
} else {
s.Intervals = append(s.Intervals, in)
result := make(map[string]*UUIDSet)
for _, set := range uuidSets {
set = strings.TrimSpace(set)
if set == "" {
continue
}
}

s.Intervals = s.Intervals.Normalize()
parts := strings.SplitN(set, ":", 2)
if len(parts) != 2 {
return nil, fmt.Errorf("invalid UUID set format: %s", set)
}

return s, nil
sid, err := uuid.Parse(parts[0])
if err != nil {
return nil, fmt.Errorf("invalid UUID: %s", parts[0])
}

// Check if this SID already exists in the map
uuidSet, exists := result[sid.String()]
if !exists {
uuidSet = &UUIDSet{SID: sid}
result[sid.String()] = uuidSet
}

intervals := strings.Split(parts[1], ":")
for _, intervalStr := range intervals {
interval, err := parseInterval(intervalStr)
if err != nil {
return nil, fmt.Errorf("invalid interval in UUID set %s: %v", set, err)
}
uuidSet.Intervals = append(uuidSet.Intervals, interval)
}

if len(uuidSet.Intervals) == 0 {
return nil, fmt.Errorf("no valid intervals in UUID set: %s", set)
}
uuidSet.Intervals = uuidSet.Intervals.Normalize() // Normalize intervals after adding
}

if len(result) == 0 {
return nil, fmt.Errorf("no valid UUID sets parsed from: %s", s)
}
return result, nil
}

func NewUUIDSet(sid uuid.UUID, in ...Interval) *UUIDSet {
Expand Down Expand Up @@ -390,15 +420,12 @@ func ParseMysqlGTIDSet(str string) (GTIDSet, error) {
return s, nil
}

sp := strings.Split(str, ",")

// todo, handle redundant same uuid
for i := 0; i < len(sp); i++ {
if set, err := ParseUUIDSet(sp[i]); err != nil {
return nil, errors.Trace(err)
} else {
s.AddSet(set)
}
sets, err := ParseUUIDSet(str) // Use the updated ParseUUIDSet
if err != nil {
return nil, errors.Trace(err)
}
for sid, set := range sets {
s.Sets[sid] = set
}
return s, nil
}
Expand Down
91 changes: 91 additions & 0 deletions mysql/mysql_gtid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package mysql

import (
"reflect"
"testing"

"github.com/google/uuid"
)

func TestParseUUIDSet(t *testing.T) {

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / golangci 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

other declaration of TestParseUUIDSet

Check failure on line 10 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

other declaration of TestParseUUIDSet
tests := []struct {
input string
expected map[string]*UUIDSet
wantErr bool
}{
{
input: "0b8beec9-911e-11e9-9f7b-8a057645f3f6:1-1175877800",
expected: map[string]*UUIDSet{
"0b8beec9-911e-11e9-9f7b-8a057645f3f6": {
SID: uuid.Must(uuid.Parse("0b8beec9-911e-11e9-9f7b-8a057645f3f6")),
Intervals: []Interval{{Start: 1, Stop: 1175877801}}, // Stop is Start+1 for single intervals
},
},
wantErr: false,
},
{
input: "0b8beec9-911e-11e9-9f7b-8a057645f3f6:1-1175877800,246e88bd-0288-11e8-9cee-230cd2fc765b:1-592884032",
expected: map[string]*UUIDSet{
"0b8beec9-911e-11e9-9f7b-8a057645f3f6": {
SID: uuid.Must(uuid.Parse("0b8beec9-911e-11e9-9f7b-8a057645f3f6")),
Intervals: []Interval{{Start: 1, Stop: 1175877801}},
},
"246e88bd-0288-11e8-9cee-230cd2fc765b": {
SID: uuid.Must(uuid.Parse("246e88bd-0288-11e8-9cee-230cd2fc765b")),
Intervals: []Interval{{Start: 1, Stop: 592884033}},
},
},
wantErr: false,
},
{
input: "invalid",
wantErr: true,
},
{
input: "",
expected: nil,
wantErr: false,
},
}

for _, tt := range tests {
t.Run(tt.input, func(t *testing.T) {
got, err := ParseUUIDSet(tt.input)
if (err != nil) != tt.wantErr {
t.Errorf("ParseUUIDSet() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.expected) {
t.Errorf("ParseUUIDSet() = %v, want %v", got, tt.expected)
}
})
}
}

func TestParseMysqlGTIDSet(t *testing.T) {

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / golangci 

other declaration of TestParseMysqlGTIDSet (typecheck)

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

other declaration of TestParseMysqlGTIDSet

Check failure on line 65 in mysql/mysql_gtid_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

other declaration of TestParseMysqlGTIDSet
input := "0b8beec9-911e-11e9-9f7b-8a057645f3f6:1-1175877800,246e88bd-0288-11e8-9cee-230cd2fc765b:1-592884032"
expected := &MysqlGTIDSet{
Sets: map[string]*UUIDSet{
"0b8beec9-911e-11e9-9f7b-8a057645f3f6": {
SID: uuid.Must(uuid.Parse("0b8beec9-911e-11e9-9f7b-8a057645f3f6")),
Intervals: []Interval{{Start: 1, Stop: 1175877801}},
},
"246e88bd-0288-11e8-9cee-230cd2fc765b": {
SID: uuid.Must(uuid.Parse("246e88bd-0288-11e8-9cee-230cd2fc765b")),
Intervals: []Interval{{Start: 1, Stop: 592884033}},
},
},
}

got, err := ParseMysqlGTIDSet(input)
if err != nil {
t.Fatalf("ParseMysqlGTIDSet() error = %v", err)
}
if !reflect.DeepEqual(got, expected) {
t.Errorf("ParseMysqlGTIDSet() = %v, want %v", got, expected)
}

if got.String() != input {
t.Errorf("String() = %v, want %v", got.String(), input)
}
}
118 changes: 92 additions & 26 deletions mysql/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import (
"fmt"
"reflect"
"strings"
"testing"

Expand Down Expand Up @@ -102,11 +103,10 @@
func TestMysqlGTIDCodec(t *testing.T) {
us, err := ParseUUIDSet("de278ad0-2106-11e4-9f8e-6edd0ca20947:1-2")
require.NoError(t, err)

require.Equal(t, "de278ad0-2106-11e4-9f8e-6edd0ca20947:1-2", us.String())

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 106 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

us.String undefined (type map[string]*UUIDSet has no field or method String)

buf := us.Encode()

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)

Check failure on line 108 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

us.Encode undefined (type map[string]*UUIDSet has no field or method Encode)
err = us.Decode(buf)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)

Check failure on line 109 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

us.Decode undefined (type map[string]*UUIDSet has no field or method Decode)
require.NoError(t, err)

gs, err := ParseMysqlGTIDSet("de278ad0-2106-11e4-9f8e-6edd0ca20947:1-2,de278ad0-2106-11e4-9f8e-6edd0ca20948:1-2")
Expand All @@ -124,29 +124,28 @@

err = g1.Update("3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58")
require.NoError(t, err)

require.Equal(t, "3E11FA47-71CA-11E1-9E33-C80AA9429562:21-58", strings.ToUpper(g1.String()))

g1, err = ParseMysqlGTIDSet(`
519CE70F-A893-11E9-A95A-B32DC65A7026:1-1154661,
5C9CA52B-9F11-11E9-8EAF-3381EC1CC790:1-244,
802D69FD-A3B6-11E9-B1EA-50BAB55BA838:1-1221371,
F2B50559-A891-11E9-B646-884FF0CA2043:1-479261
`)
519CE70F-A893-11E9-A95A-B32DC65A7026:1-1154661,
5C9CA52B-9F11-11E9-8EAF-3381EC1CC790:1-244,
802D69FD-A3B6-11E9-B1EA-50BAB55BA838:1-1221371,
F2B50559-A891-11E9-B646-884FF0CA2043:1-479261
`)
require.NoError(t, err)

err = g1.Update(`
802D69FD-A3B6-11E9-B1EA-50BAB55BA838:1221110-1221371,
F2B50559-A891-11E9-B646-884FF0CA2043:478509-479266
`)
802D69FD-A3B6-11E9-B1EA-50BAB55BA838:1221110-1221371,
F2B50559-A891-11E9-B646-884FF0CA2043:478509-479266
`)
require.NoError(t, err)

g2, err := ParseMysqlGTIDSet(`
519CE70F-A893-11E9-A95A-B32DC65A7026:1-1154661,
5C9CA52B-9F11-11E9-8EAF-3381EC1CC790:1-244,
802D69FD-A3B6-11E9-B1EA-50BAB55BA838:1-1221371,
F2B50559-A891-11E9-B646-884FF0CA2043:1-479266
`)
519CE70F-A893-11E9-A95A-B32DC65A7026:1-1154661,
5C9CA52B-9F11-11E9-8EAF-3381EC1CC790:1-244,
802D69FD-A3B6-11E9-B1EA-50BAB55BA838:1-1221371,
F2B50559-A891-11E9-B646-884FF0CA2043:1-479266
`)
require.NoError(t, err)
require.True(t, g1.Equal(g2))
}
Expand All @@ -173,8 +172,8 @@
require.NoError(t, err)
g1.AddGTID(u2, 58)
g2, err := ParseMysqlGTIDSet(`
3E11FA47-71CA-11E1-9E33-C80AA9429562:21-60,
519CE70F-A893-11E9-A95A-B32DC65A7026:58
3E11FA47-71CA-11E1-9E33-C80AA9429562:21-60,
519CE70F-A893-11E9-A95A-B32DC65A7026:58
`)
require.NoError(t, err)
require.True(t, g2.Equal(g1))
Expand All @@ -195,11 +194,8 @@
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"},
}

Expand All @@ -218,12 +214,10 @@
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", ""},
Expand Down Expand Up @@ -311,7 +305,6 @@

func TestMysqlNullDecode(t *testing.T) {
_, isNull, n := LengthEncodedInt([]byte{0xfb})

require.True(t, isNull)
require.Equal(t, 1, n)
}
Expand All @@ -319,9 +312,9 @@
func TestMysqlUUIDClone(t *testing.T) {
us, err := ParseUUIDSet("de278ad0-2106-11e4-9f8e-6edd0ca20947:1-2")
require.NoError(t, err)
require.Equal(t, "de278ad0-2106-11e4-9f8e-6edd0ca20947:1-2", us.String())

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

us.String undefined (type map[string]*UUIDSet has no field or method String)

Check failure on line 315 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

us.String undefined (type map[string]*UUIDSet has no field or method String)

clone := us.Clone()

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)

Check failure on line 317 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

us.Clone undefined (type map[string]*UUIDSet has no field or method Clone)
require.Equal(t, "de278ad0-2106-11e4-9f8e-6edd0ca20947:1-2", clone.String())
}

Expand All @@ -334,7 +327,6 @@
func mysqlGTIDfromString(t *testing.T, gtidStr string) MysqlGTIDSet {
gtid, err := ParseMysqlGTIDSet(gtidStr)
require.NoError(t, err)

return *gtid.(*MysqlGTIDSet)
}

Expand All @@ -350,17 +342,91 @@
{"msql", false},
{"mArIAdb", true},
}

for _, f := range tbls {
err := ValidateFlavor(f.flavor)
if f.valid == true {
if f.valid {
require.NoError(t, err)
} else {
require.Error(t, err)
}
}
}

func TestParseUUIDSet(t *testing.T) {

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

TestParseUUIDSet redeclared in this block

Check failure on line 355 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

TestParseUUIDSet redeclared in this block
tests := []struct {
input string
expected *UUIDSet
wantErr bool
}{
{
input: "0b8beec9-911e-11e9-9f7b-8a057645f3f6:1-1175877800",
expected: &UUIDSet{
SID: uuid.Must(uuid.Parse("0b8beec9-911e-11e9-9f7b-8a057645f3f6")),
Intervals: []Interval{{Start: 1, Stop: 1175877801}},
},
wantErr: false,
},
{
input: "246e88bd-0288-11e8-9cee-230cd2fc765b:1-592884032",
expected: &UUIDSet{
SID: uuid.Must(uuid.Parse("246e88bd-0288-11e8-9cee-230cd2fc765b")),
Intervals: []Interval{{Start: 1, Stop: 592884033}},
},
wantErr: false,
},
{
input: "invalid",
wantErr: true,
},
{
input: "",
expected: nil,
wantErr: false,
},
}

for _, tt := range tests {
t.Run(tt.input, func(t *testing.T) {
got, err := ParseUUIDSet(tt.input)
if (err != nil) != tt.wantErr {
t.Errorf("ParseUUIDSet() error = %v, wantErr %v", err, tt.wantErr)
return
}
if !reflect.DeepEqual(got, tt.expected) {
t.Errorf("ParseUUIDSet() = %v, want %v", got, tt.expected)
}
})
}
}

func TestParseMysqlGTIDSet(t *testing.T) {

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / golangci 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-latest 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-22.04 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-latest 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-22.04 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.24 on ubuntu-24.04 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests Go 1.23 on ubuntu-24.04 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 9.3.0 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.4.5 

TestParseMysqlGTIDSet redeclared in this block

Check failure on line 402 in mysql/mysql_test.go

View workflow job for this annotation

GitHub Actions / Tests with MySQL 8.0.42 

TestParseMysqlGTIDSet redeclared in this block
input := "0b8beec9-911e-11e9-9f7b-8a057645f3f6:1-1175877800,246e88bd-0288-11e8-9cee-230cd2fc765b:1-592884032"
expected := &MysqlGTIDSet{
Sets: map[string]*UUIDSet{
"0b8beec9-911e-11e9-9f7b-8a057645f3f6": {
SID: uuid.Must(uuid.Parse("0b8beec9-911e-11e9-9f7b-8a057645f3f6")),
Intervals: []Interval{{Start: 1, Stop: 1175877801}},
},
"246e88bd-0288-11e8-9cee-230cd2fc765b": {
SID: uuid.Must(uuid.Parse("246e88bd-0288-11e8-9cee-230cd2fc765b")),
Intervals: []Interval{{Start: 1, Stop: 592884033}},
},
},
}

got, err := ParseMysqlGTIDSet(input)
if err != nil {
t.Fatalf("ParseMysqlGTIDSet() error = %v", err)
}
if !reflect.DeepEqual(got, expected) {
t.Errorf("ParseMysqlGTIDSet() = %v, want %v", got, expected)
}

if got.String() != input {
t.Errorf("String() = %v, want %v", got.String(), input)
}
}

func TestMysqlGTIDSetIsEmpty(t *testing.T) {
emptyGTIDSet := new(MysqlGTIDSet)
emptyGTIDSet.Sets = make(map[string]*UUIDSet)
Expand Down
Loading