diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-22 12:54:00 -0400 |
| commit | 4c683aff7627040ff811f065848a820b2cb19d59 (patch) | |
| tree | 668061e8acfd8827fd02bab18a998b7986944296 /vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go | |
| parent | eb78d273f39202046fa71555a5a19b0ec8a95cb3 (diff) | |
| parent | 1af1bce6199597bb2d41ddcdc00ef0f28a73c83e (diff) | |
| download | chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.gz chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.bz2 chat-4c683aff7627040ff811f065848a820b2cb19d59.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go')
| -rw-r--r-- | vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go b/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go index ec34302f8..82821b0b6 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go +++ b/vendor/gopkg.in/olivere/elastic.v5/search_queries_fsq.go @@ -114,18 +114,7 @@ func (q *FunctionScoreQuery) Source() (interface{}, error) { query["filter"] = src } - if len(q.filters) == 1 && q.filters[0] == nil { - // Weight needs to be serialized on this level. - if weight := q.scoreFuncs[0].GetWeight(); weight != nil { - query["weight"] = weight - } - // Serialize the score function - src, err := q.scoreFuncs[0].Source() - if err != nil { - return nil, err - } - query[q.scoreFuncs[0].Name()] = src - } else { + if len(q.filters) > 0 { funcs := make([]interface{}, len(q.filters)) for i, filter := range q.filters { hsh := make(map[string]interface{}) |