Rename transferHoldLists() -> assign_generation().

5 files changed, 18 insertions, 18 deletions

diff --git a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
index 2c9455701f7..03bc09211b4 100644
--- a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
+++ b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp
@@ -59,7 +59,7 @@ public:
     AtomicEntryRef add_relaxed(uint32_t value) { return AtomicEntryRef(add(value)); }
     void hold(const AtomicEntryRef& ref) { _store.holdElem(ref.load_relaxed(), 1); }
     EntryRef move(EntryRef ref);
-    void transfer_hold_lists(generation_t gen) { _store.transferHoldLists(gen); }
+    void assign_generation(generation_t current_gen) { _store.assign_generation(current_gen); }
     void trim_hold_lists(generation_t gen) { _store.trimHoldLists(gen); }
     uint32_t get(EntryRef ref) const { return _store.getEntry(ref); }
     uint32_t get_acquire(const AtomicEntryRef& ref) const { return get(ref.load_acquire()); }
@@ -118,7 +118,7 @@ public:
     static uint32_t add(uint32_t value) noexcept { return value; }
     static uint32_t add_relaxed(uint32_t value) noexcept { return value; }
     static void hold(uint32_t) noexcept { }
-    static void transfer_hold_lists(generation_t) noexcept { }
+    static void assign_generation(generation_t) noexcept { }
     static void trim_hold_lists(generation_t) noexcept { }
     static uint32_t get(uint32_t value) noexcept { return value; }
     static uint32_t get_acquire(uint32_t value) noexcept { return value; }
@@ -274,10 +274,10 @@ Fixture<Params>::commit()
     auto &allocator = _tree.getAllocator();
     allocator.freeze();
     auto current_gen = _generationHandler.getCurrentGeneration();
-    allocator.transferHoldLists(current_gen);
-    _keys.transfer_hold_lists(current_gen);
-    _values.transfer_hold_lists(current_gen);
-    allocator.transferHoldLists(_generationHandler.getCurrentGeneration());
+    allocator.assign_generation(current_gen);
+    _keys.assign_generation(current_gen);
+    _values.assign_generation(current_gen);
+    allocator.assign_generation(_generationHandler.getCurrentGeneration());
     _generationHandler.incGeneration();
     auto first_used_gen = _generationHandler.get_oldest_used_generation();
     allocator.trimHoldLists(first_used_gen);
diff --git a/vespalib/src/tests/btree/btree_store/btree_store_test.cpp b/vespalib/src/tests/btree/btree_store/btree_store_test.cpp
index 5196d08aa1b..3dcc4830678 100644
--- a/vespalib/src/tests/btree/btree_store/btree_store_test.cpp
+++ b/vespalib/src/tests/btree/btree_store/btree_store_test.cpp
@@ -31,7 +31,7 @@ protected:
     void inc_generation()
     {
         _store.freeze();
-        _store.transferHoldLists(_gen_handler.getCurrentGeneration());
+        _store.assign_generation(_gen_handler.getCurrentGeneration());
         _gen_handler.incGeneration();
         _store.trimHoldLists(_gen_handler.get_oldest_used_generation());
     }
diff --git a/vespalib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp
index 8aeef40c957..09877e00ac5 100644
--- a/vespalib/src/tests/btree/btree_test.cpp
+++ b/vespalib/src/tests/btree/btree_test.cpp
@@ -163,7 +163,7 @@ void
 cleanup(GenerationHandler & g, ManagerType & m)
 {
     m.freeze();
-    m.transferHoldLists(g.getCurrentGeneration());
+    m.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
     m.trimHoldLists(g.get_oldest_used_generation());
 }
@@ -874,7 +874,7 @@ TEST_F(BTreeTest, require_that_we_can_insert_and_remove_from_tree)
         }
         compacting_buffers->finish();
         manager.freeze();
-        manager.transferHoldLists(g.getCurrentGeneration());
+        manager.assign_generation(g.getCurrentGeneration());
         g.incGeneration();
         manager.trimHoldLists(g.get_oldest_used_generation());
     }
