diff --git a/index/index.go b/index/index.go index c25d7fa4..e5a69297 100644 --- a/index/index.go +++ b/index/index.go @@ -94,8 +94,6 @@ type IndexReader interface { DumpFields() chan interface{} Close() error - - Size() int } // FieldTerms contains the terms used by a document, keyed by field diff --git a/index/scorch/snapshot_index.go b/index/scorch/snapshot_index.go index 9394f391..5289b143 100644 --- a/index/scorch/snapshot_index.go +++ b/index/scorch/snapshot_index.go @@ -27,7 +27,6 @@ import ( "github.com/blevesearch/bleve/document" "github.com/blevesearch/bleve/index" "github.com/blevesearch/bleve/index/scorch/segment" - "github.com/blevesearch/bleve/size" ) type asynchSegmentResult struct { @@ -90,12 +89,6 @@ func (i *IndexSnapshot) Close() error { return i.DecRef() } -func (i *IndexSnapshot) Size() int { - // Just return the size of the pointer for estimating the overhead - // during Search, a reference of the IndexSnapshot serves as the reader. - return size.SizeOfPtr -} - func (i *IndexSnapshot) newIndexSnapshotFieldDict(field string, makeItr func(i segment.TermDictionary) segment.DictionaryIterator) (*IndexSnapshotFieldDict, error) { results := make(chan *asynchSegmentResult) diff --git a/index/upsidedown/index_reader.go b/index/upsidedown/index_reader.go index 4e575521..e045f67c 100644 --- a/index/upsidedown/index_reader.go +++ b/index/upsidedown/index_reader.go @@ -20,7 +20,6 @@ import ( "github.com/blevesearch/bleve/document" "github.com/blevesearch/bleve/index" "github.com/blevesearch/bleve/index/store" - "github.com/blevesearch/bleve/size" ) var reflectStaticSizeIndexReader int @@ -36,10 +35,6 @@ type IndexReader struct { docCount uint64 } -func (i *IndexReader) Size() int { - return reflectStaticSizeIndexReader + size.SizeOfPtr -} - func (i *IndexReader) TermFieldReader(term []byte, fieldName string, includeFreq, includeNorm, includeTermVectors bool) (index.TermFieldReader, error) { fieldIndex, fieldExists := i.index.fieldCache.FieldNamed(fieldName, false) if fieldExists { diff --git a/index/upsidedown/reader.go b/index/upsidedown/reader.go index 646d4d8a..bc0fef11 100644 --- a/index/upsidedown/reader.go +++ b/index/upsidedown/reader.go @@ -203,7 +203,7 @@ type UpsideDownCouchDocIDReader struct { func (r *UpsideDownCouchDocIDReader) Size() int { sizeInBytes := reflectStaticSizeUpsideDownCouchDocIDReader + - r.indexReader.Size() + reflectStaticSizeIndexReader + size.SizeOfPtr for _, entry := range r.only { sizeInBytes += size.SizeOfString + len(entry) diff --git a/search/facets_builder.go b/search/facets_builder.go index 34e45af8..c5d41e2d 100644 --- a/search/facets_builder.go +++ b/search/facets_builder.go @@ -66,8 +66,7 @@ func NewFacetsBuilder(indexReader index.IndexReader) *FacetsBuilder { } func (fb *FacetsBuilder) Size() int { - sizeInBytes := reflectStaticSizeFacetsBuilder + size.SizeOfPtr + - fb.indexReader.Size() + sizeInBytes := reflectStaticSizeFacetsBuilder + size.SizeOfPtr for k, v := range fb.facets { sizeInBytes += size.SizeOfString + len(k) + diff --git a/search/searcher/search_boolean.go b/search/searcher/search_boolean.go index b87337e1..f7ee2cd8 100644 --- a/search/searcher/search_boolean.go +++ b/search/searcher/search_boolean.go @@ -62,8 +62,7 @@ func NewBooleanSearcher(indexReader index.IndexReader, mustSearcher search.Searc } func (s *BooleanSearcher) Size() int { - sizeInBytes := reflectStaticSizeBooleanSearcher + size.SizeOfPtr + - s.indexReader.Size() + sizeInBytes := reflectStaticSizeBooleanSearcher + size.SizeOfPtr if s.mustSearcher != nil { sizeInBytes += s.mustSearcher.Size() diff --git a/search/searcher/search_disjunction.go b/search/searcher/search_disjunction.go index 119bac97..32d61480 100644 --- a/search/searcher/search_disjunction.go +++ b/search/searcher/search_disjunction.go @@ -101,7 +101,6 @@ func newDisjunctionSearcher(indexReader index.IndexReader, func (s *DisjunctionSearcher) Size() int { sizeInBytes := reflectStaticSizeDisjunctionSearcher + size.SizeOfPtr + - s.indexReader.Size() + s.scorer.Size() for _, entry := range s.searchers { diff --git a/search/searcher/search_match_all.go b/search/searcher/search_match_all.go index 3f34e591..bb664012 100644 --- a/search/searcher/search_match_all.go +++ b/search/searcher/search_match_all.go @@ -58,7 +58,6 @@ func NewMatchAllSearcher(indexReader index.IndexReader, boost float64, options s func (s *MatchAllSearcher) Size() int { return reflectStaticSizeMatchAllSearcher + size.SizeOfPtr + - s.indexReader.Size() + s.reader.Size() + s.scorer.Size() } diff --git a/search/searcher/search_match_none.go b/search/searcher/search_match_none.go index 6b50b322..a345e17f 100644 --- a/search/searcher/search_match_none.go +++ b/search/searcher/search_match_none.go @@ -40,8 +40,7 @@ func NewMatchNoneSearcher(indexReader index.IndexReader) (*MatchNoneSearcher, er } func (s *MatchNoneSearcher) Size() int { - return reflectStaticSizeMatchNoneSearcher + size.SizeOfPtr + - s.indexReader.Size() + return reflectStaticSizeMatchNoneSearcher + size.SizeOfPtr } func (s *MatchNoneSearcher) Count() uint64 { diff --git a/search/searcher/search_phrase.go b/search/searcher/search_phrase.go index 23a359bd..0026794d 100644 --- a/search/searcher/search_phrase.go +++ b/search/searcher/search_phrase.go @@ -42,8 +42,7 @@ type PhraseSearcher struct { } func (s *PhraseSearcher) Size() int { - sizeInBytes := reflectStaticSizePhraseSearcher + size.SizeOfPtr + - s.indexReader.Size() + sizeInBytes := reflectStaticSizePhraseSearcher + size.SizeOfPtr if s.mustSearcher != nil { sizeInBytes += s.mustSearcher.Size() diff --git a/search/searcher/search_term.go b/search/searcher/search_term.go index 576d6643..b99e4c26 100644 --- a/search/searcher/search_term.go +++ b/search/searcher/search_term.go @@ -75,7 +75,6 @@ func NewTermSearcherBytes(indexReader index.IndexReader, term []byte, field stri func (s *TermSearcher) Size() int { return reflectStaticSizeTermSearcher + size.SizeOfPtr + - s.indexReader.Size() + s.reader.Size() + s.tfd.Size() + s.scorer.Size()