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.

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

executor: fix a bug in point get #7934

Merged
merged 4 commits into from
Oct 18, 2018
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
46 changes: 33 additions & 13 deletions executor/point_get.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,40 +135,60 @@ func (e *PointGetExecutor) get(key kv.Key) (val []byte, err error) {
}

func (e *PointGetExecutor) decodeRowValToChunk(rowVal []byte, chk *chunk.Chunk) error {
colIDs := make(map[int64]int, e.schema.Len())
for i, col := range e.schema.Columns {
colIDs[col.ID] = i
// One column could be filled for multi-times in the schema. e.g. select b, b, c, c from t where a = 1.
// We need to set the positions in the schema for the same column.
colID2DecodedPos := make(map[int64]int, e.schema.Len())
decodedPos2SchemaPos := make([][]int, 0, e.schema.Len())
for schemaPos, col := range e.schema.Columns {
if decodedPos, ok := colID2DecodedPos[col.ID]; !ok {
colID2DecodedPos[col.ID] = len(colID2DecodedPos)
decodedPos2SchemaPos = append(decodedPos2SchemaPos, []int{schemaPos})
} else {
decodedPos2SchemaPos[decodedPos] = append(decodedPos2SchemaPos[decodedPos], schemaPos)
}
}
colVals, err := tablecodec.CutRowNew(rowVal, colIDs)
decodedVals, err := tablecodec.CutRowNew(rowVal, colID2DecodedPos)
if err != nil {
return errors.Trace(err)
}
if colVals == nil {
colVals = make([][]byte, len(colIDs))
if decodedVals == nil {
decodedVals = make([][]byte, len(colID2DecodedPos))
}
decoder := codec.NewDecoder(chk, e.ctx.GetSessionVars().Location())
for id, offset := range colIDs {
if e.tblInfo.PKIsHandle && mysql.HasPriKeyFlag(e.schema.Columns[offset].RetType.Flag) {
chk.AppendInt64(offset, e.handle)
for id, decodedPos := range colID2DecodedPos {
schemaPoses := decodedPos2SchemaPos[decodedPos]
firstPos := schemaPoses[0]
if e.tblInfo.PKIsHandle && mysql.HasPriKeyFlag(e.schema.Columns[firstPos].RetType.Flag) {
chk.AppendInt64(firstPos, e.handle)
// Fill other positions.
for i := 1; i < len(schemaPoses); i++ {
chk.MakeRef(firstPos, schemaPoses[i])
}
continue
}
// ExtraHandleID is added when building plan, we can make sure that there's only one column's ID is this.
if id == model.ExtraHandleID {
chk.AppendInt64(offset, e.handle)
chk.AppendInt64(firstPos, e.handle)
continue
}
if len(colVals[offset]) == 0 {
if len(decodedVals[decodedPos]) == 0 {
// This branch only entered for updating and deleting. It won't have one column in multiple positions.
colInfo := getColInfoByID(e.tblInfo, id)
d, err1 := table.GetColOriginDefaultValue(e.ctx, colInfo)
if err1 != nil {
return errors.Trace(err1)
}
chk.AppendDatum(offset, &d)
chk.AppendDatum(firstPos, &d)
continue
}
_, err = decoder.DecodeOne(colVals[offset], offset, e.schema.Columns[offset].RetType)
_, err = decoder.DecodeOne(decodedVals[decodedPos], firstPos, e.schema.Columns[firstPos].RetType)
if err != nil {
return errors.Trace(err)
}
// Fill other positions.
for i := 1; i < len(schemaPoses); i++ {
chk.MakeRef(firstPos, schemaPoses[i])
}
}
return nil
}
Expand Down
5 changes: 4 additions & 1 deletion executor/point_get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (s *testSuite) TestPointGet(c *C) {

tk.MustExec(`drop table if exists t;`)
tk.MustExec(`create table t(a bigint primary key, b bigint, c bigint);`)
tk.MustExec(`insert into t values(1, NULL, NULL), (2, NULL, 2), (3, 3, NULL), (4, 4, 4);`)
tk.MustExec(`insert into t values(1, NULL, NULL), (2, NULL, 2), (3, 3, NULL), (4, 4, 4), (5, 6, 7);`)
tk.MustQuery(`select * from t where a = 1;`).Check(testkit.Rows(
`1 <nil> <nil>`,
))
Expand All @@ -51,4 +51,7 @@ func (s *testSuite) TestPointGet(c *C) {
tk.MustQuery(`select * from t where a = 4;`).Check(testkit.Rows(
`4 4 4`,
))
tk.MustQuery(`select a, a, b, a, b, c, b, c, c from t where a = 5;`).Check(testkit.Rows(
`5 5 6 5 6 7 6 7 7`,
))
}