From 24de9a9c6002c4a23b07b093d77f829f59763136 Mon Sep 17 00:00:00 2001 From: ale <ale@incal.net> Date: Mon, 22 Jan 2018 09:20:58 +0000 Subject: [PATCH] Update blevesearch in vendor/ --- vendor/github.com/blevesearch/bleve/README.md | 2 +- vendor/github.com/blevesearch/bleve/config.go | 3 + .../bleve/document/field_boolean.go | 2 +- .../bleve/document/field_datetime.go | 2 +- .../bleve/document/field_numeric.go | 2 +- .../blevesearch/bleve/document/field_text.go | 2 +- .../bleve/document/indexing_options.go | 11 + vendor/github.com/blevesearch/bleve/index.go | 2 +- .../blevesearch/bleve/index/analysis.go | 10 +- .../blevesearch/bleve/mapping/document.go | 1 + .../blevesearch/bleve/mapping/field.go | 26 ++- .../blevesearch/bleve/mapping/index.go | 10 +- vendor/github.com/blevesearch/bleve/query.go | 4 +- vendor/github.com/blevesearch/bleve/search.go | 5 + .../blevesearch/bleve/search/search.go | 10 +- .../search/searcher/search_conjunction.go | 19 +- .../search/searcher/search_disjunction.go | 19 +- .../bleve/search/searcher/search_phrase.go | 9 + vendor/github.com/boltdb/bolt/db.go | 4 +- vendor/golang.org/x/net/html/token.go | 4 +- vendor/vendor.json | 196 +++++++++--------- 21 files changed, 207 insertions(+), 136 deletions(-) diff --git a/vendor/github.com/blevesearch/bleve/README.md b/vendor/github.com/blevesearch/bleve/README.md index fa11f90..7c1a7c7 100644 --- a/vendor/github.com/blevesearch/bleve/README.md +++ b/vendor/github.com/blevesearch/bleve/README.md @@ -1,6 +1,6 @@ #  bleve -[](https://travis-ci.org/blevesearch/bleve) [](https://coveralls.io/r/blevesearch/bleve?branch=master) [](https://godoc.org/github.com/blevesearch/bleve) +[](https://travis-ci.org/blevesearch/bleve) [](https://coveralls.io/github/blevesearch/bleve?branch=master) [](https://godoc.org/github.com/blevesearch/bleve) [](https://gitter.im/blevesearch/bleve?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [](https://codebeat.co/projects/github-com-blevesearch-bleve) [](https://goreportcard.com/report/blevesearch/bleve) diff --git a/vendor/github.com/blevesearch/bleve/config.go b/vendor/github.com/blevesearch/bleve/config.go index 74d407f..482efb4 100644 --- a/vendor/github.com/blevesearch/bleve/config.go +++ b/vendor/github.com/blevesearch/bleve/config.go @@ -25,6 +25,9 @@ import ( "github.com/blevesearch/bleve/index/upsidedown" "github.com/blevesearch/bleve/registry" "github.com/blevesearch/bleve/search/highlight/highlighter/html" + + // force import of scorch so its accessible by default + _ "github.com/blevesearch/bleve/index/scorch" ) var bleveExpVar = expvar.NewMap("bleve") diff --git a/vendor/github.com/blevesearch/bleve/document/field_boolean.go b/vendor/github.com/blevesearch/bleve/document/field_boolean.go index 668b431..c226374 100644 --- a/vendor/github.com/blevesearch/bleve/document/field_boolean.go +++ b/vendor/github.com/blevesearch/bleve/document/field_boolean.go @@ -20,7 +20,7 @@ import ( "github.com/blevesearch/bleve/analysis" ) -const DefaultBooleanIndexingOptions = StoreField | IndexField +const DefaultBooleanIndexingOptions = StoreField | IndexField | DocValues type BooleanField struct { name string diff --git a/vendor/github.com/blevesearch/bleve/document/field_datetime.go b/vendor/github.com/blevesearch/bleve/document/field_datetime.go index 6783d53..1db068c 100644 --- a/vendor/github.com/blevesearch/bleve/document/field_datetime.go +++ b/vendor/github.com/blevesearch/bleve/document/field_datetime.go @@ -23,7 +23,7 @@ import ( "github.com/blevesearch/bleve/numeric" ) -const DefaultDateTimeIndexingOptions = StoreField | IndexField +const DefaultDateTimeIndexingOptions = StoreField | IndexField | DocValues const DefaultDateTimePrecisionStep uint = 4 var MinTimeRepresentable = time.Unix(0, math.MinInt64) diff --git a/vendor/github.com/blevesearch/bleve/document/field_numeric.go b/vendor/github.com/blevesearch/bleve/document/field_numeric.go index 7faae2b..e32993c 100644 --- a/vendor/github.com/blevesearch/bleve/document/field_numeric.go +++ b/vendor/github.com/blevesearch/bleve/document/field_numeric.go @@ -21,7 +21,7 @@ import ( "github.com/blevesearch/bleve/numeric" ) -const DefaultNumericIndexingOptions = StoreField | IndexField +const DefaultNumericIndexingOptions = StoreField | IndexField | DocValues const DefaultPrecisionStep uint = 4 diff --git a/vendor/github.com/blevesearch/bleve/document/field_text.go b/vendor/github.com/blevesearch/bleve/document/field_text.go index 37873d3..5f7a3ab 100644 --- a/vendor/github.com/blevesearch/bleve/document/field_text.go +++ b/vendor/github.com/blevesearch/bleve/document/field_text.go @@ -20,7 +20,7 @@ import ( "github.com/blevesearch/bleve/analysis" ) -const DefaultTextIndexingOptions = IndexField +const DefaultTextIndexingOptions = IndexField | DocValues type TextField struct { name string diff --git a/vendor/github.com/blevesearch/bleve/document/indexing_options.go b/vendor/github.com/blevesearch/bleve/document/indexing_options.go index 5d562c1..44498a8 100644 --- a/vendor/github.com/blevesearch/bleve/document/indexing_options.go +++ b/vendor/github.com/blevesearch/bleve/document/indexing_options.go @@ -20,6 +20,7 @@ const ( IndexField IndexingOptions = 1 << iota StoreField IncludeTermVectors + DocValues ) func (o IndexingOptions) IsIndexed() bool { @@ -34,6 +35,10 @@ func (o IndexingOptions) IncludeTermVectors() bool { return o&IncludeTermVectors != 0 } +func (o IndexingOptions) IncludeDocValues() bool { + return o&DocValues != 0 +} + func (o IndexingOptions) String() string { rv := "" if o.IsIndexed() { @@ -51,5 +56,11 @@ func (o IndexingOptions) String() string { } rv += "TV" } + if o.IncludeDocValues() { + if rv != "" { + rv += ", " + } + rv += "DV" + } return rv } diff --git a/vendor/github.com/blevesearch/bleve/index.go b/vendor/github.com/blevesearch/bleve/index.go index 293ec98..e85652d 100644 --- a/vendor/github.com/blevesearch/bleve/index.go +++ b/vendor/github.com/blevesearch/bleve/index.go @@ -76,7 +76,7 @@ func (b *Batch) SetInternal(key, val []byte) { b.internal.SetInternal(key, val) } -// SetInternal adds the specified delete internal +// DeleteInternal adds the specified delete internal // operation to the batch. NOTE: the bleve Index is // not updated until the batch is executed. func (b *Batch) DeleteInternal(key []byte) { diff --git a/vendor/github.com/blevesearch/bleve/index/analysis.go b/vendor/github.com/blevesearch/bleve/index/analysis.go index b626b9f..840dad9 100644 --- a/vendor/github.com/blevesearch/bleve/index/analysis.go +++ b/vendor/github.com/blevesearch/bleve/index/analysis.go @@ -14,7 +14,10 @@ package index -import "github.com/blevesearch/bleve/document" +import ( + "github.com/blevesearch/bleve/analysis" + "github.com/blevesearch/bleve/document" +) type IndexRow interface { KeySize() int @@ -29,6 +32,11 @@ type IndexRow interface { type AnalysisResult struct { DocID string Rows []IndexRow + + // scorch + Document *document.Document + Analyzed []analysis.TokenFrequencies + Length []int } type AnalysisWork struct { diff --git a/vendor/github.com/blevesearch/bleve/mapping/document.go b/vendor/github.com/blevesearch/bleve/mapping/document.go index d62675e..d4c9a8f 100644 --- a/vendor/github.com/blevesearch/bleve/mapping/document.go +++ b/vendor/github.com/blevesearch/bleve/mapping/document.go @@ -179,6 +179,7 @@ OUTER: continue OUTER } } + break } return current } diff --git a/vendor/github.com/blevesearch/bleve/mapping/field.go b/vendor/github.com/blevesearch/bleve/mapping/field.go index 9f1928c..278faa1 100644 --- a/vendor/github.com/blevesearch/bleve/mapping/field.go +++ b/vendor/github.com/blevesearch/bleve/mapping/field.go @@ -26,8 +26,9 @@ import ( // control the default behavior for dynamic fields (those not explicitly mapped) var ( - IndexDynamic = true - StoreDynamic = true + IndexDynamic = true + StoreDynamic = true + DocValuesDynamic = true // TODO revisit default? ) // A FieldMapping describes how a specific item @@ -54,6 +55,10 @@ type FieldMapping struct { IncludeTermVectors bool `json:"include_term_vectors,omitempty"` IncludeInAll bool `json:"include_in_all,omitempty"` DateFormat string `json:"date_format,omitempty"` + + // DocValues, if true makes the index uninverting possible for this field + // It is useful for faceting and sorting queries. + DocValues bool `json:"docvalues,omitempty"` } // NewTextFieldMapping returns a default field mapping for text @@ -64,6 +69,7 @@ func NewTextFieldMapping() *FieldMapping { Index: true, IncludeTermVectors: true, IncludeInAll: true, + DocValues: true, } } @@ -71,6 +77,7 @@ func newTextFieldMappingDynamic(im *IndexMappingImpl) *FieldMapping { rv := NewTextFieldMapping() rv.Store = im.StoreDynamic rv.Index = im.IndexDynamic + rv.DocValues = im.DocValuesDynamic return rv } @@ -81,6 +88,7 @@ func NewNumericFieldMapping() *FieldMapping { Store: true, Index: true, IncludeInAll: true, + DocValues: true, } } @@ -88,6 +96,7 @@ func newNumericFieldMappingDynamic(im *IndexMappingImpl) *FieldMapping { rv := NewNumericFieldMapping() rv.Store = im.StoreDynamic rv.Index = im.IndexDynamic + rv.DocValues = im.DocValuesDynamic return rv } @@ -98,6 +107,7 @@ func NewDateTimeFieldMapping() *FieldMapping { Store: true, Index: true, IncludeInAll: true, + DocValues: true, } } @@ -105,6 +115,7 @@ func newDateTimeFieldMappingDynamic(im *IndexMappingImpl) *FieldMapping { rv := NewDateTimeFieldMapping() rv.Store = im.StoreDynamic rv.Index = im.IndexDynamic + rv.DocValues = im.DocValuesDynamic return rv } @@ -115,6 +126,7 @@ func NewBooleanFieldMapping() *FieldMapping { Store: true, Index: true, IncludeInAll: true, + DocValues: true, } } @@ -122,6 +134,7 @@ func newBooleanFieldMappingDynamic(im *IndexMappingImpl) *FieldMapping { rv := NewBooleanFieldMapping() rv.Store = im.StoreDynamic rv.Index = im.IndexDynamic + rv.DocValues = im.DocValuesDynamic return rv } @@ -132,6 +145,7 @@ func NewGeoPointFieldMapping() *FieldMapping { Store: true, Index: true, IncludeInAll: true, + DocValues: true, } } @@ -147,6 +161,9 @@ func (fm *FieldMapping) Options() document.IndexingOptions { if fm.IncludeTermVectors { rv |= document.IncludeTermVectors } + if fm.DocValues { + rv |= document.DocValues + } return rv } @@ -308,6 +325,11 @@ func (fm *FieldMapping) UnmarshalJSON(data []byte) error { if err != nil { return err } + case "docvalues": + err := json.Unmarshal(v, &fm.DocValues) + if err != nil { + return err + } default: invalidKeys = append(invalidKeys, k) } diff --git a/vendor/github.com/blevesearch/bleve/mapping/index.go b/vendor/github.com/blevesearch/bleve/mapping/index.go index 737f26f..fc5d12a 100644 --- a/vendor/github.com/blevesearch/bleve/mapping/index.go +++ b/vendor/github.com/blevesearch/bleve/mapping/index.go @@ -50,6 +50,7 @@ type IndexMappingImpl struct { DefaultField string `json:"default_field"` StoreDynamic bool `json:"store_dynamic"` IndexDynamic bool `json:"index_dynamic"` + DocValuesDynamic bool `json:"docvalues_dynamic,omitempty"` CustomAnalysis *customAnalysis `json:"analysis,omitempty"` cache *registry.Cache } @@ -154,6 +155,7 @@ func NewIndexMapping() *IndexMappingImpl { DefaultField: defaultField, IndexDynamic: IndexDynamic, StoreDynamic: StoreDynamic, + DocValuesDynamic: DocValuesDynamic, CustomAnalysis: newCustomAnalysis(), cache: registry.NewCache(), } @@ -217,6 +219,7 @@ func (im *IndexMappingImpl) UnmarshalJSON(data []byte) error { im.TypeMapping = make(map[string]*DocumentMapping) im.StoreDynamic = StoreDynamic im.IndexDynamic = IndexDynamic + im.DocValuesDynamic = DocValuesDynamic var invalidKeys []string for k, v := range tmp { @@ -271,6 +274,11 @@ func (im *IndexMappingImpl) UnmarshalJSON(data []byte) error { if err != nil { return err } + case "docvalues_dynamic": + err := json.Unmarshal(v, &im.DocValuesDynamic) + if err != nil { + return err + } default: invalidKeys = append(invalidKeys, k) } @@ -339,7 +347,7 @@ func (im *IndexMappingImpl) newWalkContext(doc *document.Document, dm *DocumentM doc: doc, im: im, dm: dm, - excludedFromAll: []string{}, + excludedFromAll: []string{"_id"}, } } diff --git a/vendor/github.com/blevesearch/bleve/query.go b/vendor/github.com/blevesearch/bleve/query.go index 1fecfa2..523db5e 100644 --- a/vendor/github.com/blevesearch/bleve/query.go +++ b/vendor/github.com/blevesearch/bleve/query.go @@ -209,8 +209,8 @@ func NewGeoBoundingBoxQuery(topLeftLon, topLeftLat, bottomRightLon, bottomRightL return query.NewGeoBoundingBoxQuery(topLeftLon, topLeftLat, bottomRightLon, bottomRightLat) } -// NewGeoDistanceQuery creates a new Query for performing geo bounding -// box searches. The arguments describe a position and a distance. Documents +// NewGeoDistanceQuery creates a new Query for performing geo distance +// searches. The arguments describe a position and a distance. Documents // which have an indexed geo point which is less than or equal to the provided // distance from the given position will be returned. func NewGeoDistanceQuery(lon, lat float64, distance string) *query.GeoDistanceQuery { diff --git a/vendor/github.com/blevesearch/bleve/search.go b/vendor/github.com/blevesearch/bleve/search.go index c2ebafb..46d849c 100644 --- a/vendor/github.com/blevesearch/bleve/search.go +++ b/vendor/github.com/blevesearch/bleve/search.go @@ -481,5 +481,10 @@ func (sr *SearchResult) Merge(other *SearchResult) { if other.MaxScore > sr.MaxScore { sr.MaxScore = other.MaxScore } + if sr.Facets == nil && len(other.Facets) != 0 { + sr.Facets = other.Facets + return + } + sr.Facets.Merge(other.Facets) } diff --git a/vendor/github.com/blevesearch/bleve/search/search.go b/vendor/github.com/blevesearch/bleve/search/search.go index cbbcfbf..f9a9278 100644 --- a/vendor/github.com/blevesearch/bleve/search/search.go +++ b/vendor/github.com/blevesearch/bleve/search/search.go @@ -37,12 +37,12 @@ func (ap ArrayPositions) Equals(other ArrayPositions) bool { type Location struct { // Pos is the position of the term within the field, starting at 1 - Pos uint64 `json:"pos"` - + Pos uint64 `json:"pos"` + // Start and End are the byte offsets of the term in the field - Start uint64 `json:"start"` - End uint64 `json:"end"` - + Start uint64 `json:"start"` + End uint64 `json:"end"` + // ArrayPositions contains the positions of the term within any elements. ArrayPositions ArrayPositions `json:"array_positions"` } diff --git a/vendor/github.com/blevesearch/bleve/search/searcher/search_conjunction.go b/vendor/github.com/blevesearch/bleve/search/searcher/search_conjunction.go index 9ab0e7f..73fba19 100644 --- a/vendor/github.com/blevesearch/bleve/search/searcher/search_conjunction.go +++ b/vendor/github.com/blevesearch/bleve/search/searcher/search_conjunction.go @@ -57,25 +57,25 @@ func NewConjunctionSearcher(indexReader index.IndexReader, qsearchers []search.S func (s *ConjunctionSearcher) computeQueryNorm() { // first calculate sum of squared weights sumOfSquaredWeights := 0.0 - for _, termSearcher := range s.searchers { - sumOfSquaredWeights += termSearcher.Weight() + for _, searcher := range s.searchers { + sumOfSquaredWeights += searcher.Weight() } // now compute query norm from this s.queryNorm = 1.0 / math.Sqrt(sumOfSquaredWeights) // finally tell all the downstream searchers the norm - for _, termSearcher := range s.searchers { - termSearcher.SetQueryNorm(s.queryNorm) + for _, searcher := range s.searchers { + searcher.SetQueryNorm(s.queryNorm) } } func (s *ConjunctionSearcher) initSearchers(ctx *search.SearchContext) error { var err error // get all searchers pointing at their first match - for i, termSearcher := range s.searchers { + for i, searcher := range s.searchers { if s.currs[i] != nil { ctx.DocumentMatchPool.Put(s.currs[i]) } - s.currs[i], err = termSearcher.Next(ctx) + s.currs[i], err = searcher.Next(ctx) if err != nil { return err } @@ -160,11 +160,11 @@ OUTER: // we know all the searchers are pointing at the same thing // so they all need to be bumped - for i, termSearcher := range s.searchers { + for i, searcher := range s.searchers { if s.currs[i] != rv { ctx.DocumentMatchPool.Put(s.currs[i]) } - s.currs[i], err = termSearcher.Next(ctx) + s.currs[i], err = searcher.Next(ctx) if err != nil { return nil, err } @@ -184,6 +184,9 @@ func (s *ConjunctionSearcher) Advance(ctx *search.SearchContext, ID index.IndexI } } for i := range s.searchers { + if s.currs[i] != nil && s.currs[i].IndexInternalID.Compare(ID) >= 0 { + continue + } err := s.advanceChild(ctx, i, ID) if err != nil { return nil, err diff --git a/vendor/github.com/blevesearch/bleve/search/searcher/search_disjunction.go b/vendor/github.com/blevesearch/bleve/search/searcher/search_disjunction.go index 96bd544..b6910dd 100644 --- a/vendor/github.com/blevesearch/bleve/search/searcher/search_disjunction.go +++ b/vendor/github.com/blevesearch/bleve/search/searcher/search_disjunction.go @@ -93,25 +93,25 @@ func newDisjunctionSearcher(indexReader index.IndexReader, func (s *DisjunctionSearcher) computeQueryNorm() { // first calculate sum of squared weights sumOfSquaredWeights := 0.0 - for _, termSearcher := range s.searchers { - sumOfSquaredWeights += termSearcher.Weight() + for _, searcher := range s.searchers { + sumOfSquaredWeights += searcher.Weight() } // now compute query norm from this s.queryNorm = 1.0 / math.Sqrt(sumOfSquaredWeights) // finally tell all the downstream searchers the norm - for _, termSearcher := range s.searchers { - termSearcher.SetQueryNorm(s.queryNorm) + for _, searcher := range s.searchers { + searcher.SetQueryNorm(s.queryNorm) } } func (s *DisjunctionSearcher) initSearchers(ctx *search.SearchContext) error { var err error // get all searchers pointing at their first match - for i, termSearcher := range s.searchers { + for i, searcher := range s.searchers { if s.currs[i] != nil { ctx.DocumentMatchPool.Put(s.currs[i]) } - s.currs[i], err = termSearcher.Next(ctx) + s.currs[i], err = searcher.Next(ctx) if err != nil { return err } @@ -221,11 +221,14 @@ func (s *DisjunctionSearcher) Advance(ctx *search.SearchContext, } // get all searchers pointing at their first match var err error - for i, termSearcher := range s.searchers { + for i, searcher := range s.searchers { if s.currs[i] != nil { + if s.currs[i].IndexInternalID.Compare(ID) >= 0 { + continue + } ctx.DocumentMatchPool.Put(s.currs[i]) } - s.currs[i], err = termSearcher.Advance(ctx, ID) + s.currs[i], err = searcher.Advance(ctx, ID) if err != nil { return nil, err } diff --git a/vendor/github.com/blevesearch/bleve/search/searcher/search_phrase.go b/vendor/github.com/blevesearch/bleve/search/searcher/search_phrase.go index 6ff592e..6237cec 100644 --- a/vendor/github.com/blevesearch/bleve/search/searcher/search_phrase.go +++ b/vendor/github.com/blevesearch/bleve/search/searcher/search_phrase.go @@ -313,6 +313,15 @@ func (s *PhraseSearcher) Advance(ctx *search.SearchContext, ID index.IndexIntern return nil, err } } + if s.currMust != nil { + if s.currMust.IndexInternalID.Compare(ID) >= 0 { + return s.Next(ctx) + } + ctx.DocumentMatchPool.Put(s.currMust) + } + if s.currMust == nil { + return nil, nil + } var err error s.currMust, err = s.mustSearcher.Advance(ctx, ID) if err != nil { diff --git a/vendor/github.com/boltdb/bolt/db.go b/vendor/github.com/boltdb/bolt/db.go index f352ff1..cc3596f 100644 --- a/vendor/github.com/boltdb/bolt/db.go +++ b/vendor/github.com/boltdb/bolt/db.go @@ -737,9 +737,7 @@ retry: // pass success, or bolt internal errors, to all callers for _, c := range b.calls { - if c.err != nil { - c.err <- err - } + c.err <- err } break retry } diff --git a/vendor/golang.org/x/net/html/token.go b/vendor/golang.org/x/net/html/token.go index 893e272..e3c01d7 100644 --- a/vendor/golang.org/x/net/html/token.go +++ b/vendor/golang.org/x/net/html/token.go @@ -1161,8 +1161,8 @@ func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) { return nil, nil, false } -// Token returns the next Token. The result's Data and Attr values remain valid -// after subsequent Next calls. +// Token returns the current Token. The result's Data and Attr values remain +// valid after subsequent Next calls. func (z *Tokenizer) Token() Token { t := Token{Type: z.tt} switch z.tt { diff --git a/vendor/vendor.json b/vendor/vendor.json index 8c4de5f..d02dccb 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -3,238 +3,238 @@ "ignore": "test", "package": [ { - "checksumSHA1": "DoWGsv8aKpO8rHHCfdguKpp7ago=", + "checksumSHA1": "2F0VjyfWgSR+eHPRNoMeBQKLgSU=", "path": "github.com/blevesearch/bleve", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "ywqbUZb6r4Mxq2MBAbv/vaYcmdw=", "path": "github.com/blevesearch/bleve/analysis", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "9fbWSIn+xbJ14D2nMF3byvSsXXk=", "path": "github.com/blevesearch/bleve/analysis/analyzer/custom", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "OM2QW7G5DfzaUzCoe23282875TE=", "path": "github.com/blevesearch/bleve/analysis/analyzer/keyword", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "ObgKIYnYcb6jr+0NMDkgq7D1i3E=", "path": "github.com/blevesearch/bleve/analysis/analyzer/simple", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "IefDmVwLU3UiILeN35DA25gPFnc=", "path": "github.com/blevesearch/bleve/analysis/analyzer/standard", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "P+ay5l3LO/xoWJXKfyK4Ma1hGvw=", "path": "github.com/blevesearch/bleve/analysis/datetime/flexible", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "uIHCAnZoB7dKDPFc3SkiO1hN4BY=", "path": "github.com/blevesearch/bleve/analysis/datetime/optional", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "AdhWAC/hkZLFXUcihmzhMspNk3w=", "path": "github.com/blevesearch/bleve/analysis/lang/en", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "oEtk50tMGEjQxJp/NBKSRtDktcc=", "path": "github.com/blevesearch/bleve/analysis/token/edgengram", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "3VIPkl12t1ko4y6DkbPcz+MtQjY=", "path": "github.com/blevesearch/bleve/analysis/token/lowercase", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "QOw3ypU4VTmFT8XYS/52P3RILZw=", "path": "github.com/blevesearch/bleve/analysis/token/porter", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "8wCAW8E4SO7gGxt0tsr4NZ4APIg=", "path": "github.com/blevesearch/bleve/analysis/token/stop", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "Fj59TrG73yzFxMWQ/rL9VBSgxHE=", "path": "github.com/blevesearch/bleve/analysis/tokenizer/character", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "62U9SMEGOKzubs9iKgGZJv2AJOs=", "path": "github.com/blevesearch/bleve/analysis/tokenizer/letter", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "Lnopn2j55CFd15EBle12dzqQar8=", "path": "github.com/blevesearch/bleve/analysis/tokenizer/single", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "q7C04nlJLxKmemXLop0oyJhfi5M=", "path": "github.com/blevesearch/bleve/analysis/tokenizer/unicode", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { - "checksumSHA1": "NNcminBISsuVq4QCedtmVMAG4cg=", + "checksumSHA1": "KplC1kdjyDvsG1XpLa9usXdI0Lo=", "path": "github.com/blevesearch/bleve/document", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "8+NkVEqldBSg13whAM0Fgk0aIQU=", "path": "github.com/blevesearch/bleve/geo", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { - "checksumSHA1": "3g5mI6RHJOPMig/EFHGwJXuYOzg=", + "checksumSHA1": "9ni0s7Pi5P3m5iJsECX7MOgFres=", "path": "github.com/blevesearch/bleve/index", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "3ttI5qH9k/gOBaW8FJFVmOh5oIA=", "path": "github.com/blevesearch/bleve/index/store", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "9cJS6D7IAwrzK/opywK0ZgAmpTQ=", "path": "github.com/blevesearch/bleve/index/store/boltdb", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "A53rdL3K16bJyjXoEBnT792wtp0=", "path": "github.com/blevesearch/bleve/index/store/goleveldb", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "yeAX9ygUYTMbFpL20NJ0MjR7u6M=", "path": "github.com/blevesearch/bleve/index/store/gtreap", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "vKir60Q94/YveElW4PvFctW+Zf8=", "path": "github.com/blevesearch/bleve/index/upsidedown", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { - "checksumSHA1": "57WkF4dezGS6zce8JqBaXUhRA0U=", + "checksumSHA1": "WhPoJREQp6dC0iB1UPmc8X40VFU=", "path": "github.com/blevesearch/bleve/mapping", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "Qyi8BmpvHc83X9J06QB7GV7O+6M=", "path": "github.com/blevesearch/bleve/numeric", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "Qj1wH6TzvIl4OAiPQaFDpkWvwLM=", "path": "github.com/blevesearch/bleve/registry", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { - "checksumSHA1": "ePJbEPLo/mjmNWhK/U/eUf1gUuo=", + "checksumSHA1": "fs0pN6hrS8DvB6xwqLTmsUOtXPs=", "path": "github.com/blevesearch/bleve/search", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "Ct0YA2r6ruQ+y6BegLDpxz2Hq+U=", "path": "github.com/blevesearch/bleve/search/collector", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "Vull5Tu4BFP4x3fOA4NCRz852UY=", "path": "github.com/blevesearch/bleve/search/facet", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "J/bdoPp+OZ6vSqsXF10484C7asc=", "path": "github.com/blevesearch/bleve/search/highlight", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "rAz4wfq/O/Tx5aYz/6BN09jm0io=", "path": "github.com/blevesearch/bleve/search/highlight/format/html", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "JQCH82+IdGvTtmKn+rDxCDxISxI=", "path": "github.com/blevesearch/bleve/search/highlight/fragmenter/simple", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "/4Q1eosaGj0eU+F4YWQRdaOS5XA=", "path": "github.com/blevesearch/bleve/search/highlight/highlighter/html", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "m4s4+yGUKuSVYHDOQpzSZ8Jdeyg=", "path": "github.com/blevesearch/bleve/search/highlight/highlighter/simple", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "3c9y+4nTwE5+iW4tdAPAk9M181U=", "path": "github.com/blevesearch/bleve/search/query", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "MdrMXPuAS1dVzjPKP+azDaDBj3Y=", "path": "github.com/blevesearch/bleve/search/scorer", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { - "checksumSHA1": "Y52+XMCbUH7MTaPdZrULczL1EWY=", + "checksumSHA1": "1lj9JIC3dsJvQ5s03CJJqBCzmlg=", "path": "github.com/blevesearch/bleve/search/searcher", - "revision": "c048833fcdcf5b86fe09d9c1077147abf8c30416", - "revisionTime": "2017-09-01T13:16:08Z" + "revision": "cb6391e75ee5cf6314330f4c1a9ca533f3acb4ca", + "revisionTime": "2018-01-19T14:10:03Z" }, { "checksumSHA1": "F6iBQThfd04TIlxT49zaPRGvlqE=", @@ -249,16 +249,16 @@ "revisionTime": "2016-09-15T18:50:41Z" }, { - "checksumSHA1": "Ac0sHflTyYX4PmgBEJ+POSTyd5o=", + "checksumSHA1": "lbE4q2dpUgue10EEx8eutP36vzo=", "path": "github.com/boltdb/bolt", - "revision": "fa5367d20c994db73282594be0146ab221657943", - "revisionTime": "2017-09-07T20:20:52Z" + "revision": "9da31745363232bc1e27dbab3569e77383a51585", + "revisionTime": "2017-11-20T01:03:07Z" }, { "checksumSHA1": "yqF125xVSkmfLpIVGrLlfE05IUk=", "path": "github.com/golang/protobuf/proto", - "revision": "17ce1425424ab154092bbb43af630bd647f3bb0d", - "revisionTime": "2017-09-02T00:04:52Z" + "revision": "1e59b77b52bf8e4b449a57e6f79f21226d571845", + "revisionTime": "2017-11-13T18:07:20Z" }, { "checksumSHA1": "p/8vSviYF91gFflhrt5vkyksroo=", @@ -377,26 +377,26 @@ { "checksumSHA1": "GtamqiJoL7PGHsN454AoffBFMa8=", "path": "golang.org/x/net/context", - "revision": "d866cfc389cec985d6fda2859936a575a55a3ab6", - "revisionTime": "2017-12-11T20:45:21Z" + "revision": "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec", + "revisionTime": "2018-01-12T01:53:59Z" }, { - "checksumSHA1": "2t6c6F2y4b/PEV04TOHpQxh/xLc=", + "checksumSHA1": "ag6CP2CjfMRiJxDuBDVKytu5sR8=", "path": "golang.org/x/net/html", - "revision": "d866cfc389cec985d6fda2859936a575a55a3ab6", - "revisionTime": "2017-12-11T20:45:21Z" + "revision": "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec", + "revisionTime": "2018-01-12T01:53:59Z" }, { "checksumSHA1": "uMRr2bnIJS+9Xm0FqMBYUTzaSGs=", "path": "golang.org/x/net/html/atom", - "revision": "d866cfc389cec985d6fda2859936a575a55a3ab6", - "revisionTime": "2017-12-11T20:45:21Z" + "revision": "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec", + "revisionTime": "2018-01-12T01:53:59Z" }, { "checksumSHA1": "barUU39reQ7LdgYLA323hQ/UGy4=", "path": "golang.org/x/net/html/charset", - "revision": "d866cfc389cec985d6fda2859936a575a55a3ab6", - "revisionTime": "2017-12-11T20:45:21Z" + "revision": "5ccada7d0a7ba9aeb5d3aca8d3501b4c2a509fec", + "revisionTime": "2018-01-12T01:53:59Z" }, { "checksumSHA1": "SRtaMCef+ybCW9QotET1ZRe3hLo=", -- GitLab