From de91ba68c49aab1eab59898e74f608da2b64ad51 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 13 Sep 2020 23:46:33 +0800 Subject: [PATCH] test/crimson: remove unused variables Signed-off-by: Kefu Chai --- .../crimson/seastore/test_extmap_manager.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/test/crimson/seastore/test_extmap_manager.cc b/src/test/crimson/seastore/test_extmap_manager.cc index 8a46424b23ae9..3e86566c70733 100644 --- a/src/test/crimson/seastore/test_extmap_manager.cc +++ b/src/test/crimson/seastore/test_extmap_manager.cc @@ -97,15 +97,14 @@ struct extentmap_manager_test_t : public seastar_test_suite_t { return extent; } - bool rm_extent( + void rm_extent( extmap_root_t &extmap_root, Transaction &t, uint32_t lo, lext_map_val_t val ) { auto ret = extmap_manager->rm_lextent(extmap_root, t, lo, val).unsafe_get0(); - EXPECT_EQ(ret, true); + EXPECT_TRUE(ret); test_ext_mappings.erase(test_ext_mappings.find(lo)); - return ret; } void check_mappings(extmap_root_t &extmap_root, Transaction &t) { @@ -147,8 +146,8 @@ TEST_F(extentmap_manager_test_t, basic) { auto t = tm.create_transaction(); logger().debug("second transaction"); - [[maybe_unused]] auto seekref = find_extent(extmap_root, *t, lo, len); - [[maybe_unused]] auto rmret = rm_extent(extmap_root, *t, lo, {seekref.front().laddr, len}); + auto seekref = find_extent(extmap_root, *t, lo, len); + rm_extent(extmap_root, *t, lo, {seekref.front().laddr, len}); [[maybe_unused]] auto seekref2 = findno_extent(extmap_root, *t, lo, len); tm.submit_transaction(std::move(t)).unsafe_get(); } @@ -221,7 +220,7 @@ TEST_F(extentmap_manager_test_t, force_split_merge) int i = 0; for (auto &e: test_ext_mappings) { if (i % 3 != 0) { - [[maybe_unused]] auto rmref= rm_extent(extmap_root, *t, e.first, e.second); + rm_extent(extmap_root, *t, e.first, e.second); } if (i % 10 == 0) { @@ -272,17 +271,16 @@ TEST_F(extentmap_manager_test_t, force_split_balanced) int i = 0; for (auto &e: test_ext_mappings) { if (i < 100) { - auto val = e; - [[maybe_unused]] auto rmref= rm_extent(extmap_root, *t, e.first, e.second); + rm_extent(extmap_root, *t, e.first, e.second); } if (i % 10 == 0) { - logger().debug("submitting transaction i= {}", i); + logger().debug("submitting transaction i= {}", i); tm.submit_transaction(std::move(t)).unsafe_get(); t = tm.create_transaction(); } if (i % 50 == 0) { - logger().debug("check_mappings i= {}", i); + logger().debug("check_mappings i= {}", i); check_mappings(extmap_root, *t); check_mappings(extmap_root); } -- 2.39.5