Rename clearHoldLists() -> reclaim_all_memory().

18 files changed, 25 insertions, 25 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 {
diff --git a/vespalib/src/vespa/vespalib/btree/btree.hpp b/vespalib/src/vespa/vespalib/btree/btree.hpp
index c6d8886254d..81687b6e62d 100644
--- a/vespalib/src/vespa/vespalib/btree/btree.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btree.hpp
@@ -20,7 +20,7 @@ BTree<KeyT, DataT, AggrT, CompareT, TraitsT, AggrCalcT>::~BTree()
 {
     clear();
     _alloc.freeze();
-    _alloc.clearHoldLists();
+    _alloc.reclaim_all_memory();
 }
 
 template <typename KeyT, typename DataT, typename AggrT, typename CompareT,
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h
index f803fce26b6..77900edf848 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h
+++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h
@@ -111,7 +111,7 @@ public:
      */
     void assign_generation(generation_t current_gen);
 
-    void clearHoldLists();
+    void reclaim_all_memory();
 
     static bool isValidRef(BTreeNode::Ref ref) { return NodeStore::isValidRef(ref); }
 
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp
index 8c10538acf7..4968bbaf4a7 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp
@@ -285,9 +285,9 @@ template <typename KeyT, typename DataT, typename AggrT,
           size_t INTERNAL_SLOTS, size_t LEAF_SLOTS>
 void
 BTreeNodeAllocator<KeyT, DataT, AggrT, INTERNAL_SLOTS, LEAF_SLOTS>::
-clearHoldLists()
+reclaim_all_memory()
 {
-    _nodeStore.clearHoldLists();
+    _nodeStore.reclaim_all_memory();
 }
 
 
diff --git a/vespalib/src/vespa/vespalib/btree/btreenodestore.h b/vespalib/src/vespa/vespalib/btree/btreenodestore.h
index 7d273c65e0e..7b89e2d0ddb 100644
--- a/vespalib/src/vespa/vespalib/btree/btreenodestore.h
+++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.h
@@ -176,8 +176,8 @@ public:
         _store.reclaim_memory(oldest_used_gen);
     }
 
-    void clearHoldLists() {
-        _store.clearHoldLists();
+    void reclaim_all_memory() {
+        _store.reclaim_all_memory();
     }
 
     // Inherit doc from DataStoreBase
diff --git a/vespalib/src/vespa/vespalib/btree/btreestore.h b/vespalib/src/vespa/vespalib/btree/btreestore.h
index 7bb7f978ae1..e5c55d5775d 100644
--- a/vespalib/src/vespa/vespalib/btree/btreestore.h
+++ b/vespalib/src/vespa/vespalib/btree/btreestore.h
@@ -347,10 +347,10 @@ public:
     }
 
     void
-    clearHoldLists()
+    reclaim_all_memory()
     {
-        _allocator.clearHoldLists();
-        _store.clearHoldLists();
+        _allocator.reclaim_all_memory();
+        _store.reclaim_all_memory();
     }
 
 
diff --git a/vespalib/src/vespa/vespalib/datastore/array_store.hpp b/vespalib/src/vespa/vespalib/datastore/array_store.hpp
index 4df8505e927..b31d47fe4fe 100644
--- a/vespalib/src/vespa/vespalib/datastore/array_store.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/array_store.hpp
@@ -57,7 +57,7 @@ ArrayStore<EntryT, RefT, TypeMapperT>::ArrayStore(const ArrayStoreConfig &cfg, s
 template <typename EntryT, typename RefT, typename TypeMapperT>
 ArrayStore<EntryT, RefT, TypeMapperT>::~ArrayStore()
 {
-    _store.clearHoldLists();
+    _store.reclaim_all_memory();
     _store.dropBuffers();
 }
 
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
index 0d0287a1c78..96160fd347b 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp
@@ -242,7 +242,7 @@ DataStoreBase::reclaim_memory(generation_t oldest_used_gen)
 }
 
 void
-DataStoreBase::clearHoldLists()
+DataStoreBase::reclaim_all_memory()
 {
     _entry_ref_hold_list.assign_generation(0);
     reclaim_all_entry_refs();
diff --git a/vespalib/src/vespa/vespalib/datastore/datastorebase.h b/vespalib/src/vespa/vespalib/datastore/datastorebase.h
index 931f81ee7fd..598f0872253 100644
--- a/vespalib/src/vespa/vespalib/datastore/datastorebase.h
+++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.h
@@ -207,7 +207,7 @@ public:
      */
     void reclaim_memory(generation_t oldest_used_gen);
 
-    void clearHoldLists();
+    void reclaim_all_memory();
 
     template <typename EntryType, typename RefType>
     EntryType *getEntry(RefType ref) {
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_allocator.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store_allocator.hpp
index 5d96b1e0314..8ad11b18218 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store_allocator.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store_allocator.hpp
@@ -28,7 +28,7 @@ UniqueStoreAllocator<EntryT, RefT>::UniqueStoreAllocator(std::shared_ptr<alloc::
 template <typename EntryT, typename RefT>
 UniqueStoreAllocator<EntryT, RefT>::~UniqueStoreAllocator()
 {
-    _store.clearHoldLists();
+    _store.reclaim_all_memory();
     _store.dropBuffers();
 }
 
diff --git a/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.hpp
index eeba2f463b9..65cab4850ba 100644
--- a/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.hpp
+++ b/vespalib/src/vespa/vespalib/datastore/unique_store_string_allocator.hpp
@@ -30,7 +30,7 @@ UniqueStoreStringAllocator<RefT>::UniqueStoreStringAllocator(std::shared_ptr<all
 template <typename RefT>
 UniqueStoreStringAllocator<RefT>::~UniqueStoreStringAllocator()
 {
-    _store.clearHoldLists();
+    _store.reclaim_all_memory();
     _store.dropBuffers();
 }