From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 19 Aug 2020 14:40:40 +0000 (+0200)
Subject: common/bl: drop claim_append_piecewise() from bufferlist.
X-Git-Tag: v16.1.0~780^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=774676f2326abbaa0b5192aa8e69cc0cc24b2e8b;p=ceph-ci.git

common/bl: drop claim_append_piecewise() from bufferlist.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index efd49b5b671..8fce28ba31c 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -1286,15 +1286,6 @@ static ceph::spinlock debug_lock;
     bl.clear();
   }
 
-  void buffer::list::claim_append_piecewise(list& bl)
-  {
-    // steal the other guy's buffers
-    for (const auto& node : bl.buffers()) {
-      append(node, 0, node.length());
-    }
-    bl.clear();
-  }
-
   void buffer::list::append(char c)
   {
     // put what we can into the existing append_buffer.
diff --git a/src/include/buffer.h b/src/include/buffer.h
index 97c54d51132..93ef1b57f87 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -1091,8 +1091,6 @@ struct error_code;
     void claim_append(list&& bl) {
       claim_append(bl);
     }
-    // only for bl is bufferlist::page_aligned_appender
-    void claim_append_piecewise(list& bl);
 
     // copy with explicit volatile-sharing semantics
     void share(const list& bl)
diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index 4d00d576a14..c7dfc80c6e3 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -1973,27 +1973,6 @@ TEST(BufferList, claim_append) {
   EXPECT_EQ((unsigned)0, from.length());
 }
 
-TEST(BufferList, claim_append_piecewise) {
-  bufferlist bl, t, dst;
-  auto a = bl.get_page_aligned_appender(4);
-  for (uint32_t i = 0; i < (CEPH_PAGE_SIZE + CEPH_PAGE_SIZE - 1333); i++)
-    a.append("x", 1);
-  a.flush();
-  const char *p = bl.c_str();
-  t.claim_append(bl);
-
-  for (uint32_t i = 0; i < (CEPH_PAGE_SIZE + 1333); i++)
-    a.append("x", 1);
-  a.flush();
-  t.claim_append(bl);
-
-  EXPECT_FALSE(t.is_aligned_size_and_memory(CEPH_PAGE_SIZE, CEPH_PAGE_SIZE));
-  dst.claim_append_piecewise(t);
-  EXPECT_TRUE(dst.is_aligned_size_and_memory(CEPH_PAGE_SIZE, CEPH_PAGE_SIZE));
-  const char *p1 = dst.c_str();
-  EXPECT_TRUE(p == p1);
-}
-
 TEST(BufferList, begin) {
   bufferlist bl;
   bl.append("ABC");