github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simple optimization in structToUnstructured

pull/6/head
Wojciech Tyczynski 2017-01-30 16:52:47 +01:00
parent 449aade4ee
commit 9fb7f092d6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/apimachinery/pkg/conversion/unstructured/converter.go
View File

@ -457,6 +457,7 @@ func structToUnstructured(sv, dv reflect.Value) error {
if dt.Kind() != reflect.Map { if dt.Kind() != reflect.Map {
return fmt.Errorf("cannot convert struct to: %v", dt.Kind()) return fmt.Errorf("cannot convert struct to: %v", dt.Kind())
} }
realMap := dv.Interface().(map[string]interface{})
for i := 0; i < st.NumField(); i++ { for i := 0; i < st.NumField(); i++ {
fieldInfo := fieldInfoFromField(st, i) fieldInfo := fieldInfoFromField(st, i)
@ -473,20 +474,18 @@ func structToUnstructured(sv, dv reflect.Value) error {
// No fource field, skip. // No fource field, skip.
continue continue
} }
var subv reflect.Value
switch fv.Type().Kind() { switch fv.Type().Kind() {
case reflect.String, reflect.Bool, case reflect.String, reflect.Bool,
reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
subv = fv realMap[fieldInfo.name] = fv.Interface()
default: default:
subv = reflect.New(dt.Elem()).Elem() subv := reflect.New(dt.Elem()).Elem()
if err := toUnstructured(fv, subv); err != nil { if err := toUnstructured(fv, subv); err != nil {
return err return err
} }
dv.SetMapIndex(fieldInfo.nameValue, subv)
} }
// TODO: It seems this is causing 2 allocations per call, even if subv = fv.
dv.SetMapIndex(fieldInfo.nameValue, subv)
} }
return nil return nil
} }