diff options
Diffstat (limited to 'vendor/github.com/olivere/elastic/v7')
5 files changed, 36 insertions, 16 deletions
diff --git a/vendor/github.com/olivere/elastic/v7/CONTRIBUTORS b/vendor/github.com/olivere/elastic/v7/CONTRIBUTORS index 2c336910e9..8028e21f95 100644 --- a/vendor/github.com/olivere/elastic/v7/CONTRIBUTORS +++ b/vendor/github.com/olivere/elastic/v7/CONTRIBUTORS @@ -163,6 +163,7 @@ Pedro [@otherview](https://github.com/otherview) Pete C [@peteclark-ft](https://github.com/peteclark-ft) Peter Nagy [@nagypeterjob](https://github.com/nagypeterjob) Paolo [@ppiccolo](https://github.com/ppiccolo) +Phillip Baker [@phillbaker](https://github.com/phillbaker) Igor Panychek [@panychek](https://github.com/panychek) Radoslaw Wesolowski [@r--w](https://github.com/r--w) Rafał Gałus [@rgalus](https://github.com/rgalus) diff --git a/vendor/github.com/olivere/elastic/v7/client.go b/vendor/github.com/olivere/elastic/v7/client.go index b859f9eae3..bd8993c990 100644 --- a/vendor/github.com/olivere/elastic/v7/client.go +++ b/vendor/github.com/olivere/elastic/v7/client.go @@ -25,7 +25,7 @@ import ( const ( // Version is the current version of Elastic. - Version = "7.0.20" + Version = "7.0.21" // DefaultURL is the default endpoint of Elasticsearch on the local machine. // It is used e.g. when initializing a new Client without a specific URL. diff --git a/vendor/github.com/olivere/elastic/v7/docker-compose.yml b/vendor/github.com/olivere/elastic/v7/docker-compose.yml index 39309f6c2d..eda566185f 100644 --- a/vendor/github.com/olivere/elastic/v7/docker-compose.yml +++ b/vendor/github.com/olivere/elastic/v7/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.0 + image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.2 hostname: elasticsearch environment: - cluster.name=elasticsearch @@ -28,7 +28,7 @@ services: ports: - 9200:9200 platinum: - image: docker.elastic.co/elasticsearch/elasticsearch:7.9.0 + image: docker.elastic.co/elasticsearch/elasticsearch:7.9.2 hostname: elasticsearch-platinum environment: - cluster.name=platinum diff --git a/vendor/github.com/olivere/elastic/v7/inner_hit.go b/vendor/github.com/olivere/elastic/v7/inner_hit.go index 803662646c..2dbcbad1aa 100644 --- a/vendor/github.com/olivere/elastic/v7/inner_hit.go +++ b/vendor/github.com/olivere/elastic/v7/inner_hit.go @@ -41,6 +41,11 @@ func (hit *InnerHit) Query(query Query) *InnerHit { return hit } +func (hit *InnerHit) Collapse(collapse *CollapseBuilder) *InnerHit { + hit.source.Collapse(collapse) + return hit +} + func (hit *InnerHit) From(from int) *InnerHit { hit.source.From(from) return hit diff --git a/vendor/github.com/olivere/elastic/v7/scroll.go b/vendor/github.com/olivere/elastic/v7/scroll.go index 626731ec0e..92c859e3f9 100644 --- a/vendor/github.com/olivere/elastic/v7/scroll.go +++ b/vendor/github.com/olivere/elastic/v7/scroll.go @@ -32,19 +32,20 @@ type ScrollService struct { filterPath []string // list of filters used to reduce the response headers http.Header // custom request-level HTTP headers - indices []string - types []string - keepAlive string - body interface{} - ss *SearchSource - size *int - routing string - preference string - ignoreUnavailable *bool - ignoreThrottled *bool - allowNoIndices *bool - expandWildcards string - maxResponseSize int64 + indices []string + types []string + keepAlive string + body interface{} + ss *SearchSource + size *int + routing string + preference string + ignoreUnavailable *bool + ignoreThrottled *bool + allowNoIndices *bool + expandWildcards string + maxResponseSize int64 + restTotalHitsAsInt *bool mu sync.RWMutex scrollId string @@ -249,6 +250,13 @@ func (s *ScrollService) TrackTotalHits(trackTotalHits interface{}) *ScrollServic return s } +// RestTotalHitsAsInt indicates whether hits.total should be rendered as an +// integer or an object in the rest search response. +func (s *ScrollService) RestTotalHitsAsInt(enabled bool) *ScrollService { + s.restTotalHitsAsInt = &enabled + return s +} + // Routing is a list of specific routing values to control the shards // the search will be executed on. func (s *ScrollService) Routing(routings ...string) *ScrollService { @@ -507,6 +515,9 @@ func (s *ScrollService) buildFirstURL() (string, url.Values, error) { if s.ignoreThrottled != nil { params.Set("ignore_throttled", fmt.Sprintf("%v", *s.ignoreThrottled)) } + if v := s.restTotalHitsAsInt; v != nil { + params.Set("rest_total_hits_as_int", fmt.Sprint(*v)) + } return path, params, nil } @@ -607,6 +618,9 @@ func (s *ScrollService) buildNextURL() (string, url.Values, error) { } params.Set("filter_path", strings.Join(s.filterPath, ",")) } + if v := s.restTotalHitsAsInt; v != nil { + params.Set("rest_total_hits_as_int", fmt.Sprint(*v)) + } return path, params, nil } |