crimson/os/seastore/omap_manager: do binary search on omap nodes

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>

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 df97f394a0d12ba6ffdcc123b2403ca5a1420b15..9db3d09440a91567304e3980ee4a04e3ca0a9ef3 100644 (file)
--- 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
@@ -495,8 +495,11 @@ OMapInnerNode::merge_entry(
 OMapInnerNode::internal_iterator_t
 OMapInnerNode::get_containing_child(const std::string &key)
 {
-  auto iter = std::find_if(iter_begin(), iter_end(),
-       [&key](auto it) { return it.contains(key); });
+  auto iter = string_lower_bound(key);
+  if (iter == iter_end() || (iter != iter_begin() && iter.get_key() > key)) {
+    iter--;
+  }
+  assert(iter.contains(key));
   return iter;
 }
 

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 3825ebef145534fd62eae7052f49ef679af1b4f9..93a9b8dedb154ed561d88903b817ec33b7ad2074 100644 (file)
--- 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
@@ -597,13 +597,11 @@ public:
   }
 
   const_iterator find_string_key(std::string_view str) const {
-    auto ret = iter_begin();
-    for (; ret != iter_end(); ++ret) {
-     std::string s = ret->get_key();
-      if (s == str)
-        break;
+    auto iter = string_lower_bound(str);
+    if (iter.get_key() == str) {
+      return iter;
     }
-    return ret;
+    return iter_cend();
   }
 
   iterator find_string_key(std::string_view str) {