Skip to content

Fix map comparison of nil values and missing keys #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evanphx merged 1 commit into from
Aug 8, 2020
Merged

Fix map comparison of nil values and missing keys #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,12 @@ func matchesValue(av, bv interface{}) bool {
return false
}
for key := range bt {
if !matchesValue(at[key], bt[key]) {
av, aOK := at[key]
bv, bOK := bt[key]
if aOK != bOK {
return false
}
if !matchesValue(av, bv) {
return false
}
}
Expand Down
67 changes: 67 additions & 0 deletions merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,73 @@ func createNestedMap(m map[string]interface{}, depth int, objectCount *int) {
}
}

func TestMatchesValue(t *testing.T) {
testcases := []struct {
name string
a interface{}
b interface{}
want bool
}{
{
name: "map empty",
a: map[string]interface{}{},
b: map[string]interface{}{},
want: true,
},
{
name: "map equal keys, equal non-nil value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"1": true},
want: true,
},
{
name: "map equal keys, equal nil value",
a: map[string]interface{}{"1": nil},
b: map[string]interface{}{"1": nil},
want: true,
},

{
name: "map different value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"1": false},
want: false,
},
{
name: "map different key, matching non-nil value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"2": true},
want: false,
},
{
name: "map different key, matching nil value",
a: map[string]interface{}{"1": nil},
b: map[string]interface{}{"2": nil},
want: false,
},
{
name: "map different key, first nil value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"2": nil},
want: false,
},
{
name: "map different key, second nil value",
a: map[string]interface{}{"1": nil},
b: map[string]interface{}{"2": true},
want: false,
},
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
got := matchesValue(tc.a, tc.b)
if got != tc.want {
t.Fatalf("want %v, got %v", tc.want, got)
}
})
}
}

func benchmarkMatchesValueWithDeeplyNestedFields(depth int, b *testing.B) {
a := map[string]interface{}{}
objCount := 1
Expand Down
7 changes: 6 additions & 1 deletion v5/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,12 @@ func matchesValue(av, bv interface{}) bool {
return false
}
for key := range bt {
if !matchesValue(at[key], bt[key]) {
av, aOK := at[key]
bv, bOK := bt[key]
if aOK != bOK {
return false
}
if !matchesValue(av, bv) {
return false
}
}
Expand Down
67 changes: 67 additions & 0 deletions v5/merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,73 @@ func createNestedMap(m map[string]interface{}, depth int, objectCount *int) {
}
}

func TestMatchesValue(t *testing.T) {
testcases := []struct {
name string
a interface{}
b interface{}
want bool
}{
{
name: "map empty",
a: map[string]interface{}{},
b: map[string]interface{}{},
want: true,
},
{
name: "map equal keys, equal non-nil value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"1": true},
want: true,
},
{
name: "map equal keys, equal nil value",
a: map[string]interface{}{"1": nil},
b: map[string]interface{}{"1": nil},
want: true,
},

{
name: "map different value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"1": false},
want: false,
},
{
name: "map different key, matching non-nil value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"2": true},
want: false,
},
{
name: "map different key, matching nil value",
a: map[string]interface{}{"1": nil},
b: map[string]interface{}{"2": nil},
want: false,
},
{
name: "map different key, first nil value",
a: map[string]interface{}{"1": true},
b: map[string]interface{}{"2": nil},
want: false,
},
{
name: "map different key, second nil value",
a: map[string]interface{}{"1": nil},
b: map[string]interface{}{"2": true},
want: false,
},
}
for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) {
got := matchesValue(tc.a, tc.b)
if got != tc.want {
t.Fatalf("want %v, got %v", tc.want, got)
}
})
}
}

func benchmarkMatchesValueWithDeeplyNestedFields(depth int, b *testing.B) {
a := map[string]interface{}{}
objCount := 1
Expand Down