expression: remove useless HandleOverflowOnSelection (#50279)

close #50278
pingcap · Jan 11, 2024 · 22d2f6d · 22d2f6d
1 parent 62d4039
commit 22d2f6d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 22 deletions.
diff --git a/pkg/expression/expression.go b/pkg/expression/expression.go
@@ -237,18 +237,6 @@ func ExprNotNull(expr Expression) bool {
 	return mysql.HasNotNullFlag(expr.GetType().GetFlag())
 }
 
-// HandleOverflowOnSelection handles Overflow errors when evaluating selection filters.
-// We should ignore overflow errors when evaluating selection conditions:
-//
-//	INSERT INTO t VALUES ("999999999999999999");
-//	SELECT * FROM t WHERE v;
-func HandleOverflowOnSelection(sc *stmtctx.StatementContext, val int64, err error) (int64, error) {
-	if sc.InSelectStmt && err != nil && types.ErrOverflow.Equal(err) {
-		return -1, nil
-	}
-	return val, err
-}
-
 // EvalBool evaluates expression list to a boolean value. The first returned value
 // indicates bool result of the expression list, the second returned value indicates
 // whether the result of the expression list is null, it can only be true when the
@@ -275,10 +263,7 @@ func EvalBool(ctx EvalContext, exprList CNFExprs, row chunk.Row) (bool, bool, er
 
 		i, err := data.ToBool(ctx.GetSessionVars().StmtCtx.TypeCtx())
 		if err != nil {
-			i, err = HandleOverflowOnSelection(ctx.GetSessionVars().StmtCtx, i, err)
-			if err != nil {
-				return false, false, err
-			}
+			return false, false, err
 		}
 		if i == 0 {
 			return false, false, nil

diff --git a/pkg/store/mockstore/mockcopr/executor.go b/pkg/store/mockstore/mockcopr/executor.go
@@ -415,7 +415,6 @@ func evalBool(exprs []expression.Expression, row []types.Datum, ctx sessionctx.C
 		}
 
 		isBool, err := data.ToBool(ctx.GetSessionVars().StmtCtx.TypeCtx())
-		isBool, err = expression.HandleOverflowOnSelection(ctx.GetSessionVars().StmtCtx, isBool, err)
 		if err != nil {
 			return false, errors.Trace(err)
 		}

diff --git a/pkg/store/mockstore/unistore/cophandler/closure_exec.go b/pkg/store/mockstore/unistore/cophandler/closure_exec.go
@@ -796,7 +796,6 @@ func (e *closureExecutor) processSelection(needCollectDetail bool) (gotRow bool,
 			gotRow = false
 		} else {
 			isTrue, err := d.ToBool(e.sctx.GetSessionVars().StmtCtx.TypeCtx())
-			isTrue, err = expression.HandleOverflowOnSelection(e.sctx.GetSessionVars().StmtCtx, isTrue, err)
 			if err != nil {
 				return false, errors.Trace(err)
 			}

diff --git a/pkg/store/mockstore/unistore/cophandler/mpp_exec.go b/pkg/store/mockstore/unistore/cophandler/mpp_exec.go
@@ -1143,10 +1143,6 @@ func (e *selExec) next() (*chunk.Chunk, error) {
 					if err != nil {
 						return nil, errors.Trace(err)
 					}
-					isBool, err = expression.HandleOverflowOnSelection(e.sctx.GetSessionVars().StmtCtx, isBool, err)
-					if err != nil {
-						return nil, errors.Trace(err)
-					}
 					passCheck = isBool != 0
 				}
 				if !passCheck {