Merge pull request #24407 from vespa-engine/geirst/generation-hold-list-terminology

Use more general terminology for handling of generation hold lists  

12 files changed, 65 insertions, 66 deletions

diff --git a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
index 7f0a88c9f86..3fa74b78d2a 100644
--- a/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
+++ b/searchlib/src/tests/attribute/attributemanager/attributemanager_test.cpp
@@ -38,8 +38,7 @@ public:
     generation_t getGen() const { return getCurrentGeneration(); }
     uint32_t getRefCount(generation_t gen) const { return getGenerationRefCount(gen); }
     void incGen() { incGeneration(); }
-    void updateFirstUsedGen() { updateFirstUsedGeneration(); }
-    generation_t getFirstUsedGen() const { return getFirstUsedGeneration(); }
+    generation_t oldest_used_gen() const { return get_oldest_used_generation(); }
 };
 
 
@@ -49,35 +48,35 @@ TEST("Test attribute guards")
     TestAttribute * v = static_cast<TestAttribute *> (vec.get());
     EXPECT_EQUAL(v->getGen(), unsigned(0));
     EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
-    EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(0));
+    EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
     {
         AttributeGuard g0(vec);
         EXPECT_EQUAL(v->getGen(), unsigned(0));
         EXPECT_EQUAL(v->getRefCount(0), unsigned(1));
-        EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(0));
+        EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
         {
             AttributeGuard g1(vec);
             EXPECT_EQUAL(v->getGen(), unsigned(0));
             EXPECT_EQUAL(v->getRefCount(0), unsigned(2));
-            EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(0));
+            EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
         }
         EXPECT_EQUAL(v->getRefCount(0), unsigned(1));
-        EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(0));
+        EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
     }
     EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
-    EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(0));
+    EXPECT_EQUAL(v->oldest_used_gen(), unsigned(0));
 
     v->incGen();
     EXPECT_EQUAL(v->getGen(), unsigned(1));
     EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
     EXPECT_EQUAL(v->getRefCount(1), unsigned(0));
-    EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(1));
+    EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
     {
         AttributeGuard g0(vec);
         EXPECT_EQUAL(v->getGen(), unsigned(1));
         EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
         EXPECT_EQUAL(v->getRefCount(1), unsigned(1));
-        EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(1));
+        EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
         {
             v->incGen();
             AttributeGuard g1(vec);
@@ -85,19 +84,19 @@ TEST("Test attribute guards")
             EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
             EXPECT_EQUAL(v->getRefCount(1), unsigned(1));
             EXPECT_EQUAL(v->getRefCount(2), unsigned(1));
-            EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(1));
+            EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
         }
         EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
         EXPECT_EQUAL(v->getRefCount(1), unsigned(1));
         EXPECT_EQUAL(v->getRefCount(2), unsigned(0));
-        EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(1));
+        EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
     }
     EXPECT_EQUAL(v->getRefCount(0), unsigned(0));
     EXPECT_EQUAL(v->getRefCount(1), unsigned(0));
     EXPECT_EQUAL(v->getRefCount(2), unsigned(0));
-    EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(1));
-    v->updateFirstUsedGeneration();
-    EXPECT_EQUAL(v->getFirstUsedGen(), unsigned(2));
+    EXPECT_EQUAL(v->oldest_used_gen(), unsigned(1));
+    v->update_oldest_used_generation();
+    EXPECT_EQUAL(v->oldest_used_gen(), unsigned(2));
     EXPECT_EQUAL(v->getGen(), unsigned(2));
 }
 
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 e27065f1c25..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();
 }
 
@@ -143,10 +143,10 @@ void
 DocumentWeightOrFilterSearchTest::inc_generation()
 {
     _postings.freeze();
-    _postings.transferHoldLists(_gens.getCurrentGeneration());
+    _postings.assign_generation(_gens.getCurrentGeneration());
     _gens.incGeneration();
-    _gens.updateFirstUsedGeneration();
-    _postings.trimHoldLists(_gens.getFirstUsedGeneration());
+    _gens.update_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 1d76473754f..9d717202551 100644
--- a/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
+++ b/searchlib/src/tests/attribute/enum_comparator/enum_comparator_test.cpp
@@ -147,9 +147,9 @@ TEST("requireThatComparatorWithTreeIsWorking")
     EXPECT_EQUAL(101, exp);
     t.clear(m);
     m.freeze();
-    m.transferHoldLists(g.getCurrentGeneration());
+    m.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
-    m.trimHoldLists(g.getFirstUsedGeneration());
+    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 02ff01043b0..0542a253cc5 100644
--- a/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
+++ b/searchlib/src/tests/attribute/enumstore/enumstore_test.cpp
@@ -345,8 +345,8 @@ TEST(EnumStoreTest, test_hold_lists_and_generation)
     // check readers again
     checkReaders(ses, readers);
 
-    ses.transfer_hold_lists(sesGen);
-    ses.trim_hold_lists(sesGen + 1);
+    ses.assign_generation(sesGen);
+    ses.reclaim_memory(sesGen + 1);
 }
 
 void
