From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Jan 2017 20:16:20 +0000 (-0500)
Subject: ceph_test_rados_*: use new omap methods
X-Git-Tag: v12.0.0~121^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9f419430645073620bb2f27c95beffc5ae9b648;p=ceph.git

ceph_test_rados_*: use new omap methods

Make these tests pass nullptr for pmore.  This codifies our
assumption that the OSD limits are high enough.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc
index 8df39a9917d..4ec43a66061 100644
--- a/src/test/librados/aio.cc
+++ b/src/test/librados/aio.cc
@@ -2117,8 +2117,8 @@ TEST(LibRadosAio, OmapPP) {
 
     bufferlist header;
 
-    op.omap_get_keys("", 1, &set_got, 0);
-    op.omap_get_vals("foo", 1, &map_got, 0);
+    op.omap_get_keys2("", 1, &set_got, nullptr, 0);
+    op.omap_get_vals2("foo", 1, &map_got, nullptr, 0);
 
     to_get.insert("foo");
     to_get.insert("qfoo3");
@@ -2126,7 +2126,7 @@ TEST(LibRadosAio, OmapPP) {
 
     op.omap_get_header(&header, 0);
 
-    op.omap_get_vals("foo2", "q", 1, &got4, 0);
+    op.omap_get_vals2("foo2", "q", 1, &got4, nullptr, 0);
 
     ioctx.aio_operate("test_obj", my_completion.get(), &op, 0);
     {
@@ -2166,7 +2166,7 @@ TEST(LibRadosAio, OmapPP) {
     ObjectReadOperation op;
 
     set<string> set_got;
-    op.omap_get_keys("", -1, &set_got, 0);
+    op.omap_get_keys2("", -1, &set_got, nullptr, 0);
     ioctx.aio_operate("test_obj", my_completion.get(), &op, 0);
     {
       TestAlarm alarm;
@@ -2193,7 +2193,7 @@ TEST(LibRadosAio, OmapPP) {
     ObjectReadOperation op;
 
     set<string> set_got;
-    op.omap_get_keys("", -1, &set_got, 0);
+    op.omap_get_keys2("", -1, &set_got, nullptr, 0);
     ioctx.aio_operate("test_obj", my_completion.get(), &op, 0);
     {
       TestAlarm alarm;
@@ -2238,7 +2238,7 @@ TEST(LibRadosAio, OmapPP) {
     ObjectReadOperation op;
     set<string> set_got;
     bufferlist hdr;
-    op.omap_get_keys("", -1, &set_got, 0);
+    op.omap_get_keys2("", -1, &set_got, nullptr, 0);
     op.omap_get_header(&hdr, NULL);
     ioctx.aio_operate("foo3", my_completion.get(), &op, 0);
     {
diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc
index 8eac75006d4..9d3ec438380 100644
--- a/src/test/librados/c_read_operations.cc
+++ b/src/test/librados/c_read_operations.cc
@@ -39,8 +39,8 @@ protected:
     rados_omap_iter_t iter_vals, iter_keys, iter_vals_by_key;
     int r_vals, r_keys, r_vals_by_key;
     rados_read_op_t op = rados_create_read_op();
-    rados_read_op_omap_get_vals(op, NULL, NULL, 100, &iter_vals, &r_vals);
-    rados_read_op_omap_get_keys(op, NULL, 100, &iter_keys, &r_keys);
+    rados_read_op_omap_get_vals2(op, NULL, NULL, 100, &iter_vals, NULL, &r_vals);
+    rados_read_op_omap_get_keys2(op, NULL, 100, &iter_keys, NULL, &r_keys);
     rados_read_op_omap_get_vals_by_keys(op, keys, len,
 					&iter_vals_by_key, &r_vals_by_key);
     ASSERT_EQ(0, rados_read_op_operate(op, ioctx, obj, 0));
@@ -490,7 +490,7 @@ TEST_F(CReadOpsTest, Omap) {
   // with no omap entries
   rados_omap_iter_t iter_vals;
   rados_read_op_t rop = rados_create_read_op();
-  rados_read_op_omap_get_vals(rop, "", "", 10, &iter_vals, NULL);
+  rados_read_op_omap_get_vals2(rop, "", "", 10, &iter_vals, NULL, NULL);
   ASSERT_EQ(-ENOENT, rados_read_op_operate(rop, ioctx, obj, 0));
   rados_release_read_op(rop);
   compare_omap_vals(NULL, NULL, NULL, 0, iter_vals);
@@ -510,8 +510,8 @@ TEST_F(CReadOpsTest, Omap) {
   rados_omap_iter_t iter_keys;
   int r_vals = -1, r_keys = -1;
   rop = rados_create_read_op();
-  rados_read_op_omap_get_vals(rop, "", "test", 1, &iter_vals, &r_vals);
-  rados_read_op_omap_get_keys(rop, "test", 1, &iter_keys, &r_keys);
+  rados_read_op_omap_get_vals2(rop, "", "test", 1, &iter_vals, NULL, &r_vals);
+  rados_read_op_omap_get_keys2(rop, "test", 1, &iter_keys, NULL, &r_keys);
   ASSERT_EQ(0, rados_read_op_operate(rop, ioctx, obj, 0));
   rados_release_read_op(rop);
   EXPECT_EQ(0, r_vals);
diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc
index 361db602cf5..8b36c18234b 100644
--- a/src/test/librados/misc.cc
+++ b/src/test/librados/misc.cc
@@ -464,7 +464,7 @@ TEST_F(LibRadosMiscPP, Tmap2OmapPP) {
     map<string, bufferlist> m;
     ObjectReadOperation o;
     o.omap_get_header(&got, NULL);
-    o.omap_get_vals("", 1024, &m, NULL);
+    o.omap_get_vals2("", 1024, &m, nullptr, nullptr);
     ASSERT_EQ(0, ioctx.operate("foo", &o, NULL));
 
     // compare header