From cb381a6dae8517e95f7dc087117cd04f4d7c6008 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Fri, 14 Feb 2025 16:57:59 +0800 Subject: [PATCH] crimson/os/seastore/omap_manager: rename StringKVNodeLayout::get_index to StringKVNodeLayout::get_offset This is to be consistent with linked tree nodes Signed-off-by: Xuehan Xu --- .../omap_manager/btree/omap_btree_node_impl.cc | 16 ++++++++-------- .../omap_manager/btree/string_kv_node_layout.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc index bbbacfada2c11..042b22d189300 100644 --- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc +++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc @@ -63,11 +63,11 @@ OMapInnerNode::make_split_insert( return make_split_children(oc).si_then([=] (auto tuple) { auto [left, right, pivot] = tuple; if (pivot > key) { - auto liter = left->iter_idx(iter.get_index()); + auto liter = left->iter_idx(iter.get_offset()); left->journal_inner_insert(liter, laddr, key, left->maybe_get_delta_buffer()); } else { //right - auto riter = right->iter_idx(iter.get_index() - left->get_node_size()); + auto riter = right->iter_idx(iter.get_offset() - left->get_node_size()); right->journal_inner_insert(riter, laddr, key, right->maybe_get_delta_buffer()); } @@ -90,7 +90,7 @@ OMapInnerNode::handle_split( DEBUGT("this: {}", oc.t, *this); if (!is_mutable()) { auto mut = oc.tm.get_mutable_extent(oc.t, this)->cast(); - auto mut_iter = mut->iter_idx(iter.get_index()); + auto mut_iter = mut->iter_idx(iter.get_offset()); return mut->handle_split(oc, mut_iter, mresult); } auto [left, right, pivot] = *(mresult.split_tuple); @@ -396,7 +396,7 @@ OMapInnerNode::merge_entry( DEBUGT("{}, parent: {}", oc.t, *entry, *this); if (!is_mutable()) { auto mut = oc.tm.get_mutable_extent(oc.t, this)->cast(); - auto mut_iter = mut->iter_idx(iter->get_index()); + auto mut_iter = mut->iter_idx(iter->get_offset()); return mut->merge_entry(oc, mut_iter, entry); } auto is_left = (iter + 1) == iter_cend(); @@ -563,20 +563,20 @@ OMapLeafNode::insert( if (replace_pt != iter_end()) { ++(oc.t.get_omap_tree_stats().num_updates); if (key < pivot) { //left - auto mut_iter = left->iter_idx(replace_pt->get_index()); + auto mut_iter = left->iter_idx(replace_pt->get_offset()); left->journal_leaf_update(mut_iter, key, value, left->maybe_get_delta_buffer()); } else if (key >= pivot) { //right - auto mut_iter = right->iter_idx(replace_pt->get_index() - left->get_node_size()); + auto mut_iter = right->iter_idx(replace_pt->get_offset() - left->get_node_size()); right->journal_leaf_update(mut_iter, key, value, right->maybe_get_delta_buffer()); } } else { ++(oc.t.get_omap_tree_stats().num_inserts); auto insert_pt = string_lower_bound(key); if (key < pivot) { //left - auto mut_iter = left->iter_idx(insert_pt->get_index()); + auto mut_iter = left->iter_idx(insert_pt->get_offset()); left->journal_leaf_insert(mut_iter, key, value, left->maybe_get_delta_buffer()); } else { - auto mut_iter = right->iter_idx(insert_pt->get_index() - left->get_node_size()); + auto mut_iter = right->iter_idx(insert_pt->get_offset() - left->get_node_size()); right->journal_leaf_insert(mut_iter, key, value, right->maybe_get_delta_buffer()); } } diff --git a/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h b/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h index 84bdd614004fe..69f5601132181 100644 --- a/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h +++ b/src/crimson/os/seastore/omap_manager/btree/string_kv_node_layout.h @@ -440,7 +440,7 @@ public: } public: - uint16_t get_index() const { + uint16_t get_offset() const { return index; } @@ -762,7 +762,7 @@ public: auto node_key = ite->get_node_key(); size += node_key.key_len; if (size >= pivot_size){ - pivot_idx = ite.get_index(); + pivot_idx = ite.get_offset(); break; } } @@ -773,7 +773,7 @@ public: auto node_key = ite->get_node_key(); size += node_key.key_len; if (size >= more_size){ - pivot_idx = ite.get_index() + left.get_size(); + pivot_idx = ite.get_offset() + left.get_size(); break; } } @@ -1056,7 +1056,7 @@ public: } public: - uint16_t get_index() const { + uint16_t get_offset() const { return index; } @@ -1387,7 +1387,7 @@ public: auto node_key = ite->get_node_key(); size += node_key.key_len + node_key.val_len; if (size >= pivot_size){ - pivot_idx = ite.get_index(); + pivot_idx = ite.get_offset(); break; } } @@ -1398,7 +1398,7 @@ public: auto node_key = ite->get_node_key(); size += node_key.key_len + node_key.val_len; if (size >= more_size){ - pivot_idx = ite.get_index() + left.get_size(); + pivot_idx = ite.get_offset() + left.get_size(); break; } } -- 2.39.5