@@ -357,8 +357,8 @@ dec_ref_count(NumericEnumStore& store, NumericEnumStore::Index idx)
     updater.commit();
 
     generation_t gen = 5;
-    store.transfer_hold_lists(gen);
-    store.trim_hold_lists(gen + 1);
+    store.assign_generation(gen);
+    store.reclaim_memory(gen + 1);
 }
 
 TEST(EnumStoreTest, address_space_usage_is_reported)
@@ -882,9 +882,9 @@ namespace {
 void inc_generation(generation_t &gen, NumericEnumStore &store)
 {
     store.freeze_dictionary();
-    store.transfer_hold_lists(gen);
+    store.assign_generation(gen);
     ++gen;
-    store.trim_hold_lists(gen);
+    store.reclaim_memory(gen);
 }
 
 }
diff --git a/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp b/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
index b9f3c23213e..0d2ce048111 100644
--- a/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
+++ b/searchlib/src/tests/attribute/imported_attribute_vector/imported_attribute_vector_test.cpp
@@ -73,14 +73,14 @@ TEST_F("makeReadGuard(false) acquires guards on both target and reference attrib
         EXPECT_EQUAL(2u, f.target_attr->getCurrentGeneration());
         EXPECT_EQUAL(2u, f.reference_attr->getCurrentGeneration());
         // Should still be holding guard for first generation of writes for both attributes
-        EXPECT_EQUAL(1u, f.target_attr->getFirstUsedGeneration());
-        EXPECT_EQUAL(1u, f.reference_attr->getFirstUsedGeneration());
+        EXPECT_EQUAL(1u, f.target_attr->get_oldest_used_generation());
+        EXPECT_EQUAL(1u, f.reference_attr->get_oldest_used_generation());
     }
     // Force a generation handler update
     add_n_docs_with_undefined_values(*f.reference_attr, 1);
     add_n_docs_with_undefined_values(*f.target_attr, 1);
-    EXPECT_EQUAL(3u, f.target_attr->getFirstUsedGeneration());
-    EXPECT_EQUAL(3u, f.reference_attr->getFirstUsedGeneration());
+    EXPECT_EQUAL(3u, f.target_attr->get_oldest_used_generation());
+    EXPECT_EQUAL(3u, f.reference_attr->get_oldest_used_generation());
 }
 
 TEST_F("makeReadGuard(true) acquires enum guard on target and regular guard on reference attribute", Fixture) {
@@ -95,15 +95,15 @@ TEST_F("makeReadGuard(true) acquires enum guard on target and regular guard on r
         EXPECT_EQUAL(5u, f.target_attr->getCurrentGeneration());
         EXPECT_EQUAL(2u, f.reference_attr->getCurrentGeneration());
 
-        EXPECT_EQUAL(3u, f.target_attr->getFirstUsedGeneration());
-        EXPECT_EQUAL(1u, f.reference_attr->getFirstUsedGeneration());
+        EXPECT_EQUAL(3u, f.target_attr->get_oldest_used_generation());
+        EXPECT_EQUAL(1u, f.reference_attr->get_oldest_used_generation());
         EXPECT_TRUE(has_active_enum_guards(*f.target_attr));
     }
     // Force a generation handler update
     add_n_docs_with_undefined_values(*f.reference_attr, 1);
     add_n_docs_with_undefined_values(*f.target_attr, 1);
-    EXPECT_EQUAL(7u, f.target_attr->getFirstUsedGeneration());
-    EXPECT_EQUAL(3u, f.reference_attr->getFirstUsedGeneration());
+    EXPECT_EQUAL(7u, f.target_attr->get_oldest_used_generation());
+    EXPECT_EQUAL(3u, f.reference_attr->get_oldest_used_generation());
     EXPECT_FALSE(has_active_enum_guards(*f.target_attr));
 }
 
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 735ebcff6cf..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,10 +42,10 @@ 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.transferHoldLists(generation - 1);
+        _mvMapping.assign_generation(generation - 1);
     }
 
 public:
@@ -115,8 +115,8 @@ public:
         ConstArrayRef act = get(docId);
         EXPECT_EQ(exp, std::vector<EntryT>(act.cbegin(), act.cend()));
     }
-    void transferHoldLists(generation_t generation) { _mvMapping->transferHoldLists(generation); }
-    void trimHoldLists(generation_t firstUsed) { _mvMapping->trimHoldLists(firstUsed); }
+    void assign_generation(generation_t current_gen) { _mvMapping->assign_generation(current_gen); }
+    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;
@@ -245,12 +245,12 @@ TEST_F(IntMappingTest, test_that_old_value_is_not_overwritten_while_held)
     auto old3 = get(3);
     assertArray({5}, old3);
     set(3, {7});
