diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-10-11 16:52:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-11 16:52:30 +0200 |
commit | 274bcee5a55fb61a7c819e6be6acca554fe7a3ae (patch) | |
tree | d01ef596666f441c4f9871532aa462e3e4117bd0 /vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp | |
parent | 12a1252225e3dd606066250699789b0c342980a3 (diff) | |
parent | 79e553fb451b09437dad80070597fa317515ae3a (diff) |
Merge pull request #24393 from vespa-engine/toregge/rename-icompactable-move-to-move-on-compactv8.67.17
Rename ICompactable::move to move_on_compact.
Diffstat (limited to 'vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp')
-rw-r--r-- | vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp b/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp index f68dd4dde66..0b34f587c6d 100644 --- a/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp +++ b/vespalib/src/tests/datastore/unique_store_string_allocator/unique_store_string_allocator_test.cpp @@ -51,8 +51,8 @@ struct TestBase : public ::testing::Test { void remove(EntryRef ref) { allocator.hold(ref); } - EntryRef move(EntryRef ref) { - return allocator.move(ref); + EntryRef move_on_compact(EntryRef ref) { + return allocator.move_on_compact(ref); } uint32_t get_buffer_id(EntryRef ref) const { return EntryRefType(ref).bufferId(); @@ -104,7 +104,7 @@ TEST_F(StringTest, extra_bytes_used_is_tracked) assert_buffer_state(ref, TestBufferStats().used(2).hold(0).dead(2)); ref = add(spaces1000.c_str()); assert_buffer_state(ref, TestBufferStats().used(2).hold(0).dead(1).extra_used(1001)); - EntryRef ref2 = move(ref); + EntryRef ref2 = move_on_compact(ref); assert_get(ref2, spaces1000.c_str()); assert_buffer_state(ref, TestBufferStats().used(3).hold(0).dead(1).extra_used(2002)); remove(ref); @@ -159,7 +159,7 @@ TEST_F(StringTest, free_list_is_not_used_when_disabled) assert_buffer_state(ref2, TestBufferStats().used(3).hold(0).dead(2).extra_used(1001)); } -TEST_F(StringTest, free_list_is_never_used_for_move) +TEST_F(StringTest, free_list_is_never_used_for_move_on_compact) { // Free lists are default enabled for UniqueStoreStringAllocator EntryRef ref1 = add(small.c_str()); @@ -169,8 +169,8 @@ TEST_F(StringTest, free_list_is_never_used_for_move) remove(ref3); remove(ref4); trim_hold_lists(); - EntryRef ref5 = move(ref1); - EntryRef ref6 = move(ref2); + EntryRef ref5 = move_on_compact(ref1); + EntryRef ref6 = move_on_compact(ref2); EXPECT_NE(ref5, ref3); EXPECT_NE(ref6, ref4); assert_buffer_state(ref1, TestBufferStats().used(48).hold(0).dead(16)); |