@@ -1106,7 +1106,7 @@ TEST_F(BTreeTest, require_that_memory_usage_is_calculated)
     EXPECT_TRUE(assertMemoryUsage(mu, tm.getMemoryUsage()));
 
     // trim hold lists
-    tm.transferHoldLists(gh.getCurrentGeneration());
+    tm.assign_generation(gh.getCurrentGeneration());
     gh.incGeneration();
     tm.trimHoldLists(gh.get_oldest_used_generation());
     mu = vespalib::MemoryUsage();
@@ -1282,7 +1282,7 @@ TEST_F(BTreeTest, require_that_small_nodes_works)
     s.clear(root);
     s.clearBuilder();
     s.freeze();
-    s.transferHoldLists(g.getCurrentGeneration());
+    s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
     s.trimHoldLists(g.get_oldest_used_generation());
 }
@@ -1416,7 +1416,7 @@ TEST_F(BTreeTest, require_that_apply_works)
     s.clear(root);
     s.clearBuilder();
     s.freeze();
-    s.transferHoldLists(g.getCurrentGeneration());
+    s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
     s.trimHoldLists(g.get_oldest_used_generation());
 }
@@ -1553,7 +1553,7 @@ inc_generation(GenerationHandler &g, Tree &t)
 {
     auto &s = t.getAllocator();
     s.freeze();
-    s.transferHoldLists(g.getCurrentGeneration());
+    s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
     s.trimHoldLists(g.get_oldest_used_generation());
 }
diff --git a/vespalib/src/tests/btree/btreeaggregation_test.cpp b/vespalib/src/tests/btree/btreeaggregation_test.cpp
index fbe8e4c8424..6bbf9c13790 100644
--- a/vespalib/src/tests/btree/btreeaggregation_test.cpp
+++ b/vespalib/src/tests/btree/btreeaggregation_test.cpp
@@ -272,7 +272,7 @@ void
 freezeTree(GenerationHandler &g, ManagerType &m)
 {
     m.freeze();
-    m.transferHoldLists(g.getCurrentGeneration());
+    m.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
     m.trimHoldLists(g.get_oldest_used_generation());
 }
@@ -891,7 +891,7 @@ Test::requireThatWeCanInsertAndRemoveFromTree()
         }
         compacting_buffers->finish();
         manager.freeze();
-        manager.transferHoldLists(g.getCurrentGeneration());
+        manager.assign_generation(g.getCurrentGeneration());
         g.incGeneration();
         manager.trimHoldLists(g.get_oldest_used_generation());
     }
@@ -1190,7 +1190,7 @@ Test::requireThatSmallNodesWorks()
     s.clear(root);
     s.clearBuilder();
     s.freeze();
-    s.transferHoldLists(g.getCurrentGeneration());
+    s.assign_generation(g.getCurrentGeneration());
     g.incGeneration();
     s.trimHoldLists(g.get_oldest_used_generation());
 }
diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp
index e031b759f62..55b260fb1d9 100644
--- a/vespalib/src/tests/btree/frozenbtree_test.cpp
+++ b/vespalib/src/tests/btree/frozenbtree_test.cpp
@@ -134,7 +134,7 @@ FrozenBTreeTest::freeTree(bool verbose)
     (void) verbose;
     _tree->clear(*_allocator);
     _allocator->freeze();
-    _allocator->transferHoldLists(_generationHandler->getCurrentGeneration());
+    _allocator->assign_generation(_generationHandler->getCurrentGeneration());
     _generationHandler->incGeneration();
     _allocator->trimHoldLists(_generationHandler->get_oldest_used_generation());
     delete _tree;
@@ -425,7 +425,7 @@ FrozenBTreeTest::Main()
     EXPECT_TRUE(_tree->getFrozenView(*_allocator).empty());
     _allocator->freeze();
     EXPECT_FALSE(_tree->getFrozenView(*_allocator).empty());
-    _allocator->transferHoldLists(_generationHandler->getCurrentGeneration());
+    _allocator->assign_generation(_generationHandler->getCurrentGeneration());
     lookupFrozenRandomValues(*_tree, *_allocator, _randomValues);
     traverseTreeIterator(*_tree,
                          *_allocator,