From aa9f255be5c8edd694ac1503942102461d3a62ed Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 6 Aug 2022 18:30:45 +0800 Subject: [PATCH] crimson, test: s/std::random_shuffle/std::shuffle/ to silence warnings like: ../src/test/crimson/seastore/onode_tree/test_staged_fltree.cc:371:10: warning: 'random_shuffle<__gnu_cxx::__normal_iterator *, std::vector>>>' is deprecated: use 'std::shuffle' instead [-Wdeprecated-declarations] std::random_shuffle(kvs.begin(), kvs.end()); ^ Signed-off-by: Kefu Chai --- .../os/seastore/onode_manager/staged-fltree/tree_utils.h | 2 +- src/test/crimson/seastore/onode_tree/test_staged_fltree.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h b/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h index 87fd4584d7df..3ad3564a6fd5 100644 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/tree_utils.h @@ -135,7 +135,7 @@ class KVPool { } void shuffle() { - std::random_shuffle(random_p_kvs.begin(), random_p_kvs.end()); + std::shuffle(random_p_kvs.begin(), random_p_kvs.end(), std::default_random_engine{}); } void erase_from_random(iterator_t begin, iterator_t end) { 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 99e60878ddac..fe7fc869c2d3 100644 --- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc +++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc @@ -368,7 +368,7 @@ TEST_F(b_dummy_tree_test_t, 3_random_insert_erase_leaf_node) {make_ghobj(4, 4, 4, "ns4", "oid4", 4, 4), values.pick()}}; auto [smallest_key, smallest_value] = kvs[0]; auto [largest_key, largest_value] = kvs[kvs.size() - 1]; - std::random_shuffle(kvs.begin(), kvs.end()); + std::shuffle(kvs.begin(), kvs.end(), std::default_random_engine{}); std::for_each(kvs.begin(), kvs.end(), [&f_insert_erase_insert] (auto& kv) { f_insert_erase_insert(kv.first, kv.second); }); @@ -424,7 +424,7 @@ TEST_F(b_dummy_tree_test_t, 3_random_insert_erase_leaf_node) logger().info("\n{}\n", oss.str()); // randomized erase until empty - std::random_shuffle(kvs.begin(), kvs.end()); + std::shuffle(kvs.begin(), kvs.end(), std::default_random_engine{}); for (auto& [k, v] : kvs) { auto e_size = with_trans_intr(*ref_t, [this, &k=k](auto& tr) { return tree->erase(tr, k); -- 2.47.3