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

[btree_damage_visitor] cleanup: remove redundant statements

Browse Source
This commit is contained in:
Ming-Hung Tsai 2016-04-05 15:41:42 +08:00
parent f20e2a0f40
commit 9322fc9f14
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,6 +223,9 @@ namespace persistent_data {
bool check_internal(node_location const &loc, bool check_internal(node_location const &loc,
btree_detail::node_ref<block_traits> const &n) { btree_detail::node_ref<block_traits> const &n) {
if (loc.is_sub_root())
new_root(loc.level());
if (already_visited(n)) if (already_visited(n))
return false; return false;
else if (!checker_.check_block_nr(n) || else if (!checker_.check_block_nr(n) ||
@ -236,9 +239,6 @@ namespace persistent_data {
return false; return false;
} }
if (loc.is_sub_root())
new_root(loc.level());
good_internal(n.key_at(0)); good_internal(n.key_at(0));
return true; return true;
@ -247,6 +247,9 @@ namespace persistent_data {
template <typename ValueTraits2> template <typename ValueTraits2>
bool check_leaf(node_location const &loc, bool check_leaf(node_location const &loc,
btree_detail::node_ref<ValueTraits2> const &n) { btree_detail::node_ref<ValueTraits2> const &n) {
if (loc.is_sub_root())
new_root(loc.level());
if (already_visited(n)) if (already_visited(n))
return false; return false;
else if (!checker_.check_block_nr(n) || else if (!checker_.check_block_nr(n) ||
@ -254,24 +257,19 @@ namespace persistent_data {
!checker_.check_max_entries(n) || !checker_.check_max_entries(n) ||
!checker_.check_nr_entries(n, loc.is_sub_root()) || !checker_.check_nr_entries(n, loc.is_sub_root()) ||
!checker_.check_ordered_keys(n) || !checker_.check_ordered_keys(n) ||
!checker_.check_parent_key(n, loc.is_sub_root() ? boost::optional<uint64_t>() : loc.key)) { !checker_.check_parent_key(n, loc.is_sub_root() ? boost::optional<uint64_t>() : loc.key) ||
!checker_.check_leaf_key(n, last_leaf_key_[loc.level()])) {
report_damage(checker_.get_last_error_string()); report_damage(checker_.get_last_error_string());
return false; return false;
} }
if (loc.is_sub_root()) if (n.get_nr_entries() > 0) {
new_root(loc.level());
bool r = checker_.check_leaf_key(n, last_leaf_key_[loc.level()]);
if (!r)
report_damage(checker_.get_last_error_string());
else if (n.get_nr_entries() > 0) {
last_leaf_key_[loc.level()] = n.key_at(n.get_nr_entries() - 1); last_leaf_key_[loc.level()] = n.key_at(n.get_nr_entries() - 1);
good_leaf(n.key_at(0), n.key_at(n.get_nr_entries() - 1) + 1); good_leaf(n.key_at(0), n.key_at(n.get_nr_entries() - 1) + 1);
} }
return r; return true;
} }
template <typename node> template <typename node>