Revert the nil protection which is not needed
This commit is contained in:
parent
20b847f04e
commit
75c8c0e2b1
@ -40,10 +40,7 @@ func (q *BoolFieldQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *BoolFieldQuery) Boost() float64{
|
func (q *BoolFieldQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
|
||||||
return q.BoostVal.Value()
|
return q.BoostVal.Value()
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *BoolFieldQuery) SetField(f string) {
|
func (q *BoolFieldQuery) SetField(f string) {
|
||||||
@ -64,5 +61,5 @@ func (q *BoolFieldQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, e
|
|||||||
if q.Bool {
|
if q.Bool {
|
||||||
term = "T"
|
term = "T"
|
||||||
}
|
}
|
||||||
return searcher.NewTermSearcher(i, term, field, q.Boost(), explain)
|
return searcher.NewTermSearcher(i, term, field, q.BoostVal.Value(), explain)
|
||||||
}
|
}
|
||||||
|
@ -94,10 +94,7 @@ func (q *BooleanQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *BooleanQuery) Boost() float64{
|
func (q *BooleanQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *BooleanQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
func (q *BooleanQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
||||||
|
@ -42,10 +42,7 @@ func (q *ConjunctionQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *ConjunctionQuery) Boost() float64{
|
func (q *ConjunctionQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *ConjunctionQuery) AddQuery(aq ...Query) {
|
func (q *ConjunctionQuery) AddQuery(aq ...Query) {
|
||||||
|
@ -114,10 +114,7 @@ func (q *DateRangeQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *DateRangeQuery) Boost() float64{
|
func (q *DateRangeQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -140,7 +137,7 @@ func (q *DateRangeQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, e
|
|||||||
field = m.DefaultSearchField()
|
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) {
|
func (q *DateRangeQuery) parseEndpoints() (*float64, *float64, error) {
|
||||||
|
@ -44,10 +44,7 @@ func (q *DisjunctionQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *DisjunctionQuery) Boost() float64{
|
func (q *DisjunctionQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -41,12 +41,9 @@ func (q *DocIDQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *DocIDQuery) Boost() float64{
|
func (q *DocIDQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *DocIDQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
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)
|
||||||
}
|
}
|
||||||
|
@ -49,10 +49,7 @@ func (q *FuzzyQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *FuzzyQuery) Boost() float64{
|
func (q *FuzzyQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *FuzzyQuery) SetField(f string) {
|
func (q *FuzzyQuery) SetField(f string) {
|
||||||
@ -76,5 +73,5 @@ func (q *FuzzyQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
|
|||||||
if q.FieldVal == "" {
|
if q.FieldVal == "" {
|
||||||
field = m.DefaultSearchField()
|
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)
|
||||||
}
|
}
|
||||||
|
@ -91,10 +91,7 @@ func (q *MatchQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchQuery) Boost() float64{
|
func (q *MatchQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchQuery) SetField(f string) {
|
func (q *MatchQuery) SetField(f string) {
|
||||||
@ -146,14 +143,14 @@ func (q *MatchQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
|
|||||||
query.SetFuzziness(q.Fuzziness)
|
query.SetFuzziness(q.Fuzziness)
|
||||||
query.SetPrefix(q.Prefix)
|
query.SetPrefix(q.Prefix)
|
||||||
query.SetField(field)
|
query.SetField(field)
|
||||||
query.SetBoost(q.Boost())
|
query.SetBoost(q.BoostVal.Value())
|
||||||
tqs[i] = query
|
tqs[i] = query
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for i, token := range tokens {
|
for i, token := range tokens {
|
||||||
tq := NewTermQuery(string(token.Term))
|
tq := NewTermQuery(string(token.Term))
|
||||||
tq.SetField(field)
|
tq.SetField(field)
|
||||||
tq.SetBoost(q.Boost())
|
tq.SetBoost(q.BoostVal.Value())
|
||||||
tqs[i] = tq
|
tqs[i] = tq
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -162,12 +159,12 @@ func (q *MatchQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expla
|
|||||||
case MatchQueryOperatorOr:
|
case MatchQueryOperatorOr:
|
||||||
shouldQuery := NewDisjunctionQuery(tqs)
|
shouldQuery := NewDisjunctionQuery(tqs)
|
||||||
shouldQuery.SetMin(1)
|
shouldQuery.SetMin(1)
|
||||||
shouldQuery.SetBoost(q.Boost())
|
shouldQuery.SetBoost(q.BoostVal.Value())
|
||||||
return shouldQuery.Searcher(i, m, explain)
|
return shouldQuery.Searcher(i, m, explain)
|
||||||
|
|
||||||
case MatchQueryOperatorAnd:
|
case MatchQueryOperatorAnd:
|
||||||
mustQuery := NewConjunctionQuery(tqs)
|
mustQuery := NewConjunctionQuery(tqs)
|
||||||
mustQuery.SetBoost(q.Boost())
|
mustQuery.SetBoost(q.BoostVal.Value())
|
||||||
return mustQuery.Searcher(i, m, explain)
|
return mustQuery.Searcher(i, m, explain)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -39,16 +39,13 @@ func (q *MatchAllQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchAllQuery) Boost() float64{
|
func (q *MatchAllQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
func (q *MatchAllQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
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) {
|
func (q *MatchAllQuery) MarshalJSON() ([]byte, error) {
|
||||||
|
@ -39,10 +39,7 @@ func (q *MatchNoneQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchNoneQuery) Boost() float64{
|
func (q *MatchNoneQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchNoneQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
func (q *MatchNoneQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
||||||
|
@ -50,10 +50,7 @@ func (q *MatchPhraseQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchPhraseQuery) Boost() float64{
|
func (q *MatchPhraseQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *MatchPhraseQuery) SetField(f string) {
|
func (q *MatchPhraseQuery) SetField(f string) {
|
||||||
@ -85,7 +82,7 @@ func (q *MatchPhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping,
|
|||||||
if len(tokens) > 0 {
|
if len(tokens) > 0 {
|
||||||
phrase := tokenStreamToPhrase(tokens)
|
phrase := tokenStreamToPhrase(tokens)
|
||||||
phraseQuery := NewPhraseQuery(phrase, field)
|
phraseQuery := NewPhraseQuery(phrase, field)
|
||||||
phraseQuery.SetBoost(q.Boost())
|
phraseQuery.SetBoost(q.BoostVal.Value())
|
||||||
return phraseQuery.Searcher(i, m, explain)
|
return phraseQuery.Searcher(i, m, explain)
|
||||||
}
|
}
|
||||||
noneQuery := NewMatchNoneQuery()
|
noneQuery := NewMatchNoneQuery()
|
||||||
|
@ -60,10 +60,7 @@ func (q *NumericRangeQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *NumericRangeQuery) Boost() float64{
|
func (q *NumericRangeQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *NumericRangeQuery) SetField(f string) {
|
func (q *NumericRangeQuery) SetField(f string) {
|
||||||
@ -79,7 +76,7 @@ func (q *NumericRangeQuery) Searcher(i index.IndexReader, m mapping.IndexMapping
|
|||||||
if q.FieldVal == "" {
|
if q.FieldVal == "" {
|
||||||
field = m.DefaultSearchField()
|
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 {
|
func (q *NumericRangeQuery) Validate() error {
|
||||||
|
@ -59,10 +59,7 @@ func (q *PhraseQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *PhraseQuery) Boost() float64{
|
func (q *PhraseQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *PhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
func (q *PhraseQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
||||||
|
@ -42,10 +42,7 @@ func (q *PrefixQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *PrefixQuery) Boost() float64{
|
func (q *PrefixQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *PrefixQuery) SetField(f string) {
|
func (q *PrefixQuery) SetField(f string) {
|
||||||
@ -61,5 +58,5 @@ func (q *PrefixQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expl
|
|||||||
if q.FieldVal == "" {
|
if q.FieldVal == "" {
|
||||||
field = m.DefaultSearchField()
|
field = m.DefaultSearchField()
|
||||||
}
|
}
|
||||||
return searcher.NewTermPrefixSearcher(i, q.Prefix, field, q.Boost(), explain)
|
return searcher.NewTermPrefixSearcher(i, q.Prefix, field, q.BoostVal.Value(), explain)
|
||||||
}
|
}
|
||||||
|
@ -40,10 +40,7 @@ func (q *QueryStringQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *QueryStringQuery) Boost() float64{
|
func (q *QueryStringQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *QueryStringQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
func (q *QueryStringQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explain bool) (search.Searcher, error) {
|
||||||
|
@ -46,10 +46,7 @@ func (q *RegexpQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *RegexpQuery) Boost() float64{
|
func (q *RegexpQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *RegexpQuery) SetField(f string) {
|
func (q *RegexpQuery) SetField(f string) {
|
||||||
@ -70,7 +67,7 @@ func (q *RegexpQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, expl
|
|||||||
return nil, err
|
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 {
|
func (q *RegexpQuery) Validate() error {
|
||||||
|
@ -41,10 +41,7 @@ func (q *TermQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *TermQuery) Boost() float64{
|
func (q *TermQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *TermQuery) SetField(f string) {
|
func (q *TermQuery) SetField(f string) {
|
||||||
@ -60,5 +57,5 @@ func (q *TermQuery) Searcher(i index.IndexReader, m mapping.IndexMapping, explai
|
|||||||
if q.FieldVal == "" {
|
if q.FieldVal == "" {
|
||||||
field = m.DefaultSearchField()
|
field = m.DefaultSearchField()
|
||||||
}
|
}
|
||||||
return searcher.NewTermSearcher(i, q.Term, field, q.Boost(), explain)
|
return searcher.NewTermSearcher(i, q.Term, field, q.BoostVal.Value(), explain)
|
||||||
}
|
}
|
||||||
|
@ -67,10 +67,7 @@ func (q *WildcardQuery) SetBoost(b float64) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (q *WildcardQuery) Boost() float64{
|
func (q *WildcardQuery) Boost() float64{
|
||||||
if q.BoostVal != nil {
|
return q.BoostVal.Value()
|
||||||
return q.BoostVal.Value()
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (q *WildcardQuery) SetField(f string) {
|
func (q *WildcardQuery) SetField(f string) {
|
||||||
@ -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 {
|
func (q *WildcardQuery) Validate() error {
|
||||||
|
Loading…
Reference in New Issue
Block a user