From: Kefu Chai <kchai@redhat.com>
Date: Tue, 15 Nov 2016 16:17:42 +0000 (+0800)
Subject: Revert "buffer: add a test for iterator::copy(huge_chunk, dest)"
X-Git-Tag: v11.1.0~211^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=004ae597bb71473d55b802b9a59aca516f285135;p=ceph.git

Revert "buffer: add a test for iterator::copy(huge_chunk, dest)"

This reverts commit 3caafc44765d331da9d8e1d52e03c6f2562848ae.

Fixes: http://tracker.ceph.com/issues/17809
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index ddb8004a8bb..ff687e28918 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -781,20 +781,6 @@ static simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
     return new raw_unshareable(len);
   }
 
-  class dummy_raw : public buffer::raw {
-  public:
-    dummy_raw()
-      : raw(UINT_MAX)
-    {}
-    virtual raw* clone_empty() override {
-      return new dummy_raw();
-    }
-  };
-
-  buffer::raw* buffer::create_dummy() {
-    return new dummy_raw();
-  }
-
   buffer::ptr::ptr(raw *r) : _raw(r), _off(0), _len(r->len)   // no lock needed; this is an unref raw.
   {
     r->nref.inc();
diff --git a/src/include/buffer.h b/src/include/buffer.h
index 4c05e628dbe..7306b9906dd 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -155,7 +155,6 @@ namespace buffer CEPH_BUFFER_API {
   raw* create_page_aligned(unsigned len);
   raw* create_zero_copy(unsigned len, int fd, int64_t *offset);
   raw* create_unshareable(unsigned len);
-  raw* create_dummy();
   raw* create_static(unsigned len, char *buf);
   raw* claim_buffer(unsigned len, char *buf, deleter del);
 
diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc
index fc7627aeded..6042c515ff7 100644
--- a/src/test/bufferlist.cc
+++ b/src/test/bufferlist.cc
@@ -1297,21 +1297,6 @@ TEST(BufferListIterator, copy) {
   }
 }
 
-TEST(BufferListIterator, copy_huge) {
-  constexpr unsigned len = 2268888894U;
-  static_assert(int(len) < 0,
-		"should be a number underflows when being casted to int.");
-  bufferptr ptr(buffer::create_dummy());
-  ptr.set_length(len);
-
-  bufferlist src, dest;
-  src.append(ptr);
-  auto bp = src.begin();
-  bp.copy(len, dest);
-  // contents_equal() is not for this test
-  EXPECT_EQ(len, dest.length());
-}
-
 TEST(BufferListIterator, copy_in) {
   bufferlist bl;
   const char *existing = "XXX";