From 8b94f577c08cf2e39a4822a932d55b6bbc5ab9d3 Mon Sep 17 00:00:00 2001 From: Xuecheng Zhang Date: Wed, 24 Jun 2020 11:21:28 +0800 Subject: [PATCH] check: remove restrictions for MySQL 8.0 (#365) --- pkg/check/mysql_server.go | 6 +++--- pkg/check/mysql_server_test.go | 5 +++-- pkg/check/util_test.go | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkg/check/mysql_server.go b/pkg/check/mysql_server.go index 2de96e3ea..4fe9b4925 100644 --- a/pkg/check/mysql_server.go +++ b/pkg/check/mysql_server.go @@ -34,7 +34,7 @@ func NewMySQLVersionChecker(db *sql.DB, dbinfo *dbutil.DBConfig) Checker { } // SupportedVersion defines the MySQL/MariaDB version that DM/syncer supports -// * 5.6.0 <= MySQL Version < 5.8.0 +// * 5.6.0 <= MySQL Version // * 10.1.2 <= Mariadb Version var SupportedVersion = map[string]struct { Min MySQLVersion @@ -42,7 +42,7 @@ var SupportedVersion = map[string]struct { }{ "mysql": { MySQLVersion{5, 6, 0}, - MySQLVersion{5, 8, 0}, + MaxVersion, }, "mariadb": { MySQLVersion{10, 1, 2}, @@ -51,7 +51,7 @@ var SupportedVersion = map[string]struct { } // Check implements the Checker interface. -// we only support version >= 5.5 +// we only support version >= 5.6 func (pc *MySQLVersionChecker) Check(ctx context.Context) *Result { result := &Result{ Name: pc.Name(), diff --git a/pkg/check/mysql_server_test.go b/pkg/check/mysql_server_test.go index 6a1c5c7ce..54cf01442 100644 --- a/pkg/check/mysql_server_test.go +++ b/pkg/check/mysql_server_test.go @@ -14,8 +14,9 @@ func (t *testCheckSuite) TestMysqlVersion(c *tc.C) { {"5.5.0-log", false}, {"5.6.0-log", true}, {"5.7.0-log", true}, - {"5.8.0-log", false}, - {"8.0.1-log", false}, + {"5.8.0-log", true}, // although it does not exist + {"8.0.1-log", true}, + {"8.0.20", true}, {"5.5.50-MariaDB-1~wheezy", false}, {"10.1.1-MariaDB-1~wheezy", false}, {"10.1.2-MariaDB-1~wheezy", true}, diff --git a/pkg/check/util_test.go b/pkg/check/util_test.go index 848973d80..43ec78b22 100644 --- a/pkg/check/util_test.go +++ b/pkg/check/util_test.go @@ -14,9 +14,9 @@ func (t *testCheckSuite) TestVersionComparsion(c *tc.C) { {"5.5.0", false, false, true, true}, {"5.6.0", true, false, true, true}, {"5.7.0", true, true, true, true}, - {"5.8.0", true, true, false, true}, - {"8.0.1", true, true, false, false}, - {"255.255.255", true, true, false, false}, + {"5.8.0", true, true, true, true}, // although it does not exist + {"8.0.1", true, true, true, true}, + {"255.255.255", true, true, false, true}, // max version } var (