Skip to content

Commit

Permalink
chore(util/gvalid): using 64 instead of 10 bitsize parameter for …
Browse files Browse the repository at this point in the history 
…function `strconv.ParseFloat` although it treats `10` as `64` internally (#4154)
  • Loading branch information
@ansionfor
ansionfor authored Feb 20, 2025
1 parent 01593ad commit 2fa0355
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 30 deletions.
28 changes: 14 additions & 14 deletions util/gconv/gconv_z_unit_scan_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(maps, &mss)
t.AssertNil(err)
t.Assert(len(mss), len(maps))
for k, _ := range maps {
for k := range maps {
t.Assert(maps[k]["Name"], mss[k]["Name"])
t.Assert(maps[k]["Place"], mss[k]["Place"])
}
Expand All @@ -135,7 +135,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(maps, &msa)
t.AssertNil(err)
t.Assert(len(msa), len(maps))
for k, _ := range maps {
for k := range maps {
t.Assert(maps[k]["Name"], msa[k]["Name"])
t.Assert(maps[k]["Place"], msa[k]["Place"])
}
Expand All @@ -144,7 +144,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(maps, &maa)
t.AssertNil(err)
t.Assert(len(maa), len(maps))
for k, _ := range maps {
for k := range maps {
t.Assert(maps[k]["Name"], maa[k]["Name"])
t.Assert(maps[k]["Place"], maa[k]["Place"])
}
Expand All @@ -153,7 +153,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(maps, &ss)
t.AssertNil(err)
t.Assert(len(ss), len(maps))
for k, _ := range maps {
for k := range maps {
t.Assert(maps[k]["Name"], ss[k].Name)
t.Assert(maps[k]["Place"], ss[k].Place)
}
Expand All @@ -162,7 +162,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(maps, &ssp)
t.AssertNil(err)
t.Assert(len(ssp), len(maps))
for k, _ := range maps {
for k := range maps {
t.Assert(maps[k]["Name"], ssp[k].Name)
t.Assert(maps[k]["Place"], ssp[k].Place)
}
Expand Down Expand Up @@ -219,7 +219,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(structs, &mss)
t.AssertNil(err)
t.Assert(len(mss), len(structs))
for k, _ := range structs {
for k := range structs {
t.Assert(structs[k].Name, mss[k]["Name"])
t.Assert(structs[k].Place, mss[k]["Place"])
}
Expand All @@ -228,7 +228,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(structs, &msa)
t.AssertNil(err)
t.Assert(len(msa), len(structs))
for k, _ := range structs {
for k := range structs {
t.Assert(structs[k].Name, msa[k]["Name"])
t.Assert(structs[k].Place, msa[k]["Place"])
}
Expand All @@ -237,7 +237,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(structs, &maa)
t.AssertNil(err)
t.Assert(len(maa), len(structs))
for k, _ := range structs {
for k := range structs {
t.Assert(structs[k].Name, maa[k]["Name"])
t.Assert(structs[k].Place, maa[k]["Place"])
}
Expand All @@ -246,7 +246,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(structs, &ss)
t.AssertNil(err)
t.Assert(len(ss), len(structs))
for k, _ := range structs {
for k := range structs {
t.Assert(structs[k].Name, ss[k].Name)
t.Assert(structs[k].Place, ss[k].Place)
}
Expand All @@ -255,7 +255,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(structs, &ssp)
t.AssertNil(err)
t.Assert(len(ssp), len(structs))
for k, _ := range structs {
for k := range structs {
t.Assert(structs[k].Name, ssp[k].Name)
t.Assert(structs[k].Place, ssp[k].Place)
}
Expand Down Expand Up @@ -312,7 +312,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(jsons, &mss)
t.AssertNil(err)
t.Assert(len(mss), 2)
for k, _ := range mss {
for k := range mss {
t.Assert("Mars", mss[k]["Name"])
t.Assert("奥林帕斯山", mss[k]["Place"])
}
Expand All @@ -321,7 +321,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(jsons, &msa)
t.AssertNil(err)
t.Assert(len(msa), 2)
for k, _ := range msa {
for k := range msa {
t.Assert("Mars", msa[k]["Name"])
t.Assert("奥林帕斯山", msa[k]["Place"])
}
Expand All @@ -336,7 +336,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(jsons, &ss)
t.AssertNil(err)
t.Assert(len(ss), 2)
for k, _ := range ss {
for k := range ss {
t.Assert("Mars", ss[k].Name)
t.Assert("奥林帕斯山", ss[k].Place)
}
Expand All @@ -345,7 +345,7 @@ func TestScan(t *testing.T) {
err = gconv.Scan(jsons, &ssp)
t.AssertNil(err)
t.Assert(len(ssp), 2)
for k, _ := range ssp {
for k := range ssp {
t.Assert("Mars", ssp[k].Name)
t.Assert("奥林帕斯山", ssp[k].Place)
}
Expand Down
6 changes: 3 additions & 3 deletions util/gvalid/internal/builtin/builtin_between.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ func (r RuleBetween) Run(in RunInput) error {
max = float64(0)
)
if len(array) > 0 {
if v, err := strconv.ParseFloat(strings.TrimSpace(array[0]), 10); err == nil {
if v, err := strconv.ParseFloat(strings.TrimSpace(array[0]), 64); err == nil {
min = v
}
}
if len(array) > 1 {
if v, err := strconv.ParseFloat(strings.TrimSpace(array[1]), 10); err == nil {
if v, err := strconv.ParseFloat(strings.TrimSpace(array[1]), 64); err == nil {
max = v
}
}
valueF, err := strconv.ParseFloat(in.Value.String(), 10)
valueF, err := strconv.ParseFloat(in.Value.String(), 64)
if valueF < min || valueF > max || err != nil {
return errors.New(gstr.ReplaceByMap(in.Message, map[string]string{
"{min}": strconv.FormatFloat(min, 'f', -1, 64),
Expand Down
2 changes: 1 addition & 1 deletion util/gvalid/internal/builtin/builtin_float.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (r RuleFloat) Message() string {
}

func (r RuleFloat) Run(in RunInput) error {
if _, err := strconv.ParseFloat(in.Value.String(), 10); err == nil {
if _, err := strconv.ParseFloat(in.Value.String(), 64); err == nil {
return nil
}
return errors.New(in.Message)
Expand Down
4 changes: 2 additions & 2 deletions util/gvalid/internal/builtin/builtin_gt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (r RuleGT) Message() string {
func (r RuleGT) Run(in RunInput) error {
var (
fieldName, fieldValue = gutil.MapPossibleItemByKey(in.Data.Map(), in.RulePattern)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 10)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 10)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 64)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 64)
)

if valueN <= fieldValueN || err1 != nil || err2 != nil {
Expand Down
4 changes: 2 additions & 2 deletions util/gvalid/internal/builtin/builtin_gte.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (r RuleGTE) Message() string {
func (r RuleGTE) Run(in RunInput) error {
var (
fieldName, fieldValue = gutil.MapPossibleItemByKey(in.Data.Map(), in.RulePattern)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 10)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 10)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 64)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 64)
)

if valueN < fieldValueN || err1 != nil || err2 != nil {
Expand Down
4 changes: 2 additions & 2 deletions util/gvalid/internal/builtin/builtin_lt.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (r RuleLT) Message() string {
func (r RuleLT) Run(in RunInput) error {
var (
fieldName, fieldValue = gutil.MapPossibleItemByKey(in.Data.Map(), in.RulePattern)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 10)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 10)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 64)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 64)
)

if valueN >= fieldValueN || err1 != nil || err2 != nil {
Expand Down
4 changes: 2 additions & 2 deletions util/gvalid/internal/builtin/builtin_lte.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ func (r RuleLTE) Message() string {
func (r RuleLTE) Run(in RunInput) error {
var (
fieldName, fieldValue = gutil.MapPossibleItemByKey(in.Data.Map(), in.RulePattern)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 10)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 10)
fieldValueN, err1 = strconv.ParseFloat(gconv.String(fieldValue), 64)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 64)
)

if valueN > fieldValueN || err1 != nil || err2 != nil {
Expand Down
4 changes: 2 additions & 2 deletions util/gvalid/internal/builtin/builtin_max.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func (r RuleMax) Message() string {

func (r RuleMax) Run(in RunInput) error {
var (
max, err1 = strconv.ParseFloat(in.RulePattern, 10)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 10)
max, err1 = strconv.ParseFloat(in.RulePattern, 64)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 64)
)
if valueN > max || err1 != nil || err2 != nil {
return errors.New(gstr.Replace(in.Message, "{max}", strconv.FormatFloat(max, 'f', -1, 64)))
Expand Down
4 changes: 2 additions & 2 deletions util/gvalid/internal/builtin/builtin_min.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func (r RuleMin) Message() string {

func (r RuleMin) Run(in RunInput) error {
var (
min, err1 = strconv.ParseFloat(in.RulePattern, 10)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 10)
min, err1 = strconv.ParseFloat(in.RulePattern, 64)
valueN, err2 = strconv.ParseFloat(in.Value.String(), 64)
)
if valueN < min || err1 != nil || err2 != nil {
return errors.New(gstr.Replace(in.Message, "{min}", strconv.FormatFloat(min, 'f', -1, 64)))
Expand Down

0 comments on commit 2fa0355

Please sign in to comment.