Skip to content
Merged
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
17 changes: 11 additions & 6 deletions gabs.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,22 @@ func (g *Container) searchStrict(allowWildcard bool, hierarchy ...string) (*Cont
}
case []interface{}:
if allowWildcard && pathSeg == "*" {
tmpArray := []interface{}{}
for _, val := range typedObj {
if (target + 1) >= len(hierarchy) {
tmpArray = append(tmpArray, val)
} else if res := Wrap(val).Search(hierarchy[target+1:]...); res != nil {
tmpArray = append(tmpArray, res.Data())
var tmpArray []interface{}
if (target + 1) >= len(hierarchy) {
tmpArray = typedObj
} else {
tmpArray = make([]interface{}, 0, len(typedObj))
for _, val := range typedObj {
if res := Wrap(val).Search(hierarchy[target+1:]...); res != nil {
tmpArray = append(tmpArray, res.Data())
}
}
}

if len(tmpArray) == 0 {
return nil, nil
}

return &Container{tmpArray}, nil
}
index, err := strconv.Atoi(pathSeg)
Expand Down
17 changes: 17 additions & 0 deletions gabs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1914,3 +1914,20 @@ func TestFlattenIncludeEmpty(t *testing.T) {
}
}
}

func BenchmarkWildcardSearch(b *testing.B) {
sample := []byte(`{"test":[{"value":10},{"value":20}]}`)

val, err := ParseJSON(sample)
if err != nil {
b.Fatalf("Failed to parse: %v", err)
}

b.ReportAllocs()
b.ResetTimer()

for i := 0; i < b.N; i++ {
val.Search([]string{"test", "*"}...)
val.Search([]string{"test", "*", "value"}...)
}
}