Add more tests for new replication statements (pingcap#12540)

ref pingcap#11020

Author: dveeden

dm/pkg/conn/basedb.go

@@ -229,6 +229,19 @@ func NewBaseDBForTest(db *sql.DB, doFuncInClose ...func()) *BaseDB {
 	}
 }
 
+// NewBaseDBForTestWithVersion returns *BaseDB object for test.
+func NewBaseDBForTestWithVersion(db *sql.DB, version string, doFuncInClose ...func()) *BaseDB {
+	conns := make(map[*BaseConn]struct{})
+	return &BaseDB{
+		DB:            db,
+		conns:         conns,
+		Retry:         &retry.FiniteRetryStrategy{},
+		Scope:         terror.ScopeNotSet,
+		doFuncInClose: doFuncInClose,
+		version:       version,
+	}
+}
+
 // NewMockDB returns *BaseDB object for mock.
 func NewMockDB(db *sql.DB, doFuncInClose ...func()) *BaseDB {
 	baseDB := NewBaseDBForTest(db, doFuncInClose...)

dm/pkg/conn/db_test.go

@@ -436,11 +436,26 @@ func TestGetSlaveServerID(t *testing.T) {
 	require.NoError(t, err)
 
 	cases := []struct {
+		version string
+		stmt    string
 		rows    *sqlmock.Rows
 		results map[uint32]struct{}
 	}{
-		// For MySQL
+		// For MySQL 8.4
+		{
+			"8.4.8",
+			"SHOW REPLICAS",
+			sqlmock.NewRows([]string{"Server_id", "Host", "Port", "Source_id", "Replica_UUID"}).
+				AddRow(192168010, "iconnect2", 3306, 192168011, "14cb6624-7f93-11e0-b2c0-c80aa9429562").
+				AddRow(1921680101, "athena", 3306, 192168011, "07af4990-f41f-11df-a566-7ac56fdaf645"),
+			map[uint32]struct{}{
+				192168010: {}, 1921680101: {},
+			},
+		},
+		// For MySQL 8.0
 		{
+			"8.0.45",
+			"SHOW SLAVE HOSTS",
 			sqlmock.NewRows([]string{"Server_id", "Host", "Port", "Master_id", "Slave_UUID"}).
 				AddRow(192168010, "iconnect2", 3306, 192168011, "14cb6624-7f93-11e0-b2c0-c80aa9429562").
 				AddRow(1921680101, "athena", 3306, 192168011, "07af4990-f41f-11df-a566-7ac56fdaf645"),
@@ -450,6 +465,8 @@ func TestGetSlaveServerID(t *testing.T) {
 		},
 		// For MariaDB
 		{
+			"10.4.7-MariaDB",
+			"SHOW SLAVE HOSTS",
 			sqlmock.NewRows([]string{"Server_id", "Host", "Port", "Master_id"}).
 				AddRow(192168010, "iconnect2", 3306, 192168011).
 				AddRow(1921680101, "athena", 3306, 192168011),
@@ -459,6 +476,8 @@ func TestGetSlaveServerID(t *testing.T) {
 		},
 		// For MariaDB, with Server_id greater than 2^31, to test uint conversion
 		{
+			"10.4.7-MariaDB",
+			"SHOW SLAVE HOSTS",
 			sqlmock.NewRows([]string{"Server_id", "Host", "Port", "Master_id"}).
 				AddRow(2147483649, "iconnect2", 3306, 192168011).
 				AddRow(2147483650, "athena", 3306, 192168011),
@@ -470,8 +489,8 @@ func TestGetSlaveServerID(t *testing.T) {
 
 	tctx := tcontext.NewContext(context.Background(), log.L())
 	for _, ca := range cases {
-		mock.ExpectQuery("SHOW SLAVE HOSTS").WillReturnRows(ca.rows)
-		results, err2 := GetSlaveServerID(tctx, NewBaseDBForTest(db))
+		mock.ExpectQuery(ca.stmt).WillReturnRows(ca.rows)
+		results, err2 := GetSlaveServerID(tctx, NewBaseDBForTestWithVersion(db, ca.version))
 		require.NoError(t, err2)
 		require.Equal(t, ca.results, results)
 	}

dm/pkg/conn/utils_test.go

@@ -67,9 +67,10 @@ func TestGetMasterStatus(t *testing.T) {
 
 	db, mock, err := sqlmock.New()
 	require.NoError(t, err)
-	baseDB := NewBaseDBForTest(db)
 
 	cases := []struct {
+		version        string
+		stmt           string
 		rows           *sqlmock.Rows
 		binlogName     string
 		pos            uint64
@@ -79,8 +80,24 @@ func TestGetMasterStatus(t *testing.T) {
 		err            error
 		flavor         string
 	}{
-		// For MySQL
+		// For MySQL 8.4
+		{
+			"8.4.8",
+			"SHOW BINARY LOG STATUS",
+			sqlmock.NewRows([]string{"File", "Position", "Binlog_Do_DB", "Binlog_Ignore_DB", "Executed_Gtid_Set"}).
+				AddRow("ON.000001", 4822, "", "", "85ab69d1-b21f-11e6-9c5e-64006a8978d2:1-46"),
+			"ON.000001",
+			4822,
+			"",
+			"",
+			"85ab69d1-b21f-11e6-9c5e-64006a8978d2:1-46",
+			nil,
+			gmysql.MySQLFlavor,
+		},
+		// For MySQL 8.0
 		{
+			"8.0.45",
+			"SHOW MASTER STATUS",
 			sqlmock.NewRows([]string{"File", "Position", "Binlog_Do_DB", "Binlog_Ignore_DB", "Executed_Gtid_Set"}).
 				AddRow("ON.000001", 4822, "", "", "85ab69d1-b21f-11e6-9c5e-64006a8978d2:1-46"),
 			"ON.000001",
@@ -91,8 +108,10 @@ func TestGetMasterStatus(t *testing.T) {
 			nil,
 			gmysql.MySQLFlavor,
 		},
-		// test unit64 position for MySQL
+		// test unit64 position for MySQL 8.0
 		{
+			"8.0.45",
+			"SHOW MASTER STATUS",
 			sqlmock.NewRows([]string{"File", "Position", "Binlog_Do_DB", "Binlog_Ignore_DB", "Executed_Gtid_Set"}).
 				AddRow("ON.000002", 429496729500, "", "", "85ab69d1-b21f-11e6-9c5e-64006a8978d2:1-500"),
 			"ON.000002",
@@ -105,6 +124,8 @@ func TestGetMasterStatus(t *testing.T) {
 		},
 		// For MariaDB
 		{
+			"10.4.7-MariaDB",
+			"SHOW MASTER STATUS",
 			sqlmock.NewRows([]string{"File", "Position", "Binlog_Do_DB", "Binlog_Ignore_DB"}).
 				AddRow("mariadb-bin.000016", 475, "", ""),
 			"mariadb-bin.000016",
@@ -117,14 +138,15 @@ func TestGetMasterStatus(t *testing.T) {
 		},
 	}
 	for _, ca := range cases {
-		mock.ExpectQuery("SHOW MASTER STATUS").WillReturnRows(ca.rows)
+		mock.ExpectQuery(ca.stmt).WillReturnRows(ca.rows)
 		// For MariaDB
 		if ca.flavor == gmysql.MariaDBFlavor {
 			mock.ExpectQuery("SHOW GLOBAL VARIABLES LIKE 'gtid_binlog_pos'").WillReturnRows(
 				sqlmock.NewRows([]string{"Variable_name", "Value"}).
 					AddRow("gtid_binlog_pos", "0-1-2"),
 			)
 		}
+		baseDB := NewBaseDBForTestWithVersion(db, ca.version)
 		binlogName, pos, binlogDoDB, binlogIgnoreDB, gtidStr, err := GetMasterStatus(tctx, baseDB, ca.flavor)
 		require.IsType(t, uint64(0), pos)
 		require.NoError(t, err)