Skip to content

feat(search): freetext and name queries include metadata fields #2988

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

Open
flash7777 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −5
Open

feat(search): freetext and name queries include metadata fields #2988

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
22 changes: 19 additions & 3 deletions services/search/pkg/query/bleve/compiler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ func walk(offset int, nodes []ast.Node) (bleveQuery.Query, int, error) {
v = bleveEscaper.Replace(n.Value)
}

if _, ok := lowercaseFields[k]; ok {
if k == "" {
// Freetext: lowercase for _all field matching
v = strings.ToLower(v)
} else if _, ok := lowercaseFields[k]; ok {
v = strings.ToLower(v)
}

Expand All @@ -115,7 +118,20 @@ func walk(offset int, nodes []ast.Node) (bleveQuery.Query, int, error) {
isGroup = group
}
default:
q = bleveQuery.NewQueryStringQuery(k + ":" + v)
if k == "" {
q = bleveQuery.NewQueryStringQuery(v)
} else if k == "Name" {
// Also search Metadata fields when searching by name
nameQ := bleveQuery.NewQueryStringQuery(k + ":" + v)
metaQ := bleveQuery.NewQueryStringQuery(strings.ToLower(strings.Trim(v, `*\"`)))
q = bleveQuery.NewDisjunctionQuery([]bleveQuery.Query{nameQ, metaQ})
group = true
if prev == nil {
isGroup = true
}
} else {
q = bleveQuery.NewQueryStringQuery(k + ":" + v)
}
}

if prev == nil {
Expand Down Expand Up @@ -279,7 +295,7 @@ func mapBinary(operator *ast.OperatorNode, ln, rn bleveQuery.Query, leftIsGroup

func getField(name string) string {
if name == "" {
return "Name"
return ""
}
if _, ok := _fields[strings.ToLower(name)]; ok {
return _fields[strings.ToLower(name)]
Expand Down
4 changes: 2 additions & 2 deletions services/search/pkg/query/bleve/compiler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func Test_compile(t *testing.T) {
},
},
want: query.NewConjunctionQuery([]query.Query{
query.NewQueryStringQuery(`Name:federated`),
query.NewQueryStringQuery(`federated`),
}),
wantErr: false,
},
Expand All @@ -45,7 +45,7 @@ func Test_compile(t *testing.T) {
},
},
want: query.NewConjunctionQuery([]query.Query{
query.NewQueryStringQuery(`Name:john\ smith`),
query.NewQueryStringQuery(`john\ smith`),
}),
wantErr: false,
},
Expand Down