librados: deprecate ObjectWriteOperation::copy_from()

this change partially reverts 6eca7d08893abbe41f7fa6b2834fb05e84be572b

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 0f47dd6b7fda317e1b8eb726b331ced4f2ffee1a..ce0b2500a7457e4aceabf6a83ad09ad074433d11 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -432,9 +432,7 @@ namespace librados
      * @param src_fadvise_flags the fadvise flags for source object
      */
     void copy_from(const std::string& src, const IoCtx& src_ioctx,
-                  uint64_t src_version);
-    void copy_from2(const std::string& src, const IoCtx& src_ioctx,
-                    uint64_t src_version, uint32_t src_fadvise_flags);
+                  uint64_t src_version, uint32_t src_fadvise_flags);
 
     /**
      * undirty an object

diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc
index c1d2f3fd10ccaa5f9d28aa2ecb5ef67a0d151d77..33d5fde6cf0518859a2df4be83c7f383989440f3 100644 (file)
--- a/src/librados/librados_cxx.cc
+++ b/src/librados/librados_cxx.cc
@@ -526,16 +526,9 @@ void librados::ObjectWriteOperation::omap_rm_keys(
 }
 
 void librados::ObjectWriteOperation::copy_from(const std::string& src,
-                                               const IoCtx& src_ioctx,
-                                               uint64_t src_version)
-{
-  copy_from2(src, src_ioctx, src_version, 0);
-}
-
-void librados::ObjectWriteOperation::copy_from2(const std::string& src,
-                                               const IoCtx& src_ioctx,
-                                               uint64_t src_version,
-                                               uint32_t src_fadvise_flags)
+                                              const IoCtx& src_ioctx,
+                                              uint64_t src_version,
+                                              uint32_t src_fadvise_flags)
 {
   ::ObjectOperation *o = &impl->o;
   o->copy_from(object_t(src), src_ioctx.io_ctx_impl->snap_seq,

diff --git a/src/test/librados/misc_cxx.cc b/src/test/librados/misc_cxx.cc
index cf11c19d04cd3b1b90985dc52052a6a22c8c828e..22cc41de959c1cdfe9eb21af3387dfc16d93241c 100644 (file)
--- a/src/test/librados/misc_cxx.cc
+++ b/src/test/librados/misc_cxx.cc
@@ -633,18 +633,18 @@ TEST_F(LibRadosMiscPP, CopyPP) {
   {
     // pass future version
     ObjectWriteOperation op;
-    op.copy_from2("foo", ioctx, uv + 1, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
+    op.copy_from("foo", ioctx, uv + 1, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
     ASSERT_EQ(-EOVERFLOW, ioctx.operate("foo.copy", &op));
   }
   {
     // pass old version
     ObjectWriteOperation op;
-    op.copy_from2("foo", ioctx, uv - 1, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
+    op.copy_from("foo", ioctx, uv - 1, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
     ASSERT_EQ(-ERANGE, ioctx.operate("foo.copy", &op));
   }
   {
     ObjectWriteOperation op;
-    op.copy_from2("foo", ioctx, uv, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
+    op.copy_from("foo", ioctx, uv, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
     ASSERT_EQ(0, ioctx.operate("foo.copy", &op));
 
     bufferlist bl2, x2;
@@ -657,7 +657,7 @@ TEST_F(LibRadosMiscPP, CopyPP) {
   // small object without a version
   {
     ObjectWriteOperation op;
-    op.copy_from2("foo", ioctx, 0, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
+    op.copy_from("foo", ioctx, 0, LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
     ASSERT_EQ(0, ioctx.operate("foo.copy2", &op));
 
     bufferlist bl2, x2;
@@ -678,7 +678,7 @@ TEST_F(LibRadosMiscPP, CopyPP) {
 
   {
     ObjectWriteOperation op;
-    op.copy_from2("big", ioctx, ioctx.get_last_version(), LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
+    op.copy_from("big", ioctx, ioctx.get_last_version(), LIBRADOS_OP_FLAG_FADVISE_DONTNEED);
     ASSERT_EQ(0, ioctx.operate("big.copy", &op));
 
     bufferlist bl2, x2;
@@ -690,7 +690,7 @@ TEST_F(LibRadosMiscPP, CopyPP) {
 
   {
     ObjectWriteOperation op;
-    op.copy_from2("big", ioctx, 0, LIBRADOS_OP_FLAG_FADVISE_SEQUENTIAL);
+    op.copy_from("big", ioctx, 0, LIBRADOS_OP_FLAG_FADVISE_SEQUENTIAL);
     ASSERT_EQ(0, ioctx.operate("big.copy2", &op));
 
     bufferlist bl2, x2;
@@ -761,7 +761,7 @@ TEST_F(LibRadosTwoPoolsECPP, CopyFrom) {
     ASSERT_EQ(0, src_ioctx.omap_set_header("foo", b));
     version_t uv = src_ioctx.get_last_version();
     ObjectWriteOperation op;
-    op.copy_from("foo", src_ioctx, uv);
+    op.copy_from("foo", src_ioctx, uv, 0);
     ASSERT_EQ(-EOPNOTSUPP, ioctx.operate("foo.copy", &op));
   }
 
@@ -770,7 +770,7 @@ TEST_F(LibRadosTwoPoolsECPP, CopyFrom) {
     ASSERT_EQ(0, src_ioctx.omap_set_header("bar", b));
     version_t uv = src_ioctx.get_last_version();
     ObjectWriteOperation op;
-    op.copy_from("bar", src_ioctx, uv);
+    op.copy_from("bar", src_ioctx, uv, 0);
     ASSERT_EQ(-EOPNOTSUPP, ioctx.operate("bar.copy", &op));
   }
 }
@@ -828,25 +828,25 @@ TEST_F(LibRadosMiscPP, CopyScrubPP) {
 
   {
     ObjectWriteOperation op;
-    op.copy_from("small", ioctx, 0);
+    op.copy_from("small", ioctx, 0, 0);
     ASSERT_EQ(0, ioctx.operate("small.copy", &op));
   }
 
   {
     ObjectWriteOperation op;
-    op.copy_from("big", ioctx, 0);
+    op.copy_from("big", ioctx, 0, 0);
     ASSERT_EQ(0, ioctx.operate("big.copy", &op));
   }
 
   {
     ObjectWriteOperation op;
-    op.copy_from("big2", ioctx, 0);
+    op.copy_from("big2", ioctx, 0, 0);
     ASSERT_EQ(0, ioctx.operate("big2.copy", &op));
   }
 
   {
     ObjectWriteOperation op;
-    op.copy_from("big3", ioctx, 0);
+    op.copy_from("big3", ioctx, 0, 0);
     ASSERT_EQ(0, ioctx.operate("big3.copy", &op));
   }
 

diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h
index 43dd2ae4de01f2bfd30ed939707a91dfb89b7f62..f7cac8e16be7424cf2ab4354b0f6d403b5f38265 100644 (file)
--- a/src/test/osd/RadosModel.h
+++ b/src/test/osd/RadosModel.h
@@ -1903,7 +1903,7 @@ public:
     }
 
     string src = context->prefix+oid_src;
-    op.copy_from(src.c_str(), context->io_ctx, src_value.version);
+    op.copy_from(src.c_str(), context->io_ctx, src_value.version, 0);
 
     pair<TestOp*, TestOp::CallbackInfo*> *cb_arg =
       new pair<TestOp*, TestOp::CallbackInfo*>(this,
@@ -2244,7 +2244,7 @@ public:
 
     string src = context->prefix+oid_src;
     context->find_object(oid_src, &src_value); 
-    op.copy_from(src.c_str(), context->io_ctx, src_value.version);
+    op.copy_from(src.c_str(), context->io_ctx, src_value.version, 0);
 
     cout << "copy op oid " << oid_src << " to " << oid << " tgt_pool_name " << tgt_pool_name <<  std::endl;
 
@@ -2443,7 +2443,7 @@ public:
       /* copy_from oid --> oid_tgt */
       comp = context->rados.aio_create_completion();
       string src = context->prefix+oid;
