Fix duplicate warnings for string-to-float truncation

Closes: #25829
pingcap · Jul 13, 2021 · e25d4d4 · e25d4d4
1 parent 9abf9d0
commit e25d4d4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/types/convert.go b/types/convert.go
@@ -365,7 +365,7 @@ func NumberToDuration(number int64, fsp int8) (Duration, error) {
 // getValidIntPrefix gets prefix of the string which can be successfully parsed as int.
 func getValidIntPrefix(sc *stmtctx.StatementContext, str string, isFuncCast bool) (string, error) {
 	if !isFuncCast {
-		floatPrefix, err := getValidFloatPrefix(sc, str, isFuncCast)
+		floatPrefix, err := getValidFloatPrefix(sc, str, isFuncCast, true)
 		if err != nil {
 			return floatPrefix, errors.Trace(err)
 		}
@@ -524,7 +524,7 @@ func floatStrToIntStr(sc *stmtctx.StatementContext, validFloat string, oriStr st
 // StrToFloat converts a string to a float64 at the best-effort.
 func StrToFloat(sc *stmtctx.StatementContext, str string, isFuncCast bool) (float64, error) {
 	str = strings.TrimSpace(str)
-	validStr, err := getValidFloatPrefix(sc, str, isFuncCast)
+	validStr, err := getValidFloatPrefix(sc, str, isFuncCast, false)
 	f, err1 := strconv.ParseFloat(validStr, 64)
 	if err1 != nil {
 		if err2, ok := err1.(*strconv.NumError); ok {
@@ -662,7 +662,7 @@ func ConvertJSONToDecimal(sc *stmtctx.StatementContext, j json.BinaryJSON) (*MyD
 }
 
 // getValidFloatPrefix gets prefix of string which can be successfully parsed as float.
-func getValidFloatPrefix(sc *stmtctx.StatementContext, s string, isFuncCast bool) (valid string, err error) {
+func getValidFloatPrefix(sc *stmtctx.StatementContext, s string, isFuncCast bool, hideWarning bool) (valid string, err error) {
 	if isFuncCast && s == "" {
 		return "0", nil
 	}
@@ -710,7 +710,11 @@ func getValidFloatPrefix(sc *stmtctx.StatementContext, s string, isFuncCast bool
 		valid = "0"
 	}
 	if validLen == 0 || validLen != len(s) {
-		err = errors.Trace(sc.HandleTruncate(ErrTruncatedWrongVal.GenWithStackByArgs("DOUBLE", s)))
+		if hideWarning {
+			err = errors.Trace(ErrTruncatedWrongVal.GenWithStackByArgs("DOUBLE", s))
+		} else {
+			err = errors.Trace(sc.HandleTruncate(ErrTruncatedWrongVal.GenWithStackByArgs("DOUBLE", s)))
+		}
 	}
 	return valid, err
 }

diff --git a/types/convert_test.go b/types/convert_test.go
@@ -899,7 +899,7 @@ func (s *testTypeConvertSuite) TestGetValidFloat(c *C) {
 	}
 	sc := new(stmtctx.StatementContext)
 	for _, tt := range tests {
-		prefix, _ := getValidFloatPrefix(sc, tt.origin, false)
+		prefix, _ := getValidFloatPrefix(sc, tt.origin, false, false)
 		c.Assert(prefix, Equals, tt.valid)
 		_, err := strconv.ParseFloat(prefix, 64)
 		c.Assert(err, IsNil)