diff options
Diffstat (limited to 'searchlib')
39 files changed, 72 insertions, 72 deletions
diff --git a/searchlib/src/tests/attribute/document_weight_or_filter_search/document_weight_or_filter_search_test.cpp b/searchlib/src/tests/attribute/document_weight_or_filter_search/document_weight_or_filter_search_test.cpp index fded2295ef6..41369853c97 100644 --- a/searchlib/src/tests/attribute/document_weight_or_filter_search/document_weight_or_filter_search_test.cpp +++ b/searchlib/src/tests/attribute/document_weight_or_filter_search/document_weight_or_filter_search_test.cpp @@ -146,7 +146,7 @@ DocumentWeightOrFilterSearchTest::inc_generation() _postings.assign_generation(_gens.getCurrentGeneration()); _gens.incGeneration(); _gens.update_oldest_used_generation(); - _postings.trimHoldLists(_gens.get_oldest_used_generation()); + _postings.reclaim_memory(_gens.get_oldest_used_generation()); } TEST_F(DocumentWeightOrFilterSearchTest, daat_or) diff --git a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp index 64730871d9d..9d717202551 100644 --- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp +++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp @@ -149,7 +149,7 @@ TEST("requireThatComparatorWithTreeIsWorking") m.freeze(); m.assign_generation(g.getCurrentGeneration()); g.incGeneration(); - m.trimHoldLists(g.get_oldest_used_generation()); + m.reclaim_memory(g.get_oldest_used_generation()); } TEST("requireThatFoldedLessIsWorking") diff --git a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp index 8a9e053a612..0542a253cc5 100644 --- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp +++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp @@ -346,7 +346,7 @@ TEST(EnumStoreTest, test_hold_lists_and_generation) checkReaders(ses, readers); ses.assign_generation(sesGen); - ses.trim_hold_lists(sesGen + 1); + ses.reclaim_memory(sesGen + 1); } void @@ -358,7 +358,7 @@ dec_ref_count(NumericEnumStore& store, NumericEnumStore::Index idx) generation_t gen = 5; store.assign_generation(gen); - store.trim_hold_lists(gen + 1); + store.reclaim_memory(gen + 1); } TEST(EnumStoreTest, address_space_usage_is_reported) @@ -884,7 +884,7 @@ void inc_generation(generation_t &gen, NumericEnumStore &store) store.freeze_dictionary(); store.assign_generation(gen); ++gen; - store.trim_hold_lists(gen); + store.reclaim_memory(gen); } } diff --git a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp index 19dd94c5f3c..938a7fb35d7 100644 --- a/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp +++ b/searchlib/src/tests/attribute/multi_value_mapping/multi_value_mapping_test.cpp @@ -42,7 +42,7 @@ class MyAttribute : public search::NotImplementedAttribute setNumDocs(committedDocIdLimit); } virtual void removeOldGenerations(generation_t firstUsed) override { - _mvMapping.trimHoldLists(firstUsed); + _mvMapping.reclaim_memory(firstUsed); } virtual void onGenerationChange(generation_t generation) override { _mvMapping.assign_generation(generation - 1); @@ -116,7 +116,7 @@ public: EXPECT_EQ(exp, std::vector<EntryT>(act.cbegin(), act.cend())); } void assign_generation(generation_t current_gen) { _mvMapping->assign_generation(current_gen); } - void trimHoldLists(generation_t firstUsed) { _mvMapping->trimHoldLists(firstUsed); } + void reclaim_memory(generation_t oldest_used_gen) { _mvMapping->reclaim_memory(oldest_used_gen); } void addDocs(uint32_t numDocs) { for (uint32_t i = 0; i < numDocs; ++i) { uint32_t doc = 0; @@ -248,9 +248,9 @@ TEST_F(IntMappingTest, test_that_old_value_is_not_overwritten_while_held) assign_generation(10); assertArray({5}, old3); assertGet(3, {7}); - trimHoldLists(10); + reclaim_memory(10); assertArray({5}, old3); - trimHoldLists(11); + reclaim_memory(11); assertArray({0}, old3); } diff --git a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp index 5b07c0120bf..75e7faf0227 100644 --- a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp +++ b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp @@ -67,8 +67,8 @@ protected: _value_store.assign_generation(_gen_handler.getCurrentGeneration()); _store.assign_generation(_gen_handler.getCurrentGeneration()); _gen_handler.incGeneration(); - _value_store.trim_hold_lists(_gen_handler.get_oldest_used_generation()); - _store.trimHoldLists(_gen_handler.get_oldest_used_generation()); + _value_store.reclaim_memory(_gen_handler.get_oldest_used_generation()); + _store.reclaim_memory(_gen_handler.get_oldest_used_generation()); } EntryRef add_sequence(int start_key, int end_key) diff --git a/searchlib/src/tests/attribute/postinglist/postinglist.cpp b/searchlib/src/tests/attribute/postinglist/postinglist.cpp index 0c0187eb8de..e41aaec351e 100644 --- a/searchlib/src/tests/attribute/postinglist/postinglist.cpp +++ b/searchlib/src/tests/attribute/postinglist/postinglist.cpp @@ -263,8 +263,8 @@ AttributePostingListTest::freeTree(bool verbose) _intPostings->clearBuilder(); _intPostings->assign_generation(_handler.getCurrentGeneration()); _handler.incGeneration(); - _intNodeAlloc->trimHoldLists(_handler.get_oldest_used_generation()); - _intPostings->trimHoldLists(_handler.get_oldest_used_generation()); + _intNodeAlloc->reclaim_memory(_handler.get_oldest_used_generation()); + _intPostings->reclaim_memory(_handler.get_oldest_used_generation()); LOG(info, "freeTree after unhold: %" PRIu64 " (%" PRIu64 " held)", static_cast<uint64_t>(_intNodeAlloc->getMemoryUsage().allocatedBytes()), @@ -615,7 +615,7 @@ AttributePostingListTest::doCompactEnumStore(Tree &tree, generation_t generation = _handler.getCurrentGeneration(); valueHandle.assign_generation(generation); _handler.incGeneration(); - valueHandle.trimHoldLists(_handler.get_oldest_used_generation()); + valueHandle.reclaim_memory(_handler.get_oldest_used_generation()); LOG(info, "doCompactEnumStore done"); @@ -672,8 +672,8 @@ removeOldGenerations(Tree &tree, { (void) tree; (void) valueHandle; - postingsAlloc.trimHoldLists(_handler.get_oldest_used_generation()); - postings.trimHoldLists(_handler.get_oldest_used_generation()); + postingsAlloc.reclaim_memory(_handler.get_oldest_used_generation()); + postings.reclaim_memory(_handler.get_oldest_used_generation()); } int diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp index 5c6d9d42cf2..9127c4b59fc 100644 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp @@ -224,8 +224,8 @@ public: void assign_generation(generation_t current_gen) override { _transfer_gen = current_gen; } - void trim_hold_lists(generation_t first_used_gen) override { - _trim_gen = first_used_gen; + void reclaim_memory(generation_t oldest_used_gen) override { + _trim_gen = oldest_used_gen; } bool consider_compact(const CompactionStrategy&) override { return false; diff --git a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp index 9526b65846d..958423860e5 100644 --- a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp +++ b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp @@ -102,7 +102,7 @@ public: index->assign_generation(gen_handler.getCurrentGeneration()); gen_handler.incGeneration(); gen_handler.update_oldest_used_generation(); - index->trim_hold_lists(gen_handler.get_oldest_used_generation()); + index->reclaim_memory(gen_handler.get_oldest_used_generation()); } void set_filter(std::vector<uint32_t> docids) { uint32_t sz = 10; diff --git a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp index 428e6654039..47812c2a63c 100644 --- a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp +++ b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp @@ -270,7 +270,7 @@ public: index->assign_generation(gen_handler.getCurrentGeneration()); gen_handler.incGeneration(); gen_handler.update_oldest_used_generation(); - index->trim_hold_lists(gen_handler.get_oldest_used_generation()); + index->reclaim_memory(gen_handler.get_oldest_used_generation()); std::lock_guard<std::mutex> guard(in_progress_lock); in_progress->clearBit(docid); // printf("commit: %u\n", docid); diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h index 53044fa5511..0a0b2040b2a 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstore.h +++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h @@ -97,7 +97,7 @@ public: vespalib::AddressSpace get_values_address_space_usage() const override; void assign_generation(generation_t current_gen); - void trim_hold_lists(generation_t first_used); + void reclaim_memory(generation_t first_used); ssize_t load_unique_values(const void* src, size_t available, IndexVector& idx) override; diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp index ef87c55f4cc..b863e56fb4a 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp +++ b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp @@ -111,10 +111,10 @@ EnumStoreT<EntryT>::assign_generation(generation_t current_gen) template <typename EntryT> void -EnumStoreT<EntryT>::trim_hold_lists(generation_t firstUsed) +EnumStoreT<EntryT>::reclaim_memory(generation_t oldest_used_gen) { // remove generations in the range [0, firstUsed> - _store.trimHoldLists(firstUsed); + _store.reclaim_memory(oldest_used_gen); } template <typename EntryT> diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h index 2468a58211c..98587baadd2 100644 --- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h +++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h @@ -49,7 +49,7 @@ public: ReadView make_read_view(size_t read_size) const { return ReadView(_indices.make_read_view(read_size), &_store); } // Pass on hold list management to underlying store void assign_generation(generation_t current_gen) { _store.assign_generation(current_gen); } - void trimHoldLists(generation_t firstUsed) { _store.trimHoldLists(firstUsed); } + void reclaim_memory(generation_t oldest_used_gen) { _store.reclaim_memory(oldest_used_gen); } void prepareLoadFromMultiValue() { _store.setInitializing(true); } void doneLoadFromMultiValue() { _store.setInitializing(false); } diff --git a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp index 6b0f4290d69..ad827d0fd85 100644 --- a/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multienumattribute.hpp @@ -196,8 +196,8 @@ template <typename B, typename M> void MultiValueEnumAttribute<B, M>::removeOldGenerations(generation_t firstUsed) { - this->_enumStore.trim_hold_lists(firstUsed); - this->_mvMapping.trimHoldLists(firstUsed); + this->_enumStore.reclaim_memory(firstUsed); + this->_mvMapping.reclaim_memory(firstUsed); } template <typename B, typename M> diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp index c98a236e6d7..2405841f331 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattribute.hpp @@ -98,7 +98,7 @@ void MultiValueNumericAttribute<B, M>::setNewValues(DocId doc, const std::vector template <typename B, typename M> void MultiValueNumericAttribute<B, M>::removeOldGenerations(generation_t firstUsed) { - this->_mvMapping.trimHoldLists(firstUsed); + this->_mvMapping.reclaim_memory(firstUsed); } diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp index 41dbc0aff40..70a438f1551 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp @@ -59,7 +59,7 @@ void MultiValueNumericPostingAttribute<B, M>::removeOldGenerations(generation_t firstUsed) { MultiValueNumericEnumAttribute<B, M>::removeOldGenerations(firstUsed); - _postingList.trimHoldLists(firstUsed); + _postingList.reclaim_memory(firstUsed); } template <typename B, typename M> diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp index 252e71d0dde..9bc2c31b163 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp @@ -78,7 +78,7 @@ void MultiValueStringPostingAttributeT<B, T>::removeOldGenerations(generation_t firstUsed) { MultiValueStringAttributeT<B, T>::removeOldGenerations(firstUsed); - _postingList.trimHoldLists(firstUsed); + _postingList.reclaim_memory(firstUsed); } template <typename B, typename T> diff --git a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp index ff27adeb24a..8593b013443 100644 --- a/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/predicate_attribute.cpp @@ -128,7 +128,7 @@ void PredicateAttribute::removeOldGenerations(generation_t firstUsed) { getGenerationHolder().reclaim(firstUsed); - _index->trimHoldLists(firstUsed); + _index->reclaim_memory(firstUsed); } void diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp index ca25e2068a2..aa884e1e298 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp @@ -163,8 +163,8 @@ ReferenceAttribute::clearDoc(DocId doc) void ReferenceAttribute::removeOldGenerations(generation_t firstUsed) { - _referenceMappings.trimHoldLists(firstUsed); - _store.trimHoldLists(firstUsed); + _referenceMappings.reclaim_memory(firstUsed); + _store.reclaim_memory(firstUsed); getGenerationHolder().reclaim(firstUsed); } diff --git a/searchlib/src/vespa/searchlib/attribute/reference_mappings.h b/searchlib/src/vespa/searchlib/attribute/reference_mappings.h index 50f6b9188f3..cf26b424208 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_mappings.h +++ b/searchlib/src/vespa/searchlib/attribute/reference_mappings.h @@ -59,7 +59,7 @@ public: void clearMapping(const Reference &entry); // Hold list management & freezing - void trimHoldLists(generation_t usedGen) { _reverseMapping.trimHoldLists(usedGen); } + void reclaim_memory(generation_t oldest_used_gen) { _reverseMapping.reclaim_memory(oldest_used_gen); } void freeze() { _reverseMapping.freeze(); } void assign_generation(generation_t current_gen) { _reverseMapping.assign_generation(current_gen); } diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp index 0086b1b3455..f0649224b89 100644 --- a/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singleenumattribute.hpp @@ -266,7 +266,7 @@ template <typename B> void SingleValueEnumAttribute<B>::removeOldGenerations(generation_t firstUsed) { - this->_enumStore.trim_hold_lists(firstUsed); + this->_enumStore.reclaim_memory(firstUsed); getGenerationHolder().reclaim(firstUsed); } diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp index dfd66bbbf04..c5acc0c360a 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp @@ -130,7 +130,7 @@ void SingleValueNumericPostingAttribute<B>::removeOldGenerations(generation_t firstUsed) { SingleValueNumericEnumAttribute<B>::removeOldGenerations(firstUsed); - _postingList.trimHoldLists(firstUsed); + _postingList.reclaim_memory(firstUsed); } template <typename B> diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp index 3bb26b61ba9..5e7b70b5080 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp @@ -130,7 +130,7 @@ void SingleValueStringPostingAttributeT<B>::removeOldGenerations(generation_t firstUsed) { SingleValueStringAttributeT<B>::removeOldGenerations(firstUsed); - _postingList.trimHoldLists(firstUsed); + _postingList.reclaim_memory(firstUsed); } template <typename B> diff --git a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h index db917423bf9..1359fde71a7 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h @@ -205,7 +205,7 @@ public: const std::vector<PosOccFieldsParams> &getFieldsParams() const { return _fieldsParams; } - void trimHoldLists(generation_t usedGen) { _store.trimHoldLists(usedGen); } + void reclaim_memory(generation_t oldest_used_gen) { _store.reclaim_memory(oldest_used_gen); } void assign_generation(generation_t current_gen) { _store.assign_generation(current_gen); } void clearHoldLists() { _store.clearHoldLists();} std::unique_ptr<vespalib::datastore::CompactingBuffers> start_compact(); diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp index 7e6c53e627c..4be3031303e 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp @@ -74,7 +74,7 @@ FieldIndex<interleaved_features>::~FieldIndex() freeze(); // Flush pending freeze for dictionary tree. assign_generation(); incGeneration(); - trimHoldLists(); + reclaim_memory(); } template <bool interleaved_features> diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.h b/searchlib/src/vespa/searchlib/memoryindex/field_index.h index 0efb3cbe13f..187ec5ee971 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.h @@ -52,12 +52,12 @@ private: _dict.getAllocator().freeze(); } - void trimHoldLists() { - GenerationHandler::generation_t usedGen = + void reclaim_memory() { + GenerationHandler::generation_t oldest_used_gen = _generationHandler.get_oldest_used_generation(); - _postingListStore.trimHoldLists(usedGen); - _dict.getAllocator().trimHoldLists(usedGen); - _featureStore.trimHoldLists(usedGen); + _postingListStore.reclaim_memory(oldest_used_gen); + _dict.getAllocator().reclaim_memory(oldest_used_gen); + _featureStore.reclaim_memory(oldest_used_gen); } void assign_generation() { @@ -92,7 +92,7 @@ public: freeze(); assign_generation(); incGeneration(); - trimHoldLists(); + reclaim_memory(); } /** diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp index 36312950867..f21ca1b11cc 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp @@ -213,11 +213,11 @@ PredicateIndex::commit() { } void -PredicateIndex::trimHoldLists(generation_t used_generation) { - _interval_index.trimHoldLists(used_generation); - _bounds_index.trimHoldLists(used_generation); - _interval_store.trimHoldLists(used_generation); - _zero_constraint_docs.getAllocator().trimHoldLists(used_generation); +PredicateIndex::reclaim_memory(generation_t oldest_used_gen) { + _interval_index.reclaim_memory(oldest_used_gen); + _bounds_index.reclaim_memory(oldest_used_gen); + _interval_store.reclaim_memory(oldest_used_gen); + _zero_constraint_docs.getAllocator().reclaim_memory(oldest_used_gen); } void diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.h b/searchlib/src/vespa/searchlib/predicate/predicate_index.h index b6e67961cdc..238314e17f9 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_index.h +++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.h @@ -73,7 +73,7 @@ public: void indexDocument(uint32_t doc_id, const PredicateTreeAnnotations &annotations); void removeDocument(uint32_t doc_id); void commit(); - void trimHoldLists(generation_t used_generation); + void reclaim_memory(generation_t oldest_used_gen); void assign_generation(generation_t current_gen); vespalib::MemoryUsage getMemoryUsage() const; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp index 4def6cf0725..af809b2fa69 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp @@ -100,8 +100,8 @@ PredicateIntervalStore::remove(EntryRef ref) { } void -PredicateIntervalStore::trimHoldLists(generation_t used_generation) { - _store.trimHoldLists(used_generation); +PredicateIntervalStore::reclaim_memory(generation_t oldest_used_gen) { + _store.reclaim_memory(oldest_used_gen); } void diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h index af14755292e..a96c208393d 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h +++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h @@ -71,7 +71,7 @@ public: */ void remove(vespalib::datastore::EntryRef ref); - void trimHoldLists(generation_t used_generation); + void reclaim_memory(generation_t oldest_used_gen); void assign_generation(generation_t current_gen); diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.h b/searchlib/src/vespa/searchlib/predicate/simple_index.h index be5229c35aa..d49e42a1e35 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.h +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.h @@ -187,7 +187,7 @@ public: // (and after doc id limits values are determined) to promote posting lists to vectors. void promoteOverThresholdVectors(); void commit(); - void trimHoldLists(generation_t used_generation); + void reclaim_memory(generation_t oldest_used_gen); void assign_generation(generation_t current_gen); vespalib::MemoryUsage getMemoryUsage() const; template <typename FunctionType> diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp index 7b4cfa1c55d..2c1fdf4038f 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp @@ -291,10 +291,10 @@ SimpleIndex<Posting, Key, DocId>::commit() { template <typename Posting, typename Key, typename DocId> void -SimpleIndex<Posting, Key, DocId>::trimHoldLists(generation_t used_generation) { - _btree_posting_lists.trimHoldLists(used_generation); - _dictionary.getAllocator().trimHoldLists(used_generation); - _vector_posting_lists.getAllocator().trimHoldLists(used_generation); +SimpleIndex<Posting, Key, DocId>::reclaim_memory(generation_t oldest_used_gen) { + _btree_posting_lists.reclaim_memory(oldest_used_gen); + _dictionary.getAllocator().reclaim_memory(oldest_used_gen); + _vector_posting_lists.getAllocator().reclaim_memory(oldest_used_gen); } diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp index 11366952ad2..cd0fc0b88e9 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp @@ -465,7 +465,7 @@ DenseTensorAttribute::removeOldGenerations(generation_t first_used_gen) { TensorAttribute::removeOldGenerations(first_used_gen); if (_index) { - _index->trim_hold_lists(first_used_gen); + _index->reclaim_memory(first_used_gen); } } diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp index 4afdbf12ae5..d505e939a34 100644 --- a/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp +++ b/searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp @@ -521,11 +521,11 @@ HnswIndex::assign_generation(generation_t current_gen) } void -HnswIndex::trim_hold_lists(generation_t first_used_gen) +HnswIndex::reclaim_memory(generation_t oldest_used_gen) { - _graph.node_refs.removeOldGenerations(first_used_gen); - _graph.nodes.trimHoldLists(first_used_gen); - _graph.links.trimHoldLists(first_used_gen); + _graph.node_refs.removeOldGenerations(oldest_used_gen); + _graph.nodes.reclaim_memory(oldest_used_gen); + _graph.links.reclaim_memory(oldest_used_gen); } void diff --git a/searchlib/src/vespa/searchlib/tensor/hnsw_index.h b/searchlib/src/vespa/searchlib/tensor/hnsw_index.h index 04abb197cb9..8a7422907ea 100644 --- a/searchlib/src/vespa/searchlib/tensor/hnsw_index.h +++ b/searchlib/src/vespa/searchlib/tensor/hnsw_index.h @@ -188,7 +188,7 @@ public: void complete_add_document(uint32_t docid, std::unique_ptr<PrepareResult> prepare_result) override; void remove_document(uint32_t docid) override; void assign_generation(generation_t current_gen) override; - void trim_hold_lists(generation_t first_used_gen) override; + void reclaim_memory(generation_t oldest_used_gen) override; void compact_level_arrays(CompactionSpec compaction_spec, const CompactionStrategy& compaction_strategy); void compact_link_arrays(CompactionSpec compaction_spec, const CompactionStrategy& compaction_strategy); bool consider_compact_level_arrays(const CompactionStrategy& compaction_strategy); diff --git a/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index.h b/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index.h index 74e0c3e0d18..d40803dcafd 100644 --- a/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index.h +++ b/searchlib/src/vespa/searchlib/tensor/nearest_neighbor_index.h @@ -69,7 +69,7 @@ public: virtual void remove_document(uint32_t docid) = 0; virtual void assign_generation(generation_t current_gen) = 0; - virtual void trim_hold_lists(generation_t first_used_gen) = 0; + virtual void reclaim_memory(generation_t first_used_gen) = 0; virtual bool consider_compact(const CompactionStrategy& compaction_strategy) = 0; virtual vespalib::MemoryUsage update_stat(const CompactionStrategy& compaction_strategy) = 0; virtual vespalib::MemoryUsage memory_usage() const = 0; diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp index cb1668dae3c..1d147c14cca 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute.cpp @@ -112,7 +112,7 @@ TensorAttribute::onUpdateStat() void TensorAttribute::removeOldGenerations(generation_t firstUsed) { - _tensorStore.trimHoldLists(firstUsed); + _tensorStore.reclaim_memory(firstUsed); getGenerationHolder().reclaim(firstUsed); } diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_store.h b/searchlib/src/vespa/searchlib/tensor/tensor_store.h index 9ff6b7ffddd..3f2b408c667 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_store.h +++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.h @@ -48,8 +48,8 @@ public: virtual bool encode_stored_tensor(EntryRef ref, vespalib::nbostream& target) const = 0; // Inherit doc from DataStoreBase - void trimHoldLists(generation_t usedGen) { - _store.trimHoldLists(usedGen); + void reclaim_memory(generation_t oldest_used_gen) { + _store.reclaim_memory(oldest_used_gen); } // Inherit doc from DataStoreBase diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp index a57cd36b3b1..e918c523fcf 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp @@ -182,9 +182,9 @@ FakeMemTreeOccMgr::incGeneration() void -FakeMemTreeOccMgr::trimHoldLists() +FakeMemTreeOccMgr::reclaim_memory() { - _allocator.trimHoldLists(_generationHandler.get_oldest_used_generation()); + _allocator.reclaim_memory(_generationHandler.get_oldest_used_generation()); } @@ -194,7 +194,7 @@ FakeMemTreeOccMgr::sync() freeze(); assign_generation(); incGeneration(); - trimHoldLists(); + reclaim_memory(); } diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h index 4081070d8f8..290ba1cf140 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.h @@ -96,7 +96,7 @@ public: void freeze(); void assign_generation(); void incGeneration(); - void trimHoldLists(); + void reclaim_memory(); void sync(); void add(uint32_t wordIdx, index::DocIdAndFeatures &features) override; void remove(uint32_t wordIdx, uint32_t docId) override; |