bugfixes more search results and dump restore options

vendor/github.com/blevesearch/bleve/search.go

@@ -80,6 +80,30 @@ type FacetRequest struct {
 	DateTimeRanges []*dateTimeRange `json:"date_ranges,omitempty"`
 }
 
+func (fr *FacetRequest) Validate() error {
+	if len(fr.NumericRanges) > 0 && len(fr.DateTimeRanges) > 0 {
+		return fmt.Errorf("facet can only conain numeric ranges or date ranges, not both")
+	}
+
+	nrNames := map[string]interface{}{}
+	for _, nr := range fr.NumericRanges {
+		if _, ok := nrNames[nr.Name]; ok {
+			return fmt.Errorf("numeric ranges contains duplicate name '%s'", nr.Name)
+		}
+		nrNames[nr.Name] = struct{}{}
+	}
+
+	drNames := map[string]interface{}{}
+	for _, dr := range fr.DateTimeRanges {
+		if _, ok := drNames[dr.Name]; ok {
+			return fmt.Errorf("date ranges contains duplicate name '%s'", dr.Name)
+		}
+		drNames[dr.Name] = struct{}{}
+	}
+
+	return nil
+}
+
 // NewFacetRequest creates a facet on the specified
 // field that limits the number of entries to the
 // specified size.
@@ -116,6 +140,16 @@ func (fr *FacetRequest) AddNumericRange(name string, min, max *float64) {
 // FacetRequest objects for a single query.
 type FacetsRequest map[string]*FacetRequest
 
+func (fr FacetsRequest) Validate() error {
+	for _, v := range fr {
+		err := v.Validate()
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // HighlightRequest describes how field matches
 // should be highlighted.
 type HighlightRequest struct {
@@ -157,6 +191,7 @@ func (h *HighlightRequest) AddField(field string) {
 // Facets describe the set of facets to be computed.
 // Explain triggers inclusion of additional search
 // result score explanations.
+// Sort describes the desired order for the results to be returned.
 //
 // A special field named "*" can be used to return all fields.
 type SearchRequest struct {
@@ -167,6 +202,16 @@ type SearchRequest struct {
 	Fields    []string          `json:"fields"`
 	Facets    FacetsRequest     `json:"facets"`
 	Explain   bool              `json:"explain"`
+	Sort      search.SortOrder  `json:"sort"`
+}
+
+func (sr *SearchRequest) Validate() error {
+	err := sr.Query.Validate()
+	if err != nil {
+		return err
+	}
+
+	return sr.Facets.Validate()
 }
 
 // AddFacet adds a FacetRequest to this SearchRequest
@@ -177,6 +222,21 @@ func (r *SearchRequest) AddFacet(facetName string, f *FacetRequest) {
 	r.Facets[facetName] = f
 }
 
+// SortBy changes the request to use the requested sort order
+// this form uses the simplified syntax with an array of strings
+// each string can either be a field name
+// or the magic value _id and _score which refer to the doc id and search score
+// any of these values can optionally be prefixed with - to reverse the order
+func (r *SearchRequest) SortBy(order []string) {
+	so := search.ParseSortOrderStrings(order)
+	r.Sort = so
+}
+
+// SortByCustom changes the request to use the requested sort order
+func (r *SearchRequest) SortByCustom(order search.SortOrder) {
+	r.Sort = order
+}
+
 // UnmarshalJSON deserializes a JSON representation of
 // a SearchRequest
 func (r *SearchRequest) UnmarshalJSON(input []byte) error {
@@ -188,6 +248,7 @@ func (r *SearchRequest) UnmarshalJSON(input []byte) error {
 		Fields    []string          `json:"fields"`
 		Facets    FacetsRequest     `json:"facets"`
 		Explain   bool              `json:"explain"`
+		Sort      []json.RawMessage `json:"sort"`
 	}
 
 	err := json.Unmarshal(input, &temp)
@@ -200,6 +261,14 @@ func (r *SearchRequest) UnmarshalJSON(input []byte) error {
 	} else {
 		r.Size = *temp.Size
 	}
+	if temp.Sort == nil {
+		r.Sort = search.SortOrder{&search.SortScore{Desc: true}}
+	} else {
+		r.Sort, err = search.ParseSortOrderJSON(temp.Sort)
+		if err != nil {
+			return err
+		}
+	}
 	r.From = temp.From
 	r.Explain = temp.Explain
 	r.Highlight = temp.Highlight
@@ -231,12 +300,14 @@ func NewSearchRequest(q Query) *SearchRequest {
 // NewSearchRequestOptions creates a new SearchRequest
 // for the Query, with the requested size, from
 // and explanation search parameters.
+// By default results are ordered by score, descending.
 func NewSearchRequestOptions(q Query, size, from int, explain bool) *SearchRequest {
 	return &SearchRequest{
 		Query:   q,
 		Size:    size,
 		From:    from,
 		Explain: explain,
+		Sort:    search.SortOrder{&search.SortScore{Desc: true}},
 	}
 }
 
@@ -252,6 +323,18 @@ func (iem IndexErrMap) MarshalJSON() ([]byte, error) {
 	return json.Marshal(tmp)
 }
 
+func (iem IndexErrMap) UnmarshalJSON(data []byte) error {
+	var tmp map[string]string
+	err := json.Unmarshal(data, &tmp)
+	if err != nil {
+		return err
+	}
+	for k, v := range tmp {
+		iem[k] = fmt.Errorf("%s", v)
+	}
+	return nil
+}
+
 // SearchStatus is a secion in the SearchResult reporting how many
 // underlying indexes were queried, how many were successful/failed
 // and a map of any errors that were encountered