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 /searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_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 'searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp')
-rw-r--r-- | searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp index 8b21952b2d1..64cb6a6c146 100644 --- a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp +++ b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp @@ -107,7 +107,7 @@ TEST_F(DirectTensorStoreTest, hold_adds_entry_to_hold_list) EXPECT_GT(mem_2.allocatedBytesOnHold(), mem_1.allocatedBytesOnHold() + tensor_mem_usage.allocatedBytes()); } -TEST_F(DirectTensorStoreTest, move_allocates_new_entry_and_puts_old_entry_on_hold) +TEST_F(DirectTensorStoreTest, move_on_compact_allocates_new_entry_and_leaves_old_entry_alone) { auto t = make_tensor(5); auto* exp = t.get(); @@ -115,12 +115,13 @@ TEST_F(DirectTensorStoreTest, move_allocates_new_entry_and_puts_old_entry_on_hol auto ref_1 = store.store_tensor(std::move(t)); auto mem_1 = store.getMemoryUsage(); - auto ref_2 = store.move(ref_1); + auto ref_2 = store.move_on_compact(ref_1); auto mem_2 = store.getMemoryUsage(); EXPECT_NE(ref_1, ref_2); expect_tensor(exp, ref_1); expect_tensor(exp, ref_2); - EXPECT_GT(mem_2.allocatedBytesOnHold(), mem_1.allocatedBytesOnHold() + tensor_mem_usage.allocatedBytes()); + EXPECT_EQ(0, mem_2.allocatedBytesOnHold()); + EXPECT_GT(mem_2.usedBytes(), mem_1.usedBytes() + tensor_mem_usage.allocatedBytes()); } GTEST_MAIN_RUN_ALL_TESTS() |