diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-10-12 13:10:17 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-10-12 13:38:48 +0000 |
commit | 10c830d6c43ca29cb13842ce41dfdc32c8a88969 (patch) | |
tree | 41fa6baa300b2d28b988d57e41187bf31ed4584a /searchlib/src | |
parent | 462073020110f8343553cdbc1d5e264c67942c7d (diff) |
Rename clearHoldLists() -> reclaim_all_memory().
Diffstat (limited to 'searchlib/src')
8 files changed, 11 insertions, 11 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 41369853c97..b89a3827cc2 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 @@ -135,7 +135,7 @@ DocumentWeightOrFilterSearchTest::~DocumentWeightOrFilterSearchTest() _postings.clear(tree); } _postings.clearBuilder(); - _postings.clearHoldLists(); + _postings.reclaim_all_memory(); inc_generation(); } diff --git a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp index 64cb6a6c146..cb9fa8522a8 100644 --- a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp +++ b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp @@ -58,7 +58,7 @@ public: DirectTensorStoreTest() : store() {} virtual ~DirectTensorStoreTest() { - store.clearHoldLists(); + store.reclaim_all_memory(); } void expect_tensor(const Value* exp, EntryRef ref) { diff --git a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h index 1359fde71a7..5f5e782a382 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h @@ -207,7 +207,7 @@ public: 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();} + void reclaim_all_memory() { _store.reclaim_all_memory();} std::unique_ptr<vespalib::datastore::CompactingBuffers> start_compact(); vespalib::MemoryUsage getMemoryUsage() const { return _store.getMemoryUsage(); } vespalib::datastore::MemoryStats getMemStats() const { return _store.getMemStats(); } diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp index 2c1fdf4038f..c6f640d72ed 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp @@ -54,17 +54,17 @@ SimpleIndex<Posting, Key, DocId>::~SimpleIndex() { _vector_posting_lists.disableElemHoldList(); _vector_posting_lists.clear(); _vector_posting_lists.getAllocator().freeze(); - _vector_posting_lists.getAllocator().clearHoldLists(); + _vector_posting_lists.getAllocator().reclaim_all_memory(); _dictionary.disableFreeLists(); _dictionary.disableElemHoldList(); _dictionary.clear(); _dictionary.getAllocator().freeze(); - _dictionary.getAllocator().clearHoldLists(); + _dictionary.getAllocator().reclaim_all_memory(); _btree_posting_lists.clearBuilder(); _btree_posting_lists.freeze(); - _btree_posting_lists.clearHoldLists(); + _btree_posting_lists.reclaim_all_memory(); } template <typename Posting, typename Key, typename DocId> diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp index cd0fc0b88e9..6a47e0da5df 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp @@ -173,7 +173,7 @@ DenseTensorAttribute::DenseTensorAttribute(vespalib::stringref baseFileName, con DenseTensorAttribute::~DenseTensorAttribute() { getGenerationHolder().reclaim_all(); - _tensorStore.clearHoldLists(); + _tensorStore.reclaim_all_memory(); } uint32_t diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp index a68f7fcc3da..22db5dc5b47 100644 --- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp @@ -16,7 +16,7 @@ DirectTensorAttribute::DirectTensorAttribute(stringref name, const Config &cfg) DirectTensorAttribute::~DirectTensorAttribute() { getGenerationHolder().reclaim_all(); - _tensorStore.clearHoldLists(); + _tensorStore.reclaim_all_memory(); } void diff --git a/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp index d2153ac93ad..bb1c1a3d880 100644 --- a/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/serialized_fast_value_attribute.cpp @@ -24,7 +24,7 @@ SerializedFastValueAttribute::SerializedFastValueAttribute(stringref name, const SerializedFastValueAttribute::~SerializedFastValueAttribute() { getGenerationHolder().reclaim_all(); - _tensorStore.clearHoldLists(); + _tensorStore.reclaim_all_memory(); } void diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_store.h b/searchlib/src/vespa/searchlib/tensor/tensor_store.h index 3f2b408c667..53551bc48fa 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_store.h +++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.h @@ -57,8 +57,8 @@ public: _store.assign_generation(current_gen); } - void clearHoldLists() { - _store.clearHoldLists(); + void reclaim_all_memory() { + _store.reclaim_all_memory(); } vespalib::MemoryUsage getMemoryUsage() const { |