blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 03:05:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(gutil): panic when field is []byte(BINARY in mysql) (#2957)

Browse Source
This commit is contained in:
laushunyu 2023-09-18 20:16:59 +08:00 committed by GitHub
parent ef1e18df19
commit 395df940d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/gutil/gutil_list.go
View File

@ -122,10 +122,15 @@ func ListItemValuesUnique(list interface{}, key string, subKey ...interface{}) [
m = make(map[interface{}]struct{}, len(values))
)
for i := 0; i < len(values); {
if _, ok = m[values[i]]; ok {
value := values[i]
if t, ok := value.([]byte); ok {
// make byte slice comparable
value = string(t)
}
if _, ok = m[value]; ok {
values = SliceDelete(values, i)
} else {
m[values[i]] = struct{}{}
m[value] = struct{}{}
i++
}
}

14
util/gutil/gutil_z_unit_list_test.go
View File

@ -246,3 +246,17 @@ func Test_ListItemValuesUnique_Map_Array_SubKey(t *testing.T) {
t.Assert(gutil.ListItemValuesUnique(listMap, "scores", "PE"), g.Slice{})
})
}
func Test_ListItemValuesUnique_Binary_ID(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
listMap := g.List{
g.Map{"id": []byte{1}, "score": 100},
g.Map{"id": []byte{2}, "score": 100},
g.Map{"id": []byte{3}, "score": 100},
g.Map{"id": []byte{4}, "score": 100},
g.Map{"id": []byte{4}, "score": 100},
}
t.Assert(gutil.ListItemValuesUnique(listMap, "id"), g.Slice{[]byte{1}, []byte{2}, []byte{3}, []byte{4}})
t.Assert(gutil.ListItemValuesUnique(listMap, "score"), g.Slice{100})
})
}