database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*: xapi push down mysql.Duration and mysql.Decimal. (#1243)

Browse Source
This commit is contained in:
Ewan Chou
2016-05-20 18:30:30 +08:00
parent 4f840a7754
commit e22d8d06da
8 changed files with 112 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
executor/executor_test.go
View File

@ -1279,3 +1279,28 @@ func (s *testSuite) TestUsignedPKColumn(c *C) {
result = tk.MustQuery("select * from t where b=1;")
result.Check(testkit.Rows("1 1 2"))
}
func (s *testSuite) TestDatumXAPI(c *C) {
defer testleak.AfterTest(c)()
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t")
tk.MustExec("create table t (a decimal(10,6), b decimal, index idx_b (b))")
tk.MustExec("insert t values (1.1, 1.1)")
tk.MustExec("insert t values (2.2, 2.2)")
tk.MustExec("insert t values (3.3, 3.3)")
result := tk.MustQuery("select * from t where a > 1.5")
result.Check(testkit.Rows("2.200000 2.2", "3.300000 3.3"))
result = tk.MustQuery("select * from t where b > 1.5")
result.Check(testkit.Rows("2.200000 2.2", "3.300000 3.3"))
tk.MustExec("drop table if exists t")
tk.MustExec("create table t (a time(3), b time, index idx_a (a))")
tk.MustExec("insert t values ('11:11:11', '11:11:11')")
tk.MustExec("insert t values ('11:11:12', '11:11:12')")
tk.MustExec("insert t values ('11:11:13', '11:11:13')")
result = tk.MustQuery("select * from t where a > '11:11:11.5'")
result.Check(testkit.Rows("11:11:12 11:11:12", "11:11:13 11:11:13"))
result = tk.MustQuery("select * from t where b > '11:11:11.5'")
result.Check(testkit.Rows("11:11:12 11:11:12", "11:11:13 11:11:13"))
}

10
executor/executor_xapi.go
View File

@ -686,8 +686,8 @@ func (b *executorBuilder) columnNameToPBExpr(client kv.Client, column *ast.Colum
return nil
}
switch column.Refer.Expr.GetType().Tp {
case mysql.TypeBit, mysql.TypeSet, mysql.TypeEnum, mysql.TypeDecimal, mysql.TypeNewDecimal, mysql.TypeGeometry,
mysql.TypeDate, mysql.TypeNewDate, mysql.TypeDatetime, mysql.TypeDuration, mysql.TypeTimestamp, mysql.TypeYear:
case mysql.TypeBit, mysql.TypeSet, mysql.TypeEnum, mysql.TypeDecimal, mysql.TypeGeometry,
mysql.TypeDate, mysql.TypeNewDate, mysql.TypeDatetime, mysql.TypeTimestamp, mysql.TypeYear:
return nil
}
matched := false
@ -732,6 +732,12 @@ func (b *executorBuilder) datumToPBExpr(client kv.Client, d types.Datum) *tipb.E
case types.KindFloat64:
tp = tipb.ExprType_Float64
val = codec.EncodeFloat(nil, d.GetFloat64())
case types.KindMysqlDuration:
tp = tipb.ExprType_MysqlDuration
val = codec.EncodeInt(nil, int64(d.GetMysqlDuration().Duration))
case types.KindMysqlDecimal:
tp = tipb.ExprType_MysqlDecimal
val = codec.EncodeDecimal(nil, d.GetMysqlDecimal())
default:
return nil
}

2
store/localstore/local_region.go
View File

@ -353,7 +353,7 @@ func (rs *localRegion) evalWhereForRow(ctx *selectContext, h int64) (bool, error
} else if err != nil {
return false, errors.Trace(err)
}
_, datum, err := codec.DecodeOne(data)
datum, err := tablecodec.DecodeColumnValue(data, col)
if err != nil {
return false, errors.Trace(err)
}

5
store/tikv/mock-tikv/cop_handler.go
View File

@ -368,11 +368,12 @@ func (h *rpcHandler) evalWhereForRow(ctx *selectContext, handle int64) (bool, er
}
ctx.eval.Row[colID] = types.Datum{}
} else {
_, datum, err := codec.DecodeOne(data)
var d types.Datum
d, err = tablecodec.DecodeColumnValue(data, col)
if err != nil {
return false, errors.Trace(err)
}
ctx.eval.Row[colID] = datum
ctx.eval.Row[colID] = d
}
}
}

12
util/types/datum.go
View File

