Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64 (#45614) #45944

Merged
merged 7 commits into from
Aug 15, 2023
Merged

lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64 (#45614) #45944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c1af6aa
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 27, 2023
16b6374
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 27, 2023
ee203b0
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 27, 2023
dca149b
lightning: save NEXT_GLOBAL_ROW_ID as string instead of int64
lyzx2001 Jul 28, 2023
67b6875
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 28, 2023
edb7dc4
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 28, 2023
ca5191a
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions br/pkg/lightning/backend/tidb/tidb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ func (w *Writer) IsSynced() bool {

type TableAutoIDInfo struct {
Column string
NextID int64
NextID uint64
Type string
}

Expand All @@ -800,7 +800,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 {
Expand All @@ -813,7 +813,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)
Expand Down
2 changes: 1 addition & 1 deletion br/pkg/lightning/backend/tidb/tidb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ func TestFetchRemoteTableModels_4_0(t *testing.T) {
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(context.Background(), s.dbHandle, config.ErrorOnDup, errormanager.New(nil, config.NewConfig(), log.L()))
Expand Down