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

Merge pull request #701 from pingcap/coocood/fix-eval

Browse Source 
evaluator: fix unary evaluation bug.
This commit is contained in:
Ewan Chou
2015-12-10 13:36:07 +08:00
parent e8eaf5f295 2050c8dceb
commit bed4557127
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
optimizer/evaluator/evaluator.go
View File

@ -350,6 +350,7 @@ func (e *Evaluator) unaryOperation(u *ast.UnaryOperationExpr) bool {
a := u.V.GetValue()
a = types.RawData(a)
if a == nil {
u.SetValue(nil)
return true
}
switch op := u.Op; op {
@ -372,7 +373,6 @@ func (e *Evaluator) unaryOperation(u *ast.UnaryOperationExpr) bool {
u.SetValue(uint64(^n))
case opcode.Plus:
switch x := a.(type) {
case nil:
case bool:
u.SetValue(boolToInt64(x))
case float32:
@ -423,7 +423,6 @@ func (e *Evaluator) unaryOperation(u *ast.UnaryOperationExpr) bool {
}
case opcode.Minus:
switch x := a.(type) {
case nil:
case bool:
if x {
u.SetValue(int64(-1))
@ -595,6 +594,7 @@ func (e *Evaluator) funcConvert(f *ast.FuncConvertExpr) bool {
// Casting nil to any type returns nil
if value == nil {
f.SetValue(nil)
return true
}
str, ok := value.(string)

4
optimizer/evaluator/evaluator_test.go
View File

@ -969,8 +969,10 @@ func (s *testEvaluatorSuite) TestUnaryOp(c *C) {
{mysql.Set{Name: "a", Value: 1}, opcode.Minus, -1.0},
}
ctx := mock.NewContext()
expr := &ast.UnaryOperationExpr{}
for _, t := range tbl {
expr := &ast.UnaryOperationExpr{Op: t.op, V: ast.NewValueExpr(t.arg)}
expr.Op = t.op
expr.V = ast.NewValueExpr(t.arg)
result, err := Eval(ctx, expr)
c.Assert(err, IsNil)
c.Assert(result, DeepEquals, t.result)