diff --git a/br/pkg/lightning/backend/tidb/tidb.go b/br/pkg/lightning/backend/tidb/tidb.go index c748da0c76625..1b38e0054ac82 100644 --- a/br/pkg/lightning/backend/tidb/tidb.go +++ b/br/pkg/lightning/backend/tidb/tidb.go @@ -712,7 +712,7 @@ func (w *Writer) IsSynced() bool { type TableAutoIDInfo struct { Column string - NextID int64 + NextID uint64 Type string } @@ -725,7 +725,7 @@ func FetchTableAutoIDInfos(ctx context.Context, exec utils.QueryExecutor, tableN for rows.Next() { var ( dbName, tblName, columnName, idType string - nextID int64 + nextID uint64 ) columns, err := rows.Columns() if err != nil { @@ -738,7 +738,7 @@ func FetchTableAutoIDInfos(ctx context.Context, exec utils.QueryExecutor, tableN //| testsysbench | t | _tidb_rowid | 1 | AUTO_INCREMENT | //+--------------+------------+-------------+--------------------+----------------+ - // if columns length is 4, it doesn't contains the last column `ID_TYPE`, and it will always be 'AUTO_INCREMENT' + // if columns length is 4, it doesn't contain the last column `ID_TYPE`, and it will always be 'AUTO_INCREMENT' // for v4.0.0~v4.0.2 show table t next_row_id only returns 4 columns. if len(columns) == 4 { err = rows.Scan(&dbName, &tblName, &columnName, &nextID) diff --git a/br/pkg/lightning/backend/tidb/tidb_test.go b/br/pkg/lightning/backend/tidb/tidb_test.go index 3a824063ccaed..aada4b24f91ed 100644 --- a/br/pkg/lightning/backend/tidb/tidb_test.go +++ b/br/pkg/lightning/backend/tidb/tidb_test.go @@ -295,7 +295,7 @@ func (s *mysqlSuite) TestFetchRemoteTableModels_4_0(c *C) { AddRow("t", "id", "bigint(20) unsigned", "", "auto_increment")) s.mockDB.ExpectQuery("SHOW TABLE `test`.`t` NEXT_ROW_ID"). WillReturnRows(sqlmock.NewRows([]string{"DB_NAME", "TABLE_NAME", "COLUMN_NAME", "NEXT_GLOBAL_ROW_ID"}). - AddRow("test", "t", "id", int64(1))) + AddRow("test", "t", "id", "10942694589135710585")) s.mockDB.ExpectCommit() bk := tidb.NewTiDBBackend(s.dbHandle, config.ErrorOnDup, errormanager.New(nil, config.NewConfig()))