diff options
Diffstat (limited to 'searchlib')
6 files changed, 13 insertions, 14 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp index 3e85b8021b7..6c6b7f3200e 100644 --- a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp +++ b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.cpp @@ -41,9 +41,9 @@ EnumStoreDictionary<DictionaryT>::getNumUniques() const template <typename DictionaryT> void -EnumStoreDictionary<DictionaryT>::fixupRefCounts(const EnumVector& hist) +EnumStoreDictionary<DictionaryT>::set_ref_counts(const EnumVector &hist) { - _enumStore.fixupRefCounts(hist, this->_dict); + _enumStore.set_ref_counts(hist, this->_dict); } template <typename DictionaryT> diff --git a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.h b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.h index 05c3366b1d1..f2ab7a0fa9e 100644 --- a/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.h +++ b/searchlib/src/vespa/searchlib/attribute/enum_store_dictionary.h @@ -33,7 +33,7 @@ public: DictionaryT &getDictionary() { return this->_dict; } uint32_t getNumUniques() const override; - void fixupRefCounts(const EnumVector& hist) override; + void set_ref_counts(const EnumVector &hist) override; void removeUnusedEnums(const IndexSet& unused, const datastore::EntryComparator& cmp); diff --git a/searchlib/src/vespa/searchlib/attribute/enum_store_loaders.cpp b/searchlib/src/vespa/searchlib/attribute/enum_store_loaders.cpp index f98dbcd5675..98560061be4 100644 --- a/searchlib/src/vespa/searchlib/attribute/enum_store_loaders.cpp +++ b/searchlib/src/vespa/searchlib/attribute/enum_store_loaders.cpp @@ -28,7 +28,7 @@ EnumeratedLoader::EnumeratedLoader(IEnumStore& store) void EnumeratedLoader::set_ref_counts() { - _store.fixupRefCounts(_enums_histogram); + _store.set_ref_counts(_enums_histogram); } EnumeratedPostingsLoader::EnumeratedPostingsLoader(IEnumStore& store) @@ -46,7 +46,7 @@ EnumeratedPostingsLoader::is_folded_change(const Index& lhs, const Index& rhs) c void EnumeratedPostingsLoader::set_ref_count(Index idx, uint32_t ref_count) { - _store.fixupRefCount(idx, ref_count); + _store.set_ref_count(idx, ref_count); } void diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h index c41794726ac..e16479072a2 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstore.h +++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h @@ -79,9 +79,8 @@ public: void incRefCount(Index idx) { return get_entry_base(idx).inc_ref_count(); } // Only use when reading from enumerated attribute save files - // TODO: Instead create an API that is used for loading/initializing. - void fixupRefCount(Index idx, uint32_t refCount) override { - get_entry_base(idx).set_ref_count(refCount); + void set_ref_count(Index idx, uint32_t ref_count) override { + get_entry_base(idx).set_ref_count(ref_count); } uint32_t getNumUniques() const override { return _dict->getNumUniques(); } @@ -96,7 +95,7 @@ public: ssize_t load_unique_values(const void* src, size_t available, IndexVector& idx) override; - void fixupRefCounts(const EnumVector &hist) override { _dict->fixupRefCounts(hist); } + void set_ref_counts(const EnumVector& hist) override { _dict->set_ref_counts(hist); } void freezeTree() { _store.freeze(); } IEnumStoreDictionary &getEnumStoreDict() override { return *_dict; } diff --git a/searchlib/src/vespa/searchlib/attribute/i_enum_store.h b/searchlib/src/vespa/searchlib/attribute/i_enum_store.h index a5a888f10e7..4edc30dae45 100644 --- a/searchlib/src/vespa/searchlib/attribute/i_enum_store.h +++ b/searchlib/src/vespa/searchlib/attribute/i_enum_store.h @@ -54,8 +54,8 @@ public: virtual void write_value(BufferWriter& writer, Index idx) const = 0; virtual ssize_t load_unique_values(const void* src, size_t available, IndexVector& idx) = 0; - virtual void fixupRefCount(Index idx, uint32_t refCount) = 0; - virtual void fixupRefCounts(const EnumVector& histogram) = 0; + virtual void set_ref_count(Index idx, uint32_t ref_count) = 0; + virtual void set_ref_counts(const EnumVector &histogram) = 0; virtual void freeUnusedEnum(Index idx, IndexSet& unused) = 0; virtual void freeUnusedEnums() = 0; virtual bool foldedChange(const Index& idx1, const Index& idx2) const = 0; @@ -82,7 +82,7 @@ public: virtual std::unique_ptr<Enumerator> make_enumerator() const = 0; template <typename TreeT> - void fixupRefCounts(const EnumVector& hist, TreeT& tree) { + void set_ref_counts(const EnumVector& hist, TreeT& tree) { if (hist.empty()) { return; } @@ -91,7 +91,7 @@ public: for (HistIT hi(hist.begin()), hie(hist.end()); hi != hie; ++hi, ++ti) { assert(ti.valid()); - fixupRefCount(ti.getKey(), *hi); + set_ref_count(ti.getKey(), *hi); } assert(!ti.valid()); freeUnusedEnums(); diff --git a/searchlib/src/vespa/searchlib/attribute/i_enum_store_dictionary.h b/searchlib/src/vespa/searchlib/attribute/i_enum_store_dictionary.h index 15b351b7b33..e70b059b7c9 100644 --- a/searchlib/src/vespa/searchlib/attribute/i_enum_store_dictionary.h +++ b/searchlib/src/vespa/searchlib/attribute/i_enum_store_dictionary.h @@ -39,7 +39,7 @@ public: virtual uint32_t getNumUniques() const = 0; - virtual void fixupRefCounts(const EnumVector& hist) = 0; + virtual void set_ref_counts(const EnumVector& hist) = 0; virtual void freeUnusedEnums(const datastore::EntryComparator& cmp) = 0; virtual void freeUnusedEnums(const IndexSet& toRemove, const datastore::EntryComparator& cmp) = 0; |