Skip to content

fix: Object.ForEach now continues the loop after consuming a skipped value #92

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions parsed_object.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ func (o *Object) ForEach(fn func(key []byte, i Iter), onlyKeys map[string]struct
if t == TypeNone {
return nil
}
continue
}
}

Expand Down
114 changes: 114 additions & 0 deletions parsed_object_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package simdjson
import (
"fmt"
"log"
"reflect"
"testing"
)

Expand Down Expand Up @@ -130,6 +131,119 @@ func TestObject_FindPath(t *testing.T) {
}
}

func TestObject_ForEach(t *testing.T) {
if !SupportedCPU() {
t.SkipNow()
}
input := `{
"key1": "value1",
"key2": "value2",
"key3": "value3",
"key4": "value4",
"key5": "value5",
"key6": "value6",
"key7": "value7",
"key8": "value8",
"key9": "value9",
"key10": "value10"
}`
tests := []struct {
name string
onlyKeys []string
want map[string]string
}{
{
name: "all-keys",
onlyKeys: nil,
want: map[string]string{
"key1": "value1",
"key2": "value2",
"key3": "value3",
"key4": "value4",
"key5": "value5",
"key6": "value6",
"key7": "value7",
"key8": "value8",
"key9": "value9",
"key10": "value10",
},
},
{
name: "some-keys",
onlyKeys: []string{"key1", "key3"},
want: map[string]string{
"key1": "value1",
"key3": "value3"},
},
{
name: "sparse-keys",
onlyKeys: []string{
"key1", "key3", "key5", "key7", "key9"},
want: map[string]string{
"key1": "value1",
"key3": "value3",
"key5": "value5",
"key7": "value7",
"key9": "value9",
},
},
{
name: "sparse-keys",
onlyKeys: []string{"key1", "key2", "key3", "key9", "key10"},
want: map[string]string{
"key1": "value1",
"key2": "value2",
"key3": "value3",
"key9": "value9",
"key10": "value10",
},
},
{
name: "no-keys",
onlyKeys: []string{"key20"},
want: map[string]string{},
},
}
for _, tt := range tests {
pj, err := Parse([]byte(input), nil)
if err != nil {
t.Fatal(err)
}
t.Run(tt.name, func(t *testing.T) {
filtered := make(map[string]string)
var onlyKeys map[string]struct{}
if len(tt.onlyKeys) > 0 {
onlyKeys = make(map[string]struct{}, len(tt.onlyKeys))
for _, key := range tt.onlyKeys {
onlyKeys[key] = struct{}{}
}
}
i := pj.Iter()
var elem Iter
ty, err := i.AdvanceIter(&elem)

if err != nil || ty != TypeRoot {
t.Fatal(err)
}
_ = elem.AdvanceInto()
obj, err := elem.Object(nil)
if err != nil {
t.Fatal(err)
}
err = obj.ForEach(func(key []byte, i Iter) {
value, _ := i.StringCvt()
filtered[string(key)] = value
}, onlyKeys)
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(tt.want, filtered) {
t.Errorf("want %v\ngot %v\n", tt.want, filtered)
}
})
}
}

func ExampleObject_FindPath() {
if !SupportedCPU() {
// Fake it
Expand Down
Loading