util/types: new Compare implementation with Datum.

rjmcguire · Mar 2, 2016 · e71e25e · e71e25e
1 parent b207d1a
commit e71e25e
Show file tree

Hide file tree

Showing 11 changed files with 537 additions and 485 deletions.
diff --git a/ast/base.go b/ast/base.go
@@ -62,7 +62,7 @@ func (dn *dmlNode) dmlStatement() {}
 // Expression implementations should embed it in.
 type exprNode struct {
 	node
-	Datum
+	types.Datum
 	Type *types.FieldType
 	flag uint64
 }

diff --git a/ast/cloner_test.go b/ast/cloner_test.go
@@ -29,6 +29,6 @@ func (ts *testClonerSuite) TestCloner(c *C) {
 	a3 := a2.(*ValueExpr)
 	b3 := b2.(*ValueExpr)
 	c.Assert(a3, Not(Equals), b3)
-	c.Assert(a3.GetValue(), Equals, true)
-	c.Assert(b3.GetValue(), Equals, true)
+	c.Assert(a3.GetValue(), Equals, int64(1))
+	c.Assert(b3.GetValue(), Equals, int64(1))
 }
diff --git a/ast/datum.go b/ast/datum.go
diff --git a/executor/subquery.go b/executor/subquery.go
@@ -24,9 +24,9 @@ import (
 
 var _ ast.SubqueryExec = &subquery{}
 
-// SubQuery is an exprNode with a plan.
+// subquery is an exprNode with a plan.
 type subquery struct {
-	ast.Datum
+	types.Datum
 	Type *types.FieldType
 	flag uint64
 	text string

diff --git a/expression/builtin/control_test.go b/expression/builtin/control_test.go
@@ -76,7 +76,4 @@ func (s *testBuiltinSuite) TestNullIf(c *C) {
 		c.Assert(err, IsNil)
 		c.Assert(v, DeepEquals, t.Ret)
 	}
-
-	_, err := builtinNullIf([]interface{}{errors.New("must error"), 1}, nil)
-	c.Assert(err, NotNil)
 }
diff --git a/optimizer/evaluator/evaluator_test.go b/optimizer/evaluator/evaluator_test.go
@@ -1013,12 +1013,12 @@ func (s *testEvaluatorSuite) TestUnaryOp(c *C) {
 	}
 	ctx := mock.NewContext()
 	expr := &ast.UnaryOperationExpr{}
-	for _, t := range tbl {
+	for i, t := range tbl {
 		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)
+		c.Assert(result, DeepEquals, t.result, Commentf("%d", i))
 	}
 
 	tbl = []struct {

diff --git a/optimizer/evaluator/helper.go b/optimizer/evaluator/helper.go
@@ -56,17 +56,17 @@ func getTimeValue(ctx context.Context, v interface{}, tp byte, fsp int) (interfa
 		}
 	case *ast.ValueExpr:
 		switch x.Kind() {
-		case ast.KindString:
+		case types.KindString:
 			value, err = mysql.ParseTime(x.GetString(), tp, fsp)
 			if err != nil {
 				return nil, errors.Trace(err)
 			}
-		case ast.KindInt64:
+		case types.KindInt64:
 			value, err = mysql.ParseTimeFromNum(x.GetInt64(), tp, fsp)
 			if err != nil {
 				return nil, errors.Trace(err)
 			}
-		case ast.KindNull:
+		case types.KindNull:
 			return nil, nil
 		default:
 			return nil, errors.Trace(errDefaultValue)