Rename first used generation -> oldest used generation.

13 files changed, 53 insertions, 56 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..0635b86121a 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
@@ -145,8 +145,8 @@ DocumentWeightOrFilterSearchTest::inc_generation()
     _postings.freeze();
     _postings.transferHoldLists(_gens.getCurrentGeneration());
     _gens.incGeneration();
-    _gens.updateFirstUsedGeneration();
-    _postings.trimHoldLists(_gens.getFirstUsedGeneration());
+    _gens.update_oldest_used_generation();
+    _postings.trimHoldLists(_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..b957c31c7dc 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.transferHoldLists(g.getCurrentGeneration());
     g.incGeneration();
-    m.trimHoldLists(g.getFirstUsedGeneration());
+    m.trimHoldLists(g.get_oldest_used_generation());
 }
 
 TEST("requireThatFoldedLessIsWorking")
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/posting_store/posting_store_test.cpp b/searchlib/src/tests/attribute/posting_store/posting_store_test.cpp
index 36babec6a89..a2d04488003 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.transfer_hold_lists(_gen_handler.getCurrentGeneration());
         _store.transferHoldLists(_gen_handler.getCurrentGeneration());
         _gen_handler.incGeneration();
-        _value_store.trim_hold_lists(_gen_handler.getFirstUsedGeneration());
-        _store.trimHoldLists(_gen_handler.getFirstUsedGeneration());
+        _value_store.trim_hold_lists(_gen_handler.get_oldest_used_generation());
+        _store.trimHoldLists(_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..9e3ea72045f 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->transferHoldLists(_handler.getCurrentGeneration());
     _handler.incGeneration();
-    _intNodeAlloc->trimHoldLists(_handler.getFirstUsedGeneration());
-    _intPostings->trimHoldLists(_handler.getFirstUsedGeneration());
+    _intNodeAlloc->trimHoldLists(_handler.get_oldest_used_generation());
+    _intPostings->trimHoldLists(_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.transferHoldLists(generation);
     _handler.incGeneration();
-    valueHandle.trimHoldLists(_handler.getFirstUsedGeneration());
+    valueHandle.trimHoldLists(_handler.get_oldest_used_generation());
 
     LOG(info,
         "doCompactEnumStore done");
@@ -672,8 +672,8 @@ removeOldGenerations(Tree &tree,
 {
     (void) tree;
     (void) valueHandle;
-    postingsAlloc.trimHoldLists(_handler.getFirstUsedGeneration());
-    postings.trimHoldLists(_handler.getFirstUsedGeneration());
+    postingsAlloc.trimHoldLists(_handler.get_oldest_used_generation());
+    postings.trimHoldLists(_handler.get_oldest_used_generation());
 }
 
 int
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..1ebef22bab7 100644
--- a/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/hnsw_index_test.cpp
@@ -101,8 +101,8 @@ public:
     void commit() {
         index->transfer_hold_lists(gen_handler.getCurrentGeneration());
         gen_handler.incGeneration();
-        gen_handler.updateFirstUsedGeneration();
-        index->trim_hold_lists(gen_handler.getFirstUsedGeneration());
+        gen_handler.update_oldest_used_generation();
+        index->trim_hold_lists(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..69a454e92cb 100644
--- a/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
+++ b/searchlib/src/tests/tensor/hnsw_index/stress_hnsw_mt.cpp
@@ -269,8 +269,8 @@ public:
     void commit(uint32_t docid) {
         index->transfer_hold_lists(gen_handler.getCurrentGeneration());
         gen_handler.incGeneration();
-        gen_handler.updateFirstUsedGeneration();
-        index->trim_hold_lists(gen_handler.getFirstUsedGeneration());
+        gen_handler.update_oldest_used_generation();
+        index->trim_hold_lists(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/attributevector.cpp b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
index 963285d760d..876830bb186 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.cpp
@@ -409,8 +409,8 @@ bool AttributeVector::applyWeight(DocId, const FieldValue&, const AssignValueUpd
 
 void
 AttributeVector::removeAllOldGenerations() {
-    _genHandler.updateFirstUsedGeneration();
-    removeOldGenerations(_genHandler.getFirstUsedGeneration());
+    _genHandler.update_oldest_used_generation();
+    removeOldGenerations(_genHandler.get_oldest_used_generation());
 }
 
 
@@ -483,14 +483,12 @@ AttributeVector::compactLidSpace(uint32_t wantedLidLimit) {
     incGeneration();
 }
 
-
 bool
 AttributeVector::canShrinkLidSpace() const {
     return wantShrinkLidSpace() &&
-        _compactLidSpaceGeneration.load(std::memory_order_relaxed) < getFirstUsedGeneration();
+        _compactLidSpaceGeneration.load(std::memory_order_relaxed) < get_oldest_used_generation();
 }
 
-
 void
 AttributeVector::shrinkLidSpace()
 {
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index f245a216aeb..4d4cd8ac35f 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -158,8 +158,8 @@ public:
     void incGeneration();
     void removeAllOldGenerations();
 
-    generation_t getFirstUsedGeneration() const {
-        return _genHandler.getFirstUsedGeneration();
+    generation_t get_oldest_used_generation() const {
+        return _genHandler.get_oldest_used_generation();
     }
 
     generation_t getCurrentGeneration() const {
@@ -466,8 +466,8 @@ public:
     /**
      * Should be called by the writer thread.
      */
-    void updateFirstUsedGeneration() {
-        _genHandler.updateFirstUsedGeneration();
+    void update_oldest_used_generation() {
+        _genHandler.update_oldest_used_generation();
     }
 
     /**
diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
index 7036ef238b6..cdf7e5f5ea8 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.cpp
@@ -109,8 +109,8 @@ LogDataStore::~LogDataStore()
 {
     // Must be called before ending threads as there are sanity checks.
     _fileChunks.clear();
-    _genHandler.updateFirstUsedGeneration();
-    _lidInfo.removeOldGenerations(_genHandler.getFirstUsedGeneration());
+    _genHandler.update_oldest_used_generation();
+    _lidInfo.removeOldGenerations(_genHandler.get_oldest_used_generation());
 }
 
 void
@@ -485,8 +485,8 @@ void LogDataStore::compactFile(FileId fileId)
     FileChunk::UP toDie;
     for (;;) {
         MonitorGuard guard(_updateLock);
-        _genHandler.updateFirstUsedGeneration();
-        if (currentGeneration < _genHandler.getFirstUsedGeneration()) {
+        _genHandler.update_oldest_used_generation();
+        if (currentGeneration < _genHandler.get_oldest_used_generation()) {
             if (_holdFileChunks[fc->getFileId().getId()] == 0u) {
                 toDie = std::move(fc);
                 break;
@@ -939,8 +939,8 @@ LogDataStore::setLid(const MonitorGuard &guard, uint32_t lid, const LidInfo &met
 {
     (void) guard;
     if (lid < _lidInfo.size()) {
-        _genHandler.updateFirstUsedGeneration();
-        _lidInfo.removeOldGenerations(_genHandler.getFirstUsedGeneration());
+        _genHandler.update_oldest_used_generation();
+        _lidInfo.removeOldGenerations(_genHandler.get_oldest_used_generation());
         const LidInfo prev = vespalib::atomic::load_ref_relaxed(_lidInfo[lid]);
         if (prev.valid()) {
             _fileChunks[prev.getFileId()]->remove(lid, prev.size());
@@ -958,8 +958,8 @@ LogDataStore::incGeneration()
 {
     _lidInfo.setGeneration(_genHandler.getNextGeneration());
     _genHandler.incGeneration();
-    _genHandler.updateFirstUsedGeneration();
-    _lidInfo.removeOldGenerations(_genHandler.getFirstUsedGeneration());
+    _genHandler.update_oldest_used_generation();
+    _lidInfo.removeOldGenerations(_genHandler.get_oldest_used_generation());
 }
 
 size_t
@@ -1213,7 +1213,7 @@ LogDataStore::canShrinkLidSpace(const MonitorGuard &) const
 {
     // Update lock is held, allowing call to _lidInfo.get_size()
     return getDocIdLimit() < _lidInfo.get_size() &&
-           _compactLidSpaceGeneration < _genHandler.getFirstUsedGeneration();
+           _compactLidSpaceGeneration < _genHandler.get_oldest_used_generation();
 }
 
 size_t
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.h b/searchlib/src/vespa/searchlib/memoryindex/field_index.h
index fb02ed880b4..bd087c8eae1 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/field_index.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.h
@@ -54,7 +54,7 @@ private:
 
     void trimHoldLists() {
         GenerationHandler::generation_t usedGen =
-            _generationHandler.getFirstUsedGeneration();
+                _generationHandler.get_oldest_used_generation();
         _postingListStore.trimHoldLists(usedGen);
         _dict.getAllocator().trimHoldLists(usedGen);
         _featureStore.trimHoldLists(usedGen);
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp
index 6e86d70fe52..e13d746df49 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp
@@ -184,7 +184,7 @@ FakeMemTreeOccMgr::incGeneration()
 void
 FakeMemTreeOccMgr::trimHoldLists()
 {
-    _allocator.trimHoldLists(_generationHandler.getFirstUsedGeneration());
+    _allocator.trimHoldLists(_generationHandler.get_oldest_used_generation());
 }