fix error test

sync_diff_inspector/report/report_test.go

@@ -24,10 +24,10 @@ import (
 	"github.com/BurntSushi/toml"
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/pingcap/tidb/pkg/parser"
-	"github.com/pingcap/tidb/pkg/util/dbutil/dbutiltest"
 	"github.com/pingcap/tiflow/sync_diff_inspector/chunk"
 	"github.com/pingcap/tiflow/sync_diff_inspector/config"
 	"github.com/pingcap/tiflow/sync_diff_inspector/source/common"
+	"github.com/pingcap/tiflow/sync_diff_inspector/utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -45,10 +45,10 @@ func TestReport(t *testing.T) {
 
 	report := NewReport(task)
 	createTableSQL1 := "create table `test`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo1, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo1, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 	createTableSQL2 := "create table `atest`.`atbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo2, err := dbutiltest.GetTableInfoBySQL(createTableSQL2, parser.New())
+	tableInfo2, err := utils.GetTableInfoBySQL(createTableSQL2, parser.New())
 	require.NoError(t, err)
 
 	tableDiffs := []*common.TableDiff{
@@ -162,7 +162,7 @@ func TestCalculateTotal(t *testing.T) {
 
 	report := NewReport(task)
 	createTableSQL := "create table `test`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	tableDiffs := []*common.TableDiff{
@@ -209,7 +209,7 @@ func TestCalculateTotal(t *testing.T) {
 func TestPrint(t *testing.T) {
 	report := NewReport(task)
 	createTableSQL := "create table `test`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	tableDiffs := []*common.TableDiff{
@@ -275,13 +275,13 @@ func TestPrint(t *testing.T) {
 func TestGetSnapshot(t *testing.T) {
 	report := NewReport(task)
 	createTableSQL1 := "create table `test`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo1, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo1, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 	createTableSQL2 := "create table `atest`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo2, err := dbutiltest.GetTableInfoBySQL(createTableSQL2, parser.New())
+	tableInfo2, err := utils.GetTableInfoBySQL(createTableSQL2, parser.New())
 	require.NoError(t, err)
 	createTableSQL3 := "create table `xtest`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo3, err := dbutiltest.GetTableInfoBySQL(createTableSQL3, parser.New())
+	tableInfo3, err := utils.GetTableInfoBySQL(createTableSQL3, parser.New())
 	require.NoError(t, err)
 
 	tableDiffs := []*common.TableDiff{
@@ -392,16 +392,16 @@ func TestCommitSummary(t *testing.T) {
 	outputDir := "./"
 	report := NewReport(&config.TaskConfig{OutputDir: outputDir, FixDir: task.FixDir})
 	createTableSQL1 := "create table `test`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo1, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo1, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 	createTableSQL2 := "create table `atest`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo2, err := dbutiltest.GetTableInfoBySQL(createTableSQL2, parser.New())
+	tableInfo2, err := utils.GetTableInfoBySQL(createTableSQL2, parser.New())
 	require.NoError(t, err)
 	createTableSQL3 := "create table `xtest`.`tbl`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo3, err := dbutiltest.GetTableInfoBySQL(createTableSQL3, parser.New())
+	tableInfo3, err := utils.GetTableInfoBySQL(createTableSQL3, parser.New())
 	require.NoError(t, err)
 	createTableSQL4 := "create table `xtest`.`tb1`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo4, err := dbutiltest.GetTableInfoBySQL(createTableSQL4, parser.New())
+	tableInfo4, err := utils.GetTableInfoBySQL(createTableSQL4, parser.New())
 	require.NoError(t, err)
 	tableDiffs := []*common.TableDiff{
 		{

sync_diff_inspector/source/common/common_test.go

@@ -19,14 +19,13 @@ import (
 
 	"github.com/pingcap/tidb/pkg/parser"
 	"github.com/pingcap/tidb/pkg/util/dbutil"
-	"github.com/pingcap/tidb/pkg/util/dbutil/dbutiltest"
 	"github.com/pingcap/tiflow/sync_diff_inspector/utils"
 	"github.com/stretchr/testify/require"
 )
 
 func TestRowData(t *testing.T) {
 	createTableSQL := "create table test.test(id int(24), name varchar(24), age int(24), primary key(id, name));"
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	_, orderKeyCols := dbutil.SelectUniqueOrderKey(tableInfo)

sync_diff_inspector/source/source_test.go

@@ -27,7 +27,6 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/pingcap/tidb/pkg/parser"
 	"github.com/pingcap/tidb/pkg/util/dbutil"
-	"github.com/pingcap/tidb/pkg/util/dbutil/dbutiltest"
 	filter "github.com/pingcap/tidb/pkg/util/table-filter"
 	router "github.com/pingcap/tidb/pkg/util/table-router"
 	"github.com/pingcap/tiflow/sync_diff_inspector/chunk"
@@ -293,7 +292,7 @@ func TestFallbackToRandomIfRangeIsSet(t *testing.T) {
 		"`c` char(120) NOT NULL DEFAULT '', " +
 		"PRIMARY KEY (`id`), KEY `k_1` (`k`))"
 
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 
 	table1 := &common.TableDiff{
@@ -625,7 +624,7 @@ func TestTiDBRouter(t *testing.T) {
 func prepareTiDBTables(t *testing.T, tableCases []*tableCaseType) []*common.TableDiff {
 	tableDiffs := make([]*common.TableDiff, 0, len(tableCases))
 	for n, tableCase := range tableCases {
-		tableInfo, err := dbutiltest.GetTableInfoBySQL(tableCase.createTableSQL, parser.New())
+		tableInfo, err := utils.GetTableInfoBySQL(tableCase.createTableSQL, parser.New())
 		require.NoError(t, err)
 		tableDiffs = append(tableDiffs, &common.TableDiff{
 			Schema: "source_test",

sync_diff_inspector/splitter/index_fields_test.go

@@ -17,7 +17,7 @@ import (
 	"testing"
 
 	"github.com/pingcap/tidb/pkg/parser"
-	"github.com/pingcap/tidb/pkg/util/dbutil/dbutiltest"
+	"github.com/pingcap/tiflow/sync_diff_inspector/utils"
 	"github.com/stretchr/testify/require"
 )
 
@@ -30,7 +30,7 @@ func TestIndexFieldsSimple(t *testing.T) {
 		"`c` char(120) NOT NULL DEFAULT '', " +
 		"PRIMARY KEY (`id`), KEY `k_1` (`k`))"
 
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 
 	fields, err := indexFieldsFromConfigString("k", tableInfo)
@@ -61,7 +61,7 @@ func TestIndexFieldsComposite(t *testing.T) {
 		"KEY `k_1` (`k`)," +
 		"UNIQUE INDEX `c_1` (`c`))"
 
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 
 	fields, err := indexFieldsFromConfigString("id, k", tableInfo)
@@ -92,7 +92,7 @@ func TestIndexFieldsEmpty(t *testing.T) {
 		"`c` char(120) NOT NULL DEFAULT '', " +
 		"PRIMARY KEY (`id`), KEY `k_1` (`k`))"
 
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL1, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL1, parser.New())
 	require.NoError(t, err)
 
 	fields, err := indexFieldsFromConfigString("", tableInfo)

sync_diff_inspector/splitter/splitter_test.go

@@ -23,7 +23,6 @@ import (
 
 	sqlmock "github.com/DATA-DOG/go-sqlmock"
 	"github.com/pingcap/tidb/pkg/parser"
-	"github.com/pingcap/tidb/pkg/util/dbutil/dbutiltest"
 	"github.com/pingcap/tiflow/sync_diff_inspector/chunk"
 	"github.com/pingcap/tiflow/sync_diff_inspector/source/common"
 	"github.com/pingcap/tiflow/sync_diff_inspector/utils"
@@ -142,7 +141,7 @@ func TestSplitRangeByRandom(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		tableInfo, err := dbutiltest.GetTableInfoBySQL(testCase.createTableSQL, parser.New())
+		tableInfo, err := utils.GetTableInfoBySQL(testCase.createTableSQL, parser.New())
 		require.NoError(t, err)
 
 		splitCols, err := GetSplitFields(tableInfo, nil)
@@ -322,7 +321,7 @@ func TestRandomSpliter(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		tableInfo, err := dbutiltest.GetTableInfoBySQL(testCase.createTableSQL, parser.New())
+		tableInfo, err := utils.GetTableInfoBySQL(testCase.createTableSQL, parser.New())
 		require.NoError(t, err)
 
 		info, needUnifiedTimeStamp := utils.ResetColumns(tableInfo, testCase.IgnoreColumns)
@@ -357,7 +356,7 @@ func TestRandomSpliter(t *testing.T) {
 
 	// Test Checkpoint
 	stopJ := 3
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(testCases[0].createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(testCases[0].createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	tableDiff := &common.TableDiff{
@@ -431,7 +430,7 @@ func TestBucketSpliter(t *testing.T) {
 	require.NoError(t, err)
 
 	createTableSQL := "create table `test`.`test`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	testCases := []struct {
@@ -743,7 +742,7 @@ func TestLimitSpliter(t *testing.T) {
 	ctx := context.Background()
 
 	createTableSQL := "create table `test`.`test`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	testCases := []struct {
@@ -884,7 +883,7 @@ func TestChunkSize(t *testing.T) {
 	require.NoError(t, err)
 
 	createTableSQL := "create table `test`.`test`(`a` int, `b` varchar(10), `c` float, `d` datetime, primary key(`a`, `b`))"
-	tableInfo, err := dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err := utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	tableDiff := &common.TableDiff{
@@ -925,7 +924,7 @@ func TestChunkSize(t *testing.T) {
 	require.Equal(t, randomIter.chunkSize, int64(100000))
 
 	createTableSQL = "create table `test`.`test`(`a` int, `b` varchar(10), `c` float, `d` datetime)"
-	tableInfo, err = dbutiltest.GetTableInfoBySQL(createTableSQL, parser.New())
+	tableInfo, err = utils.GetTableInfoBySQL(createTableSQL, parser.New())
 	require.NoError(t, err)
 
 	tableDiffNoIndex := &common.TableDiff{

sync_diff_inspector/utils/table.go

@@ -32,7 +32,6 @@ import (
 	"github.com/pingcap/tidb/pkg/types"
 	"github.com/pingcap/tidb/pkg/util/collate"
 	"github.com/pingcap/tidb/pkg/util/dbutil"
-	"github.com/pingcap/tidb/pkg/util/dbutil/dbutiltest"
 	"github.com/pingcap/tidb/pkg/util/mock"
 )
 
@@ -191,5 +190,44 @@ func GetTableInfo(
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
-	return dbutiltest.GetTableInfoBySQL(createTableSQL, parser2)
+	return GetTableInfoBySQL(createTableSQL, parser2)
+}
+
+// GetTableInfoBySQL gets the table info from SQL.
+func GetTableInfoBySQL(createTableSQL string, parser2 *parser.Parser) (table *model.TableInfo, err error) {
+	stmt, err := parser2.ParseOneStmt(createTableSQL, "", "")
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	s, ok := stmt.(*ast.CreateTableStmt)
+	if ok {
+		table, err := ddl.BuildTableInfoWithStmt(metabuild.NewContext(), s, mysql.DefaultCharset, "", nil)
+		if err != nil {
+			return nil, errors.Trace(err)
+		}
+
+		// put primary key in indices
+		if table.PKIsHandle {
+			pkIndex := &model.IndexInfo{
+				Name:    pmodel.NewCIStr("PRIMARY"),
+				Primary: true,
+				State:   model.StatePublic,
+				Unique:  true,
+				Tp:      pmodel.IndexTypeBtree,
+				Columns: []*model.IndexColumn{
+					{
+						Name:   table.GetPkName(),
+						Length: types.UnspecifiedLength,
+					},
+				},
+			}
+
+			table.Indices = append(table.Indices, pkIndex)
+		}
+
+		return table, nil
+	}
+
+	return nil, errors.Errorf("get table info from sql %s failed", createTableSQL)
 }