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

mounter: fix error decoding when rowid is very large #153

Merged
merged 2 commits into from
Dec 4, 2019
Merged

mounter: fix error decoding when rowid is very large #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce83e68
fix_large_rowid
Dec 3, 2019
8fd9456
update
Dec 4, 2019
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
44 changes: 30 additions & 14 deletions cdc/entry/mounter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (m *Mounter) Mount(rawTxn model.RawTxn) (*model.Txn, error) {
}

func (m *Mounter) mountRowKVEntry(row *rowKVEntry) (*model.DML, error) {
tableInfo, tableName, handleColName, err := m.fetchTableInfo(row.TableID)
tableInfo, tableName, err := m.fetchTableInfo(row.TableID)
if err != nil {
return nil, errors.Trace(err)
}
Expand All @@ -84,12 +84,15 @@ func (m *Mounter) mountRowKVEntry(row *rowKVEntry) (*model.DML, error) {

if row.Delete {
if tableInfo.PKIsHandle {
values := map[string]types.Datum{handleColName: types.NewIntDatum(row.RecordID)}
pkColName, pkValue, err := fetchHandleValue(tableInfo, row)
if err != nil {
return nil, errors.Trace(err)
}
return &model.DML{
Database: tableName.Schema,
Table: tableName.Table,
Tp: model.DeleteDMLType,
Values: values,
Values: map[string]types.Datum{pkColName: *pkValue},
}, nil
}
return nil, nil
Expand All @@ -101,7 +104,11 @@ func (m *Mounter) mountRowKVEntry(row *rowKVEntry) (*model.DML, error) {
values[colName] = colValue
}
if tableInfo.PKIsHandle {
values[handleColName] = types.NewIntDatum(row.RecordID)
pkColName, pkValue, err := fetchHandleValue(tableInfo, row)
if err != nil {
return nil, errors.Trace(err)
}
values[pkColName] = *pkValue
}
return &model.DML{
Database: tableName.Schema,
Expand All @@ -112,7 +119,7 @@ func (m *Mounter) mountRowKVEntry(row *rowKVEntry) (*model.DML, error) {
}

func (m *Mounter) mountIndexKVEntry(idx *indexKVEntry) (*model.DML, error) {
tableInfo, tableName, _, err := m.fetchTableInfo(idx.TableID)
tableInfo, tableName, err := m.fetchTableInfo(idx.TableID)
if err != nil {
return nil, errors.Trace(err)
}
Expand All @@ -139,30 +146,39 @@ func (m *Mounter) mountIndexKVEntry(idx *indexKVEntry) (*model.DML, error) {
}, nil
}

func (m *Mounter) fetchTableInfo(tableID int64) (tableInfo *timodel.TableInfo, tableName *schema.TableName, handleColName string, err error) {
func (m *Mounter) fetchTableInfo(tableID int64) (tableInfo *timodel.TableInfo, tableName *schema.TableName, err error) {
tableInfo, exist := m.schemaStorage.TableByID(tableID)
if !exist {
return nil, nil, "", errors.Errorf("can not find table, id: %d", tableID)
return nil, nil, errors.Errorf("can not find table, id: %d", tableID)
}

database, table, exist := m.schemaStorage.SchemaAndTableName(tableID)
if !exist {
return nil, nil, "", errors.Errorf("can not find table, id: %d", tableID)
return nil, nil, errors.Errorf("can not find table, id: %d", tableID)
}
tableName = &schema.TableName{Schema: database, Table: table}
return
}

pkColOffset := -1
func fetchHandleValue(tableInfo *timodel.TableInfo, row *rowKVEntry) (pkColName string, pkValue *types.Datum, err error) {
handleColOffset := -1
for i, col := range tableInfo.Columns {
if mysql.HasPriKeyFlag(col.Flag) {
pkColOffset = i
handleColName = tableInfo.Columns[i].Name.O
handleColOffset = i
break
}
}
if tableInfo.PKIsHandle && pkColOffset == -1 {
return nil, nil, "", errors.Errorf("this table (%d) is handled by pk, but pk column not found", tableID)
if handleColOffset == -1 {
return "", nil, errors.New("can't find handle column, please check if the pk is handle")
}
handleCol := tableInfo.Columns[handleColOffset]
pkColName = handleCol.Name.O
pkValue = &types.Datum{}
if mysql.HasUnsignedFlag(handleCol.Flag) {
suzaku marked this conversation as resolved.
Show resolved Hide resolved
pkValue.SetUint64(uint64(row.RecordID))
} else {
pkValue.SetInt64(row.RecordID)
}

return
}

Expand Down
64 changes: 64 additions & 0 deletions cdc/entry/mounter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package entry

import (
"context"
"math"
"reflect"
"sync"
"time"
Expand Down Expand Up @@ -245,6 +246,69 @@ func (cs *mountTxnsSuite) TestInsertPkIsHandle(c *check.C) {
})
}

func (cs *mountTxnsSuite) TestLargeInteger(c *check.C) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
pm, schema := setUpPullerAndSchema(ctx, c,
"create database testDB",
"CREATE TABLE testDB.large_int(id BIGINT UNSIGNED PRIMARY KEY, a int)",
)
tableInfo := pm.GetTableInfo("testDB", "large_int")
tableID := tableInfo.ID
mounter := NewTxnMounter(schema, time.UTC)
plr := pm.CreatePuller(0, []util.Span{util.GetTableSpan(tableID, false)})

pm.MustExec("insert into testDB.large_int values(?, ?)", uint64(math.MaxUint64), 123)
rawTxn := getFirstRealTxn(ctx, c, plr)
t, err := mounter.Mount(rawTxn)
c.Assert(err, check.IsNil)
cs.assertTableTxnEquals(c, t, &model.Txn{
Ts: rawTxn.Entries[0].Ts,
DMLs: []*model.DML{
{
Database: "testDB",
Table: "large_int",
Tp: model.InsertDMLType,
Values: map[string]types.Datum{
"id": types.NewUintDatum(uint64(math.MaxUint64)),
"a": types.NewIntDatum(123),
},
},
},
})

ctx, cancel = context.WithCancel(context.Background())
defer cancel()
pm, schema = setUpPullerAndSchema(ctx, c,
"create database testDB",
"CREATE TABLE testDB.large_int(id BIGINT PRIMARY KEY, a int)",
)
tableInfo = pm.GetTableInfo("testDB", "large_int")
tableID = tableInfo.ID
mounter = NewTxnMounter(schema, time.UTC)
plr = pm.CreatePuller(0, []util.Span{util.GetTableSpan(tableID, false)})

pm.MustExec("insert into testDB.large_int values(?, ?)", int64(math.MinInt64), 123)
rawTxn = getFirstRealTxn(ctx, c, plr)
t, err = mounter.Mount(rawTxn)
c.Assert(err, check.IsNil)
cs.assertTableTxnEquals(c, t, &model.Txn{
Ts: rawTxn.Entries[0].Ts,
DMLs: []*model.DML{
{
Database: "testDB",
Table: "large_int",
Tp: model.InsertDMLType,
Values: map[string]types.Datum{
"id": types.NewIntDatum(int64(math.MinInt64)),
"a": types.NewIntDatum(123),
},
},
},
})

}

func (cs *mountTxnsSuite) assertTableTxnEquals(c *check.C,
obtained, expected *model.Txn) {
obtainedDMLs := obtained.DMLs
Expand Down