glenux-archive/spf13--viper
1
0
Fork 0
mirror of https://github.com/spf13/viper synced 2025-05-07 12:47:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

mergeMaps support update diff type values

Browse source
This commit is contained in:
lousong 2024-06-24 16:45:42 +08:00
parent 01e104428a
commit 2b0ff92949
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
viper.go
View file

@ -1649,13 +1649,19 @@ func mergeMaps(
svType := reflect.TypeOf(sv) svType := reflect.TypeOf(sv)
tvType := reflect.TypeOf(tv) tvType := reflect.TypeOf(tv)
if svType != tvType { // type different
v.logger.Errorf("svType != tvType; key=%s, st=%v, tt=%v, sv=%v, tv=%v", sk, svType, tvType, sv, tv) diffType := svType != tvType
v.logger.Debugf("processing key=%s, st=%v, tt=%v, sv=%v, tv=%v, diffType=%v", sk, svType, tvType, sv, tv, diffType)
// just update when type different
if diffType {
v.logger.Debugf("setting diffType value")
tgt[tk] = sv
if itgt != nil {
itgt[tk] = sv
}
continue continue
} }
v.logger.Debugf("processing key=%s, st=%v, tt=%v, sv=%v, tv=%v", sk, svType, tvType, sv, tv)
switch ttv := tv.(type) { switch ttv := tv.(type) {
case map[interface{}]interface{}: case map[interface{}]interface{}:
v.logger.Debugf("merging maps (must convert)") v.logger.Debugf("merging maps (must convert)")