-      op.copy_from(src.c_str(), context->io_ctx, src_value.version);
+      op.copy_from(src.c_str(), context->io_ctx, src_value.version, 0);
       context->low_tier_io_ctx.aio_operate(context->prefix+oid_tgt, comp, &op,
                                           librados::OPERATION_ORDER_READS_WRITES);
       comp->wait_for_safe();

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index f879970d4b9429fc5ac0a5d339eb28b85bcd72d1..b7531cfcdd9f9e7fb9929f052f07f50b9ce45536 100644 (file)
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -499,7 +499,7 @@ static int do_copy(IoCtx& io_ctx, const char *objname,
   __le32 src_fadvise_flags = LIBRADOS_OP_FLAG_FADVISE_SEQUENTIAL | LIBRADOS_OP_FLAG_FADVISE_NOCACHE;
   __le32 dest_fadvise_flags = LIBRADOS_OP_FLAG_FADVISE_SEQUENTIAL | LIBRADOS_OP_FLAG_FADVISE_DONTNEED;
   ObjectWriteOperation op;
-  op.copy_from2(objname, io_ctx, 0, src_fadvise_flags);
+  op.copy_from(objname, io_ctx, 0, src_fadvise_flags);
   op.set_op_flags2(dest_fadvise_flags);
 
   return target_ctx.operate(target_obj, &op);