fix ci

pingcap · Dec 21, 2020 · 41ef863 · 41ef863
1 parent db85f8f
commit 41ef863
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/dm/worker/server.go b/dm/worker/server.go
@@ -560,6 +560,8 @@ func (s *Server) startWorker(cfg *config.SourceConfig) error {
 			if err != nil {
 				return err
 			}
+		} else {
+			cfg.UUIDSuffix = binlog.MinUUIDSuffix
 		}
 	}
 

diff --git a/pkg/binlog/position.go b/pkg/binlog/position.go
@@ -36,7 +36,8 @@ const (
 	// eg. mysql-bin.000003 in c6ae5afe-c7a3-11e8-a19d-0242ac130006.000002 => mysql-bin|000002.000003
 	// where `000002` in `c6ae5afe-c7a3-11e8-a19d-0242ac130006.000002` is the UUIDSuffix
 	posUUIDSuffixSeparator = "|"
-	minUUIDSuffix          = 1
+	// MinUUIDSuffix is same as relay.MinUUIDSuffix
+	MinUUIDSuffix = 1
 )
 
 var (
@@ -114,7 +115,7 @@ func RealMySQLPos(pos gmysql.Position) (gmysql.Position, error) {
 // ExtractSuffix extracts uuidSuffix from input name
 func ExtractSuffix(name string) (int, error) {
 	if len(name) == 0 {
-		return minUUIDSuffix, nil
+		return MinUUIDSuffix, nil
 	}
 	filename, err := ParseFilename(name)
 	if err != nil {
@@ -126,7 +127,7 @@ func ExtractSuffix(name string) (int, error) {
 		v, err := strconv.ParseInt(suffix, 10, 64)
 		return int(v), err
 	}
-	return minUUIDSuffix, nil
+	return MinUUIDSuffix, nil
 }
 
 // ExtractPos extracts (uuidWithSuffix, uuidSuffix, originalPos) from input pos (originalPos or convertedPos)

diff --git a/pkg/binlog/position_test.go b/pkg/binlog/position_test.go
@@ -773,10 +773,10 @@ func (t *testPositionSuite) TestExtractSuffix(c *C) {
 	}{
 		{
 			"",
-			minUUIDSuffix,
+			MinUUIDSuffix,
 		}, {
 			"mysql-bin.00005",
-			minUUIDSuffix,
+			MinUUIDSuffix,
 		},
 		{
 			"mysql-bin|000001.000001",