From 6fba204d553e78202c5a3071fc3664b5d7eb44e9 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Sat, 17 Jun 2017 11:19:58 +0800 Subject: [PATCH] os/bluestore: kill dead ExtentMap::find_lextent() method Which currently has no consumers. Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 9 ---- src/os/bluestore/BlueStore.h | 4 +- src/test/objectstore/test_bluestore_types.cc | 48 -------------------- 3 files changed, 1 insertion(+), 60 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 357c848d05f..b9d6ec4c70f 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -2649,15 +2649,6 @@ BlueStore::extent_map_t::iterator BlueStore::ExtentMap::find( return extent_map.find(dummy); } -BlueStore::extent_map_t::iterator BlueStore::ExtentMap::find_lextent( - uint64_t offset) -{ - auto fp = seek_lextent(offset); - if (fp != extent_map.end() && fp->logical_offset > offset) - return extent_map.end(); // extent is past offset - return fp; -} - BlueStore::extent_map_t::iterator BlueStore::ExtentMap::seek_lextent( uint64_t offset) { diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index bd73e0486f0..1114e7b4f47 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -831,11 +831,9 @@ public: /// ensure a range of the map is marked dirty void dirty_range(uint32_t offset, uint32_t length); + /// for seek_lextent test extent_map_t::iterator find(uint64_t offset); - /// find a lextent that includes offset - extent_map_t::iterator find_lextent(uint64_t offset); - /// seek to the first lextent including or after offset extent_map_t::iterator seek_lextent(uint64_t offset); extent_map_t::const_iterator seek_lextent(uint64_t offset) const; diff --git a/src/test/objectstore/test_bluestore_types.cc b/src/test/objectstore/test_bluestore_types.cc index 39c3918043a..f16f8452c4c 100644 --- a/src/test/objectstore/test_bluestore_types.cc +++ b/src/test/objectstore/test_bluestore_types.cc @@ -1029,54 +1029,6 @@ TEST(Blob, legacy_decode) ASSERT_TRUE(Bres.get_blob_use_tracker().equal(Bres2.get_blob_use_tracker())); } } -TEST(ExtentMap, find_lextent) -{ - BlueStore store(g_ceph_context, "", 4096); - BlueStore::LRUCache cache(g_ceph_context); - BlueStore::CollectionRef coll(new BlueStore::Collection(&store, &cache, coll_t())); - BlueStore::Onode onode(coll.get(), ghobject_t(), ""); - BlueStore::ExtentMap em(&onode); - BlueStore::BlobRef br(new BlueStore::Blob); - br->shared_blob = new BlueStore::SharedBlob(coll.get()); - - ASSERT_EQ(em.extent_map.end(), em.find_lextent(0)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(100)); - - em.extent_map.insert(*new BlueStore::Extent(100, 0, 100, br)); - auto a = em.find(100); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(0)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(99)); - ASSERT_EQ(a, em.find_lextent(100)); - ASSERT_EQ(a, em.find_lextent(101)); - ASSERT_EQ(a, em.find_lextent(199)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(200)); - - em.extent_map.insert(*new BlueStore::Extent(200, 0, 100, br)); - auto b = em.find(200); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(0)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(99)); - ASSERT_EQ(a, em.find_lextent(100)); - ASSERT_EQ(a, em.find_lextent(101)); - ASSERT_EQ(a, em.find_lextent(199)); - ASSERT_EQ(b, em.find_lextent(200)); - ASSERT_EQ(b, em.find_lextent(299)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(300)); - - em.extent_map.insert(*new BlueStore::Extent(400, 0, 100, br)); - auto d = em.find(400); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(0)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(99)); - ASSERT_EQ(a, em.find_lextent(100)); - ASSERT_EQ(a, em.find_lextent(101)); - ASSERT_EQ(a, em.find_lextent(199)); - ASSERT_EQ(b, em.find_lextent(200)); - ASSERT_EQ(b, em.find_lextent(299)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(300)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(399)); - ASSERT_EQ(d, em.find_lextent(400)); - ASSERT_EQ(d, em.find_lextent(499)); - ASSERT_EQ(em.extent_map.end(), em.find_lextent(500)); -} TEST(ExtentMap, seek_lextent) { -- 2.39.5