Fix unit tests

Signed-off-by: Matt Lord <[email protected]>
vitessio · Jan 7, 2025 · 85389bb · 85389bb
1 parent 8fe55af
commit 85389bb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/go/mysql/replication/binlog_file_position.go b/go/mysql/replication/binlog_file_position.go
@@ -28,12 +28,14 @@ type BinlogFilePos struct {
 }
 
 // ParseBinlogFilePos parses a binlog file and position in the input
-// format used by commands such as SHOW REPLICA STATUS and SHOW BINARY
-// LOG STATUS.
+// format used by internal code that processes output from MySQL such
+// as SHOW REPLICA STATUS and SHOW BINARY LOG STATUS.
 func ParseBinlogFilePos(s string) (BinlogFilePos, error) {
 	bfp := BinlogFilePos{}
+	if s == "" {
+		return bfp, nil
+	}
 
-	// Split into parts.
 	file, posStr, ok := strings.Cut(s, ":")
 	if !ok {
 		return bfp, fmt.Errorf("invalid binlog file position (%v): expecting file:pos", s)
@@ -64,3 +66,7 @@ func (bfp BinlogFilePos) ConvertToFlavorPosition() (pos Position, err error) {
 	pos.GTIDSet, err = ParseFilePosGTIDSet(bfp.String())
 	return pos, err
 }
+
+func (bfp BinlogFilePos) Equal(b BinlogFilePos) bool {
+	return bfp.File == b.File && bfp.Pos == b.Pos
+}
diff --git a/go/mysql/replication/replication_status.go b/go/mysql/replication/replication_status.go
@@ -89,7 +89,7 @@ func (s *ReplicationStatus) SQLHealthy() bool {
 func ReplicationStatusToProto(s ReplicationStatus) *replicationdatapb.Status {
 	replstatuspb := &replicationdatapb.Status{
 		Position:                               EncodePosition(s.Position),
-		RelayLogPosition:                       s.RelayLogPosition.String(),
+		RelayLogPosition:                       EncodePosition(s.RelayLogPosition),
 		FilePosition:                           s.FilePosition.String(),
 		RelayLogSourceBinlogEquivalentPosition: s.RelayLogSourceBinlogEquivalentPosition.String(),
 		SourceServerId:                         s.SourceServerID,

diff --git a/go/mysql/replication/replication_status_test.go b/go/mysql/replication/replication_status_test.go
@@ -310,12 +310,16 @@ func TestFilePosRetrieveExecutedPosition(t *testing.T) {
 	got, err := ParseFilePosReplicationStatus(resultMap)
 	require.NoError(t, err)
 	assert.Equalf(t, got.Position.GTIDSet, want.Position.GTIDSet, "got Position: %v; want Position: %v", got.Position.GTIDSet, want.Position.GTIDSet)
-	assert.Equalf(t, got.RelayLogPosition.GTIDSet, want.RelayLogPosition, "got RelayLogPosition: %v; want RelayLogPosition: %v", got.RelayLogPosition.GTIDSet, want.RelayLogPosition.GTIDSet)
+	assert.Equalf(t, got.RelayLogPosition.GTIDSet, want.RelayLogPosition.GTIDSet, "got RelayLogPosition: %v; want RelayLogPosition: %v", got.RelayLogPosition.GTIDSet, want.RelayLogPosition.GTIDSet)
 	assert.Equalf(t, got.RelayLogFilePosition, want.RelayLogFilePosition, "got RelayLogFilePosition: %v; want RelayLogFilePosition: %v", got.RelayLogFilePosition, want.RelayLogFilePosition)
 	assert.Equalf(t, got.FilePosition, want.FilePosition, "got FilePosition: %v; want FilePosition: %v", got.FilePosition, want.FilePosition)
 	assert.Equalf(t, got.RelayLogSourceBinlogEquivalentPosition, want.RelayLogSourceBinlogEquivalentPosition, "got RelayLogSourceBinlogEquivalentPosition: %v; want RelayLogSourceBinlogEquivalentPosition: %v", got.RelayLogSourceBinlogEquivalentPosition, want.RelayLogSourceBinlogEquivalentPosition)
-	assert.Equalf(t, got.Position.GTIDSet, got.FilePosition, "FilePosition and Position don't match when they should for the FilePos flavor")
-	assert.Equalf(t, got.RelayLogPosition.GTIDSet, got.RelayLogSourceBinlogEquivalentPosition, "RelayLogPosition and RelayLogSourceBinlogEquivalentPosition don't match when they should for the FilePos flavor")
+	filePos, err := got.FilePosition.ConvertToFlavorPosition()
+	require.NoError(t, err)
+	assert.Equalf(t, got.Position.GTIDSet, filePos.GTIDSet, "FilePosition and Position don't match when they should for the FilePos flavor")
+	filePos, err = got.RelayLogSourceBinlogEquivalentPosition.ConvertToFlavorPosition()
+	require.NoError(t, err)
+	assert.Equalf(t, got.RelayLogPosition.GTIDSet, filePos.GTIDSet, "RelayLogPosition and RelayLogSourceBinlogEquivalentPosition don't match when they should for the FilePos flavor")
 }
 
 func TestFilePosShouldGetPosition(t *testing.T) {
@@ -332,5 +336,7 @@ func TestFilePosShouldGetPosition(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equalf(t, got.Position.GTIDSet, want.Position.GTIDSet, "got Position: %v; want Position: %v", got.Position.GTIDSet, want.Position.GTIDSet)
 	assert.Equalf(t, got.FilePosition, want.FilePosition, "got FilePosition: %v; want FilePosition: %v", got.FilePosition, want.FilePosition)
-	assert.Equalf(t, got.Position.GTIDSet, got.FilePosition, "FilePosition and Position don't match when they should for the FilePos flavor")
+	filePos, err := got.FilePosition.ConvertToFlavorPosition()
+	require.NoError(t, err)
+	assert.Equalf(t, got.Position.GTIDSet, filePos.GTIDSet, "FilePosition and Position don't match when they should for the FilePos flavor")
 }