Fix conversion from string float to integer (#5518)

This commit is contained in:
Daniel Nelson
2019-03-04 12:35:57 -08:00
committed by GitHub
parent d09c213562
commit c0e0da7ef6
2 changed files with 43 additions and 19 deletions

View File

@@ -336,7 +336,7 @@ func toInteger(v interface{}) (int64, bool) {
} else if value > float64(math.MaxInt64) {
return math.MaxInt64, true
} else {
return int64(value), true
return int64(Round(value)), true
}
case bool:
if value {
@@ -345,8 +345,11 @@ func toInteger(v interface{}) (int64, bool) {
return 0, true
}
case string:
result, err := strconv.ParseInt(value, 10, 64)
return result, err == nil
result, err := strconv.ParseFloat(value, 64)
if err != nil {
return 0, false
}
return toInteger(result)
}
return 0, false
}
@@ -367,7 +370,7 @@ func toUnsigned(v interface{}) (uint64, bool) {
} else if value > float64(math.MaxUint64) {
return math.MaxUint64, true
} else {
return uint64(value), true
return uint64(Round(value)), true
}
case bool:
if value {
@@ -376,8 +379,11 @@ func toUnsigned(v interface{}) (uint64, bool) {
return 0, true
}
case string:
result, err := strconv.ParseUint(value, 10, 64)
return result, err == nil
result, err := strconv.ParseFloat(value, 64)
if err != nil {
return 0, false
}
return toUnsigned(result)
}
return 0, false
}
@@ -419,6 +425,16 @@ func toString(v interface{}) (string, bool) {
return "", false
}
// math.Round was not added until Go 1.10, can be removed when support for Go
// 1.9 is dropped.
func Round(x float64) float64 {
t := math.Trunc(x)
if math.Abs(x-t) >= 0.5 {
return t + math.Copysign(1, x)
}
return t
}
func logPrintf(format string, v ...interface{}) {
log.Printf("D! [processors.converter] "+format, v...)
}