expression: maintain DeferredExpr in aggressive constant folding.

expression/constant_fold.go

@@ -15,6 +15,7 @@ package expression
 
 import (
 	"github.com/pingcap/tidb/ast"
+	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
 	log "github.com/sirupsen/logrus"
 )
@@ -118,10 +119,10 @@ func foldConstant(expr Expression) (Expression, bool) {
 				return expr, isDeferredConst
 			}
 			if value.IsNull() {
-				return &Constant{Value: value, RetType: x.RetType}, false
+				return foldedConstForScalarFunc(value, x, isDeferredConst), isDeferredConst
 			}
 			if isTrue, err := value.ToBool(sc); err == nil && isTrue == 0 {
-				return &Constant{Value: value, RetType: x.RetType}, false
+				return foldedConstForScalarFunc(value, x, isDeferredConst), isDeferredConst
 			}
 			return expr, isDeferredConst
 		}
@@ -130,10 +131,7 @@ func foldConstant(expr Expression) (Expression, bool) {
 			log.Warnf("fold constant %s: %s", x.ExplainInfo(), err.Error())
 			return expr, isDeferredConst
 		}
-		if isDeferredConst {
-			return &Constant{Value: value, RetType: x.RetType, DeferredExpr: x}, true
-		}
-		return &Constant{Value: value, RetType: x.RetType}, false
+		return foldedConstForScalarFunc(value, x, isDeferredConst), isDeferredConst
 	case *Constant:
 		if x.DeferredExpr != nil {
 			value, err := x.DeferredExpr.Eval(chunk.Row{})
@@ -146,3 +144,10 @@ func foldConstant(expr Expression) (Expression, bool) {
 	}
 	return expr, false
 }
+
+func foldedConstForScalarFunc(value types.Datum, sf *ScalarFunction, isDeferred bool) *Constant {
+	if isDeferred {
+		return &Constant{Value: value, RetType: sf.RetType, DeferredExpr: sf}
+	}
+	return &Constant{Value: value, RetType: sf.RetType}
+}

expression/constant_test.go

@@ -202,3 +202,31 @@ func (*testExpressionSuite) TestConstantFolding(c *C) {
 		c.Assert(newConds.String(), Equals, tt.result, Commentf("different for expr %s", tt.condition))
 	}
 }
+
+func (*testExpressionSuite) TestDeferredExprNullConstantFold(c *C) {
+	defer testleak.AfterTest(c)()
+	nullConst := &Constant{
+		Value:        types.NewDatum(nil),
+		RetType:      types.NewFieldType(mysql.TypeTiny),
+		DeferredExpr: Null,
+	}
+	tests := []struct {
+		condition Expression
+		deferred  string
+	}{
+		{
+			condition: newFunction(ast.LT, newColumn(0), nullConst),
+			deferred:  "lt(test.t.0, <nil>)",
+		},
+	}
+	for _, tt := range tests {
+		comment := Commentf("different for expr %s", tt.condition)
+		sf, ok := tt.condition.(*ScalarFunction)
+		c.Assert(ok, IsTrue, comment)
+		sf.GetCtx().GetSessionVars().StmtCtx.InNullRejectCheck = true
+		newConds := FoldConstant(tt.condition)
+		newConst, ok := newConds.(*Constant)
+		c.Assert(ok, IsTrue, comment)
+		c.Assert(newConst.DeferredExpr.String(), Equals, tt.deferred, comment)
+	}
+}