Merge remote-tracking branch 'origin/master' into shenli/wrap-data

bootstrap.go

@@ -22,7 +22,7 @@ import (
 	"runtime/debug"
 
 	"github.com/ngaut/log"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/errors"
 	"github.com/pingcap/tidb/util/errors2"
 )

column/column.go

@@ -24,7 +24,7 @@ import (
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

column/column_test.go

@@ -18,7 +18,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

ddl/ddl.go

@@ -30,7 +30,7 @@ import (
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/coldef"
 	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/table/tables"

ddl/ddl_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/pingcap/tidb/ddl"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/stmt"

driver.go

@@ -31,7 +31,7 @@ import (
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/rset"
 	"github.com/pingcap/tidb/sessionctx"
 	qerror "github.com/pingcap/tidb/util/errors"

expression/binop.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/context"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/util/types"
 )

expression/binop_test.go

@@ -20,7 +20,7 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/expression/builtin"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/util/types"
 )
@@ -186,7 +186,7 @@ func (s *testBinOpSuite) TestIdentRelOp(c *C) {
 
 	f := func(name string) *Ident {
 		return &Ident{
-			model.NewCIStr(name),
+			CIStr: model.NewCIStr(name),
 		}
 	}
 

expression/builtin/groupby.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/kv/memkv"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

expression/builtin/groupby_test.go

@@ -15,7 +15,7 @@ package builtin
 
 import (
 	. "github.com/pingcap/check"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

expression/builtin/string_test.go

@@ -19,7 +19,7 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 )
 
 func (s *testBuiltinSuite) TestLength(c *C) {

expression/builtin/time.go

@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/juju/errors"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

expression/builtin/time_test.go

@@ -18,7 +18,7 @@ import (
 	"time"
 
 	. "github.com/pingcap/check"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 )
 
 func (s *testBuiltinSuite) TestDate(c *C) {

expression/cast.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/pingcap/tidb/context"
 
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

expression/cast_test.go

@@ -17,7 +17,7 @@ import (
 	"errors"
 
 	. "github.com/pingcap/check"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/charset"
 	"github.com/pingcap/tidb/util/types"
 )

expression/date_add.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/context"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

expression/date_add_test.go

@@ -15,7 +15,7 @@ package expression
 
 import (
 	. "github.com/pingcap/check"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 )
 
 var _ = Suite(&testDateAddSuite{})

expression/extract.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/context"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )
 

expression/helper.go

@@ -30,7 +30,7 @@ import (
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/expression/builtin"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/util/types"
@@ -45,13 +45,15 @@ const (
 	ExprEvalPositionFunc = "$positionFunc"
 	// ExprEvalValuesFunc is the key saving a function to retrieve value for column name.
 	ExprEvalValuesFunc = "$valuesFunc"
+	// ExprEvalIdentReferFunc is the key saving a function to retrieve value with identifier reference index.
+	ExprEvalIdentReferFunc = "$identReferFunc"
 )
 
 var (
 	// CurrentTimestamp is the keyword getting default value for datetime and timestamp type.
 	CurrentTimestamp = "CURRENT_TIMESTAMP"
 	// CurrentTimeExpr is the expression retireving default value for datetime and timestamp type.
-	CurrentTimeExpr = &Ident{model.NewCIStr(CurrentTimestamp)}
+	CurrentTimeExpr = &Ident{CIStr: model.NewCIStr(CurrentTimestamp)}
 	// ZeroTimestamp shows the zero datetime and timestamp.
 	ZeroTimestamp = "0000-00-00 00:00:00"
 )
@@ -148,22 +150,40 @@ func newMentionedAggregateFuncsVisitor() *mentionedAggregateFuncsVisitor {
 }
 
 func (v *mentionedAggregateFuncsVisitor) VisitCall(c *Call) (Expression, error) {
+	isAggregate := IsAggregateFunc(c.F)
+
+	if isAggregate {
+		v.exprs = append(v.exprs, c)
+	}
+
+	n := len(v.exprs)
 	for _, e := range c.Args {
 		_, err := e.Accept(v)
 		if err != nil {
 			return nil, errors.Trace(err)
 		}
 	}
-	f, ok := builtin.Funcs[strings.ToLower(c.F)]
-	if !ok {
-		return nil, errors.Errorf("unknown function %s", c.F)
-	}
-	if f.IsAggregate {
-		v.exprs = append(v.exprs, c)
+
+	if isAggregate && len(v.exprs) != n {
+		// aggregate function can't use aggregate function as the arg.
+		// here means we have aggregate function in arg.
+		return nil, errors.Errorf("Invalid use of group function")
 	}
+
 	return c, nil
 }
 
+// IsAggregateFunc checks whether name is an aggregate function or not.
+func IsAggregateFunc(name string) bool {
+	// TODO: use switch defined aggregate name "sum", "count", etc... directly.
+	// Maybe we can remove builtin IsAggregate field later.
+	f, ok := builtin.Funcs[strings.ToLower(name)]
+	if !ok {
+		return false
+	}
+	return f.IsAggregate
+}
+
 // MentionedColumns returns a list of names for Ident expression.
 func MentionedColumns(e Expression) []string {
 	var names []string

expression/helper_test.go

@@ -6,7 +6,7 @@ import (
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/sessionctx/variable"
 )
@@ -46,6 +46,15 @@ func (s *testHelperSuite) TestContainAggFunc(c *C) {
 		b := ContainAggregateFunc(t.Expr)
 		c.Assert(b, Equals, t.Expect)
 	}
+
+	expr := &Call{
+		F: "count",
+		Args: []Expression{
+			&Call{F: "count", Args: []Expression{v}},
+		},
+	}
+	_, err := MentionedAggregateFuncs(expr)
+	c.Assert(err, NotNil)
 }
 
 func (s *testHelperSuite) TestMentionedColumns(c *C) {
@@ -56,7 +65,7 @@ func (s *testHelperSuite) TestMentionedColumns(c *C) {
 	}{
 		{Value{1}, 0},
 		{&BinaryOperation{L: v, R: v}, 0},
-		{&Ident{model.NewCIStr("id")}, 1},
+		{&Ident{CIStr: model.NewCIStr("id")}, 1},
 		{&Call{F: "count", Args: []Expression{v}}, 0},
 		{&IsNull{Expr: v}, 0},
 		{&PExpr{Expr: v}, 0},
@@ -105,7 +114,7 @@ func (s *testHelperSuite) TestBase(c *C) {
 		{int64(1), int64(1)},
 		{&UnaryOperation{Op: opcode.Plus, V: Value{1}}, 1},
 		{&UnaryOperation{Op: opcode.Not, V: Value{1}}, nil},
-		{&UnaryOperation{Op: opcode.Plus, V: &Ident{model.NewCIStr("id")}}, nil},
+		{&UnaryOperation{Op: opcode.Plus, V: &Ident{CIStr: model.NewCIStr("id")}}, nil},
 		{nil, nil},
 	}
 
@@ -227,7 +236,7 @@ func (s *testHelperSuite) TestGetTimeValue(c *C) {
 		{Value{"2012-13-12 00:00:00"}},
 		{Value{0}},
 		{Value{int64(1)}},
-		{&Ident{model.NewCIStr("xxx")}},
+		{&Ident{CIStr: model.NewCIStr("xxx")}},
 		{NewUnaryOperation(opcode.Minus, Value{int64(1)})},
 	}
 

expression/ident.go

@@ -29,10 +29,23 @@ var (
 	_ Expression = (*Ident)(nil)
 )
 
+const (
+	// IdentReferSelectList means the identifier reference is in select list.
+	IdentReferSelectList = 1
+	// IdentReferFromTable means the identifier reference is in FROM table.
+	IdentReferFromTable = 2
+)
+
 // Ident is the identifier expression.
 type Ident struct {
 	// model.CIStr contains origin identifier name and its lowercase name.
 	model.CIStr
+
+	// ReferScope means where the identifer reference is, select list or from.
+	ReferScope int
+
+	// ReferIndex is the index to get the identifer data.
+	ReferIndex int
 }
 
 // Clone implements the Expression Clone interface.
@@ -63,6 +76,14 @@ func (i *Ident) Eval(ctx context.Context, args map[interface{}]interface{}) (v i
 		return nil, nil
 	}
 
+	// TODO: we will unify ExprEvalIdentReferFunc and ExprEvalIdentFunc later,
+	// now just put them here for refactor step by step.
+	if f, ok := args[ExprEvalIdentReferFunc]; ok {
+		if got, ok := f.(func(string, int, int) (interface{}, error)); ok {
+			return got(i.L, i.ReferScope, i.ReferIndex)
+		}
+	}
+
 	if f, ok := args[ExprEvalIdentFunc]; ok {
 		if got, ok := f.(func(string) (interface{}, error)); ok {
 			return got(i.L)

expression/ident_test.go

@@ -26,7 +26,7 @@ type testIdentSuite struct {
 
 func (s *testIdentSuite) TestIdent(c *C) {
 	e := Ident{
-		model.NewCIStr("id"),
+		CIStr: model.NewCIStr("id"),
 	}
 
 	c.Assert(e.IsStatic(), IsFalse)
@@ -55,4 +55,14 @@ func (s *testIdentSuite) TestIdent(c *C) {
 	v, err = e.Eval(nil, m)
 	c.Assert(err, IsNil)
 	c.Assert(v, Equals, 1)
+
+	delete(m, ExprEvalIdentFunc)
+	e.ReferScope = IdentReferSelectList
+	e.ReferIndex = 1
+	m[ExprEvalIdentReferFunc] = func(string, int, int) (interface{}, error) {
+		return 2, nil
+	}
+	v, err = e.Eval(nil, m)
+	c.Assert(err, IsNil)
+	c.Assert(v, Equals, 2)
 }

expression/unary.go

@@ -23,7 +23,7 @@ import (
 	"github.com/juju/errors"
 	"github.com/pingcap/tidb/context"
 
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/util/types"
 )

expression/unary_test.go

@@ -19,7 +19,7 @@ import (
 
 	. "github.com/pingcap/check"
 
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/util/types"
 )

expression/visitor_test.go

@@ -17,7 +17,7 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/model"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/util/types"
 )

field/field_test.go

@@ -19,7 +19,7 @@ import (
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/field"
-	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/util/types"
 )