gibheer/bleve
0
0
Fork 0
Code

Revert the nil protection which is not needed

Browse Source
This commit is contained in:
slavikm 2016-11-23 09:26:07 -08:00
parent 20b847f04e
commit 75c8c0e2b1
18 changed files with 32 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
search/query/bool_field.go
View File

@ -40,11 +40,8 @@ func (q *BoolFieldQuery) SetBoost(b float64) {
}
func (q *BoolFieldQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *BoolFieldQuery) SetField(f string) {
q.FieldVal = f
@ -64,5 +61,5 @@ func (q *BoolFieldQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, e
if q.Bool {
term = "T"
}
return searcher.NewTermSearcher(i, term, field, q.Boost(), explain)
return searcher.NewTermSearcher(i, term, field, q.BoostVal.Value(), explain)
}

3
search/query/boolean.go
View File

@ -94,11 +94,8 @@ func (q *BooleanQuery) SetBoost(b float64) {
}
func (q *BooleanQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *BooleanQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
var err error

3
search/query/conjunction.go
View File

@ -42,11 +42,8 @@ func (q *ConjunctionQuery) SetBoost(b float64) {
}
func (q *ConjunctionQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *ConjunctionQuery) AddQuery(aq ...Query) {
for _, aaq := range aq {

5
search/query/date_range.go
View File

@ -114,11 +114,8 @@ func (q *DateRangeQuery) SetBoost(b float64) {
}
func (q *DateRangeQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *DateRangeQuery) SetField(f string) {
@ -140,7 +137,7 @@ func (q *DateRangeQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, e
field = m.DefaultSearchField()
}
return searcher.NewNumericRangeSearcher(i, min, max, q.InclusiveStart, q.InclusiveEnd, field, q.Boost(), explain)
return searcher.NewNumericRangeSearcher(i, min, max, q.InclusiveStart, q.InclusiveEnd, field, q.BoostVal.Value(), explain)
}
func (q *DateRangeQuery) parseEndpoints() (*float64, *float64, error) {

3
search/query/disjunction.go
View File

@ -44,11 +44,8 @@ func (q *DisjunctionQuery) SetBoost(b float64) {
}
func (q *DisjunctionQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *DisjunctionQuery) AddQuery(aq ...Query) {

5
search/query/docid.go
View File

@ -41,12 +41,9 @@ func (q *DocIDQuery) SetBoost(b float64) {
}
func (q *DocIDQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *DocIDQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
return searcher.NewDocIDSearcher(i, q.IDs, q.Boost(), explain)
return searcher.NewDocIDSearcher(i, q.IDs, q.BoostVal.Value(), explain)
}

5
search/query/fuzzy.go
View File

@ -49,11 +49,8 @@ func (q *FuzzyQuery) SetBoost(b float64) {
}
func (q *FuzzyQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *FuzzyQuery) SetField(f string) {
q.FieldVal = f
@ -76,5 +73,5 @@ func (q *FuzzyQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
if q.FieldVal == "" {
field = m.DefaultSearchField()
}
return searcher.NewFuzzySearcher(i, q.Term, q.Prefix, q.Fuzziness, field, q.Boost(), explain)
return searcher.NewFuzzySearcher(i, q.Term, q.Prefix, q.Fuzziness, field, q.BoostVal.Value(), explain)
}

11
search/query/match.go
View File

@ -91,11 +91,8 @@ func (q *MatchQuery) SetBoost(b float64) {
}
func (q *MatchQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *MatchQuery) SetField(f string) {
q.FieldVal = f
@ -146,14 +143,14 @@ func (q *MatchQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
query.SetFuzziness(q.Fuzziness)
query.SetPrefix(q.Prefix)
query.SetField(field)
query.SetBoost(q.Boost())
query.SetBoost(q.BoostVal.Value())
tqs[i] = query
}
} else {
for i, token := range tokens {
tq := NewTermQuery(string(token.Term))
tq.SetField(field)
tq.SetBoost(q.Boost())
tq.SetBoost(q.BoostVal.Value())
tqs[i] = tq
}
}
@ -162,12 +159,12 @@ func (q *MatchQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
case MatchQueryOperatorOr:
shouldQuery := NewDisjunctionQuery(tqs)
shouldQuery.SetMin(1)
shouldQuery.SetBoost(q.Boost())
shouldQuery.SetBoost(q.BoostVal.Value())
return shouldQuery.Searcher(i, m, explain)
case MatchQueryOperatorAnd:
mustQuery := NewConjunctionQuery(tqs)
mustQuery.SetBoost(q.Boost())
mustQuery.SetBoost(q.BoostVal.Value())
return mustQuery.Searcher(i, m, explain)
default:

5
search/query/match_all.go
View File

@ -39,16 +39,13 @@ func (q *MatchAllQuery) SetBoost(b float64) {
}
func (q *MatchAllQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *MatchAllQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
return searcher.NewMatchAllSearcher(i, q.Boost(), explain)
return searcher.NewMatchAllSearcher(i, q.BoostVal.Value(), explain)
}
func (q *MatchAllQuery) MarshalJSON() ([]byte, error) {

3
search/query/match_none.go
View File

@ -39,11 +39,8 @@ func (q *MatchNoneQuery) SetBoost(b float64) {
}
func (q *MatchNoneQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *MatchNoneQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
return searcher.NewMatchNoneSearcher(i)

5
search/query/match_phrase.go
View File

@ -50,11 +50,8 @@ func (q *MatchPhraseQuery) SetBoost(b float64) {
}
func (q *MatchPhraseQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *MatchPhraseQuery) SetField(f string) {
q.FieldVal = f
@ -85,7 +82,7 @@ func (q *MatchPhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping,
if len(tokens) > 0 {
phrase := tokenStreamToPhrase(tokens)
phraseQuery := NewPhraseQuery(phrase, field)
phraseQuery.SetBoost(q.Boost())
phraseQuery.SetBoost(q.BoostVal.Value())
return phraseQuery.Searcher(i, m, explain)
}
noneQuery := NewMatchNoneQuery()

5
search/query/numeric_range.go
View File

@ -60,11 +60,8 @@ func (q *NumericRangeQuery) SetBoost(b float64) {
}
func (q *NumericRangeQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *NumericRangeQuery) SetField(f string) {
q.FieldVal = f
@ -79,7 +76,7 @@ func (q *NumericRangeQuery) Searcher(i index.IndexReader, m mapping.IndexMapping
if q.FieldVal == "" {
field = m.DefaultSearchField()
}
return searcher.NewNumericRangeSearcher(i, q.Min, q.Max, q.InclusiveMin, q.InclusiveMax, field, q.Boost(), explain)
return searcher.NewNumericRangeSearcher(i, q.Min, q.Max, q.InclusiveMin, q.InclusiveMax, field, q.BoostVal.Value(), explain)
}
func (q *NumericRangeQuery) Validate() error {

3
search/query/phrase.go
View File

@ -59,11 +59,8 @@ func (q *PhraseQuery) SetBoost(b float64) {
}
func (q *PhraseQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *PhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {

5
search/query/prefix.go
View File

@ -42,11 +42,8 @@ func (q *PrefixQuery) SetBoost(b float64) {
}
func (q *PrefixQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *PrefixQuery) SetField(f string) {
q.FieldVal = f
@ -61,5 +58,5 @@ func (q *PrefixQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expl
if q.FieldVal == "" {
field = m.DefaultSearchField()
}
return searcher.NewTermPrefixSearcher(i, q.Prefix, field, q.Boost(), explain)
return searcher.NewTermPrefixSearcher(i, q.Prefix, field, q.BoostVal.Value(), explain)
}

3
search/query/query_string.go
View File

@ -40,11 +40,8 @@ func (q *QueryStringQuery) SetBoost(b float64) {
}
func (q *QueryStringQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *QueryStringQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
newQuery, err := parseQuerySyntax(q.Query)

5
search/query/regexp.go
View File

@ -46,11 +46,8 @@ func (q *RegexpQuery) SetBoost(b float64) {
}
func (q *RegexpQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *RegexpQuery) SetField(f string) {
q.FieldVal = f
@ -70,7 +67,7 @@ func (q *RegexpQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expl
return nil, err
}
return searcher.NewRegexpSearcher(i, q.compiled, field, q.Boost(), explain)
return searcher.NewRegexpSearcher(i, q.compiled, field, q.BoostVal.Value(), explain)
}
func (q *RegexpQuery) Validate() error {

5
search/query/term.go
View File

@ -41,11 +41,8 @@ func (q *TermQuery) SetBoost(b float64) {
}
func (q *TermQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *TermQuery) SetField(f string) {
q.FieldVal = f
@ -60,5 +57,5 @@ func (q *TermQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explai
if q.FieldVal == "" {
field = m.DefaultSearchField()
}
return searcher.NewTermSearcher(i, q.Term, field, q.Boost(), explain)
return searcher.NewTermSearcher(i, q.Term, field, q.BoostVal.Value(), explain)
}

5
search/query/wildcard.go
View File

@ -67,11 +67,8 @@ func (q *WildcardQuery) SetBoost(b float64) {
}
func (q *WildcardQuery) Boost() float64{
if q.BoostVal != nil {
return q.BoostVal.Value()
}
return 0
}
func (q *WildcardQuery) SetField(f string) {
q.FieldVal = f
@ -94,7 +91,7 @@ func (q *WildcardQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, ex
}
}
return searcher.NewRegexpSearcher(i, q.compiled, field, q.Boost(), explain)
return searcher.NewRegexpSearcher(i, q.compiled, field, q.BoostVal.Value(), explain)
}
func (q *WildcardQuery) Validate() error {