forked from forgejo/forgejo
Vendor Update Go Libs (#13166)
* update github.com/alecthomas/chroma v0.8.0 -> v0.8.1 * github.com/blevesearch/bleve v1.0.10 -> v1.0.12 * editorconfig-core-go v2.1.1 -> v2.3.7 * github.com/gliderlabs/ssh v0.2.2 -> v0.3.1 * migrate editorconfig.ParseBytes to Parse * github.com/shurcooL/vfsgen to 0d455de96546 * github.com/go-git/go-git/v5 v5.1.0 -> v5.2.0 * github.com/google/uuid v1.1.1 -> v1.1.2 * github.com/huandu/xstrings v1.3.0 -> v1.3.2 * github.com/klauspost/compress v1.10.11 -> v1.11.1 * github.com/markbates/goth v1.61.2 -> v1.65.0 * github.com/mattn/go-sqlite3 v1.14.0 -> v1.14.4 * github.com/mholt/archiver v3.3.0 -> v3.3.2 * github.com/microcosm-cc/bluemonday 4f7140c49acb -> v1.0.4 * github.com/minio/minio-go v7.0.4 -> v7.0.5 * github.com/olivere/elastic v7.0.9 -> v7.0.20 * github.com/urfave/cli v1.20.0 -> v1.22.4 * github.com/prometheus/client_golang v1.1.0 -> v1.8.0 * github.com/xanzy/go-gitlab v0.37.0 -> v0.38.1 * mvdan.cc/xurls v2.1.0 -> v2.2.0 Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
parent
91f2afdb54
commit
12a1f914f4
656 changed files with 52967 additions and 25229 deletions
65
vendor/github.com/olivere/elastic/v7/search.go
generated
vendored
65
vendor/github.com/olivere/elastic/v7/search.go
generated
vendored
|
@ -375,6 +375,19 @@ func (s *SearchService) SearchAfter(sortValues ...interface{}) *SearchService {
|
|||
return s
|
||||
}
|
||||
|
||||
// DefaultRescoreWindowSize sets the rescore window size for rescores
|
||||
// that don't specify their window.
|
||||
func (s *SearchService) DefaultRescoreWindowSize(defaultRescoreWindowSize int) *SearchService {
|
||||
s.searchSource = s.searchSource.DefaultRescoreWindowSize(defaultRescoreWindowSize)
|
||||
return s
|
||||
}
|
||||
|
||||
// Rescorer adds a rescorer to the search.
|
||||
func (s *SearchService) Rescorer(rescore *Rescore) *SearchService {
|
||||
s.searchSource = s.searchSource.Rescorer(rescore)
|
||||
return s
|
||||
}
|
||||
|
||||
// IgnoreUnavailable indicates whether the specified concrete indices
|
||||
// should be ignored when unavailable (missing or closed).
|
||||
func (s *SearchService) IgnoreUnavailable(ignoreUnavailable bool) *SearchService {
|
||||
|
@ -628,20 +641,20 @@ func (s *SearchService) Do(ctx context.Context) (*SearchResult, error) {
|
|||
|
||||
// SearchResult is the result of a search in Elasticsearch.
|
||||
type SearchResult struct {
|
||||
Header http.Header `json:"-"`
|
||||
TookInMillis int64 `json:"took,omitempty"` // search time in milliseconds
|
||||
TerminatedEarly bool `json:"terminated_early,omitempty"` // request terminated early
|
||||
NumReducePhases int `json:"num_reduce_phases,omitempty"`
|
||||
Clusters []*SearchResultCluster `json:"_clusters,omitempty"` // 6.1.0+
|
||||
ScrollId string `json:"_scroll_id,omitempty"` // only used with Scroll and Scan operations
|
||||
Hits *SearchHits `json:"hits,omitempty"` // the actual search hits
|
||||
Suggest SearchSuggest `json:"suggest,omitempty"` // results from suggesters
|
||||
Aggregations Aggregations `json:"aggregations,omitempty"` // results from aggregations
|
||||
TimedOut bool `json:"timed_out,omitempty"` // true if the search timed out
|
||||
Error *ErrorDetails `json:"error,omitempty"` // only used in MultiGet
|
||||
Profile *SearchProfile `json:"profile,omitempty"` // profiling results, if optional Profile API was active for this search
|
||||
Shards *ShardsInfo `json:"_shards,omitempty"` // shard information
|
||||
Status int `json:"status,omitempty"` // used in MultiSearch
|
||||
Header http.Header `json:"-"`
|
||||
TookInMillis int64 `json:"took,omitempty"` // search time in milliseconds
|
||||
TerminatedEarly bool `json:"terminated_early,omitempty"` // request terminated early
|
||||
NumReducePhases int `json:"num_reduce_phases,omitempty"`
|
||||
Clusters *SearchResultCluster `json:"_clusters,omitempty"` // 6.1.0+
|
||||
ScrollId string `json:"_scroll_id,omitempty"` // only used with Scroll and Scan operations
|
||||
Hits *SearchHits `json:"hits,omitempty"` // the actual search hits
|
||||
Suggest SearchSuggest `json:"suggest,omitempty"` // results from suggesters
|
||||
Aggregations Aggregations `json:"aggregations,omitempty"` // results from aggregations
|
||||
TimedOut bool `json:"timed_out,omitempty"` // true if the search timed out
|
||||
Error *ErrorDetails `json:"error,omitempty"` // only used in MultiGet
|
||||
Profile *SearchProfile `json:"profile,omitempty"` // profiling results, if optional Profile API was active for this search
|
||||
Shards *ShardsInfo `json:"_shards,omitempty"` // shard information
|
||||
Status int `json:"status,omitempty"` // used in MultiSearch
|
||||
}
|
||||
|
||||
// SearchResultCluster holds information about a search response
|
||||
|
@ -704,6 +717,30 @@ type TotalHits struct {
|
|||
Relation string `json:"relation"` // how the value should be interpreted: accurate ("eq") or a lower bound ("gte")
|
||||
}
|
||||
|
||||
// UnmarshalJSON into TotalHits, accepting both the new response structure
|
||||
// in ES 7.x as well as the older response structure in earlier versions.
|
||||
// The latter can be enabled with RestTotalHitsAsInt(true).
|
||||
func (h *TotalHits) UnmarshalJSON(data []byte) error {
|
||||
if data == nil || string(data) == "null" {
|
||||
return nil
|
||||
}
|
||||
var v struct {
|
||||
Value int64 `json:"value"` // value of the total hit count
|
||||
Relation string `json:"relation"` // how the value should be interpreted: accurate ("eq") or a lower bound ("gte")
|
||||
}
|
||||
if err := json.Unmarshal(data, &v); err != nil {
|
||||
var count int64
|
||||
if err2 := json.Unmarshal(data, &count); err2 != nil {
|
||||
return err // return inner error
|
||||
}
|
||||
h.Value = count
|
||||
h.Relation = "eq"
|
||||
return nil
|
||||
}
|
||||
*h = v
|
||||
return nil
|
||||
}
|
||||
|
||||
// SearchHit is a single hit.
|
||||
type SearchHit struct {
|
||||
Score *float64 `json:"_score,omitempty"` // computed score
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue