evaluator: Check function call min and max arguments in new evaluator.

For github issue pingcap#758.
satchel9 · Dec 20, 2015 · a5b5fd6 · a5b5fd6
1 parent 60ec9fc
commit a5b5fd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/expression/builtin/builtin.go b/expression/builtin/builtin.go
@@ -70,7 +70,7 @@ var Funcs = map[string]Func{
 	"curdate":           {builtinCurrentDate, 0, 0, false, false},
 	"current_date":      {builtinCurrentDate, 0, 0, false, false},
 	"current_timestamp": {builtinNow, 0, 1, false, false},
-	"date":              {builtinDate, 8, 8, true, false},
+	"date":              {builtinDate, 1, 1, true, false},
 	"day":               {builtinDay, 1, 1, true, false},
 	"dayofmonth":        {builtinDayOfMonth, 1, 1, true, false},
 	"dayofweek":         {builtinDayOfWeek, 1, 1, true, false},

diff --git a/optimizer/evaluator/evaluator.go b/optimizer/evaluator/evaluator.go
@@ -536,6 +536,10 @@ func (e *Evaluator) funcCall(v *ast.FuncCallExpr) bool {
 		e.err = ErrInvalidOperation.Gen("unknown function %s", v.FnName.O)
 		return false
 	}
+	if len(v.Args) < f.MinArgs || len(v.Args) > f.MaxArgs {
+		e.err = ErrInvalidOperation.Gen("number of function arguments must in [%d, %d].", f.MinArgs, f.MaxArgs)
+		return false
+	}
 	a := make([]interface{}, len(v.Args))
 	for i, arg := range v.Args {
 		a[i] = arg.GetValue()