From 40ee41803980ea361a202c91f2ec795ca33d9fe7 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 3 Mar 2021 22:18:33 +0000 Subject: GC unused typeddefs and params. --- .../src/vespa/searchlib/attribute/multistringattribute.h | 3 --- .../vespa/searchlib/attribute/multistringpostattribute.h | 2 -- .../src/vespa/searchlib/attribute/postinglistattribute.cpp | 3 +-- .../src/vespa/searchlib/attribute/postinglistattribute.h | 1 - .../vespa/searchlib/attribute/postinglistsearchcontext.cpp | 2 -- .../vespa/searchlib/attribute/postinglistsearchcontext.h | 14 +++++--------- .../vespa/searchlib/attribute/postinglistsearchcontext.hpp | 12 ++++++------ .../src/vespa/searchlib/attribute/singlestringattribute.h | 2 -- .../vespa/searchlib/attribute/singlestringpostattribute.h | 1 - searchlib/src/vespa/searchlib/attribute/stringbase.h | 6 +++--- 10 files changed, 15 insertions(+), 31 deletions(-) (limited to 'searchlib') diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringattribute.h index 781fe106d87..fcf98e89188 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.h @@ -33,13 +33,11 @@ protected: using QueryTermSimpleUP = AttributeVector::QueryTermSimpleUP; using WeightedIndex = typename MultiValueAttribute::MultiValueType; using WeightedIndexArrayRef = typename MultiValueAttribute::MultiValueArrayRef; - using WeightedIndexVector = typename MultiValueAttribute::ValueVector; using Change = StringAttribute::Change; using ChangeVector = StringAttribute::ChangeVector; using DocId = StringAttribute::DocId; using EnumHandle = StringAttribute::EnumHandle; - using EnumModifier = StringAttribute::EnumModifier; using LoadedVector = StringAttribute::LoadedVector; using SearchContext = StringAttribute::SearchContext; using ValueModifier = StringAttribute::ValueModifier; @@ -159,7 +157,6 @@ public: { using BT::queryTerm; using AttrType = MultiValueStringAttributeT; - using FoldedComparatorType = typename EnumStore::FoldedComparatorType; public: StringTemplSearchContext(SearchContext::QueryTermSimpleUP qTerm, const AttrType & toBeSearched); }; diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h index 142879f4578..7cc827f6384 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h @@ -58,8 +58,6 @@ private: using DocId = typename MultiValueStringAttributeT::DocId; using DocIndices = typename MultiValueStringAttributeT::DocIndices; using EnumIndex = typename EnumStore::Index; - using FoldedComparatorType = typename EnumStore::FoldedComparatorType; - using FrozenDictionary = typename Dictionary::FrozenView; using LoadedEnumAttributeVector = attribute::LoadedEnumAttributeVector; using Posting = typename PostingParent::Posting; using PostingList = typename PostingParent::PostingList; diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp index ed764dd9ffc..f5b4accfedc 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp @@ -17,8 +17,7 @@ PostingListAttributeBase(AttributeVector &attr, _postingList(enumStore.get_dictionary().get_posting_dictionary(), attr.getStatus(), attr.getConfig()), _attr(attr), - _dict(enumStore.get_dictionary().get_posting_dictionary()), - _esb(enumStore) + _dict(enumStore.get_dictionary().get_posting_dictionary()) { } template diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h index 0d4a4982793..5f2eb02ecd2 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h @@ -50,7 +50,6 @@ protected: PostingList _postingList; AttributeVector &_attr; EnumPostingTree &_dict; - IEnumStore &_esb; PostingListAttributeBase(AttributeVector &attr, IEnumStore &enumStore); virtual ~PostingListAttributeBase(); diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp index 0dc063a5165..972baa267ce 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp @@ -15,7 +15,6 @@ PostingListSearchContext(const Dictionary &dictionary, uint32_t docIdLimit, uint64_t numValues, bool hasWeight, - const IEnumStore &esb, uint32_t minBvDocFreq, bool useBitVector, const ISearchContext &baseSearchCtx) @@ -32,7 +31,6 @@ PostingListSearchContext(const Dictionary &dictionary, _frozenRoot(), _FSTC(0.0), _PLSTC(0.0), - _esb(esb), _minBvDocFreq(minBvDocFreq), _gbv(nullptr), _baseSearchCtx(baseSearchCtx) diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h index 8cd7a7064f6..9486b129fcc 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.h @@ -42,14 +42,13 @@ protected: vespalib::datastore::EntryRef _frozenRoot; // Posting list in tree form float _FSTC; // Filtering Search Time Constant float _PLSTC; // Posting List Search Time Constant - const IEnumStore &_esb; uint32_t _minBvDocFreq; const GrowableBitVector *_gbv; // bitvector if _useBitVector has been set const ISearchContext &_baseSearchCtx; PostingListSearchContext(const Dictionary &dictionary, uint32_t docIdLimit, uint64_t numValues, bool hasWeight, - const IEnumStore &esb, uint32_t minBvDocFreq, bool useBitVector, const ISearchContext &baseSearchCtx); + uint32_t minBvDocFreq, bool useBitVector, const ISearchContext &baseSearchCtx); ~PostingListSearchContext(); @@ -98,7 +97,6 @@ protected: using Traits = PostingListTraits; using PostingList = typename Traits::PostingList; using Posting = typename Traits::Posting; - using PostingVector = std::vector; using EntryRef = vespalib::datastore::EntryRef; using FrozenView = typename PostingList::BTreeType::FrozenView; @@ -113,8 +111,8 @@ protected: static const long MIN_APPROXHITS_TO_NUMDOCS_RATIO_BEFORE_APPROXIMATION = 10; PostingListSearchContextT(const Dictionary &dictionary, uint32_t docIdLimit, uint64_t numValues, - bool hasWeight, const PostingList &postingList, const IEnumStore &esb, - uint32_t minBvCocFreq, bool useBitVector, const ISearchContext &baseSearchCtx); + bool hasWeight, const PostingList &postingList, uint32_t minBvCocFreq, + bool useBitVector, const ISearchContext &baseSearchCtx); ~PostingListSearchContextT() override; void lookupSingle(); @@ -151,8 +149,8 @@ protected: using Parent::singleHits; PostingListFoldedSearchContextT(const Dictionary &dictionary, uint32_t docIdLimit, uint64_t numValues, - bool hasWeight, const PostingList &postingList, const IEnumStore &esb, - uint32_t minBvCocFreq, bool useBitVector, const ISearchContext &baseSearchCtx); + bool hasWeight, const PostingList &postingList, uint32_t minBvCocFreq, + bool useBitVector, const ISearchContext &baseSearchCtx); unsigned int approximateHits() const override; }; @@ -181,7 +179,6 @@ private: using AggregationTraits = PostingListTraits; using PostingList = typename AggregationTraits::PostingList; using Parent = PostingSearchContext, AttrT>; - using FoldedComparatorType = typename Parent::EnumStore::FoldedComparatorType; using RegexpUtil = vespalib::RegexpUtil; using QueryTermSimpleUP = typename Parent::QueryTermSimpleUP; using Parent::_toBeSearched; @@ -255,7 +252,6 @@ PostingSearchContext(QueryTermSimpleUP qTerm, bool useBitVector, const AttrT &to toBeSearched.getStatus().getNumValues(), toBeSearched.hasWeightedSetType(), toBeSearched.getPostingList(), - toBeSearched.getEnumStore(), toBeSearched._postingList._minBvDocFreq, useBitVector, *this), diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp index 09e5a9da5bc..072b52ff47a 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp @@ -21,9 +21,9 @@ namespace search::attribute { template PostingListSearchContextT:: PostingListSearchContextT(const Dictionary &dictionary, uint32_t docIdLimit, uint64_t numValues, bool hasWeight, - const PostingList &postingList, const IEnumStore &esb, - uint32_t minBvDocFreq, bool useBitVector, const ISearchContext &searchContext) - : PostingListSearchContext(dictionary, docIdLimit, numValues, hasWeight, esb, minBvDocFreq, useBitVector, searchContext), + const PostingList &postingList, uint32_t minBvDocFreq, + bool useBitVector, const ISearchContext &searchContext) + : PostingListSearchContext(dictionary, docIdLimit, numValues, hasWeight, minBvDocFreq, useBitVector, searchContext), _postingList(postingList), _merger(docIdLimit) { @@ -283,9 +283,9 @@ PostingListSearchContextT::applyRangeLimit(int rangeLimit) template PostingListFoldedSearchContextT:: PostingListFoldedSearchContextT(const Dictionary &dictionary, uint32_t docIdLimit, uint64_t numValues, - bool hasWeight, const PostingList &postingList, const IEnumStore &esb, - uint32_t minBvDocFreq, bool useBitVector, const ISearchContext &searchContext) - : Parent(dictionary, docIdLimit, numValues, hasWeight, postingList, esb, minBvDocFreq, useBitVector, searchContext) + bool hasWeight, const PostingList &postingList, uint32_t minBvDocFreq, + bool useBitVector, const ISearchContext &searchContext) + : Parent(dictionary, docIdLimit, numValues, hasWeight, postingList, minBvDocFreq, useBitVector, searchContext) { } diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h b/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h index 5d0c636dc91..11d4911bf09 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlestringattribute.h @@ -25,7 +25,6 @@ protected: using EnumHintSearchContext = attribute::EnumHintSearchContext; using EnumIndex = typename SingleValueEnumAttributeBase::EnumIndex; using EnumIndexVector = typename SingleValueEnumAttributeBase::EnumIndexVector; - using EnumModifier = StringAttribute::EnumModifier; using EnumStore = typename SingleValueEnumAttribute::EnumStore; using LoadedVector = StringAttribute::LoadedVector; using QueryTermSimpleUP = AttributeVector::QueryTermSimpleUP; @@ -107,7 +106,6 @@ public: public EnumHintSearchContext { using AttrType = SingleValueStringAttributeT; - using FoldedComparatorType = typename EnumStore::FoldedComparatorType; using StringSingleImplSearchContext::queryTerm; public: StringTemplSearchContext(QueryTermSimpleUP qTerm, const AttrType & toBeSearched); diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h index 3ac49ab6921..4b36717d0c3 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h @@ -43,7 +43,6 @@ private: using Dictionary = EnumPostingTree; using DocId = typename SingleValueStringAttributeT::DocId; using EnumIndex = typename SingleValueStringAttributeT::EnumIndex; - using FoldedComparatorType = typename EnumStore::FoldedComparatorType; using LoadedEnumAttributeVector = attribute::LoadedEnumAttributeVector; using PostingList = typename PostingParent::PostingList; using PostingMap = typename PostingParent::PostingMap; diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.h b/searchlib/src/vespa/searchlib/attribute/stringbase.h index e6238cc0f94..5d21f48fc74 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.h +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.h @@ -60,7 +60,7 @@ public: protected: StringAttribute(const vespalib::string & name); StringAttribute(const vespalib::string & name, const Config & c); - ~StringAttribute(); + ~StringAttribute() override; static const char * defaultValue() { return ""; } using Change = ChangeTemplate; using ChangeVector = ChangeVectorT; @@ -71,9 +71,9 @@ protected: bool onLoadEnumerated(ReaderBase &attrReader); - virtual bool onAddDoc(DocId doc) override; + bool onAddDoc(DocId doc) override; - virtual vespalib::MemoryUsage getChangeVectorMemoryUsage() const override; + vespalib::MemoryUsage getChangeVectorMemoryUsage() const override; private: virtual void load_posting_lists(LoadedVector& loaded); virtual void load_enum_store(LoadedVector& loaded); -- cgit v1.2.3