emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove level from btree_details::damage

Browse Source
This commit is contained in:
Joe Thornber
2013-05-17 11:35:46 +01:00
parent f016161e9a
commit 08b2749191
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
persistent-data/data-structures/btree_damage_visitor.h
View File

@@ -12,28 +12,23 @@ namespace persistent_data {
struct damage { struct damage {
typedef boost::shared_ptr<damage> ptr; typedef boost::shared_ptr<damage> ptr;
damage(unsigned level, damage(range<uint64_t> lost_keys,
range<uint64_t> lost_keys,
std::string const &desc) std::string const &desc)
: level_(level), : lost_keys_(lost_keys),
lost_keys_(lost_keys),
desc_(desc) { desc_(desc) {
} }
// Does _not_ compare the descriptions // FIXME: Write a matcher instead. Does _not_ compare the descriptions
bool operator ==(damage const &rhs) const { bool operator ==(damage const &rhs) const {
return (level_ == rhs.level_) && return (lost_keys_ == rhs.lost_keys_);
(lost_keys_ == rhs.lost_keys_);
} }
unsigned level_;
range<uint64_t> lost_keys_; range<uint64_t> lost_keys_;
std::string desc_; std::string desc_;
}; };
inline std::ostream &operator <<(std::ostream &out, damage const &d) { inline std::ostream &operator <<(std::ostream &out, damage const &d) {
out << "btree damage[level = " << d.level_ out << "btree damage[lost_keys = " << d.lost_keys_
<< ", effected_keys = " << d.lost_keys_
<< ", \"" << d.desc_ << "\"]"; << ", \"" << d.desc_ << "\"]";
return out; return out;
} }
@@ -387,7 +382,7 @@ namespace persistent_data {
void issue_damage(range64 const &r) { void issue_damage(range64 const &r) {
// FIXME: we don't really know what level // FIXME: we don't really know what level
// the damage is coming from // the damage is coming from
damage d(0, r, build_damage_desc()); damage d(r, build_damage_desc());
clear_damage_desc(); clear_damage_desc();
damage_visitor_.visit(d); damage_visitor_.visit(d);
} }

2
unit-tests/btree_damage_visitor_t.cc
View File

@@ -270,7 +270,7 @@ namespace {
} }
void expect_damage(unsigned level, range<uint64_t> keys) { void expect_damage(unsigned level, range<uint64_t> keys) {
EXPECT_CALL(damage_visitor_, visit(Eq(damage(level, keys, "foo")))).Times(1); EXPECT_CALL(damage_visitor_, visit(Eq(damage(keys, "foo")))).Times(1);
} }
//-------------------------------- //--------------------------------