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

enhance: use map iter to iterate the map instead of map keys and values (#3457)

Browse Source
This commit is contained in:
wln32 2024-04-07 10:00:04 +08:00 committed by GitHub
parent 1b7aea0ced
commit 911f1cb1de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/gconv/gconv_map.go
View File

@ -298,12 +298,12 @@ func doMapConvertForMapOrStructValue(in doMapConvertForMapOrStructValueInput) in
switch reflectKind {
case reflect.Map:
var (
mapKeys = reflectValue.MapKeys()
mapIter = reflectValue.MapRange()
dataMap = make(map[string]interface{})
)
for _, k := range mapKeys {
for mapIter.Next() {
var (
mapKeyValue = reflectValue.MapIndex(k)
mapKeyValue = mapIter.Value()
mapValue interface{}
)
switch {
@ -319,7 +319,7 @@ func doMapConvertForMapOrStructValue(in doMapConvertForMapOrStructValueInput) in
default:
mapValue = mapKeyValue.Interface()
}
dataMap[String(k.Interface())] = doMapConvertForMapOrStructValue(
dataMap[String(mapIter.Key().Interface())] = doMapConvertForMapOrStructValue(
doMapConvertForMapOrStructValueInput{
IsRoot: false,
Value: mapValue,
@ -486,14 +486,14 @@ func doMapConvertForMapOrStructValue(in doMapConvertForMapOrStructValueInput) in
dataMap[mapKey] = array
case reflect.Map:
var (
mapKeys = rvAttrField.MapKeys()
mapIter = rvAttrField.MapRange()
nestedMap = make(map[string]interface{})
)
for _, k := range mapKeys {
nestedMap[String(k.Interface())] = doMapConvertForMapOrStructValue(
for mapIter.Next() {
nestedMap[String(mapIter.Key().Interface())] = doMapConvertForMapOrStructValue(
doMapConvertForMapOrStructValueInput{
IsRoot: false,
Value: rvAttrField.MapIndex(k).Interface(),
Value: mapIter.Value().Interface(),
RecursiveType: in.RecursiveType,
RecursiveOption: in.RecursiveType == recursiveTypeTrue,
Option: in.Option,