diff options
Diffstat (limited to 'vendor/gopkg.in/olivere/elastic.v5/delete.go')
| -rw-r--r-- | vendor/gopkg.in/olivere/elastic.v5/delete.go | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/vendor/gopkg.in/olivere/elastic.v5/delete.go b/vendor/gopkg.in/olivere/elastic.v5/delete.go index b1b06c2c3..1e20de11f 100644 --- a/vendor/gopkg.in/olivere/elastic.v5/delete.go +++ b/vendor/gopkg.in/olivere/elastic.v5/delete.go @@ -7,17 +7,16 @@ package elastic import ( "context" "fmt" - "net/url" - "net/http" + "net/url" - "gopkg.in/olivere/elastic.v5/uritemplates" + "github.com/olivere/elastic/uritemplates" ) // DeleteService allows to delete a typed JSON document from a specified // index based on its id. // -// See https://www.elastic.co/guide/en/elasticsearch/reference/5.2/docs-delete.html +// See https://www.elastic.co/guide/en/elasticsearch/reference/6.0/docs-delete.html // for details. type DeleteService struct { client *Client @@ -126,7 +125,7 @@ func (s *DeleteService) buildURL() (string, url.Values, error) { // Add query string parameters params := url.Values{} if s.pretty { - params.Set("pretty", "1") + params.Set("pretty", "true") } if s.refresh != "" { params.Set("refresh", s.refresh) @@ -186,7 +185,12 @@ func (s *DeleteService) Do(ctx context.Context) (*DeleteResponse, error) { } // Get HTTP response - res, err := s.client.PerformRequest(ctx, "DELETE", path, params, nil, http.StatusNotFound) + res, err := s.client.PerformRequest(ctx, PerformRequestOptions{ + Method: "DELETE", + Path: path, + Params: params, + IgnoreErrors: []int{http.StatusNotFound}, + }) if err != nil { return nil, err } @@ -209,12 +213,14 @@ func (s *DeleteService) Do(ctx context.Context) (*DeleteResponse, error) { // DeleteResponse is the outcome of running DeleteService.Do. type DeleteResponse struct { - Index string `json:"_index"` - Type string `json:"_type"` - Id string `json:"_id"` - Version int64 `json:"_version"` - Shards *shardsInfo `json:"_shards"` + Index string `json:"_index,omitempty"` + Type string `json:"_type,omitempty"` + Id string `json:"_id,omitempty"` + Version int64 `json:"_version,omitempty"` Result string `json:"result,omitempty"` + Shards *shardsInfo `json:"_shards,omitempty"` + SeqNo int64 `json:"_seq_no,omitempty"` + PrimaryTerm int64 `json:"_primary_term,omitempty"` + Status int `json:"status,omitempty"` ForcedRefresh bool `json:"forced_refresh,omitempty"` - Found bool `json:"found"` } |