Skip to content

K
k3s
Commit fe3b68ec authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #53762 from smarterclayton/reflect_diff

Automatic merge from submit-queue (batch tested with PRs 53749, 53642, 53813, 53771, 53762). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Don't exit early in diff.ObjectReflectDiff on slices
parents 53241b93 178baa9a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
staging/src/k8s.io/apimachinery/pkg/util/diff/diff.go
View file @ fe3b68ec
...@@ -142,10 +142,6 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff { ...@@ -142,10 +142,6 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
} }
if sub := objectReflectDiff(path.Child(a.Type().Field(i).Name), a.Field(i), b.Field(i)); len(sub) > 0 { if sub := objectReflectDiff(path.Child(a.Type().Field(i).Name), a.Field(i), b.Field(i)); len(sub) > 0 {
changes = append(changes, sub...) changes = append(changes, sub...)
} else {
if !reflect.DeepEqual(a.Field(i).Interface(), b.Field(i).Interface()) {
changes = append(changes, diff{path: path, a: a.Field(i).Interface(), b: b.Field(i).Interface()})
}
} }
} }
return changes return changes
...@@ -178,21 +174,18 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff { ...@@ -178,21 +174,18 @@ func objectReflectDiff(path *field.Path, a, b reflect.Value) []diff {
} }
return nil return nil
} }
var diffs []diff
for i := 0; i < l; i++ { for i := 0; i < l; i++ {
if !reflect.DeepEqual(a.Index(i), b.Index(i)) { if !reflect.DeepEqual(a.Index(i), b.Index(i)) {
return objectReflectDiff(path.Index(i), a.Index(i), b.Index(i)) diffs = append(diffs, objectReflectDiff(path.Index(i), a.Index(i), b.Index(i))...)
} }
} }
var diffs []diff
for i := l; i < lA; i++ { for i := l; i < lA; i++ {
diffs = append(diffs, diff{path: path.Index(i), a: a.Index(i), b: nil}) diffs = append(diffs, diff{path: path.Index(i), a: a.Index(i), b: nil})
} }
for i := l; i < lB; i++ { for i := l; i < lB; i++ {
diffs = append(diffs, diff{path: path.Index(i), a: nil, b: b.Index(i)}) diffs = append(diffs, diff{path: path.Index(i), a: nil, b: b.Index(i)})
} }
if len(diffs) == 0 {
diffs = append(diffs, diff{path: path, a: a, b: b})
}
return diffs return diffs
case reflect.Map: case reflect.Map:
if reflect.DeepEqual(a.Interface(), b.Interface()) { if reflect.DeepEqual(a.Interface(), b.Interface()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment