diff options
Diffstat (limited to 'vespalib/src/tests/btree')
5 files changed, 12 insertions, 12 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 3ba7bf85e42..2c9455701f7 100644 --- a/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp +++ b/vespalib/src/tests/btree/btree-stress/btree_stress_test.cpp @@ -279,7 +279,7 @@ Fixture<Params>::commit() _values.transfer_hold_lists(current_gen); allocator.transferHoldLists(_generationHandler.getCurrentGeneration()); _generationHandler.incGeneration(); - auto first_used_gen = _generationHandler.getFirstUsedGeneration(); + auto first_used_gen = _generationHandler.get_oldest_used_generation(); allocator.trimHoldLists(first_used_gen); _keys.trim_hold_lists(first_used_gen); _values.trim_hold_lists(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 4da34c64ed9..5196d08aa1b 100644 --- a/vespalib/src/tests/btree/btree_store/btree_store_test.cpp +++ b/vespalib/src/tests/btree/btree_store/btree_store_test.cpp @@ -33,7 +33,7 @@ protected: _store.freeze(); _store.transferHoldLists(_gen_handler.getCurrentGeneration()); _gen_handler.incGeneration(); - _store.trimHoldLists(_gen_handler.getFirstUsedGeneration()); + _store.trimHoldLists(_gen_handler.get_oldest_used_generation()); } EntryRef add_sequence(int start_key, int end_key) diff --git a/vespalib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp index 3fd00a26189..8aeef40c957 100644 --- a/vespalib/src/tests/btree/btree_test.cpp +++ b/vespalib/src/tests/btree/btree_test.cpp @@ -165,7 +165,7 @@ cleanup(GenerationHandler & g, ManagerType & m) m.freeze(); m.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - m.trimHoldLists(g.getFirstUsedGeneration()); + m.trimHoldLists(g.get_oldest_used_generation()); } template <typename ManagerType, typename NodeType> @@ -876,7 +876,7 @@ TEST_F(BTreeTest, require_that_we_can_insert_and_remove_from_tree) manager.freeze(); manager.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - manager.trimHoldLists(g.getFirstUsedGeneration()); + manager.trimHoldLists(g.get_oldest_used_generation()); } // remove entries for (size_t i = 0; i < numEntries; ++i) { @@ -1108,7 +1108,7 @@ TEST_F(BTreeTest, require_that_memory_usage_is_calculated) // trim hold lists tm.transferHoldLists(gh.getCurrentGeneration()); gh.incGeneration(); - tm.trimHoldLists(gh.getFirstUsedGeneration()); + tm.trimHoldLists(gh.get_oldest_used_generation()); mu = vespalib::MemoryUsage(); mu.incAllocatedBytes(adjustAllocatedBytes(initialInternalNodes, sizeof(INode))); mu.incAllocatedBytes(adjustAllocatedBytes(initialLeafNodes, sizeof(LNode))); @@ -1284,7 +1284,7 @@ TEST_F(BTreeTest, require_that_small_nodes_works) s.freeze(); s.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - s.trimHoldLists(g.getFirstUsedGeneration()); + s.trimHoldLists(g.get_oldest_used_generation()); } namespace { @@ -1418,7 +1418,7 @@ TEST_F(BTreeTest, require_that_apply_works) s.freeze(); s.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - s.trimHoldLists(g.getFirstUsedGeneration()); + s.trimHoldLists(g.get_oldest_used_generation()); } class MyTreeTestIterator : public MyTree::Iterator @@ -1555,7 +1555,7 @@ inc_generation(GenerationHandler &g, Tree &t) s.freeze(); s.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - s.trimHoldLists(g.getFirstUsedGeneration()); + s.trimHoldLists(g.get_oldest_used_generation()); } template <typename Tree> diff --git a/vespalib/src/tests/btree/btreeaggregation_test.cpp b/vespalib/src/tests/btree/btreeaggregation_test.cpp index dff7de6660f..fbe8e4c8424 100644 --- a/vespalib/src/tests/btree/btreeaggregation_test.cpp +++ b/vespalib/src/tests/btree/btreeaggregation_test.cpp @@ -274,7 +274,7 @@ freezeTree(GenerationHandler &g, ManagerType &m) m.freeze(); m.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - m.trimHoldLists(g.getFirstUsedGeneration()); + m.trimHoldLists(g.get_oldest_used_generation()); } template <typename ManagerType> @@ -893,7 +893,7 @@ Test::requireThatWeCanInsertAndRemoveFromTree() manager.freeze(); manager.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - manager.trimHoldLists(g.getFirstUsedGeneration()); + manager.trimHoldLists(g.get_oldest_used_generation()); } // remove entries for (size_t i = 0; i < numEntries; ++i) { @@ -1192,7 +1192,7 @@ Test::requireThatSmallNodesWorks() s.freeze(); s.transferHoldLists(g.getCurrentGeneration()); g.incGeneration(); - s.trimHoldLists(g.getFirstUsedGeneration()); + s.trimHoldLists(g.get_oldest_used_generation()); } void diff --git a/vespalib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp index 01748b9edeb..e031b759f62 100644 --- a/vespalib/src/tests/btree/frozenbtree_test.cpp +++ b/vespalib/src/tests/btree/frozenbtree_test.cpp @@ -136,7 +136,7 @@ FrozenBTreeTest::freeTree(bool verbose) _allocator->freeze(); _allocator->transferHoldLists(_generationHandler->getCurrentGeneration()); _generationHandler->incGeneration(); - _allocator->trimHoldLists(_generationHandler->getFirstUsedGeneration()); + _allocator->trimHoldLists(_generationHandler->get_oldest_used_generation()); delete _tree; _tree = NULL; delete _allocator; |