diff options
author | Geir Storli <geirst@verizonmedia.com> | 2019-09-04 11:31:25 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2019-09-04 11:31:25 +0000 |
commit | ea1f51fd2fed6293048e05bb20145d817752ae9c (patch) | |
tree | a3e6dd8319b157332a84fbb34a49720b220f8dfd /searchlib/src | |
parent | bb62d785d6659ec23515833cdd05b323dd1c8a80 (diff) |
Rename functions used to load posting lists.
Diffstat (limited to 'searchlib/src')
15 files changed, 43 insertions, 41 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/enumattribute.h b/searchlib/src/vespa/searchlib/attribute/enumattribute.h index 0cda7c7db53..d913dd2959c 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/enumattribute.h @@ -64,7 +64,7 @@ protected: IEnumStore* getEnumStoreBase() override { return &_enumStore; } EnumType getFromEnum(EnumHandle e) const override { return _enumStore.getValue(e); } - void fillPostings(LoadedVector & loaded) override { (void) loaded; } + void load_posting_lists(LoadedVector& loaded) override { (void) loaded; } void fillEnum(LoadedVector & loaded) override; uint64_t getUniqueValueCount() const override; diff --git a/searchlib/src/vespa/searchlib/attribute/floatbase.h b/searchlib/src/vespa/searchlib/attribute/floatbase.h index 892baea742f..fc504652228 100644 --- a/searchlib/src/vespa/searchlib/attribute/floatbase.h +++ b/searchlib/src/vespa/searchlib/attribute/floatbase.h @@ -77,7 +77,7 @@ protected: virtual bool findEnum(T v, EnumHandle & e) const = 0; virtual void fillEnum(LoadedVector&) {} virtual void fillValues(LoadedVector &) {} - virtual void fillPostings(LoadedVector &) {} + virtual void load_posting_lists(LoadedVector&) {} largeint_t getDefaultValue() const override { return static_cast<largeint_t>(-std::numeric_limits<T>::max()); } Change _defaultValue; diff --git a/searchlib/src/vespa/searchlib/attribute/integerbase.h b/searchlib/src/vespa/searchlib/attribute/integerbase.h index e05952db73e..38ed7f491d7 100644 --- a/searchlib/src/vespa/searchlib/attribute/integerbase.h +++ b/searchlib/src/vespa/searchlib/attribute/integerbase.h @@ -90,7 +90,7 @@ protected: virtual bool findEnum(T v, EnumHandle & e) const = 0; virtual void fillEnum(LoadedVector&) {} virtual void fillValues(LoadedVector &) {} - virtual void fillPostings(LoadedVector &) {} + virtual void load_posting_lists(LoadedVector&) {} largeint_t getDefaultValue() const override { return defaultValue(); } bool isUndefined(DocId doc) const override { return get(doc) == defaultValue(); } diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp index 85560a4b48c..c972ad5e207 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericenumattribute.hpp @@ -39,7 +39,7 @@ MultiValueNumericEnumAttribute<B, M>::loadAllAtOnce(AttributeReader & attrReader } attribute::sortLoadedByValue(loaded); - this->fillPostings(loaded); + this->load_posting_lists(loaded); loaded.rewind(); this->fillEnum(loaded); attribute::sortLoadedByDocId(loaded); @@ -71,7 +71,7 @@ MultiValueNumericEnumAttribute<B, M>::onLoadEnumerated(ReaderBase &attrReader) if (numDocs > 0) { this->onAddDoc(numDocs - 1); } - this->fillPostingsFixupEnum(loader); + this->load_posting_lists_and_update_enum_store(loader); } else { auto loader = this->getEnumStore().make_enumerated_loader(); loader.read_unique_values(udatBuffer->buffer(), udatBuffer->size()); diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h index 26cd0aac779..1e22bc1fefa 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.h @@ -72,8 +72,8 @@ private: using PostingParent::_postingList; using PostingParent::clearAllPostings; - using PostingParent::handleFillPostings; - using PostingParent::fillPostingsFixupEnumBase; + using PostingParent::handle_load_posting_lists; + using PostingParent::handle_load_posting_lists_and_update_enum_store; using PostingParent::forwardedOnAddDoc; void freezeEnumDictionary() override; @@ -96,8 +96,8 @@ public: return forwardedOnAddDoc(doc, this->_mvMapping.getNumKeys(), this->_mvMapping.getCapacityKeys()); } - void fillPostings(LoadedVector & loaded) override { - handleFillPostings(loaded); + void load_posting_lists(LoadedVector& loaded) override { + handle_load_posting_lists(loaded); } attribute::IPostingListAttributeBase *getIPostingListAttributeBase() override { @@ -108,8 +108,8 @@ public: return this; } - void fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader& loader) override { - fillPostingsFixupEnumBase(loader); + void load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader) override { + handle_load_posting_lists_and_update_enum_store(loader); } }; diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h index 1a3d6d9bc90..bb90bbe38cb 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.h @@ -73,8 +73,8 @@ private: using PostingParent::_postingList; using PostingParent::clearAllPostings; - using PostingParent::handleFillPostings; - using PostingParent::fillPostingsFixupEnumBase; + using PostingParent::handle_load_posting_lists; + using PostingParent::handle_load_posting_lists_and_update_enum_store; using PostingParent::forwardedOnAddDoc; void freezeEnumDictionary() override; @@ -99,16 +99,16 @@ public: return forwardedOnAddDoc(doc, this->_mvMapping.getNumKeys(), this->_mvMapping.getCapacityKeys()); } - void fillPostings(LoadedVector & loaded) override { - handleFillPostings(loaded); + void load_posting_lists(LoadedVector& loaded) override { + handle_load_posting_lists(loaded); } attribute::IPostingListAttributeBase * getIPostingListAttributeBase() override { return this; } const attribute::IPostingListAttributeBase * getIPostingListAttributeBase() const override { return this; } - void fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader& loader) override { - fillPostingsFixupEnumBase(loader); + void load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader) override { + handle_load_posting_lists_and_update_enum_store(loader); } }; diff --git a/searchlib/src/vespa/searchlib/attribute/numericbase.cpp b/searchlib/src/vespa/searchlib/attribute/numericbase.cpp index cf6c9b5b09e..da9b612b1e1 100644 --- a/searchlib/src/vespa/searchlib/attribute/numericbase.cpp +++ b/searchlib/src/vespa/searchlib/attribute/numericbase.cpp @@ -34,7 +34,7 @@ NumericAttribute::load_enumerated_data(ReaderBase&, } void -NumericAttribute::fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader&) +NumericAttribute::load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader&) { LOG_ABORT("Should not be reached"); } diff --git a/searchlib/src/vespa/searchlib/attribute/numericbase.h b/searchlib/src/vespa/searchlib/attribute/numericbase.h index a02cf2cfeb8..a87407a631d 100644 --- a/searchlib/src/vespa/searchlib/attribute/numericbase.h +++ b/searchlib/src/vespa/searchlib/attribute/numericbase.h @@ -26,7 +26,7 @@ protected: virtual void fillEnum0(const void *src, size_t srcLen, EnumIndexVector &eidxs); virtual void load_enumerated_data(ReaderBase& attrReader, enumstore::EnumeratedPostingsLoader& loader, size_t num_values); virtual void load_enumerated_data(ReaderBase& attrReader, enumstore::EnumeratedLoader& loader); - virtual void fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader& loader); + virtual void load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader); virtual void fixupEnumRefCounts(const EnumVector &enumHist); bool onAddDoc(DocId) override { return true; } diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp index 0db0dde9cc5..ce32d458445 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.cpp @@ -49,7 +49,7 @@ PostingListAttributeBase<P>::clearAllPostings() template <typename P> void -PostingListAttributeBase<P>::fillPostingsFixupEnumBase(enumstore::EnumeratedPostingsLoader& loader) +PostingListAttributeBase<P>::handle_load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader) { clearAllPostings(); uint32_t docIdLimit = _attr.getNumDocs(); @@ -218,7 +218,7 @@ template <typename P, typename LoadedVector, typename LoadedValueType, typename EnumStoreType> void PostingListAttributeSubBase<P, LoadedVector, LoadedValueType, EnumStoreType>:: -handleFillPostings(LoadedVector &loaded) +handle_load_posting_lists(LoadedVector& loaded) { if constexpr (!std::is_same_v<LoadedVector, NoLoadedVector>) { clearAllPostings(); diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h index e17ba2c6ac7..51aee8fc59a 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h @@ -61,7 +61,7 @@ protected: void clearAllPostings(); void disableFreeLists() { _postingList.disableFreeLists(); } void disableElemHoldList() { _postingList.disableElemHoldList(); } - void fillPostingsFixupEnumBase(enumstore::EnumeratedPostingsLoader& loader); + void handle_load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader); bool forwardedOnAddDoc(DocId doc, size_t wantSize, size_t wantCapacity); void clearPostings(attribute::IAttributeVector::EnumHandle eidx, uint32_t fromLid, @@ -92,7 +92,7 @@ public: using Parent::clearAllPostings; using Parent::updatePostings; - using Parent::fillPostingsFixupEnumBase; + using Parent::handle_load_posting_lists_and_update_enum_store; using Parent::clearPostings; using Parent::_postingList; using Parent::_attr; @@ -105,7 +105,7 @@ public: PostingListAttributeSubBase(AttributeVector &attr, EnumStore &enumStore); virtual ~PostingListAttributeSubBase(); - void handleFillPostings(LoadedVector &loaded); + void handle_load_posting_lists(LoadedVector &loaded); void updatePostings(PostingMap &changePost) override; void clearPostings(attribute::IAttributeVector::EnumHandle eidx, uint32_t fromLid, uint32_t toLid) override; }; diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp index 6d160642dd2..95c621bc157 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericenumattribute.hpp @@ -93,7 +93,7 @@ SingleValueNumericEnumAttribute<B>::onLoadEnumerated(ReaderBase &attrReader) if (numDocs > 0) { this->onAddDoc(numDocs - 1); } - this->fillPostingsFixupEnum(loader); + this->load_posting_lists_and_update_enum_store(loader); } else { auto loader = this->getEnumStore().make_enumerated_loader(); loader.read_unique_values(udatBuffer->buffer(), udatBuffer->size()); @@ -136,7 +136,7 @@ SingleValueNumericEnumAttribute<B>::onLoad() } attribute::sortLoadedByValue(loaded); - this->fillPostings(loaded); + this->load_posting_lists(loaded); loaded.rewind(); this->fillEnum(loaded); attribute::sortLoadedByDocId(loaded); diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h index 6f5880a954e..bf4cefd562a 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.h @@ -55,8 +55,8 @@ private: using PostingParent::_postingList; using PostingParent::clearAllPostings; - using PostingParent::handleFillPostings; - using PostingParent::fillPostingsFixupEnumBase; + using PostingParent::handle_load_posting_lists; + using PostingParent::handle_load_posting_lists_and_update_enum_store; using PostingParent::forwardedOnAddDoc; void freezeEnumDictionary() override; @@ -86,10 +86,12 @@ public: forwardedOnAddDoc(docIdLimit, this->_enumIndices.size(), this->_enumIndices.capacity()); } - void fillPostings(LoadedVector & loaded) override { handleFillPostings(loaded); } + void load_posting_lists(LoadedVector& loaded) override { handle_load_posting_lists(loaded); } attribute::IPostingListAttributeBase *getIPostingListAttributeBase() override { return this; } const attribute::IPostingListAttributeBase *getIPostingListAttributeBase() const override { return this; } - void fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader& loader) override { fillPostingsFixupEnumBase(loader); } + void load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader) override { + handle_load_posting_lists_and_update_enum_store(loader); + } }; } // namespace search diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h index d07ea21dd1c..11f85433b74 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.h @@ -58,8 +58,8 @@ private: using PostingParent::_postingList; using PostingParent::clearAllPostings; - using PostingParent::handleFillPostings; - using PostingParent::fillPostingsFixupEnumBase; + using PostingParent::handle_load_posting_lists; + using PostingParent::handle_load_posting_lists_and_update_enum_store; using PostingParent::forwardedOnAddDoc; public: using PostingParent::getPostingList; @@ -97,8 +97,8 @@ public: forwardedOnAddDoc(lidLimit, this->_enumIndices.size(), this->_enumIndices.capacity()); } - void fillPostings(LoadedVector & loaded) override { - handleFillPostings(loaded); + void load_posting_lists(LoadedVector& loaded) override { + handle_load_posting_lists(loaded); } attribute::IPostingListAttributeBase * getIPostingListAttributeBase() override { @@ -109,8 +109,8 @@ public: return this; } - void fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader& loader) override { - fillPostingsFixupEnumBase(loader); + void load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader) override { + handle_load_posting_lists_and_update_enum_store(loader); } }; diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp index 52bde8ae411..65976690307 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.cpp +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.cpp @@ -342,7 +342,7 @@ StringAttribute::onLoadEnumerated(ReaderBase &attrReader) if (numDocs > 0) { onAddDoc(numDocs - 1); } - fillPostingsFixupEnum(loader); + load_posting_lists_and_update_enum_store(loader); } else { auto loader = this->getEnumStoreBase()->make_enumerated_loader(); loader.read_unique_values(udatBuffer->buffer(), udatBuffer->size()); @@ -372,7 +372,7 @@ StringAttribute::onAddDoc(DocId ) return false; } -void StringAttribute::fillPostings(LoadedVector &) +void StringAttribute::load_posting_lists(LoadedVector&) { } @@ -403,7 +403,7 @@ StringAttribute::load_enumerated_data(ReaderBase&, enumstore::EnumeratedLoader&) } void -StringAttribute::fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader&) +StringAttribute::load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader&) { LOG_ABORT("Should not be reached"); } diff --git a/searchlib/src/vespa/searchlib/attribute/stringbase.h b/searchlib/src/vespa/searchlib/attribute/stringbase.h index 7858c707315..4278ff23911 100644 --- a/searchlib/src/vespa/searchlib/attribute/stringbase.h +++ b/searchlib/src/vespa/searchlib/attribute/stringbase.h @@ -74,14 +74,14 @@ protected: virtual vespalib::MemoryUsage getChangeVectorMemoryUsage() const override; private: - virtual void fillPostings(LoadedVector & loaded); + virtual void load_posting_lists(LoadedVector& loaded); virtual void fillEnum(LoadedVector & loaded); virtual void fillValues(LoadedVector & loaded); virtual void fillEnum0(const void *src, size_t srcLen, EnumIndexVector &eidxs); virtual void load_enumerated_data(ReaderBase &attrReader, enumstore::EnumeratedPostingsLoader& loader, size_t num_values); virtual void load_enumerated_data(ReaderBase &attrReader, enumstore::EnumeratedLoader& loader); - virtual void fillPostingsFixupEnum(enumstore::EnumeratedPostingsLoader& loader); + virtual void load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader); virtual void fixupEnumRefCounts(const EnumVector &enumHist); largeint_t getInt(DocId doc) const override { return strtoll(get(doc), NULL, 0); } |