From 94c7e97c6d0de75d7fbf4366228902ae9436621d Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Mon, 16 Oct 2017 16:09:51 +0800 Subject: [PATCH] osd/osd_type.h: kill pg_missing_set.have_old which has no consumers, and removing the unused code should always be the preferred option. Signed-off-by: xie xingguo --- src/osd/osd_types.h | 9 --------- src/test/osd/types.cc | 12 ------------ 2 files changed, 21 deletions(-) diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index a1201c537e4dd..392adfaf8b22a 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -3745,7 +3745,6 @@ public: virtual bool have_missing() const = 0; virtual bool is_missing(const hobject_t& oid, pg_missing_item *out = nullptr) const = 0; virtual bool is_missing(const hobject_t& oid, eversion_t v) const = 0; - virtual eversion_t have_old(const hobject_t& oid) const = 0; virtual ~pg_missing_const_i() {} }; @@ -3836,14 +3835,6 @@ public: return false; return true; } - eversion_t have_old(const hobject_t& oid) const override { - map::const_iterator m = - missing.find(oid); - if (m == missing.end()) - return eversion_t(); - const item &item(m->second); - return item.have; - } void claim(pg_missing_set& o) { static_assert(!TrackChanges, "Can't use claim with TrackChanges"); diff --git a/src/test/osd/types.cc b/src/test/osd/types.cc index 16154fb06cac0..6491cc74c0c9d 100644 --- a/src/test/osd/types.cc +++ b/src/test/osd/types.cc @@ -723,18 +723,6 @@ TEST(pg_missing_t, is_missing) } } -TEST(pg_missing_t, have_old) -{ - hobject_t oid(object_t("objname"), "key", 123, 456, 0, ""); - pg_missing_t missing; - EXPECT_EQ(eversion_t(), missing.have_old(oid)); - missing.add(oid, eversion_t(), eversion_t(), false); - EXPECT_EQ(eversion_t(), missing.have_old(oid)); - eversion_t have(1,1); - missing.revise_have(oid, have); - EXPECT_EQ(have, missing.have_old(oid)); -} - TEST(pg_missing_t, add_next_event) { hobject_t oid(object_t("objname"), "key", 123, 456, 0, ""); -- 2.39.5