Merge pull request #152 from jpbetz/reflect-nopool-with-marshaller

Optimize conversion to unstructured

Author: k8s-ci-robot

value/fields.go

@@ -27,7 +27,7 @@ type Field struct {
 	Value Value
 }
 
-// FieldList is a list of key-value pairs. Each field is expectUpdated to
+// FieldList is a list of key-value pairs. Each field is expected to
 // have a different name.
 type FieldList []Field
 

value/listreflect.go

@@ -32,7 +32,7 @@ func (r listReflect) Length() int {
 
 func (r listReflect) At(i int) Value {
 	val := r.Value
-	return mustWrapValueReflect(val.Index(i))
+	return mustWrapValueReflect(val.Index(i), nil, nil)
 }
 
 func (r listReflect) Unstructured() interface{} {
@@ -58,13 +58,15 @@ func (r listReflect) Range() ListRange {
 	rr := lrrPool.Get().(*listReflectRange)
 	rr.list = r.Value
 	rr.i = -1
+	rr.entry = nil
 	return rr
 }
 
 type listReflectRange struct {
-	list reflect.Value
-	vr   *valueReflect
-	i    int
+	list  reflect.Value
+	vr    *valueReflect
+	i     int
+	entry *TypeReflectCacheEntry
 }
 
 func (r *listReflectRange) Next() bool {
@@ -79,7 +81,11 @@ func (r *listReflectRange) Item() (index int, value Value) {
 	if r.i >= r.list.Len() {
 		panic("Item() called on ListRange with no more items")
 	}
-	return r.i, r.vr.reuse(r.list.Index(r.i))
+	v := r.list.Index(r.i)
+	if r.entry == nil {
+		r.entry = TypeReflectEntryOf(v.Type())
+	}
+	return r.i, r.vr.mustReuse(v, r.entry, nil, nil)
 }
 
 func (r *listReflectRange) Recycle() {

value/mapreflect.go

@@ -34,7 +34,7 @@ func (r mapReflect) Get(key string) (Value, bool) {
 	if !ok {
 		return nil, false
 	}
-	return mustWrapValueReflectMapItem(&r.Value, &k, v), true
+	return mustWrapValueReflect(v, &r.Value, &k), true
 }
 
 func (r mapReflect) get(k string) (key, value reflect.Value, ok bool) {
@@ -68,21 +68,29 @@ func (r mapReflect) toMapKey(key string) reflect.Value {
 }
 
 func (r mapReflect) Iterate(fn func(string, Value) bool) bool {
+	if r.Value.Len() == 0 {
+		return true
+	}
 	vr := reflectPool.Get().(*valueReflect)
 	defer vr.Recycle()
-	return eachMapEntry(r.Value, func(s string, value reflect.Value) bool {
-		return fn(s, vr.reuse(value))
+	return eachMapEntry(r.Value, func(e *TypeReflectCacheEntry, key reflect.Value, value reflect.Value) bool {
+		// TODO: Track cache entry
+		return fn(key.String(), vr.mustReuse(value, nil, &r.Value, &key))
 	})
 }
 
-func eachMapEntry(val reflect.Value, fn func(string, reflect.Value) bool) bool {
+func eachMapEntry(val reflect.Value, fn func(*TypeReflectCacheEntry, reflect.Value, reflect.Value) bool) bool {
 	iter := val.MapRange()
+	var entry *TypeReflectCacheEntry
 	for iter.Next() {
 		next := iter.Value()
 		if !next.IsValid() {
 			continue
 		}
-		if !fn(iter.Key().String(), next) {
+		if entry == nil {
+			entry = TypeReflectEntryOf(next.Type())
+		}
+		if !fn(entry, iter.Key(), next) {
 			return false
 		}
 	}
@@ -114,6 +122,7 @@ func (r mapReflect) Equals(m Map) bool {
 		if !ok {
 			return false
 		}
-		return Equals(vr.reuse(lhsVal), value)
+		// TODO: Track cache entry
+		return Equals(vr.mustReuse(lhsVal, nil, nil, nil), value)
 	})
 }