gibheer/bleve
0
0
Fork 0
Code

made conjuction queries compatible with interface

Browse Source
This commit is contained in:
Marty Schoch 2014-08-25 22:40:06 -04:00
parent 0e26a6233e
commit 367e4f53a7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
query_boolean.go
View File

@ -40,7 +40,7 @@ func (q *BooleanQuery) SetBoost(b float64) *BooleanQuery {
func (q *BooleanQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, error) {
var err error
var mustSearcher *search.ConjunctionSearcher
var mustSearcher search.Searcher
if q.Must != nil {
mustSearcher, err = q.Must.Searcher(i, explain)
if err != nil {
@ -48,7 +48,7 @@ func (q *BooleanQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, er
}
}
var shouldSearcher *search.DisjunctionSearcher
var shouldSearcher search.Searcher
if q.Should != nil {
shouldSearcher, err = q.Should.Searcher(i, explain)
if err != nil {
@ -56,7 +56,7 @@ func (q *BooleanQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, er
}
}
var mustNotSearcher *search.DisjunctionSearcher
var mustNotSearcher search.Searcher
if q.MustNot != nil {
mustNotSearcher, err = q.MustNot.Searcher(i, explain)
if err != nil {
@ -64,7 +64,7 @@ func (q *BooleanQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, er
}
}
return search.NewBooleanSearcher(i.i, mustSearcher, shouldSearcher, mustNotSearcher, explain)
return search.NewBooleanSearcher(i.i, mustSearcher.(*search.ConjunctionSearcher), shouldSearcher.(*search.DisjunctionSearcher), mustNotSearcher.(*search.DisjunctionSearcher), explain)
}
func (q *BooleanQuery) Validate() error {

2
query_conjunction.go
View File

@ -40,7 +40,7 @@ func (q *ConjunctionQuery) AddQuery(aq Query) *ConjunctionQuery {
return q
}
func (q *ConjunctionQuery) Searcher(i *indexImpl, explain bool) (*search.ConjunctionSearcher, error) {
func (q *ConjunctionQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, error) {
searchers := make([]search.Searcher, len(q.Conjuncts))
for in, conjunct := range q.Conjuncts {
var err error

2
query_phrase.go
View File

@ -47,7 +47,7 @@ func (q *PhraseQuery) Searcher(i *indexImpl, explain bool) (search.Searcher, err
if err != nil {
return nil, err
}
return search.NewPhraseSearcher(i.i, conjunctionSearcher, terms)
return search.NewPhraseSearcher(i.i, conjunctionSearcher.(*search.ConjunctionSearcher), terms)
}
func (q *PhraseQuery) Validate() error {