librados: get it compiled

diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 8b451816ed782b8f3ad4614e5c743a086c16c353..e0a709de565c59bebf85a69328750a89daecf1e9 100644 (file)
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -114,6 +114,8 @@ namespace librados
 
     void cmpxattr(const char *name, uint8_t op, const bufferlist& bl);
     void cmpxattr(const char *name, uint8_t op, uint64_t v);
+    void src_cmpxattr(const std::string& src_oid,
+                     const char *name, const bufferlist& val, int op, int mode);
 
   protected:
     ObjectOperationImpl *impl;
@@ -147,9 +149,6 @@ namespace librados
     void clone_range(uint64_t dst_off,
                      const std::string& src_oid, uint64_t src_off,
                      size_t len);
-    void src_cmpxattr(const std::string& src_oid,
-                     const char *name, const bufferlist& val, int op, int mode);
-
   };
 
   /*

diff --git a/src/testradospp.cc b/src/testradospp.cc
index bfe612292233e6d354e0ec93098f274200684895..a07b33b222c718742e450e889f4b359e7b5ff8df 100644 (file)
--- a/src/testradospp.cc
+++ b/src/testradospp.cc
@@ -251,16 +251,16 @@ int main(int argc, const char **argv)
   r = io_ctx.setxattr(oid, "foo", val);
   assert(r >= 0);
   {
-    ObjectOperation o;
-    o.cmpxattr("foo", val, CEPH_OSD_CMPXATTR_OP_EQ, CEPH_OSD_CMPXATTR_MODE_STRING);
+    ObjectReadOperation o;
+    o.cmpxattr("foo", CEPH_OSD_CMPXATTR_OP_EQ, val);
     r = io_ctx.operate(oid, &o, &bl2);
     cout << " got " << r << " wanted >= 0" << std::endl;
     assert(r >= 0);
   }
   val.append("...");
   {
-    ObjectOperation o;
-    o.cmpxattr("foo", val, CEPH_OSD_CMPXATTR_OP_EQ, CEPH_OSD_CMPXATTR_MODE_STRING);
+    ObjectReadOperation o;
+    o.cmpxattr("foo", CEPH_OSD_CMPXATTR_OP_EQ, val);
     r = io_ctx.operate(oid, &o, &bl2);
     cout << " got " << r << " wanted ECANCELED" << std::endl;
     assert(r == -ECANCELED);
@@ -269,7 +269,7 @@ int main(int argc, const char **argv)
   cout << "src_cmpxattr" << std::endl;
   const char *oidb = "bar-clone";
   {
-    ObjectOperation o;
+    ObjectWriteOperation o;
     o.src_cmpxattr(oid, "foo", val, CEPH_OSD_CMPXATTR_OP_EQ, CEPH_OSD_CMPXATTR_MODE_STRING);
     io_ctx.locator_set_key(oid);
     o.write_full(val);
@@ -278,7 +278,7 @@ int main(int argc, const char **argv)
     assert(r == -ECANCELED);
   }
   {
-    ObjectOperation o;
+    ObjectWriteOperation o;
     o.src_cmpxattr(oid, "foo", val, CEPH_OSD_CMPXATTR_OP_NE, CEPH_OSD_CMPXATTR_MODE_STRING);
     io_ctx.locator_set_key(oid);
     o.write_full(val);