From 02b7841d062c12261c876dabe8d4a329e8c1d7bc Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 7 Aug 2021 00:37:28 +0800 Subject: [PATCH] test/crimson/seastore: capture labels by defining new variables structured binding does not define variables, so we have to define variables in capture list for capturing them. Signed-off-by: Kefu Chai --- .../seastore/onode_tree/test_staged_fltree.cc | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc index 0736746a4c632..ac23d040ddc18 100644 --- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc +++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc @@ -377,7 +377,9 @@ TEST_F(b_dummy_tree_test_t, 3_random_insert_erase_leaf_node) for (auto& [k, val] : insert_history) { auto& [v, c] = val; // validate values in tree keep intact - auto cursor = INTR_R(tree.find, t, k).unsafe_get0(); + auto cursor = with_trans_intr(t, [this, &k=k](auto& tr) { + return tree.find(tr, k); + }).unsafe_get0(); EXPECT_NE(cursor, tree.end()); validate_cursor_from_item(k, v, cursor); // validate values in cursors keep intact @@ -423,7 +425,9 @@ TEST_F(b_dummy_tree_test_t, 3_random_insert_erase_leaf_node) // randomized erase until empty std::random_shuffle(kvs.begin(), kvs.end()); for (auto& [k, v] : kvs) { - auto e_size = INTR_R(tree.erase, t, k).unsafe_get0(); + auto e_size = with_trans_intr(t, [this, &k=k](auto& tr) { + return tree.erase(tr, k); + }).unsafe_get0(); ASSERT_EQ(e_size, 1); } auto cursor = INTR(tree.begin, t).unsafe_get0(); @@ -543,7 +547,9 @@ class TestTree { for (auto& [k, val] : insert_history) { auto& [v, c] = val; - auto result = INTR_R(tree_clone.find, t_clone, k).unsafe_get0(); + auto result = with_trans_intr(t_clone, [&tree_clone, &k=k] (auto& tr) { + return tree_clone.find(tr, k); + }).unsafe_get0(); EXPECT_NE(result, tree_clone.end()); validate_cursor_from_item(k, v, result); } @@ -555,7 +561,9 @@ class TestTree { // erase and merge logger().info("\n\nERASE-MERGE {}:", key_hobj_t(key)); - auto nxt_cursor = INTR(cursor.erase, t_clone).unsafe_get0(); + auto nxt_cursor = with_trans_intr(t_clone, [&cursor=cursor](auto& tr) { + return cursor.erase(tr); + }).unsafe_get0(); { // track root again to dump @@ -577,7 +585,9 @@ class TestTree { for (auto& [k, val] : insert_history) { auto& [v, c] = val; - auto result = INTR_R(tree_clone.find, t_clone, k).unsafe_get0(); + auto result = with_trans_intr(t_clone, [&tree_clone, &k=k](auto& tr) { + return tree_clone.find(tr, k); + }).unsafe_get0(); EXPECT_NE(result, tree_clone.end()); validate_cursor_from_item(k, v, result); } -- 2.39.5