mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-06 13:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update queries

Browse source
This commit is contained in:
Till Faelligen 2022-05-18 17:05:24 +02:00
parent 1b13fa3654
commit d2af5cfa1d
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
internal/fulltext/bleve.go
View file

@ -15,9 +15,10 @@
package fulltext package fulltext
import ( import (
"strings"
"github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2"
"github.com/blevesearch/bleve/v2/analysis/lang/en" "github.com/blevesearch/bleve/v2/analysis/lang/en"
"github.com/blevesearch/bleve/v2/search/query"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
) )
@ -90,16 +91,18 @@ func (f *Search) Search(term string, roomIDs, keys []string, limit, from int, or
qry := bleve.NewConjunctionQuery() qry := bleve.NewConjunctionQuery()
termQuery := bleve.NewBooleanQuery() termQuery := bleve.NewBooleanQuery()
matchQuery := bleve.NewMatchQuery(term) terms := strings.Split(term, " ")
matchQuery.SetField("Content") for _, term := range terms {
termQuery.AddMust(matchQuery) matchQuery := bleve.NewMatchQuery(term)
matchQuery.SetField("Content")
termQuery.AddMust(matchQuery)
}
qry.AddQuery(termQuery) qry.AddQuery(termQuery)
roomQuery := bleve.NewBooleanQuery() roomQuery := bleve.NewBooleanQuery()
for _, roomID := range roomIDs { for _, roomID := range roomIDs {
roomSearch := bleve.NewMatchQuery(roomID) roomSearch := bleve.NewMatchQuery(roomID)
roomSearch.SetField("RoomID") roomSearch.SetField("RoomID")
roomSearch.SetOperator(query.MatchQueryOperatorOr)
roomQuery.AddShould(roomSearch) roomQuery.AddShould(roomSearch)
} }
if len(roomIDs) > 0 { if len(roomIDs) > 0 {
@ -109,16 +112,14 @@ func (f *Search) Search(term string, roomIDs, keys []string, limit, from int, or
for _, key := range keys { for _, key := range keys {
keySearch := bleve.NewMatchQuery(key) keySearch := bleve.NewMatchQuery(key)
keySearch.SetField("ContentType") keySearch.SetField("ContentType")
keySearch.SetOperator(query.MatchQueryOperatorOr)
keyQuery.AddShould(keySearch) keyQuery.AddShould(keySearch)
} }
if len(keys) > 0 { if len(keys) > 0 {
keyQuery.SetMinShould(1)
qry.AddQuery(keyQuery) qry.AddQuery(keyQuery)
} }
s := bleve.NewSearchRequestOptions(qry, limit, from, false) s := bleve.NewSearchRequestOptions(qry, limit, from, false)
s.Fields = []string{"*"}
s.SortBy([]string{"_score"}) s.SortBy([]string{"_score"})
if orderByStreamPos { if orderByStreamPos {
s.SortBy([]string{"-StreamPosition"}) s.SortBy([]string{"-StreamPosition"})