From 92f6354fad784c88da38f4fb519efe9daefcdffb Mon Sep 17 00:00:00 2001
From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Mon, 2 Nov 2020 13:35:11 +0800
Subject: [PATCH] crimson/onode-staged-tree: rename
 ns_oid_view_t::test_append()

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---
 .../staged-fltree/stages/key_layout.h              | 14 +++++++-------
 .../seastore/onode_tree/test_staged_fltree.cc      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h
index 77dec492438..9436894f925 100644
--- a/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h
+++ b/src/crimson/os/seastore/onode_manager/staged-fltree/stages/key_layout.h
@@ -191,7 +191,7 @@ struct string_key_view_t {
   static void append_str(
       NodeExtentMutable&, std::string_view, char*& p_append);
 
-  static void append_str(std::string_view str, char*& p_append) {
+  static void test_append_str(std::string_view str, char*& p_append) {
     p_append -= sizeof(string_size_t);
     assert(str.length() < std::numeric_limits<string_size_t>::max());
     string_size_t len = str.length();
@@ -204,7 +204,7 @@ struct string_key_view_t {
   static void append_dedup(
       NodeExtentMutable&, const Type& dedup_type, char*& p_append);
 
-  static void append_dedup(const Type& dedup_type, char*& p_append) {
+  static void test_append_dedup(const Type& dedup_type, char*& p_append) {
     p_append -= sizeof(string_size_t);
     string_size_t len;
     if (dedup_type == Type::MIN) {
@@ -364,7 +364,7 @@ struct ns_oid_view_t {
   }
 
   template <KeyT KT>
-  static void append(const full_key_t<KT>& key, char*& p_append);
+  static void test_append(const full_key_t<KT>& key, char*& p_append);
 
   string_key_view_t nspace;
   string_key_view_t oid;
@@ -718,12 +718,12 @@ void ns_oid_view_t::append(
 }
 
 template <KeyT KT>
-void ns_oid_view_t::append(const full_key_t<KT>& key, char*& p_append) {
+void ns_oid_view_t::test_append(const full_key_t<KT>& key, char*& p_append) {
   if (key.dedup_type() == Type::STR) {
-    string_key_view_t::append_str(key.nspace(), p_append);
-    string_key_view_t::append_str(key.oid(), p_append);
+    string_key_view_t::test_append_str(key.nspace(), p_append);
+    string_key_view_t::test_append_str(key.oid(), p_append);
   } else {
-    string_key_view_t::append_dedup(key.dedup_type(), p_append);
+    string_key_view_t::test_append_dedup(key.dedup_type(), p_append);
   }
 }
 
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 45d60dc569c..03793adf4f5 100644
--- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
+++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
@@ -44,7 +44,7 @@ namespace {
     key_view.set(*reinterpret_cast<const shard_pool_crush_t*>(p_fill));
 
     auto p_ns_oid = p_fill;
-    ns_oid_view_t::append<KeyT::HOBJ>(key_hobj, p_fill);
+    ns_oid_view_t::test_append<KeyT::HOBJ>(key_hobj, p_fill);
     ns_oid_view_t ns_oid_view(p_ns_oid);
     key_view.set(ns_oid_view);
 
-- 
2.39.5