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

Align terminology on generation hold lists in attribute vector code

9 files changed, 12 insertions, 12 deletions

diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
index c62226ad363..f25446d918f 100644
--- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
+++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp
@@ -1802,7 +1802,7 @@ TEST(DocumentMetaStoreTest, shrink_via_flush_target_works)
               ft->getApproxMemoryGain().getAfter());
 
     g.reset();
-    dms->removeAllOldGenerations();
+    dms->reclaim_unused_memory();
     assertLidSpace(10, shrinkTarget, shrinkTarget - 1, true, true, *dms);
     EXPECT_TRUE(ft->getApproxMemoryGain().getBefore() >
                 ft->getApproxMemoryGain().getAfter());
@@ -2008,7 +2008,7 @@ namespace {
 
 void try_compact_document_meta_store(DocumentMetaStore &dms)
 {
-    dms.removeAllOldGenerations();
+    dms.reclaim_unused_memory();
     dms.commit(true);
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index 69ef42ef9a8..418615058ce 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -239,7 +239,7 @@ applyReplayDone(uint32_t docIdLimit, AttributeVector &attr)
 void
 applyHeartBeat(SerialNum serialNum, AttributeVector &attr)
 {
-    attr.removeAllOldGenerations();
+    attr.reclaim_unused_memory();
     if (attr.getStatus().getLastSyncToken() <= serialNum) {
         attr.commit(search::CommitParam(serialNum));
     }
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
index 93663637e75..9a5e358a6f3 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
@@ -207,7 +207,7 @@ IFlushTarget::Task::UP
 FlushableAttribute::internalInitFlush(SerialNum currentSerial)
 {
     // Called by attribute field writer thread while document db executor waits
-    _attr->removeAllOldGenerations();
+    _attr->reclaim_unused_memory();
     SerialNum syncToken = std::max(currentSerial, _attr->getStatus().getLastSyncToken());
     auto writer = _attrDir->tryGetWriter();
     if (!writer) {
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_adapter.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_adapter.h
index 843a9eaaeaa..a4f744df6f9 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_adapter.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_adapter.h
@@ -24,7 +24,7 @@ public:
     DocId getCommittedDocIdLimit() const override {
         return doGetCommittedDocIdLimit();
     }
-    void removeAllOldGenerations() override {
+    void reclaim_unused_memory() override {
         doRemoveAllOldGenerations();
     }
     uint64_t getCurrentGeneration() const override {
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
index 2dc85f07cf4..401b210f6e0 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.h
@@ -51,7 +51,7 @@ public:
     // the ones with the same signature in proton::IDocumentMetaStore.
     using DocumentMetaStoreAttribute::commit;
     using DocumentMetaStoreAttribute::getCommittedDocIdLimit;
-    using DocumentMetaStoreAttribute::removeAllOldGenerations;
+    using DocumentMetaStoreAttribute::reclaim_unused_memory;
     using DocumentMetaStoreAttribute::getCurrentGeneration;
 
 private:
@@ -122,7 +122,7 @@ private:
         return getCommittedDocIdLimit();
     }
     void doRemoveAllOldGenerations() override {
-        removeAllOldGenerations();
+        reclaim_unused_memory();
     }
     uint64_t doGetCurrentGeneration() const override {
         return getCurrentGeneration();
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
index 7786ead49b2..609ee585a6c 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp
@@ -203,7 +203,7 @@ IFlushTarget::Task::UP
 DocumentMetaStoreFlushTarget::initFlush(SerialNum currentSerial, std::shared_ptr<search::IFlushToken>)
 {
     // Called by document db executor
-    _dms->removeAllOldGenerations();
+    _dms->reclaim_unused_memory();
     SerialNum syncToken = std::max(currentSerial, _dms->getStatus().getLastSyncToken());
     auto writer = _dmsDir->tryGetWriter();
     if (!writer) {
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h
index a03b6325797..942d3e21da5 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h
@@ -68,7 +68,7 @@ struct IDocumentMetaStore : public search::IDocumentMetaStore,
 
     // Functions that are also defined search::AttributeVector
     virtual void commit(const CommitParam & param) = 0;
-    virtual void removeAllOldGenerations() = 0;
+    virtual void reclaim_unused_memory() = 0;
     virtual bool canShrinkLidSpace() const = 0;
     virtual SerialNum getLastSerialNum() const = 0;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index a9850b5c2b7..533b270c20a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -763,7 +763,7 @@ void
 StoreOnlyFeedView::heartBeat(SerialNum serialNum, DoneCallback onDone)
 {
     assert(_writeService.master().isCurrentThread());
-    _metaStore.removeAllOldGenerations();
+    _metaStore.reclaim_unused_memory();
     _metaStore.commit(CommitParam(serialNum));
     heartBeatSummary(serialNum, onDone);
     heartBeatIndexedFields(serialNum, onDone);
diff --git a/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h b/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h
index 60682ae90e5..4092f548016 100644
--- a/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/document_meta_store_observer.h
@@ -162,8 +162,8 @@ struct DocumentMetaStoreObserver : public IDocumentMetaStore
     DocId getCommittedDocIdLimit() const override {
         return _store.getCommittedDocIdLimit();
     }
-    void removeAllOldGenerations() override {
-        _store.removeAllOldGenerations();
+    void reclaim_unused_memory() override {
+        _store.reclaim_unused_memory();
     }
     bool canShrinkLidSpace() const override {
         return _store.canShrinkLidSpace();