expression: Optimize builtinArithmeticModRealSig and builtinGreatestD…

…ecimalSig using MergeNull method (#22418) * optimize with mergenulls * optimize with mergenulls * remove unnecessary import Co-authored-by: ti-srebot <[email protected]>
pingcap · Feb 22, 2021 · 50607db · 50607db
1 parent 49f3e29
commit 50607db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/expression/builtin_arithmetic_vec.go b/expression/builtin_arithmetic_vec.go
@@ -515,11 +515,11 @@ func (b *builtinArithmeticModRealSig) vecEvalReal(input *chunk.Chunk, result *ch
 	if err := b.args[0].VecEvalReal(b.ctx, input, result); err != nil {
 		return err
 	}
+	result.MergeNulls(buf)
 	x := result.Float64s()
 	y := buf.Float64s()
 	for i := 0; i < n; i++ {
 		if buf.IsNull(i) {
-			result.SetNull(i, true)
 			continue
 		}
 		if y[i] == 0 {
@@ -529,9 +529,6 @@ func (b *builtinArithmeticModRealSig) vecEvalReal(input *chunk.Chunk, result *ch
 			result.SetNull(i, true)
 			continue
 		}
-		if result.IsNull(i) {
-			continue
-		}
 
 		x[i] = math.Mod(x[i], y[i])
 	}

diff --git a/expression/builtin_compare_vec.go b/expression/builtin_compare_vec.go
@@ -39,12 +39,10 @@ func (b *builtinGreatestDecimalSig) vecEvalDecimal(input *chunk.Chunk, result *c
 		if err := b.args[j].VecEvalDecimal(b.ctx, input, buf); err != nil {
 			return err
 		}
+		result.MergeNulls(buf)
 		for i := 0; i < n; i++ {
 			if result.IsNull(i) {
 				continue
-			} else if buf.IsNull(i) {
-				result.SetNull(i, true)
-				continue
 			}
 			v := buf.GetDecimal(i)
 			if v.Compare(&d64s[i]) > 0 {