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

lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64 #45614

Merged
merged 7 commits into from
Aug 9, 2023
Merged

lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64 #45614

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c002143
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 27, 2023
51f3856
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 27, 2023
8415079
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 27, 2023
5ad6b35
lightning: save NEXT_GLOBAL_ROW_ID as string instead of int64
lyzx2001 Jul 28, 2023
bbc61d4
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 28, 2023
d2a1d02
lightning: save NEXT_GLOBAL_ROW_ID as uint64 instead of int64
lyzx2001 Jul 28, 2023
296f45f
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 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 @@ -870,7 +870,7 @@ func (*Writer) IsSynced() bool {
// TableAutoIDInfo is the auto id information of a table.
type TableAutoIDInfo struct {
Column string
NextID int64
NextID string
lyzx2001 marked this conversation as resolved.
Show resolved Hide resolved
Type string
}

Expand All @@ -883,8 +883,7 @@ func FetchTableAutoIDInfos(ctx context.Context, exec utils.QueryExecutor, tableN
var autoIDInfos []*TableAutoIDInfo
for rows.Next() {
var (
dbName, tblName, columnName, idType string
nextID int64
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can change the type of nextID to uint64, so SQL drvier will do the conversion work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

modified

dbName, tblName, columnName, nextID, idType string
)
columns, err := rows.Columns()
if err != nil {
Expand All @@ -897,7 +896,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 @@ -372,7 +372,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()

targetInfoGetter := tidb.NewTargetInfoGetter(s.dbHandle)
Expand Down