Initial support for structurized oracle gtid entries

Author: shlomi-noach

build.sh

@@ -6,7 +6,7 @@
 #
 set -e
 
-RELEASE_VERSION="1.4.541"
+RELEASE_VERSION="1.4.542"
 TOPDIR=/tmp/orchestrator-release
 export RELEASE_VERSION TOPDIR
 

go/inst/instance_test.go

@@ -227,7 +227,7 @@ func (s *TestSuite) TestInstanceKeyValid(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(i.IsValid(), Equals, false)
 	i, err = inst.ParseInstanceKey("//myhost:3306")
-	c.Assert(err, IsNil)
+	c.Assert(err, Not(IsNil))
 	c.Assert(i.IsValid(), Equals, false)
 }
 
@@ -304,6 +304,52 @@ func (s *TestSuite) TestNextGTID(c *C) {
 	}
 }
 
+func (s *TestSuite) TestOracleGTIDSet(c *C) {
+	gtidSetString := `230ea8ea-81e3-11e4-972a-e25ec4bd140a:1-10539,
+316d193c-70e5-11e5-adb2-ecf4bb2262ff:1-8935:8984-6124596,
+321f5c0d-70e5-11e5-adb2-ecf4bb2262ff:1-56`
+	gtidSet, err := inst.ParseGtidSet(gtidSetString)
+	c.Assert(err, IsNil)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 3)
+	c.Assert(gtidSet.String(), Equals, `230ea8ea-81e3-11e4-972a-e25ec4bd140a:1-10539,
+316d193c-70e5-11e5-adb2-ecf4bb2262ff:1-8935:8984-6124596,
+321f5c0d-70e5-11e5-adb2-ecf4bb2262ff:1-56`)
+
+	c.Assert(gtidSet.GtidEntries[0].UUID, Equals, `230ea8ea-81e3-11e4-972a-e25ec4bd140a`)
+	c.Assert(gtidSet.GtidEntries[1].UUID, Equals, `316d193c-70e5-11e5-adb2-ecf4bb2262ff`)
+	c.Assert(gtidSet.GtidEntries[2].UUID, Equals, `321f5c0d-70e5-11e5-adb2-ecf4bb2262ff`)
+	c.Assert(gtidSet.GtidEntries[1].Ranges, Equals, `1-8935:8984-6124596`)
+
+	removed := gtidSet.RemoveUUID(`ffffffff-70e5-11e5-adb2-ecf4bb2262ff`)
+	c.Assert(removed, Equals, false)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 3)
+
+	removed = gtidSet.RemoveUUID(`316d193c-70e5-11e5-adb2-ecf4bb2262ff`)
+	c.Assert(removed, Equals, true)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 2)
+
+	c.Assert(gtidSet.String(), Equals, `230ea8ea-81e3-11e4-972a-e25ec4bd140a:1-10539,
+321f5c0d-70e5-11e5-adb2-ecf4bb2262ff:1-56`)
+
+	removed = gtidSet.RemoveUUID(`316d193c-70e5-11e5-adb2-ecf4bb2262ff`)
+	c.Assert(removed, Equals, false)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 2)
+
+	removed = gtidSet.RemoveUUID(`321f5c0d-70e5-11e5-adb2-ecf4bb2262ff`)
+	c.Assert(removed, Equals, true)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 1)
+	c.Assert(gtidSet.String(), Equals, `230ea8ea-81e3-11e4-972a-e25ec4bd140a:1-10539`)
+
+	removed = gtidSet.RemoveUUID(`230ea8ea-81e3-11e4-972a-e25ec4bd140a`)
+	c.Assert(removed, Equals, true)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 0)
+
+	removed = gtidSet.RemoveUUID(`230ea8ea-81e3-11e4-972a-e25ec4bd140a`)
+	c.Assert(removed, Equals, false)
+	c.Assert(len(gtidSet.GtidEntries), Equals, 0)
+	c.Assert(gtidSet.String(), Equals, ``)
+}
+
 func (s *TestSuite) TestRemoveInstance(c *C) {
 	{
 		instances := [](*inst.Instance){&instance1, &instance2}

go/inst/oracle_gtid_set.go

@@ -0,0 +1,73 @@
+/*
+   Copyright 2015 Shlomi Noach, courtesy Booking.com
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package inst
+
+import (
+	"strings"
+)
+
+// OracleGtidSet represents a set of GTID ranges as depicted by Retrieved_Gtid_Set, Executed_Gtid_Set or @@gtid_purged.
+type OracleGtidSet struct {
+	GtidEntries [](*OracleGtidSetEntry)
+}
+
+// Example input:  `230ea8ea-81e3-11e4-972a-e25ec4bd140a:1-10539,
+// 316d193c-70e5-11e5-adb2-ecf4bb2262ff:1-8935:8984-6124596,
+// 321f5c0d-70e5-11e5-adb2-ecf4bb2262ff:1-56`
+func ParseGtidSet(gtidSet string) (res *OracleGtidSet, err error) {
+	res = &OracleGtidSet{}
+
+	gtidSet = strings.TrimSpace(gtidSet)
+	if gtidSet == "" {
+		return res, nil
+	}
+	entries := strings.Split(gtidSet, ",")
+	for _, entry := range entries {
+		if gtidRange, err := NewOracleGtidSetEntry(entry); err == nil {
+			res.GtidEntries = append(res.GtidEntries, gtidRange)
+		} else {
+			return res, err
+		}
+	}
+	return res, nil
+}
+
+// RemoveUUID removes entries that belong to given UUID.
+// By way of how this works there can only be one entry matching our UUID, but we generalize.
+// We keep order of entries.
+func (this *OracleGtidSet) RemoveUUID(uuid string) (removed bool) {
+	filteredEntries := [](*OracleGtidSetEntry){}
+	for _, entry := range this.GtidEntries {
+		if entry.UUID == uuid {
+			removed = true
+		} else {
+			filteredEntries = append(filteredEntries, entry)
+		}
+	}
+	if removed {
+		this.GtidEntries = filteredEntries
+	}
+	return removed
+}
+
+func (this OracleGtidSet) String() string {
+	tokens := []string{}
+	for _, entry := range this.GtidEntries {
+		tokens = append(tokens, entry.String())
+	}
+	return strings.Join(tokens, ",\n")
+}

go/inst/oracle_gtid_set_entry.go

@@ -0,0 +1,46 @@
+/*
+   Copyright 2015 Shlomi Noach, courtesy Booking.com
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package inst
+
+import (
+	"fmt"
+	"strings"
+)
+
+// OracleGtidSetEntry represents an entry in a set of GTID ranges, 
+// for example, the entry: "316d193c-70e5-11e5-adb2-ecf4bb2262ff:1-8935:8984-6124596" (may include gaps)
+type OracleGtidSetEntry struct {
+	UUID   string
+	Ranges string
+}
+
+
+// NewOracleGtidSetEntry parses a single entry text
+func NewOracleGtidSetEntry(gtidRangeString string) (*OracleGtidSetEntry, error) {
+	gtidRangeString = strings.TrimSpace(gtidRangeString)
+	tokens := strings.SplitN(gtidRangeString, ":", 2)
+	if len(tokens) != 2 {
+		return nil, fmt.Errorf("Cannot parse OracleGtidSetEntry from %s", gtidRangeString)
+	}
+	gtidRange := &OracleGtidSetEntry{UUID: tokens[0], Ranges: tokens[1]}
+	return gtidRange, nil
+}
+
+// String returns a user-friendly string representation of this entry
+func (this OracleGtidSetEntry) String() string {
+	return fmt.Sprintf("%s:%s", this.UUID, this.Ranges)
+}