gibheer
/
bleve
0
0
Fork 0
Code

fix nil checking and add test for nested boolean query

This commit is contained in:
Marty Schoch 2014-04-25 12:47:15 -06:00
parent e5bb94774b
commit 940f7c4e5d
2 changed files with 73 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
search/search_boolean.go
View File

@ -153,15 +153,23 @@ func (s *TermBooleanSearcher) advanceNextMust() error {
func (s *TermBooleanSearcher) Weight() float64 {
var rv float64
rv += s.mustSearcher.Weight()
rv += s.shouldSearcher.Weight()
if s.mustSearcher != nil {
rv += s.mustSearcher.Weight()
}
if s.shouldSearcher != nil {
rv += s.shouldSearcher.Weight()
}
return rv
}
func (s *TermBooleanSearcher) SetQueryNorm(qnorm float64) {
s.mustSearcher.SetQueryNorm(qnorm)
s.shouldSearcher.SetQueryNorm(qnorm)
if s.mustSearcher != nil {
s.mustSearcher.SetQueryNorm(qnorm)
}
if s.shouldSearcher != nil {
s.shouldSearcher.SetQueryNorm(qnorm)
}
}
func (s *TermBooleanSearcher) Next() (*DocumentMatch, error) {
@ -232,6 +240,26 @@ func (s *TermBooleanSearcher) Next() (*DocumentMatch, error) {
}
func (s *TermBooleanSearcher) Advance(ID string) (*DocumentMatch, error) {
var err error
if s.mustSearcher != nil {
s.currMust, err = s.mustSearcher.Advance(ID)
if err != nil {
return nil, err
}
}
if s.shouldSearcher != nil {
s.currShould, err = s.shouldSearcher.Advance(ID)
if err != nil {
return nil, err
}
}
if s.mustNotSearcher != nil {
s.currMustNot, err = s.mustNotSearcher.Advance(ID)
if err != nil {
return nil, err
}
}
s.currentId = ID
return s.Next()
}
@ -239,8 +267,12 @@ func (s *TermBooleanSearcher) Advance(ID string) (*DocumentMatch, error) {
func (s *TermBooleanSearcher) Count() uint64 {
// for now return a worst case
var sum uint64 = 0
sum += s.mustSearcher.Count()
sum += s.shouldSearcher.Count()
if s.mustSearcher != nil {
sum += s.mustSearcher.Count()
}
if s.shouldSearcher != nil {
sum += s.shouldSearcher.Count()
}
return sum
}

35
search/search_boolean_test.go
View File

@ -272,6 +272,41 @@ func TestTermBooleanSearch(t *testing.T) {
},
results: []*DocumentMatch{},
},
// test a conjunction query with a nested boolean
{
index: twoDocIndex,
query: &TermConjunctionQuery{
Terms: []Query{
&TermBooleanQuery{
Must: &TermConjunctionQuery{
Terms: []Query{
&TermQuery{
Term: "beer",
Field: "desc",
BoostVal: 1.0,
Explain: true,
},
},
Explain: true,
},
Explain: true,
},
&TermQuery{
Term: "marty",
Field: "name",
BoostVal: 5.0,
Explain: true,
},
},
Explain: true,
},
results: []*DocumentMatch{
&DocumentMatch{
ID: "1",
Score: 2.905938399789078,
},
},
},
}
for testIndex, test := range tests {