-    transferHoldLists(10);
+    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 36babec6a89..75e7faf0227 100644
--- a/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp
+++ b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp
@@ -64,11 +64,11 @@ protected:
     {
         _value_store.freeze_dictionary();
         _store.freeze();
-        _value_store.transfer_hold_lists(_gen_handler.getCurrentGeneration());
-        _store.transferHoldLists(_gen_handler.getCurrentGeneration());
+        _value_store.assign_generation(_gen_handler.getCurrentGeneration());
+        _store.assign_generation(_gen_handler.getCurrentGeneration());
         _gen_handler.incGeneration();
-        _value_store.trim_hold_lists(_gen_handler.getFirstUsedGeneration());
-        _store.trimHoldLists(_gen_handler.getFirstUsedGeneration());
+        _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 54efb3261c8..e41aaec351e 100644
--- a/searchlib/src/tests/attribute/postinglist/postinglist.cpp
+++ b/searchlib/src/tests/attribute/postinglist/postinglist.cpp
@@ -259,12 +259,12 @@ AttributePostingListTest::freeTree(bool verbose)
         static_cast<uint64_t>(_intNodeAlloc->getMemoryUsage().allocatedBytesOnHold()));
     _intNodeAlloc->freeze();
     _intPostings->freeze();
-    _intNodeAlloc->transferHoldLists(_handler.getCurrentGeneration());
+    _intNodeAlloc->assign_generation(_handler.getCurrentGeneration());
     _intPostings->clearBuilder();
-    _intPostings->transferHoldLists(_handler.getCurrentGeneration());
+    _intPostings->assign_generation(_handler.getCurrentGeneration());
     _handler.incGeneration();
-    _intNodeAlloc->trimHoldLists(_handler.getFirstUsedGeneration());
-    _intPostings->trimHoldLists(_handler.getFirstUsedGeneration());
+    _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()),
@@ -613,9 +613,9 @@ AttributePostingListTest::doCompactEnumStore(Tree &tree,
         valueHandle.holdBuffer(*it);
     }
     generation_t generation = _handler.getCurrentGeneration();
-    valueHandle.transferHoldLists(generation);
+    valueHandle.assign_generation(generation);
     _handler.incGeneration();
-    valueHandle.trimHoldLists(_handler.getFirstUsedGeneration());
+    valueHandle.reclaim_memory(_handler.get_oldest_used_generation());
 
     LOG(info,
         "doCompactEnumStore done");
@@ -658,8 +658,8 @@ bumpGeneration(Tree &tree,
     (void) tree;
     (void) valueHandle;
     postingsAlloc.freeze();
-    postingsAlloc.transferHoldLists(_handler.getCurrentGeneration());
-    postings.transferHoldLists(_handler.getCurrentGeneration());
+    postingsAlloc.assign_generation(_handler.getCurrentGeneration());
+    postings.assign_generation(_handler.getCurrentGeneration());
     _handler.incGeneration();
 }
 
@@ -672,8 +672,8 @@ removeOldGenerations(Tree &tree,
 {
     (void) tree;
     (void) valueHandle;
-    postingsAlloc.trimHoldLists(_handler.getFirstUsedGeneration());
-    postings.trimHoldLists(_handler.getFirstUsedGeneration());
+    postingsAlloc.reclaim_memory(_handler.get_oldest_used_generation());
+    postings.reclaim_memory(_handler.get_oldest_used_generation());
 }
 
 int
@@ -689,7 +689,7 @@ AttributePostingListTest::Main()
     lookupRandomValues(*_intTree, *_intNodeAlloc, *_intKeyStore, *_intPostings,
                        _stlTree, _randomValues);
     _intNodeAlloc->freeze();
-    _intNodeAlloc->transferHoldLists(_handler.getCurrentGeneration());
+    _intNodeAlloc->assign_generation(_handler.getCurrentGeneration());
     doCompactEnumStore(*_intTree, *_intNodeAlloc, *_intKeyStore);
     removeRandomValues(*_intTree, *_intNodeAlloc, *_intKeyStore, *_intPostings,
                        _stlTree, _randomValues);
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
index 222a3341ef9..9127c4b59fc 100644
--- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
+++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp
@@ -221,11 +221,11 @@ public:
         auto vector = _vectors.get_vector(docid).typify<double>();
         _removes.emplace_back(docid, DoubleVector(vector.begin(), vector.end()));
     }
-    void transfer_hold_lists(generation_t current_gen) override {
+    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/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/tests/tensor/hnsw_index/hnsw_index_test.cpp b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
index 7877b488065..958423860e5 100644
--- a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
@@ -99,10 +99,10 @@ public:
         commit();
     }
     void commit() {
-        index->transfer_hold_lists(gen_handler.getCurrentGeneration());
+        index->assign_generation(gen_handler.getCurrentGeneration());
         gen_handler.incGeneration();
-        gen_handler.updateFirstUsedGeneration();
-        index->trim_hold_lists(gen_handler.getFirstUsedGeneration());
+        gen_handler.update_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 d559fa592ad..47812c2a63c 100644
--- a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
@@ -267,10 +267,10 @@ public:
         ASSERT_EQ(r.get(), nullptr);
     }
     void commit(uint32_t docid) {
-        index->transfer_hold_lists(gen_handler.getCurrentGeneration());
+        index->assign_generation(gen_handler.getCurrentGeneration());
         gen_handler.incGeneration();
-        gen_handler.updateFirstUsedGeneration();
-        index->trim_hold_lists(gen_handler.getFirstUsedGeneration());
+        gen_handler.update_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);