Merge branch 'master' into disksing/update-codec

yixiaodaxia · Dec 14, 2015 · c8d7ed1 · c8d7ed1
2 parents a66bc59 + d15bd86
commit c8d7ed1
Show file tree

Hide file tree

Showing 32 changed files with 713 additions and 244 deletions.
diff --git a/ast/ast.go b/ast/ast.go
@@ -38,13 +38,23 @@ type Node interface {
 	SetText(text string)
 }
 
+// Flags indicates whether an expression contains certain types of expression.
+const (
+	FlagConstant       uint64 = 0
+	FlagHasParamMarker uint64 = 1 << iota
+	FlagHasFunc
+	FlagHasReference
+	FlagHasAggregateFunc
+	FlagHasSubquery
+	FlagHasVariable
+	FlagHasDefault
+)
+
 // ExprNode is a node that can be evaluated.
 // Name of implementations should have 'Expr' suffix.
 type ExprNode interface {
 	// Node is embeded in ExprNode.
 	Node
-	// IsStatic means it can be evaluated independently.
-	IsStatic() bool
 	// SetType sets evaluation type to the expression.
 	SetType(tp *types.FieldType)
 	// GetType gets the evaluation type of the expression.
@@ -53,6 +63,12 @@ type ExprNode interface {
 	SetValue(val interface{})
 	// GetValue gets value of the expression.
 	GetValue() interface{}
+	// SetFlag sets flag to the expression.
+	// Flag indicates whether the expression contains
+	// parameter marker, reference, aggregate function...
+	SetFlag(flag uint64)
+	// GetFlag returns the flag of the expression.
+	GetFlag() uint64
 }
 
 // FuncNode represents function call expression node.

diff --git a/ast/base.go b/ast/base.go
@@ -63,11 +63,7 @@ func (dn *dmlNode) dmlStatement() {}
 type exprNode struct {
 	node
 	types.DataItem
-}
-
-// IsStatic implements Expression interface.
-func (en *exprNode) IsStatic() bool {
-	return false
+	flag uint64
 }
 
 // SetType implements Expression interface.
@@ -90,6 +86,16 @@ func (en *exprNode) GetValue() interface{} {
 	return en.Data
 }
 
+// SetFlag implements Expression interface.
+func (en *exprNode) SetFlag(flag uint64) {
+	en.flag = flag
+}
+
+// GetFlag implements Expression interface.
+func (en *exprNode) GetFlag() uint64 {
+	return en.flag
+}
+
 type funcNode struct {
 	exprNode
 }

diff --git a/ast/expressions.go b/ast/expressions.go
@@ -102,11 +102,6 @@ func NewValueExpr(value interface{}) *ValueExpr {
 	return ve
 }
 
-// IsStatic implements ExprNode interface.
-func (n *ValueExpr) IsStatic() bool {
-	return true
-}
-
 // Accept implements Node interface.
 func (n *ValueExpr) Accept(v Visitor) (Node, bool) {
 	newNod, skipChildren := v.Enter(n)
@@ -159,11 +154,6 @@ func (n *BetweenExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *BetweenExpr) IsStatic() bool {
-	return n.Expr.IsStatic() && n.Left.IsStatic() && n.Right.IsStatic()
-}
-
 // BinaryOperationExpr is for binary operation like 1 + 1, 1 - 1, etc.
 type BinaryOperationExpr struct {
 	exprNode
@@ -198,11 +188,6 @@ func (n *BinaryOperationExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *BinaryOperationExpr) IsStatic() bool {
-	return n.L.IsStatic() && n.R.IsStatic()
-}
-
 // WhenClause is the when clause in Case expression for "when condition then result".
 type WhenClause struct {
 	node
@@ -275,22 +260,6 @@ func (n *CaseExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *CaseExpr) IsStatic() bool {
-	if n.Value != nil && !n.Value.IsStatic() {
-		return false
-	}
-	for _, w := range n.WhenClauses {
-		if !w.Expr.IsStatic() || !w.Result.IsStatic() {
-			return false
-		}
-	}
-	if n.ElseClause != nil && !n.ElseClause.IsStatic() {
-		return false
-	}
-	return true
-}
-
 // SubqueryExpr represents a subquery.
 type SubqueryExpr struct {
 	exprNode
@@ -517,11 +486,6 @@ func (n *IsNullExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *IsNullExpr) IsStatic() bool {
-	return n.Expr.IsStatic()
-}
-
 // IsTruthExpr is the expression for true/false check.
 type IsTruthExpr struct {
 	exprNode
@@ -548,11 +512,6 @@ func (n *IsTruthExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *IsTruthExpr) IsStatic() bool {
-	return n.Expr.IsStatic()
-}
-
 // PatternLikeExpr is the expression for like operator, e.g, expr like "%123%"
 type PatternLikeExpr struct {
 	exprNode
@@ -593,11 +552,6 @@ func (n *PatternLikeExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *PatternLikeExpr) IsStatic() bool {
-	return n.Expr.IsStatic() && n.Pattern.IsStatic()
-}
-
 // ParamMarkerExpr expresion holds a place for another expression.
 // Used in parsing prepare statement.
 type ParamMarkerExpr struct {
@@ -639,11 +593,6 @@ func (n *ParenthesesExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *ParenthesesExpr) IsStatic() bool {
-	return n.Expr.IsStatic()
-}
-
 // PositionExpr is the expression for order by and group by position.
 // MySQL use position expression started from 1, it looks a little confused inner.
 // maybe later we will use 0 at first.
@@ -655,11 +604,6 @@ type PositionExpr struct {
 	Refer *ResultField
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *PositionExpr) IsStatic() bool {
-	return false
-}
-
 // Accept implements Node Accept interface.
 func (n *PositionExpr) Accept(v Visitor) (Node, bool) {
 	newNod, skipChildren := v.Enter(n)
@@ -706,11 +650,6 @@ func (n *PatternRegexpExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *PatternRegexpExpr) IsStatic() bool {
-	return n.Expr.IsStatic() && n.Pattern.IsStatic()
-}
-
 // RowExpr is the expression for row constructor.
 // See https://dev.mysql.com/doc/refman/5.7/en/row-subqueries.html
 type RowExpr struct {
@@ -736,16 +675,6 @@ func (n *RowExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *RowExpr) IsStatic() bool {
-	for _, v := range n.Values {
-		if !v.IsStatic() {
-			return false
-		}
-	}
-	return true
-}
-
 // UnaryOperationExpr is the expression for unary operator.
 type UnaryOperationExpr struct {
 	exprNode
@@ -770,11 +699,6 @@ func (n *UnaryOperationExpr) Accept(v Visitor) (Node, bool) {
 	return v.Leave(n)
 }
 
-// IsStatic implements the ExprNode IsStatic interface.
-func (n *UnaryOperationExpr) IsStatic() bool {
-	return n.V.IsStatic()
-}
-
 // ValuesExpr is the expression used in INSERT VALUES
 type ValuesExpr struct {
 	exprNode