@ -1398,6 +1398,18 @@ func NewFloat32Datum(f float32) (d Datum) {
return d
}
// NewDurationDatum creates a new Datum from a mysql.Duration value.
func NewDurationDatum(dur mysql.Duration) (d Datum) {
d.SetMysqlDuration(dur)
return d
}
// NewDecimalDatum creates a new Datum form a mysql.Decimal value.
func NewDecimalDatum(dec mysql.Decimal) (d Datum) {
d.SetMysqlDecimal(dec)
return d
}
// MakeDatums creates datum slice from interfaces.
func MakeDatums(args ...interface{}) []Datum {
datums := make([]Datum, len(args))

23
xapi/tablecodec/tablecodec.go
View File

@ -138,6 +138,9 @@ func unflatten(datum types.Datum, ft *types.FieldType) (types.Datum, error) {
datum.SetValue(dur)
return datum, nil
case mysql.TypeNewDecimal:
if datum.Kind() == types.KindMysqlDecimal {
return datum, nil
}
dec, err := mysql.ParseDecimal(datum.GetString())
if err != nil {
return datum, errors.Trace(err)
@ -166,6 +169,26 @@ func unflatten(datum types.Datum, ft *types.FieldType) (types.Datum, error) {
return datum, nil
}
// DecodeColumnValue decodes data to a Datum according to the column info.
func DecodeColumnValue(data []byte, col *tipb.ColumnInfo) (types.Datum, error) {
_, d, err := codec.DecodeOne(data)
if err != nil {
return types.Datum{}, errors.Trace(err)
}
ft := &types.FieldType{
Tp: byte(col.GetTp()),
Flen: int(col.GetColumnLen()),
Decimal: int(col.GetDecimal()),
Elems: col.Elems,
Collate: mysql.Collations[uint8(col.GetCollation())],
}
colDatum, err := unflatten(d, ft)
if err != nil {
return types.Datum{}, errors.Trace(err)
}
return colDatum, nil
}
// EncodeIndexSeekKey encodes an index value to kv.Key.
func EncodeIndexSeekKey(tableID int64, idxID int64, encodedValue []byte) kv.Key {
key := make([]byte, 0, prefixLen+len(encodedValue))

26
xapi/xeval/eval.go
View File

@ -16,8 +16,10 @@ package xeval
import (
"sort"
"strings"
"time"
"github.com/juju/errors"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/terror"
"github.com/pingcap/tidb/util/codec"
"github.com/pingcap/tidb/util/types"
@ -66,6 +68,10 @@ func (e *Evaluator) Eval(expr *tipb.Expr) (types.Datum, error) {
return e.evalFloat(expr.Val, true)
case tipb.ExprType_Float64:
return e.evalFloat(expr.Val, false)
case tipb.ExprType_MysqlDecimal:
return e.evalDecimal(expr.Val)
case tipb.ExprType_MysqlDuration:
return e.evalDuration(expr.Val)
case tipb.ExprType_ColumnRef:
return e.evalColumnRef(expr.Val)
case tipb.ExprType_LT:
@ -149,6 +155,26 @@ func (e *Evaluator) evalFloat(val []byte, f32 bool) (types.Datum, error) {
return d, nil
}
func (e *Evaluator) evalDecimal(val []byte) (types.Datum, error) {
var d types.Datum
_, dec, err := codec.DecodeDecimal(val)
if err != nil {
return d, ErrInvalid.Gen("invalid decimal % x", val)
}
d.SetMysqlDecimal(dec)
return d, nil
}
func (e *Evaluator) evalDuration(val []byte) (types.Datum, error) {
var d types.Datum
_, i, err := codec.DecodeInt(val)
if err != nil {
return d, ErrInvalid.Gen("invalid duration %d", i)
}
d.SetMysqlDuration(mysql.Duration{Duration: time.Duration(i), Fsp: mysql.MaxFsp})
return d, nil
}
func (e *Evaluator) evalLT(expr *tipb.Expr) (types.Datum, error) {
cmp, err := e.compareTwoChildren(expr)
if err != nil {

16
xapi/xeval/eval_test.go
View File

@ -15,8 +15,10 @@ package xeval
import (
"testing"
"time"
. "github.com/pingcap/check"
"github.com/pingcap/tidb/mysql"
"github.com/pingcap/tidb/util/codec"
"github.com/pingcap/tidb/util/types"
"github.com/pingcap/tipb/go-tipb"
@ -70,8 +72,12 @@ func (s *testEvalSuite) TestEval(c *C) {
types.Datum{},
},
{
datumExpr(types.Datum{}),
types.Datum{},
datumExpr(types.NewDurationDatum(mysql.Duration{Duration: time.Hour})),
types.NewDurationDatum(mysql.Duration{Duration: time.Hour}),
},
{
datumExpr(types.NewDecimalDatum(mysql.NewDecimalFromFloat(1.1))),
types.NewDecimalDatum(mysql.NewDecimalFromFloat(1.1)),
},
{
columnExpr(1),
@ -261,6 +267,12 @@ func datumExpr(d types.Datum) *tipb.Expr {
case types.KindFloat64:
expr.Tp = tipb.ExprType_Float64.Enum()
expr.Val = codec.EncodeFloat(nil, d.GetFloat64())
case types.KindMysqlDuration:
expr.Tp = tipb.ExprType_MysqlDuration.Enum()
expr.Val = codec.EncodeInt(nil, int64(d.GetMysqlDuration().Duration))
case types.KindMysqlDecimal:
expr.Tp = tipb.ExprType_MysqlDecimal.Enum()
expr.Val = codec.EncodeDecimal(nil, d.GetMysqlDecimal())
default:
expr.Tp = tipb.ExprType_Null.Enum()
}