crimson/os: use IsFullKey in _node_fields_013_t::append_key()

to fade out KeyT, so we can have more straightforward definitions.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc
index f2a55e5fffdda1dd5795501f2548c7ef16665ac2..95855943fc22f27c3bb40845424b03e4a9f18af0 100644 (file)
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage.cc
@@ -372,9 +372,9 @@ APPEND_T::open_nxt(const full_key_t<KT>& key)
 {
   if constexpr (FIELD_TYPE == field_type_t::N0 ||
                 FIELD_TYPE == field_type_t::N1) {
-    FieldType::template append_key<KT>(*p_mut, key, p_append_left);
+    FieldType::append_key(*p_mut, key, p_append_left);
   } else if constexpr (FIELD_TYPE == field_type_t::N2) {
-    FieldType::template append_key<KT>(*p_mut, key, p_append_right);
+    FieldType::append_key(*p_mut, key, p_append_right);
   } else {
     ceph_abort("impossible path");
   }

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h
index a3a3c69ad212744bcec2d1e7357c23be1972a252..101485c82d18bc618d96aa1527aee3800ba7c93a 100644 (file)
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/node_stage_layout.h
@@ -191,9 +191,9 @@ struct _node_fields_013_t {
       NodeExtentMutable&, const me_t& node, index_t index, int change);
   static void append_key(
       NodeExtentMutable&, const key_t& key, char*& p_append);
-  template <KeyT KT>
+  template <IsFullKey Key>
   static void append_key(
-      NodeExtentMutable& mut, const full_key_t<KT>& key, char*& p_append) {
+      NodeExtentMutable& mut, const Key& key, char*& p_append) {
     append_key(mut, key_t::from_key(key), p_append);
   }
   static void append_offset(
@@ -292,9 +292,9 @@ struct node_fields_2_t {
       NodeExtentMutable& mut, const key_t& key, char*& p_append) {
     ns_oid_view_t::append(mut, key, p_append);
   }
-  template <KeyT KT>
+  template <IsFullKey Key>
   static void append_key(
-      NodeExtentMutable& mut, const full_key_t<KT>& key, char*& p_append) {
+      NodeExtentMutable& mut, const Key& key, char*& p_append) {
     ns_oid_view_t::append(mut, key, p_append);
   }
   static void append_offset(

diff --git a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
index 5f2cc000f93569f76896c739d50ce62ca6e47f7a..1631f46f3157b4ca55e157c141396758589f6dd2 100644 (file)
--- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
+++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
@@ -67,7 +67,7 @@ namespace {
   std::pair<key_view_t, void*> build_key_view(const ghobject_t& hobj) {
     key_hobj_t key_hobj(hobj);
     size_t key_size = sizeof(shard_pool_crush_t) + sizeof(snap_gen_t) +
-                      ns_oid_view_t::estimate_size<KeyT::HOBJ>(key_hobj);
+                      ns_oid_view_t::estimate_size(key_hobj);
     void* p_mem = std::malloc(key_size);
 
     key_view_t key_view;
@@ -79,7 +79,7 @@ namespace {
     key_view.set(*reinterpret_cast<const shard_pool_crush_t*>(p_fill));
 
     auto p_ns_oid = p_fill;
-    ns_oid_view_t::test_append<KeyT::HOBJ>(key_hobj, p_fill);
+    ns_oid_view_t::test_append(key_hobj, p_fill);
     ns_oid_view_t ns_oid_view(p_ns_oid);
     key_view.set(ns_oid_view);