1 files changed, 16 insertions, 14 deletions

diff --git a/vespalib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp
index 92f55681c0f..f2896cb783c 100644
--- a/vespalib/src/tests/btree/btree_test.cpp
+++ b/vespalib/src/tests/btree/btree_test.cpp
@@ -163,9 +163,9 @@ void
 cleanup(GenerationHandler & g, ManagerType & 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());
 }
 
 template <typename ManagerType, typename NodeType>
@@ -862,19 +862,21 @@ TEST_F(BTreeTest, require_that_we_can_insert_and_remove_from_tree)
     }
     // compact full tree by calling incremental compaction methods in a loop
     {
+        // Use a compaction strategy that will compact all active buffers
+        auto compaction_strategy = CompactionStrategy::make_compact_all_active_buffers_strategy();
         MyTree::NodeAllocatorType &manager = tree.getAllocator();
-        std::vector<uint32_t> toHold = manager.startCompact();
+        auto compacting_buffers = manager.start_compact_worst(compaction_strategy);
         MyTree::Iterator itr = tree.begin();
         tree.setRoot(itr.moveFirstLeafNode(tree.getRoot()));
         while (itr.valid()) {
             // LOG(info, "Leaf moved to %d", UNWRAP(itr.getKey()));
             itr.moveNextLeafNode();
         }
-        manager.finishCompact(toHold);
+        compacting_buffers->finish();
         manager.freeze();
-        manager.transferHoldLists(g.getCurrentGeneration());
+        manager.assign_generation(g.getCurrentGeneration());
         g.incGeneration();
-        manager.trimHoldLists(g.getFirstUsedGeneration());
+        manager.reclaim_memory(g.get_oldest_used_generation());
     }
     // remove entries
     for (size_t i = 0; i < numEntries; ++i) {
@@ -1104,9 +1106,9 @@ 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.getFirstUsedGeneration());
+    tm.reclaim_memory(gh.get_oldest_used_generation());
     mu = vespalib::MemoryUsage();
     mu.incAllocatedBytes(adjustAllocatedBytes(initialInternalNodes, sizeof(INode)));
     mu.incAllocatedBytes(adjustAllocatedBytes(initialLeafNodes, sizeof(LNode)));
@@ -1280,9 +1282,9 @@ 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.getFirstUsedGeneration());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 namespace {
@@ -1414,9 +1416,9 @@ 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.getFirstUsedGeneration());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 class MyTreeTestIterator : public MyTree::Iterator
@@ -1551,9 +1553,9 @@ 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.getFirstUsedGeneration());
+    s.reclaim_memory(g.get_oldest_used_generation());
 }
 
 template <typename Tree>