Change buffer state accounting from elements to entries.

22 files changed, 107 insertions, 107 deletions

diff --git a/searchlib/src/tests/attribute/attribute_test.cpp b/searchlib/src/tests/attribute/attribute_test.cpp
index 7eb43faac18..4549291b80f 100644
--- a/searchlib/src/tests/attribute/attribute_test.cpp
+++ b/searchlib/src/tests/attribute/attribute_test.cpp
@@ -912,8 +912,8 @@ AttributeTest::testSingle()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("sv-post-int32", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(339020u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(101852u, ptr->getStatus().getUsed());
+            EXPECT_EQ(338972u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(101612u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<IntegerAttribute, AttributeVector::largeint_t, int32_t>(ptr, values);
         }
@@ -934,8 +934,8 @@ AttributeTest::testSingle()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("sv-post-float", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(339020, ptr->getStatus().getAllocated());
-            EXPECT_EQ(101852u, ptr->getStatus().getUsed());
+            EXPECT_EQ(338972u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(101612u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<FloatingPointAttribute, double, float>(ptr, values);
         }
@@ -947,8 +947,8 @@ AttributeTest::testSingle()
         {
             AttributePtr ptr = createAttribute("sv-string", Config(BasicType::STRING, CollectionType::SINGLE));
             ptr->updateStat(true);
-            EXPECT_EQ(117256u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(53240u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(116528u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(52920u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<StringAttribute, string, string>(ptr, values);
         }
@@ -957,8 +957,8 @@ AttributeTest::testSingle()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("sv-fs-string", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(345624u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(105176u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(344848u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(104664u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testSingle<StringAttribute, string, string>(ptr, values);
         }
@@ -1089,8 +1089,8 @@ AttributeTest::testArray()
         {
             AttributePtr ptr = createAttribute("a-int32", Config(BasicType::INT32, CollectionType::ARRAY));
             ptr->updateStat(true);
-            EXPECT_EQ(512056u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(504392u, ptr->getStatus().getUsed());
+            EXPECT_EQ(495672u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(487944u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1099,8 +1099,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("flags", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(512056u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(504392u, ptr->getStatus().getUsed());
+            EXPECT_EQ(495672u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(487944u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1109,8 +1109,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("a-fs-int32", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(868788u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(606264u, ptr->getStatus().getUsed());
+            EXPECT_EQ(852308u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(589576u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<IntegerAttribute, AttributeVector::largeint_t>(ptr, values);
         }
@@ -1128,8 +1128,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("a-fs-float", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(868788u, ptr->getStatus().getAllocated());
-            EXPECT_EQ(606264u, ptr->getStatus().getUsed());
+            EXPECT_EQ(852308u, ptr->getStatus().getAllocated());
+            EXPECT_EQ(589576u, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<FloatingPointAttribute, double>(ptr, values);
         }
@@ -1140,8 +1140,8 @@ AttributeTest::testArray()
         {
             AttributePtr ptr = createAttribute("a-string", Config(BasicType::STRING, CollectionType::ARRAY));
             ptr->updateStat(true);
-            EXPECT_EQ(625088u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(557632u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(607976u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(540864u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<StringAttribute, string>(ptr, values);
         }
@@ -1150,8 +1150,8 @@ AttributeTest::testArray()
             cfg.setFastSearch(true);
             AttributePtr ptr = createAttribute("afs-string", cfg);
             ptr->updateStat(true);
-            EXPECT_EQ(875392u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
-            EXPECT_EQ(609588u + sizeof_large_string_entry, ptr->getStatus().getUsed());
+            EXPECT_EQ(858184u + sizeof_large_string_entry, ptr->getStatus().getAllocated());
+            EXPECT_EQ(592628u + sizeof_large_string_entry, ptr->getStatus().getUsed());
             addDocs(ptr, numDocs);
             testArray<StringAttribute, string>(ptr, values);
         }
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index b57a2f42ea7..69478c09a25 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -1032,14 +1032,14 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
 
     auto beforeStats = getFeatureStoreMemStats(_fic);
     LOG(info,
-        "Before feature compaction: allocElems=%zu, usedElems=%zu"
-        ", deadElems=%zu, holdElems=%zu"
+        "Before feature compaction: alloc_entries=%zu, used_entries=%zu"
+        ", dead_entries=%zu, hold_entries=%zu"
         ", freeBuffers=%u, activeBuffers=%u"
         ", holdBuffers=%u",
-        beforeStats._allocElems,
-        beforeStats._usedElems,
-        beforeStats._deadElems,
-        beforeStats._holdElems,
+        beforeStats._alloc_entries,
+        beforeStats._used_entries,
+        beforeStats._dead_entries,
+        beforeStats._hold_entries,
         beforeStats._freeBuffers,
         beforeStats._activeBuffers,
         beforeStats._holdBuffers);
@@ -1052,14 +1052,14 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
     myCommit(_fic, *_pushThreads);
     auto duringStats = getFeatureStoreMemStats(_fic);
     LOG(info,
-        "During feature compaction: allocElems=%zu, usedElems=%zu"
-        ", deadElems=%zu, holdElems=%zu"
+        "During feature compaction: alloc_entries=%zu, used_entries=%zu"
+        ", dead_entries=%zu, hold_entries=%zu"
         ", freeBuffers=%u, activeBuffers=%u"
         ", holdBuffers=%u",
-        duringStats._allocElems,
-        duringStats._usedElems,
-        duringStats._deadElems,
-        duringStats._holdElems,
+        duringStats._alloc_entries,
+        duringStats._used_entries,
+        duringStats._dead_entries,
+        duringStats._hold_entries,
         duringStats._freeBuffers,
         duringStats._activeBuffers,
         duringStats._holdBuffers);
@@ -1067,14 +1067,14 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
     myCommit(_fic, *_pushThreads);
     auto afterStats = getFeatureStoreMemStats(_fic);
     LOG(info,
-        "After feature compaction: allocElems=%zu, usedElems=%zu"
-        ", deadElems=%zu, holdElems=%zu"
+        "After feature compaction: alloc_entries=%zu, used_entries=%zu"
+        ", dead_entries=%zu, hold_entries=%zu"
         ", freeBuffers=%u, activeBuffers=%u"
         ", holdBuffers=%u",
-        afterStats._allocElems,
-        afterStats._usedElems,
-        afterStats._deadElems,
-        afterStats._holdElems,
+        afterStats._alloc_entries,
+        afterStats._used_entries,
+        afterStats._dead_entries,
+        afterStats._hold_entries,
         afterStats._freeBuffers,
         afterStats._activeBuffers,
         afterStats._holdBuffers);
diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
index 8073fb8d232..388b708f9aa 100644
--- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
@@ -462,8 +462,8 @@ TEST(MemoryIndexTest, require_that_num_docs_and_doc_id_limit_is_returned)
 
 TEST(MemoryIndexTest, require_that_we_understand_the_memory_footprint)
 {
-    constexpr size_t BASE_ALLOCATED = 361032u;
-    constexpr size_t BASE_USED = 151188u;
+    constexpr size_t BASE_ALLOCATED = 360936u;
+    constexpr size_t BASE_USED = 150932u;
     {
         MySetup setup;
         Index index(setup);
diff --git a/searchlib/src/tests/predicate/document_features_store_test.cpp b/searchlib/src/tests/predicate/document_features_store_test.cpp
index 4ac4bdc32f0..ee247f8c74e 100644
--- a/searchlib/src/tests/predicate/document_features_store_test.cpp
+++ b/searchlib/src/tests/predicate/document_features_store_test.cpp
@@ -165,17 +165,17 @@ TEST("require that both features and ranges are removed by 'remove'") {
 
 TEST("require that both features and ranges counts towards memory usage") {
     DocumentFeaturesStore features_store(10);
-    EXPECT_EQUAL(50136u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50088u, features_store.getMemoryUsage().usedBytes());
 
     PredicateTreeAnnotations annotations;
     annotations.features.push_back(PredicateHash::hash64("foo=100-199"));
     features_store.insert(annotations, doc_id);
-    EXPECT_EQUAL(50144u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50096u, features_store.getMemoryUsage().usedBytes());
 
     annotations.features.clear();
     annotations.range_features.push_back({"foo", 100, 199});
     features_store.insert(annotations, doc_id + 1);
-    EXPECT_EQUAL(50240u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50192u, features_store.getMemoryUsage().usedBytes());
 }
 
 TEST("require that DocumentFeaturesStore can be serialized") {
@@ -205,17 +205,17 @@ TEST("require that serialization cleans up wordstore") {
     PredicateTreeAnnotations annotations;
     annotations.range_features.push_back({"foo", 100, 199});
     features_store.insert(annotations, doc_id);
-    EXPECT_EQUAL(50232u, features_store.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50184u, features_store.getMemoryUsage().usedBytes());
     annotations.range_features.push_back({"bar", 100, 199});
     features_store.insert(annotations, doc_id + 1);
-    EXPECT_EQUAL(50620u, features_store.getMemoryUsage().usedBytes());
-    features_store.remove(doc_id + 1);
     EXPECT_EQUAL(50572u, features_store.getMemoryUsage().usedBytes());
+    features_store.remove(doc_id + 1);
+    EXPECT_EQUAL(50524u, features_store.getMemoryUsage().usedBytes());
 
     vespalib::DataBuffer buffer;
     features_store.serialize(buffer);
     DocumentFeaturesStore features_store2(buffer);
-    EXPECT_EQUAL(50232u, features_store2.getMemoryUsage().usedBytes());
+    EXPECT_EQUAL(50184u, features_store2.getMemoryUsage().usedBytes());
 }
 
 
diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp
index ea449300aef..1009fa2fb5f 100644
--- a/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multinumericpostattribute.hpp
@@ -51,7 +51,7 @@ template <typename B, typename M>
 MultiValueNumericPostingAttribute<B, M>::~MultiValueNumericPostingAttribute()
 {
     this->disableFreeLists();
-    this->disableElemHoldList();
+    this->disable_entry_hold_list();
     clearAllPostings();
 }
 
diff --git a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
index cd46bbb5a8a..19840b5a474 100644
--- a/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/multistringpostattribute.hpp
@@ -27,7 +27,7 @@ template <typename B, typename T>
 MultiValueStringPostingAttributeT<B, T>::~MultiValueStringPostingAttributeT()
 {
     this->disableFreeLists();
-    this->disableElemHoldList();
+    this->disable_entry_hold_list();
     clearAllPostings();
 }
 
diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h
index 29440b6ce43..ecf7a46f21e 100644
--- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h
+++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h
@@ -58,7 +58,7 @@ protected:
     void updatePostings(PostingMap &changePost, const vespalib::datastore::EntryComparator &cmp);
     void clearAllPostings();
     void disableFreeLists() { _postingList.disableFreeLists(); }
-    void disableElemHoldList() { _postingList.disableElemHoldList(); }
+    void disable_entry_hold_list() { _postingList.disable_entry_hold_list(); }
     void handle_load_posting_lists_and_update_enum_store(enumstore::EnumeratedPostingsLoader& loader);
     bool forwardedOnAddDoc(DocId doc, size_t wantSize, size_t wantCapacity);
 
diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp
index 94720212faf..2703201b292 100644
--- a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp
@@ -231,7 +231,7 @@ PostingStore<DataT>::dropBitVector(EntryRef &ref)
     (void) tree;
     (void) docFreq;
     _bvs.erase(ref.ref());
-    _store.holdElem(iRef, 1);
+    _store.hold_entry(iRef);
     _status.decBitVectors();
     _bvExtraBytes -= bv->writer().extraByteSize();
     ref = ref2;
@@ -267,7 +267,7 @@ PostingStore<DataT>::makeBitVector(EntryRef &ref)
     if (_enableOnlyBitVector) {
         BTreeType *tree = getWTreeEntry(iRef);
         tree->clear(_allocator);
-        _store.holdElem(ref, 1);
+        _store.hold_entry(ref);
     } else {
         bve->_tree = ref;
     }
@@ -590,19 +590,19 @@ PostingStore<DataT>::clear(const EntryRef ref)
                 assert(isBTree(iRef2));
                 BTreeType *tree = getWTreeEntry(iRef2);
                 tree->clear(_allocator);
-                _store.holdElem(iRef2, 1);
+                _store.hold_entry(iRef2);
             }
             _bvs.erase(ref.ref());
             _status.decBitVectors();
             _bvExtraBytes -= bve->_bv->writer().extraByteSize();
-            _store.holdElem(ref, 1);
+            _store.hold_entry(ref);
         } else {
             BTreeType *tree = getWTreeEntry(iRef);
             tree->clear(_allocator);
-            _store.holdElem(ref, 1);
+            _store.hold_entry(ref);
         }
     } else {
-        _store.holdElem(ref, clusterSize);
+        _store.hold_entry(ref);
     }
 }
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp
index 1775774171d..de4a7157dae 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlenumericpostattribute.hpp
@@ -13,7 +13,7 @@ template <typename B>
 SingleValueNumericPostingAttribute<B>::~SingleValueNumericPostingAttribute()
 {
     this->disableFreeLists();
-    this->disableElemHoldList();
+    this->disable_entry_hold_list();
     clearAllPostings();
 }
 
diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp
index eef72984e79..1ec9b54a73b 100644
--- a/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp
+++ b/searchlib/src/vespa/searchlib/attribute/singlestringpostattribute.hpp
@@ -27,7 +27,7 @@ template <typename B>
 SingleValueStringPostingAttributeT<B>::~SingleValueStringPostingAttributeT()
 {
     this->disableFreeLists();
-    this->disableElemHoldList();
+    this->disable_entry_hold_list();
     clearAllPostings();
 }
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp
index 4be3031303e..8dd76a90b14 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp
@@ -55,9 +55,9 @@ template <bool interleaved_features>
 FieldIndex<interleaved_features>::~FieldIndex()
 {
     _postingListStore.disableFreeLists();
-    _postingListStore.disableElemHoldList();
+    _postingListStore.disable_entry_hold_list();
     _dict.disableFreeLists();
-    _dict.disableElemHoldList();
+    _dict.disable_entry_hold_list();
     // XXX: Kludge
     for (DictionaryTree::Iterator it = _dict.begin();
          it.valid(); ++it) {
diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp
index 604a467a6e6..a6a82ec09f8 100644
--- a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp
@@ -102,7 +102,7 @@ DocumentFeaturesStore::DocumentFeaturesStore(DataBuffer &buffer)
 
 DocumentFeaturesStore::~DocumentFeaturesStore() {
     _word_index.disableFreeLists();
-    _word_index.disableElemHoldList();
+    _word_index.disable_entry_hold_list();
     _word_index.getAllocator().freeze();
     _word_index.clear();
 }
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp
index af809b2fa69..af5aae6e519 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp
@@ -95,7 +95,7 @@ PredicateIntervalStore::remove(EntryRef ref) {
         // BufferState &state = _store.getBufferState(buffer_id);
         // uint32_t type_id = state.getTypeId();
         // uint32_t size = type_id <= MAX_ARRAY_SIZE ? type_id : 1;
-        // _store.holdElem(ref, size);
+        // _store.hold_entries(ref, size);
     }
 }
 
diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
index c6f640d72ed..9320488f88e 100644
--- a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
+++ b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
@@ -41,7 +41,7 @@ SimpleIndex<Posting, Key, DocId>::insertIntoVectorPosting(vespalib::datastore::E
 template <typename Posting, typename Key, typename DocId>
 SimpleIndex<Posting, Key, DocId>::~SimpleIndex() {
     _btree_posting_lists.disableFreeLists();
-    _btree_posting_lists.disableElemHoldList();
+    _btree_posting_lists.disable_entry_hold_list();
 
     for (auto it = _dictionary.begin(); it.valid(); ++it) {
         vespalib::datastore::EntryRef ref(it.getData());
@@ -51,13 +51,13 @@ SimpleIndex<Posting, Key, DocId>::~SimpleIndex() {
     }
 
     _vector_posting_lists.disableFreeLists();
-    _vector_posting_lists.disableElemHoldList();
+    _vector_posting_lists.disable_entry_hold_list();
     _vector_posting_lists.clear();
     _vector_posting_lists.getAllocator().freeze();
     _vector_posting_lists.getAllocator().reclaim_all_memory();
 
     _dictionary.disableFreeLists();
-    _dictionary.disableElemHoldList();
+    _dictionary.disable_entry_hold_list();
     _dictionary.clear();
     _dictionary.getAllocator().freeze();
     _dictionary.getAllocator().reclaim_all_memory();
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
index a2bbbe231c3..c51d0ec7fd3 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp
@@ -62,10 +62,10 @@ DenseTensorStore::BufferType::BufferType(const TensorSizeCalc &tensorSizeCalc, s
 DenseTensorStore::BufferType::~BufferType() = default;
 
 void
-DenseTensorStore::BufferType::cleanHold(void *buffer, size_t offset,
-                                        ElemCount numElems, CleanContext)
+DenseTensorStore::BufferType::clean_hold(void *buffer, size_t offset, EntryCount num_entries, CleanContext)
 {
-    memset(static_cast<char *>(buffer) + offset, 0, numElems);
+    auto num_elems = num_entries * getArraySize();
+    memset(static_cast<char *>(buffer) + offset * getArraySize(), 0, num_elems);
 }
 
 const vespalib::alloc::MemoryAllocator*
@@ -118,7 +118,7 @@ DenseTensorStore::holdTensor(EntryRef ref)
     if (!ref.valid()) {
         return;
     }
-    _concreteStore.holdElem(ref, _tensorSizeCalc.alignedSize());
+    _concreteStore.hold_entry(ref);
 }
 
 TensorStore::EntryRef
diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
index 9e326e0ab1e..0dd483e7f08 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
@@ -44,7 +44,7 @@ public:
     public:
         BufferType(const TensorSizeCalc &tensorSizeCalc, std::shared_ptr<vespalib::alloc::MemoryAllocator> allocator);
         ~BufferType() override;
-        void cleanHold(void *buffer, size_t offset, ElemCount numElems, CleanContext cleanCtx) override;
+        void clean_hold(void *buffer, size_t offset, EntryCount num_entries, CleanContext cleanCtx) override;
         const vespalib::alloc::MemoryAllocator* get_memory_allocator() const override;
     };
 private:
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp
index fa13ab6303c..8526138fd31 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.cpp
@@ -30,11 +30,11 @@ DirectTensorStore::TensorBufferType::TensorBufferType()
 }
 
 void
-DirectTensorStore::TensorBufferType::cleanHold(void* buffer, size_t offset, ElemCount num_elems, CleanContext clean_ctx)
+DirectTensorStore::TensorBufferType::clean_hold(void* buffer, size_t offset, EntryCount num_entries, CleanContext clean_ctx)
 {
     TensorSP* elem = static_cast<TensorSP*>(buffer) + offset;
     const auto& empty = empty_entry();
-    for (size_t i = 0; i < num_elems; ++i) {
+    for (size_t i = 0; i < num_entries; ++i) {
         clean_ctx.extraBytesCleaned((*elem)->get_memory_usage().allocatedBytes());
         *elem = empty;
         ++elem;
@@ -69,7 +69,7 @@ DirectTensorStore::holdTensor(EntryRef ref)
     }
     const auto& tensor = _tensor_store.getEntry(ref);
     assert(tensor);
-    _tensor_store.holdElem(ref, 1, tensor->get_memory_usage().allocatedBytes());
+    _tensor_store.hold_entry(ref, tensor->get_memory_usage().allocatedBytes());
 }
 
 EntryRef
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
index 01084e89776..1230494fe41 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
@@ -20,7 +20,7 @@ namespace search::tensor {
  */
 class DirectTensorStore : public TensorStore {
 private:
-    // Note: Must use SP (instead of UP) because of fallbackCopy() and initializeReservedElements() in BufferType,
+    // Note: Must use SP (instead of UP) because of fallback_copy() and initialize_reserved_entries() in BufferType,
     //       and implementation of move().
     using TensorSP = std::shared_ptr<vespalib::eval::Value>;
     using TensorStoreType = vespalib::datastore::DataStore<TensorSP>;
@@ -32,7 +32,7 @@ private:
         using CleanContext = typename ParentType::CleanContext;
     public:
         TensorBufferType();
-        void cleanHold(void* buffer, size_t offset, ElemCount num_elems, CleanContext clean_ctx) override;
+        void clean_hold(void* buffer, size_t offset, EntryCount num_entries, CleanContext clean_ctx) override;
     };
 
     TensorStoreType _tensor_store;
diff --git a/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.cpp b/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.cpp
index 18eba079045..5d3b2206703 100644
--- a/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.cpp
@@ -21,10 +21,10 @@ LargeSubspacesBufferType::LargeSubspacesBufferType(const AllocSpec& spec, std::s
 LargeSubspacesBufferType::~LargeSubspacesBufferType() = default;
 
 void
-LargeSubspacesBufferType::cleanHold(void* buffer, size_t offset, ElemCount numElems, CleanContext cleanCtx)
+LargeSubspacesBufferType::clean_hold(void* buffer, size_t offset, EntryCount num_entries, CleanContext cleanCtx)
 {
     auto elem = static_cast<ArrayType*>(buffer) + offset;
-    for (size_t i = 0; i < numElems; ++i) {
+    for (size_t i = 0; i < num_entries; ++i) {
         if (!elem->empty()) {
             cleanCtx.extraBytesCleaned(elem->size());
             _ops.reclaim_labels({elem->data(), elem->size()});
@@ -35,10 +35,10 @@ LargeSubspacesBufferType::cleanHold(void* buffer, size_t offset, ElemCount numEl
 }
 
 void
-LargeSubspacesBufferType::destroyElements(void *buffer, ElemCount numElems)
+LargeSubspacesBufferType::destroy_entries(void *buffer, EntryCount num_entries)
 {
     auto elem = static_cast<ArrayType*>(buffer);
-    for (size_t i = 0; i < numElems; ++i) {
+    for (size_t i = 0; i < num_entries; ++i) {
         if (!elem->empty()) {
             _ops.reclaim_labels({elem->data(), elem->size()});
             ArrayType().swap(*elem);
@@ -48,11 +48,11 @@ LargeSubspacesBufferType::destroyElements(void *buffer, ElemCount numElems)
 }
 
 void
-LargeSubspacesBufferType::fallbackCopy(void *newBuffer, const void *oldBuffer, ElemCount numElems)
+LargeSubspacesBufferType::fallback_copy(void *newBuffer, const void *oldBuffer, EntryCount num_entries)
 {
     auto old_elems = static_cast<const ArrayType*>(oldBuffer);
     auto new_elems = static_cast<ArrayType*>(newBuffer);
-    for (size_t i = 0; i < numElems; ++i) {
+    for (size_t i = 0; i < num_entries; ++i) {
         auto& old_elem = old_elems[i];
         new (new_elems + i) ArrayType(old_elem);
         if (!old_elem.empty()) {
@@ -62,12 +62,12 @@ LargeSubspacesBufferType::fallbackCopy(void *newBuffer, const void *oldBuffer, E
 }
 
 void
-LargeSubspacesBufferType::initializeReservedElements(void *buffer, ElemCount reservedElements)
+LargeSubspacesBufferType::initialize_reserved_entries(void *buffer, EntryCount reserved_entries)
 {
-    auto new_elems = static_cast<ArrayType*>(buffer);
+    auto new_entries = static_cast<ArrayType*>(buffer);
     const auto& empty = empty_entry();
-    for (size_t i = 0; i < reservedElements; ++i) {
-        new (new_elems + i) ArrayType(empty);
+    for (size_t i = 0; i < reserved_entries; ++i) {
+        new (new_entries + i) ArrayType(empty);
     }
 }
 
diff --git a/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.h b/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.h
index cfab8ef20af..8cce08e9d81 100644
--- a/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.h
+++ b/searchlib/src/vespa/searchlib/tensor/large_subspaces_buffer_type.h
@@ -30,10 +30,10 @@ class LargeSubspacesBufferType : public vespalib::datastore::BufferType<vespalib
 public:
     LargeSubspacesBufferType(const AllocSpec& spec, std::shared_ptr<vespalib::alloc::MemoryAllocator> memory_allocator, TensorBufferTypeMapper& type_mapper) noexcept;
     ~LargeSubspacesBufferType() override;
-    void cleanHold(void* buffer, size_t offset, ElemCount numElems, CleanContext cleanCtx) override;
-    void destroyElements(void *buffer, ElemCount numElems) override;
-    void fallbackCopy(void *newBuffer, const void *oldBuffer, ElemCount numElems) override;
-    void initializeReservedElements(void *buffer, ElemCount reservedElements) override;
+    void clean_hold(void* buffer, size_t offset, EntryCount num_entries, CleanContext cleanCtx) override;
+    void destroy_entries(void *buffer, EntryCount num_entries) override;
+    void fallback_copy(void *newBuffer, const void *oldBuffer, EntryCount num_entries) override;
+    void initialize_reserved_entries(void *buffer, EntryCount reserved_entries) override;
     const vespalib::alloc::MemoryAllocator* get_memory_allocator() const override;
 };
 
diff --git a/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.cpp b/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.cpp
index 8ab42980548..7b54182f062 100644
--- a/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.cpp
@@ -19,45 +19,45 @@ SmallSubspacesBufferType::SmallSubspacesBufferType(uint32_t array_size, const Al
 SmallSubspacesBufferType::~SmallSubspacesBufferType() = default;
 
 void
-SmallSubspacesBufferType::cleanHold(void* buffer, size_t offset, ElemCount numElems, CleanContext)
+SmallSubspacesBufferType::clean_hold(void* buffer, size_t offset, EntryCount num_entries, CleanContext)
 {
-    char* elem = static_cast<char *>(buffer) + offset;
-    while (numElems >= getArraySize()) {
+    char* elem = static_cast<char *>(buffer) + offset * getArraySize();
+    while (num_entries >= 1) {
         _ops.reclaim_labels(vespalib::ArrayRef<char>(elem, getArraySize()));
         elem += getArraySize();
-        numElems -= getArraySize();
+        --num_entries;
     }
 }
 
 void
-SmallSubspacesBufferType::destroyElements(void *buffer, ElemCount numElems)
+SmallSubspacesBufferType::destroy_entries(void *buffer, EntryCount num_entries)
 {
     char* elem = static_cast<char *>(buffer);
-    while (numElems >= getArraySize()) {
+    while (num_entries >= 1) {
         _ops.reclaim_labels(vespalib::ArrayRef<char>(elem, getArraySize()));
         elem += getArraySize();
-        numElems -= getArraySize();
+        --num_entries;
     }
 }
 
 void
-SmallSubspacesBufferType::fallbackCopy(void *newBuffer, const void *oldBuffer, ElemCount numElems)
+SmallSubspacesBufferType::fallback_copy(void *newBuffer, const void *oldBuffer, EntryCount num_entries)
 {
-    if (numElems > 0) {
-        memcpy(newBuffer, oldBuffer, numElems);
+    if (num_entries > 0) {
+        memcpy(newBuffer, oldBuffer, num_entries * getArraySize());
     }
     const char *elem = static_cast<const char *>(oldBuffer);
-    while (numElems >= getArraySize()) {
+    while (num_entries >= 1) {
         _ops.copied_labels(unconstify(vespalib::ConstArrayRef<char>(elem, getArraySize())));
         elem += getArraySize();
-        numElems -= getArraySize();
+        --num_entries;
     }
 }
 
 void
-SmallSubspacesBufferType::initializeReservedElements(void *buffer, ElemCount reservedElements)
+SmallSubspacesBufferType::initialize_reserved_entries(void *buffer, EntryCount reserved_entries)
 {
-    memset(buffer, 0, reservedElements);
+    memset(buffer, 0, reserved_entries * getArraySize());
 }
 
 const vespalib::alloc::MemoryAllocator*
diff --git a/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.h b/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.h
index 5622e9970b8..2f287ef1f3d 100644
--- a/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.h
+++ b/searchlib/src/vespa/searchlib/tensor/small_subspaces_buffer_type.h
@@ -30,10 +30,10 @@ public:
     SmallSubspacesBufferType& operator=(SmallSubspacesBufferType&&) noexcept = delete;
     SmallSubspacesBufferType(uint32_t array_size, const AllocSpec& spec, std::shared_ptr<vespalib::alloc::MemoryAllocator> memory_allocator, TensorBufferTypeMapper& type_mapper) noexcept;
     ~SmallSubspacesBufferType() override;
-    void cleanHold(void* buffer, size_t offset, ElemCount numElems, CleanContext cleanCtx) override;
-    void destroyElements(void *buffer, ElemCount numElems) override;
-    void fallbackCopy(void *newBuffer, const void *oldBuffer, ElemCount numElems) override;
-    void initializeReservedElements(void *buffer, ElemCount reservedElements) override;
+    void clean_hold(void* buffer, size_t offset, EntryCount num_entries, CleanContext cleanCtx) override;
+    void destroy_entries(void *buffer, EntryCount num_entries) override;
+    void fallback_copy(void *newBuffer, const void *oldBuffer, EntryCount num_entries) override;
+    void initialize_reserved_entries(void *buffer, EntryCount reserved_entries) override;
     const vespalib::alloc::MemoryAllocator* get_memory_allocator() const override;
 };