Merge branch 'vec-builtinLogicAndSig' of github.com:lauhg/tidb into v…

…ec-builtinLogicAndSig
pingcap · Sep 25, 2019 · 8f19cd5 · 8f19cd5
2 parents 3f5adcf + f1f1d31
commit 8f19cd5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/executor/adapter.go b/executor/adapter.go
@@ -748,9 +748,6 @@ func FormatSQL(sql string, pps variable.PreparedParams) stringutil.StringerFunc
 func (a *ExecStmt) LogSlowQuery(txnTS uint64, succ bool) {
 	sessVars := a.Ctx.GetSessionVars()
 	level := log.GetLevel()
-	if level > zapcore.WarnLevel {
-		return
-	}
 	cfg := config.GetGlobalConfig()
 	costTime := time.Since(a.Ctx.GetSessionVars().StartTime)
 	threshold := time.Duration(atomic.LoadUint64(&cfg.Log.SlowThreshold)) * time.Millisecond

diff --git a/expression/builtin_math_vec.go b/expression/builtin_math_vec.go
@@ -431,6 +431,24 @@ func (b *builtinPowSig) vectorized() bool {
 	return true
 }
 
+func (b *builtinCeilRealSig) vecEvalReal(input *chunk.Chunk, result *chunk.Column) error {
+	if err := b.args[0].VecEvalReal(b.ctx, input, result); err != nil {
+		return err
+	}
+	f64s := result.Float64s()
+	for i := 0; i < len(f64s); i++ {
+		if result.IsNull(i) {
+			continue
+		}
+		f64s[i] = math.Ceil(f64s[i])
+	}
+	return nil
+}
+
+func (b *builtinCeilRealSig) vectorized() bool {
+	return true
+}
+
 func (b *builtinRoundRealSig) vecEvalReal(input *chunk.Chunk, result *chunk.Column) error {
 	if err := b.args[0].VecEvalReal(b.ctx, input, result); err != nil {
 		return err

diff --git a/expression/builtin_math_vec_test.go b/expression/builtin_math_vec_test.go
@@ -82,6 +82,9 @@ var vecBuiltinMathCases = map[string][]vecExprBenchCase{
 	ast.Pow: {
 		{retEvalType: types.ETReal, childrenTypes: []types.EvalType{types.ETReal, types.ETReal}, geners: []dataGenerator{&rangeRealGener{0, 10, 0.5}, &rangeRealGener{0, 100, 0.5}}},
 	},
+	ast.Ceil: {
+		{retEvalType: types.ETReal, childrenTypes: []types.EvalType{types.ETReal}, geners: nil},
+	},
 	ast.Truncate: {
 		{retEvalType: types.ETReal, childrenTypes: []types.EvalType{types.ETReal, types.ETInt}, geners: []dataGenerator{nil, &rangeInt64Gener{-10, 10}}},
 	},