X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fceph%2Fsrc%2Ftest%2Flibrados%2Flist.cc;fp=src%2Fceph%2Fsrc%2Ftest%2Flibrados%2Flist.cc;h=0000000000000000000000000000000000000000;hb=7da45d65be36d36b880cc55c5036e96c24b53f00;hp=db90ac80c3aa6b498e4768fb3b44b9744bfbe2cb;hpb=691462d09d0987b47e112d6ee8740375df3c51b2;p=stor4nfv.git

diff --git a/src/ceph/src/test/librados/list.cc b/src/ceph/src/test/librados/list.cc
deleted file mode 100644
index db90ac8..0000000
--- a/src/ceph/src/test/librados/list.cc
+++ /dev/null
@@ -1,1256 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-#include "include/rados/librados.h"
-#include "include/rados/librados.hpp"
-#include "include/stringify.h"
-#include "test/librados/test.h"
-#include "test/librados/test_common.h"
-#include "test/librados/TestCase.h"
-#include "global/global_context.h"
-
-#include "include/types.h"
-#include "common/hobject.h"
-#include "gtest/gtest.h"
-#include <errno.h>
-#include <string>
-#include <stdexcept>
-
-using namespace librados;
-
-typedef RadosTestNSCleanup LibRadosList;
-typedef RadosTestPPNSCleanup LibRadosListPP;
-typedef RadosTestECNSCleanup LibRadosListEC;
-typedef RadosTestECPPNSCleanup LibRadosListECPP;
-typedef RadosTestNP LibRadosListNP;
-
-
-TEST_F(LibRadosList, ListObjects) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-  rados_list_ctx_t ctx;
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  const char *entry;
-  bool foundit = false;
-  while (rados_nobjects_list_next(ctx, &entry, NULL, NULL) != -ENOENT) {
-    foundit = true;
-    ASSERT_EQ(std::string(entry), "foo");
-  }
-  ASSERT_TRUE(foundit);
-  rados_nobjects_list_close(ctx);
-}
-
-TEST_F(LibRadosListPP, ListObjectsPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-  NObjectIterator iter(ioctx.nobjects_begin());
-  bool foundit = false;
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-  }
-  ASSERT_TRUE(foundit);
-}
-
-TEST_F(LibRadosListPP, ListObjectsTwicePP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-  NObjectIterator iter(ioctx.nobjects_begin());
-  bool foundit = false;
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-  }
-  ASSERT_TRUE(foundit);
-  ++iter;
-  ASSERT_TRUE(iter == ioctx.nobjects_end());
-  foundit = false;
-  iter.seek(0);
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-  }
-  ASSERT_TRUE(foundit);
-}
-
-TEST_F(LibRadosListPP, ListObjectsCopyIterPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-
-  // make sure this is still valid after the original iterators are gone
-  NObjectIterator iter3;
-  {
-    NObjectIterator iter(ioctx.nobjects_begin());
-    NObjectIterator iter2(iter);
-    iter3 = iter2;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-    ASSERT_TRUE(iter == ioctx.nobjects_end());
-    ++iter;
-    ASSERT_TRUE(iter == ioctx.nobjects_end());
-
-    ASSERT_EQ(iter2->get_oid(), "foo");
-    ASSERT_EQ(iter3->get_oid(), "foo");
-    ++iter2;
-    ASSERT_TRUE(iter2 == ioctx.nobjects_end());
-  }
-
-  ASSERT_EQ(iter3->get_oid(), "foo");
-  iter3 = iter3;
-  ASSERT_EQ(iter3->get_oid(), "foo");
-  ++iter3;
-  ASSERT_TRUE(iter3 == ioctx.nobjects_end());
-}
-
-TEST_F(LibRadosListPP, ListObjectsEndIter) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-
-  NObjectIterator iter(ioctx.nobjects_begin());
-  NObjectIterator iter_end(ioctx.nobjects_end());
-  NObjectIterator iter_end2 = ioctx.nobjects_end();
-  ASSERT_TRUE(iter_end == iter_end2);
-  ASSERT_TRUE(iter_end == ioctx.nobjects_end());
-  ASSERT_TRUE(iter_end2 == ioctx.nobjects_end());
-
-  ASSERT_EQ(iter->get_oid(), "foo");
-  ++iter;
-  ASSERT_TRUE(iter == ioctx.nobjects_end());
-  ASSERT_TRUE(iter == iter_end);
-  ASSERT_TRUE(iter == iter_end2);
-  NObjectIterator iter2 = iter;
-  ASSERT_TRUE(iter2 == ioctx.nobjects_end());
-  ASSERT_TRUE(iter2 == iter_end);
-  ASSERT_TRUE(iter2 == iter_end2);
-}
-
-static void check_list(
-  std::set<std::string>& myset,
-  rados_list_ctx_t& ctx,
-  std::string check_nspace)
-{
-  const char *entry, *nspace;
-  cout << "myset " << myset << std::endl;
-  // we should see every item exactly once.
-  int ret;
-  while ((ret = rados_nobjects_list_next(ctx, &entry, NULL, &nspace)) == 0) {
-    std::string test_name;
-    if (check_nspace == all_nspaces) {
-      test_name = std::string(nspace) + ":" + std::string(entry);
-    } else {
-      ASSERT_TRUE(std::string(nspace) == check_nspace);
-      test_name = std::string(entry);
-    }
-    cout << test_name << std::endl;
-
-    ASSERT_TRUE(myset.end() != myset.find(test_name));
-    myset.erase(test_name);
-  }
-  ASSERT_EQ(-ENOENT, ret);
-  ASSERT_TRUE(myset.empty());
-}
-
-TEST_F(LibRadosList, ListObjectsNS) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_write(ioctx, "foo3", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ(0, rados_write(ioctx, "foo4", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_write(ioctx, "foo5", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "ns2");
-  ASSERT_EQ(0, rados_write(ioctx, "foo6", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_write(ioctx, "foo7", buf, sizeof(buf), 0));
-
-  std::set<std::string> def, ns1, ns2, all;
-  def.insert(std::string("foo1"));
-  def.insert(std::string("foo2"));
-  def.insert(std::string("foo3"));
-  ns1.insert(std::string("foo1"));
-  ns1.insert(std::string("foo4"));
-  ns1.insert(std::string("foo5"));
-  ns2.insert(std::string("foo6"));
-  ns2.insert(std::string("foo7"));
-  all.insert(std::string(":foo1"));
-  all.insert(std::string(":foo2"));
-  all.insert(std::string(":foo3"));
-  all.insert(std::string("ns1:foo1"));
-  all.insert(std::string("ns1:foo4"));
-  all.insert(std::string("ns1:foo5"));
-  all.insert(std::string("ns2:foo6"));
-  all.insert(std::string("ns2:foo7"));
-
-  rados_list_ctx_t ctx;
-  // Check default namespace ""
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(def, ctx, "");
-  rados_nobjects_list_close(ctx);
-
-  // Check namespace "ns1"
-  rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(ns1, ctx, "ns1");
-  rados_nobjects_list_close(ctx);
-
-  // Check namespace "ns2"
-  rados_ioctx_set_namespace(ioctx, "ns2");
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(ns2, ctx, "ns2");
-  rados_nobjects_list_close(ctx);
-
-  // Check ALL namespaces
-  rados_ioctx_set_namespace(ioctx, LIBRADOS_ALL_NSPACES);
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(all, ctx, all_nspaces);
-  rados_nobjects_list_close(ctx);
-}
-
-static void check_listpp(std::set<std::string>& myset, IoCtx& ioctx, std::string check_nspace)
-{
-  NObjectIterator iter(ioctx.nobjects_begin());
-  std::set<std::string> orig_set(myset);
-  /**
-   * During splitting, we might see duplicate items.
-   * We assert that every object returned is in myset and that
-   * we don't hit ENOENT until we have hit every item in myset
-   * at least once.
-   */
-  while (iter != ioctx.nobjects_end()) {
-    std::string test_name;
-    if (check_nspace == all_nspaces) {
-      test_name = iter->get_nspace() + ":" + iter->get_oid();
-    } else {
-      ASSERT_TRUE(iter->get_nspace() == check_nspace);
-      test_name = iter->get_oid();
-    }
-    ASSERT_TRUE(orig_set.end() != orig_set.find(test_name));
-    myset.erase(test_name);
-    ++iter;
-  }
-  ASSERT_TRUE(myset.empty());
-}
-
-TEST_F(LibRadosListPP, ListObjectsPPNS) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
-  ioctx.set_namespace("");
-  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("ns1");
-  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("");
-  ASSERT_EQ(0, ioctx.write("foo2", bl1, sizeof(buf), 0));
-  ASSERT_EQ(0, ioctx.write("foo3", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("ns1");
-  ASSERT_EQ(0, ioctx.write("foo4", bl1, sizeof(buf), 0));
-  ASSERT_EQ(0, ioctx.write("foo5", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("ns2");
-  ASSERT_EQ(0, ioctx.write("foo6", bl1, sizeof(buf), 0));
-  ASSERT_EQ(0, ioctx.write("foo7", bl1, sizeof(buf), 0));
-
-  std::set<std::string> def, ns1, ns2, all;
-  def.insert(std::string("foo1"));
-  def.insert(std::string("foo2"));
-  def.insert(std::string("foo3"));
-  ns1.insert(std::string("foo1"));
-  ns1.insert(std::string("foo4"));
-  ns1.insert(std::string("foo5"));
-  ns2.insert(std::string("foo6"));
-  ns2.insert(std::string("foo7"));
-  all.insert(std::string(":foo1"));
-  all.insert(std::string(":foo2"));
-  all.insert(std::string(":foo3"));
-  all.insert(std::string("ns1:foo1"));
-  all.insert(std::string("ns1:foo4"));
-  all.insert(std::string("ns1:foo5"));
-  all.insert(std::string("ns2:foo6"));
-  all.insert(std::string("ns2:foo7"));
-
-  ioctx.set_namespace("");
-  check_listpp(def, ioctx, "");
-
-  ioctx.set_namespace("ns1");
-  check_listpp(ns1, ioctx, "ns1");
-
-  ioctx.set_namespace("ns2");
-  check_listpp(ns2, ioctx, "ns2");
-
-  ioctx.set_namespace(all_nspaces);
-  check_listpp(all, ioctx, all_nspaces);
-}
-
-TEST_F(LibRadosListPP, ListObjectsManyPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  for (int i=0; i<256; ++i) {
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
-  }
-
-  librados::NObjectIterator it = ioctx.nobjects_begin();
-  std::set<std::string> saw_obj;
-  std::set<int> saw_pg;
-  for (; it != ioctx.nobjects_end(); ++it) {
-    std::cout << it->get_oid()
-	      << " " << it.get_pg_hash_position() << std::endl;
-    saw_obj.insert(it->get_oid());
-    saw_pg.insert(it.get_pg_hash_position());
-  }
-  std::cout << "saw " << saw_pg.size() << " pgs " << std::endl;
-
-  // make sure they are 0..n
-  for (unsigned i = 0; i < saw_pg.size(); ++i)
-    ASSERT_TRUE(saw_pg.count(i));
-}
-
-TEST_F(LibRadosList, ListObjectsStart) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-
-  for (int i=0; i<16; ++i) {
-    string n = stringify(i);
-    ASSERT_EQ(0, rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
-  }
-
-  rados_list_ctx_t ctx;
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  std::map<int, std::set<std::string> > pg_to_obj;
-  const char *entry;
-  while (rados_nobjects_list_next(ctx, &entry, NULL, NULL) == 0) {
-    uint32_t pos = rados_nobjects_list_get_pg_hash_position(ctx);
-    std::cout << entry << " " << pos << std::endl;
-    pg_to_obj[pos].insert(entry);
-  }
-  rados_nobjects_list_close(ctx);
-
-  std::map<int, std::set<std::string> >::reverse_iterator p =
-    pg_to_obj.rbegin();
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  while (p != pg_to_obj.rend()) {
-    ASSERT_EQ((uint32_t)p->first, rados_nobjects_list_seek(ctx, p->first));
-    ASSERT_EQ(0, rados_nobjects_list_next(ctx, &entry, NULL, NULL));
-    std::cout << "have " << entry << " expect one of " << p->second << std::endl;
-    ASSERT_TRUE(p->second.count(entry));
-    ++p;
-  }
-  rados_nobjects_list_close(ctx);
-}
-
-TEST_F(LibRadosListPP, ListObjectsStartPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  for (int i=0; i<16; ++i) {
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
-  }
-
-  librados::NObjectIterator it = ioctx.nobjects_begin();
-  std::map<int, std::set<std::string> > pg_to_obj;
-  for (; it != ioctx.nobjects_end(); ++it) {
-    std::cout << it->get_oid() << " " << it.get_pg_hash_position() << std::endl;
-    pg_to_obj[it.get_pg_hash_position()].insert(it->get_oid());
-  }
-
-  std::map<int, std::set<std::string> >::reverse_iterator p =
-    pg_to_obj.rbegin();
-  it = ioctx.nobjects_begin(p->first);
-  while (p != pg_to_obj.rend()) {
-    ASSERT_EQ((uint32_t)p->first, it.seek(p->first));
-    std::cout << "have " << it->get_oid() << " expect one of " << p->second << std::endl;
-    ASSERT_TRUE(p->second.count(it->get_oid()));
-    ++p;
-  }
-}
-
-TEST_F(LibRadosListPP, ListObjectsCursorNSPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  const int max_objs = 16;
-
-  map<string, string> oid_to_ns;
-
-  for (int i=0; i<max_objs; ++i) {
-    stringstream ss;
-    ss << "ns" << i / 4;
-    ioctx.set_namespace(ss.str());
-    string oid = stringify(i);
-    ASSERT_EQ(0, ioctx.write(oid, bl, bl.length(), 0));
-
-    oid_to_ns[oid] = ss.str();
-  }
-
-  ioctx.set_namespace(all_nspaces);
-
-  librados::NObjectIterator it = ioctx.nobjects_begin();
-  std::map<librados::ObjectCursor, string> cursor_to_obj;
-
-  int count = 0;
-
-  librados::ObjectCursor seek_cursor;
-
-  map<string, list<librados::ObjectCursor> > ns_to_cursors;
-
-  for (it = ioctx.nobjects_begin(); it != ioctx.nobjects_end(); ++it) {
-    librados::ObjectCursor cursor = it.get_cursor();
-    string oid = it->get_oid();
-    cout << "> oid=" << oid << " cursor=" << it.get_cursor() << std::endl;
-  }
-
-  vector<string> objs_order;
-
-  for (it = ioctx.nobjects_begin(); it != ioctx.nobjects_end(); ++it, ++count) {
-    librados::ObjectCursor cursor = it.get_cursor();
-    string oid = it->get_oid();
-    std::cout << oid << " " << it.get_pg_hash_position() << std::endl;
-    cout << ": oid=" << oid << " cursor=" << it.get_cursor() << std::endl;
-    cursor_to_obj[cursor] = oid;
-
-    ASSERT_EQ(oid_to_ns[oid], it->get_nspace());
-
-    it.seek(cursor);
-    cout << ": seek to " << cursor << " it.cursor=" << it.get_cursor() << std::endl;
-    ASSERT_EQ(oid, it->get_oid());
-    ASSERT_LT(count, max_objs); /* avoid infinite loops due to bad seek */
-
-    ns_to_cursors[it->get_nspace()].push_back(cursor);
-
-    if (count == max_objs/2) {
-      seek_cursor = cursor;
-    }
-    objs_order.push_back(it->get_oid());
-  }
-
-  ASSERT_EQ(count, max_objs);
-
-  /* check that reading past seek also works */
-  cout << "seek_cursor=" << seek_cursor << std::endl;
-  it.seek(seek_cursor);
-  for (count = max_objs/2; count < max_objs; ++count, ++it) {
-    ASSERT_EQ(objs_order[count], it->get_oid());
-  }
-
-  /* seek to all cursors, check that we get expected obj */
-  for (auto& niter : ns_to_cursors) {
-    const string& ns = niter.first;
-    list<librados::ObjectCursor>& cursors = niter.second;
-
-    for (auto& cursor : cursors) {
-      cout << ": seek to " << cursor << std::endl;
-      it.seek(cursor);
-      ASSERT_EQ(cursor, it.get_cursor());
-      string& expected_oid = cursor_to_obj[cursor];
-      cout << ": it->get_cursor()=" << it.get_cursor() << " expected=" << cursor << std::endl;
-      cout << ": it->get_oid()=" << it->get_oid() << " expected=" << expected_oid << std::endl;
-      cout << ": it->get_nspace()=" << it->get_oid() << " expected=" << ns << std::endl;
-      ASSERT_EQ(expected_oid, it->get_oid());
-      ASSERT_EQ(it->get_nspace(), ns);
-    }
-  }
-}
-
-TEST_F(LibRadosListPP, ListObjectsCursorPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  const int max_objs = 16;
-
-  for (int i=0; i<max_objs; ++i) {
-    stringstream ss;
-    ss << "ns" << i / 4;
-    ioctx.set_namespace(ss.str());
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
-  }
-
-  ioctx.set_namespace(all_nspaces);
-
-  librados::NObjectIterator it = ioctx.nobjects_begin();
-  std::map<librados::ObjectCursor, string> cursor_to_obj;
-
-  int count = 0;
-
-  for (; it != ioctx.nobjects_end(); ++it, ++count) {
-    librados::ObjectCursor cursor = it.get_cursor();
-    string oid = it->get_oid();
-    std::cout << oid << " " << it.get_pg_hash_position() << std::endl;
-    cout << ": oid=" << oid << " cursor=" << it.get_cursor() << std::endl;
-    cursor_to_obj[cursor] = oid;
-
-    it.seek(cursor);
-    cout << ": seek to " << cursor << std::endl;
-    ASSERT_EQ(oid, it->get_oid());
-    ASSERT_LT(count, max_objs); /* avoid infinite loops due to bad seek */
-  }
-
-  ASSERT_EQ(count, max_objs);
-
-  auto p = cursor_to_obj.rbegin();
-  it = ioctx.nobjects_begin();
-  while (p != cursor_to_obj.rend()) {
-    cout << ": seek to " << p->first << std::endl;
-    it.seek(p->first);
-    ASSERT_EQ(p->first, it.get_cursor());
-    cout << ": it->get_cursor()=" << it.get_cursor() << " expected=" << p->first << std::endl;
-    cout << ": it->get_oid()=" << it->get_oid() << " expected=" << p->second << std::endl;
-    ASSERT_EQ(p->second, it->get_oid());
-
-    librados::NObjectIterator it2 = ioctx.nobjects_begin(it.get_cursor());
-    ASSERT_EQ(it2->get_oid(), it->get_oid());
-
-    ++p;
-  }
-}
-
-TEST_F(LibRadosList, ListObjectsCursor) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-
-  const int max_objs = 16;
-
-  for (int i=0; i<max_objs; ++i) {
-    string n = stringify(i);
-    ASSERT_EQ(0, rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
-  }
-
-  {
-    rados_list_ctx_t ctx;
-    const char *entry;
-    rados_object_list_cursor cursor;
-    ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-    ASSERT_EQ(rados_nobjects_list_get_cursor(ctx, &cursor), 0);
-    rados_object_list_cursor first_cursor = cursor;
-    cout << "x cursor=" << ObjectCursor(cursor) << std::endl;
-    while (rados_nobjects_list_next(ctx, &entry, NULL, NULL) == 0) {
-      string oid = entry;
-      ASSERT_EQ(rados_nobjects_list_get_cursor(ctx, &cursor), 0);
-      cout << "> oid=" << oid << " cursor=" << ObjectCursor(cursor) << std::endl;
-    }
-    rados_nobjects_list_seek_cursor(ctx, first_cursor);
-    ASSERT_EQ(rados_nobjects_list_next(ctx, &entry, NULL, NULL), 0);
-    cout << "FIRST> seek to " << ObjectCursor(first_cursor) << " oid=" << string(entry) << std::endl;
-  }
-  rados_list_ctx_t ctx;
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-
-  std::map<rados_object_list_cursor, string> cursor_to_obj;
-  int count = 0;
-
-  const char *entry;
-  while (rados_nobjects_list_next(ctx, &entry, NULL, NULL) == 0) {
-    rados_object_list_cursor cursor;
-    ASSERT_EQ(rados_nobjects_list_get_cursor(ctx, &cursor), 0);
-    string oid = entry;
-    cout << ": oid=" << oid << " cursor=" << ObjectCursor(cursor) << std::endl;
-    cursor_to_obj[cursor] = oid;
-
-    rados_nobjects_list_seek_cursor(ctx, cursor);
-    cout << ": seek to " << ObjectCursor(cursor) << std::endl;
-    ASSERT_EQ(rados_nobjects_list_next(ctx, &entry, NULL, NULL), 0);
-    cout << "> " << ObjectCursor(cursor) << " -> " << entry << std::endl;
-    ASSERT_EQ(string(entry), oid);
-    ASSERT_LT(count, max_objs); /* avoid infinite loops due to bad seek */
-
-    ++count;
-  }
-
-  ASSERT_EQ(count, max_objs);
-
-  auto p = cursor_to_obj.rbegin();
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  while (p != cursor_to_obj.rend()) {
-    cout << ": seek to " << ObjectCursor(p->first) << std::endl;
-    rados_object_list_cursor cursor;
-    rados_object_list_cursor oid(p->first);
-    rados_nobjects_list_seek_cursor(ctx, oid);
-    ASSERT_EQ(rados_nobjects_list_get_cursor(ctx, &cursor), 0);
-    cout << ": cursor()=" << ObjectCursor(cursor) << " expected=" << oid << std::endl;
-    // ASSERT_EQ(ObjectCursor(oid), ObjectCursor(cursor));
-    ASSERT_EQ(rados_nobjects_list_next(ctx, &entry, NULL, NULL), 0);
-    cout << "> " << ObjectCursor(cursor) << " -> " << entry << std::endl;
-    cout << ": entry=" << entry << " expected=" << p->second << std::endl;
-    ASSERT_EQ(p->second, string(entry));
-
-    ++p;
-
-    rados_object_list_cursor_free(ctx, cursor);
-  }
-}
-
-TEST_F(LibRadosListEC, ListObjects) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-  rados_list_ctx_t ctx;
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  const char *entry;
-  bool foundit = false;
-  while (rados_nobjects_list_next(ctx, &entry, NULL, NULL) != -ENOENT) {
-    foundit = true;
-    ASSERT_EQ(std::string(entry), "foo");
-  }
-  ASSERT_TRUE(foundit);
-  rados_nobjects_list_close(ctx);
-}
-
-TEST_F(LibRadosListECPP, ListObjectsPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-  NObjectIterator iter(ioctx.nobjects_begin());
-  bool foundit = false;
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-  }
-  ASSERT_TRUE(foundit);
-}
-
-TEST_F(LibRadosListECPP, ListObjectsTwicePP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-  NObjectIterator iter(ioctx.nobjects_begin());
-  bool foundit = false;
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-  }
-  ASSERT_TRUE(foundit);
-  ++iter;
-  ASSERT_TRUE(iter == ioctx.nobjects_end());
-  foundit = false;
-  iter.seek(0);
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-  }
-  ASSERT_TRUE(foundit);
-}
-
-TEST_F(LibRadosListECPP, ListObjectsCopyIterPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-
-  // make sure this is still valid after the original iterators are gone
-  NObjectIterator iter3;
-  {
-    NObjectIterator iter(ioctx.nobjects_begin());
-    NObjectIterator iter2(iter);
-    iter3 = iter2;
-    ASSERT_EQ((*iter).get_oid(), "foo");
-    ++iter;
-    ASSERT_TRUE(iter == ioctx.nobjects_end());
-    ++iter;
-    ASSERT_TRUE(iter == ioctx.nobjects_end());
-
-    ASSERT_EQ(iter2->get_oid(), "foo");
-    ASSERT_EQ(iter3->get_oid(), "foo");
-    ++iter2;
-    ASSERT_TRUE(iter2 == ioctx.nobjects_end());
-  }
-
-  ASSERT_EQ(iter3->get_oid(), "foo");
-  iter3 = iter3;
-  ASSERT_EQ(iter3->get_oid(), "foo");
-  ++iter3;
-  ASSERT_TRUE(iter3 == ioctx.nobjects_end());
-}
-
-TEST_F(LibRadosListECPP, ListObjectsEndIter) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  ASSERT_EQ(0, ioctx.write("foo", bl1, sizeof(buf), 0));
-
-  NObjectIterator iter(ioctx.nobjects_begin());
-  NObjectIterator iter_end(ioctx.nobjects_end());
-  NObjectIterator iter_end2 = ioctx.nobjects_end();
-  ASSERT_TRUE(iter_end == iter_end2);
-  ASSERT_TRUE(iter_end == ioctx.nobjects_end());
-  ASSERT_TRUE(iter_end2 == ioctx.nobjects_end());
-
-  ASSERT_EQ(iter->get_oid(), "foo");
-  ++iter;
-  ASSERT_TRUE(iter == ioctx.nobjects_end());
-  ASSERT_TRUE(iter == iter_end);
-  ASSERT_TRUE(iter == iter_end2);
-  NObjectIterator iter2 = iter;
-  ASSERT_TRUE(iter2 == ioctx.nobjects_end());
-  ASSERT_TRUE(iter2 == iter_end);
-  ASSERT_TRUE(iter2 == iter_end2);
-}
-
-TEST_F(LibRadosListEC, ListObjectsNS) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ(0, rados_write(ioctx, "foo1", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_write(ioctx, "foo2", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_write(ioctx, "foo3", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ(0, rados_write(ioctx, "foo4", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_write(ioctx, "foo5", buf, sizeof(buf), 0));
-  rados_ioctx_set_namespace(ioctx, "ns2");
-  ASSERT_EQ(0, rados_write(ioctx, "foo6", buf, sizeof(buf), 0));
-  ASSERT_EQ(0, rados_write(ioctx, "foo7", buf, sizeof(buf), 0));
-
-  std::set<std::string> def, ns1, ns2, all;
-  def.insert(std::string("foo1"));
-  def.insert(std::string("foo2"));
-  def.insert(std::string("foo3"));
-  ns1.insert(std::string("foo1"));
-  ns1.insert(std::string("foo4"));
-  ns1.insert(std::string("foo5"));
-  ns2.insert(std::string("foo6"));
-  ns2.insert(std::string("foo7"));
-  all.insert(std::string(":foo1"));
-  all.insert(std::string(":foo2"));
-  all.insert(std::string(":foo3"));
-  all.insert(std::string("ns1:foo1"));
-  all.insert(std::string("ns1:foo4"));
-  all.insert(std::string("ns1:foo5"));
-  all.insert(std::string("ns2:foo6"));
-  all.insert(std::string("ns2:foo7"));
-
-  rados_list_ctx_t ctx;
-  // Check default namespace ""
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(def, ctx, "");
-  rados_nobjects_list_close(ctx);
-
-  // Check default namespace "ns1"
-  rados_ioctx_set_namespace(ioctx, "ns1");
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(ns1, ctx, "ns1");
-  rados_nobjects_list_close(ctx);
-
-  // Check default namespace "ns2"
-  rados_ioctx_set_namespace(ioctx, "ns2");
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(ns2, ctx, "ns2");
-  rados_nobjects_list_close(ctx);
-
-  // Check all namespaces
-  rados_ioctx_set_namespace(ioctx, LIBRADOS_ALL_NSPACES);
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  check_list(all, ctx, all_nspaces);
-  rados_nobjects_list_close(ctx);
-}
-
-TEST_F(LibRadosListECPP, ListObjectsPPNS) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl1;
-  bl1.append(buf, sizeof(buf));
-  // Create :foo1, :foo2, :foo3, n1:foo1, ns1:foo4, ns1:foo5, ns2:foo6, n2:foo7
-  ioctx.set_namespace("");
-  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("ns1");
-  ASSERT_EQ(0, ioctx.write("foo1", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("");
-  ASSERT_EQ(0, ioctx.write("foo2", bl1, sizeof(buf), 0));
-  ASSERT_EQ(0, ioctx.write("foo3", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("ns1");
-  ASSERT_EQ(0, ioctx.write("foo4", bl1, sizeof(buf), 0));
-  ASSERT_EQ(0, ioctx.write("foo5", bl1, sizeof(buf), 0));
-  ioctx.set_namespace("ns2");
-  ASSERT_EQ(0, ioctx.write("foo6", bl1, sizeof(buf), 0));
-  ASSERT_EQ(0, ioctx.write("foo7", bl1, sizeof(buf), 0));
-
-  std::set<std::string> def, ns1, ns2;
-  def.insert(std::string("foo1"));
-  def.insert(std::string("foo2"));
-  def.insert(std::string("foo3"));
-  ns1.insert(std::string("foo1"));
-  ns1.insert(std::string("foo4"));
-  ns1.insert(std::string("foo5"));
-  ns2.insert(std::string("foo6"));
-  ns2.insert(std::string("foo7"));
-
-  ioctx.set_namespace("");
-  check_listpp(def, ioctx, "");
-
-  ioctx.set_namespace("ns1");
-  check_listpp(ns1, ioctx, "ns1");
-
-  ioctx.set_namespace("ns2");
-  check_listpp(ns2, ioctx, "ns2");
-}
-
-TEST_F(LibRadosListECPP, ListObjectsManyPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  for (int i=0; i<256; ++i) {
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
-  }
-
-  librados::NObjectIterator it = ioctx.nobjects_begin();
-  std::set<std::string> saw_obj;
-  std::set<int> saw_pg;
-  for (; it != ioctx.nobjects_end(); ++it) {
-    std::cout << it->get_oid()
-	      << " " << it.get_pg_hash_position() << std::endl;
-    saw_obj.insert(it->get_oid());
-    saw_pg.insert(it.get_pg_hash_position());
-  }
-  std::cout << "saw " << saw_pg.size() << " pgs " << std::endl;
-
-  // make sure they are 0..n
-  for (unsigned i = 0; i < saw_pg.size(); ++i)
-    ASSERT_TRUE(saw_pg.count(i));
-}
-
-TEST_F(LibRadosListEC, ListObjectsStart) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-
-  for (int i=0; i<16; ++i) {
-    string n = stringify(i);
-    ASSERT_EQ(0, rados_write(ioctx, n.c_str(), buf, sizeof(buf), 0));
-  }
-
-  rados_list_ctx_t ctx;
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  std::map<int, std::set<std::string> > pg_to_obj;
-  const char *entry;
-  while (rados_nobjects_list_next(ctx, &entry, NULL, NULL) == 0) {
-    uint32_t pos = rados_nobjects_list_get_pg_hash_position(ctx);
-    std::cout << entry << " " << pos << std::endl;
-    pg_to_obj[pos].insert(entry);
-  }
-  rados_nobjects_list_close(ctx);
-
-  std::map<int, std::set<std::string> >::reverse_iterator p =
-    pg_to_obj.rbegin();
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  while (p != pg_to_obj.rend()) {
-    ASSERT_EQ((uint32_t)p->first, rados_nobjects_list_seek(ctx, p->first));
-    ASSERT_EQ(0, rados_nobjects_list_next(ctx, &entry, NULL, NULL));
-    std::cout << "have " << entry << " expect one of " << p->second << std::endl;
-    ASSERT_TRUE(p->second.count(entry));
-    ++p;
-  }
-  rados_nobjects_list_close(ctx);
-}
-
-TEST_F(LibRadosListECPP, ListObjectsStartPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  for (int i=0; i<16; ++i) {
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, bl.length(), 0));
-  }
-
-  librados::NObjectIterator it = ioctx.nobjects_begin();
-  std::map<int, std::set<std::string> > pg_to_obj;
-  for (; it != ioctx.nobjects_end(); ++it) {
-    std::cout << it->get_oid() << " " << it.get_pg_hash_position() << std::endl;
-    pg_to_obj[it.get_pg_hash_position()].insert(it->get_oid());
-  }
-
-  std::map<int, std::set<std::string> >::reverse_iterator p =
-    pg_to_obj.rbegin();
-  it = ioctx.nobjects_begin(p->first);
-  while (p != pg_to_obj.rend()) {
-    ASSERT_EQ((uint32_t)p->first, it.seek(p->first));
-    std::cout << "have " << it->get_oid() << " expect one of " << p->second << std::endl;
-    ASSERT_TRUE(p->second.count(it->get_oid()));
-    ++p;
-  }
-}
-
-TEST_F(LibRadosListPP, ListObjectsFilterPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist obj_content;
-  obj_content.append(buf, sizeof(buf));
-
-  std::string target_str = "content";
-
-  // Write xattr bare, no ::encod'ing
-  bufferlist target_val;
-  target_val.append(target_str);
-  bufferlist nontarget_val;
-  nontarget_val.append("rhubarb");
-
-  ASSERT_EQ(0, ioctx.write("has_xattr", obj_content, obj_content.length(), 0));
-  ASSERT_EQ(0, ioctx.write("has_wrong_xattr", obj_content, obj_content.length(), 0));
-  ASSERT_EQ(0, ioctx.write("no_xattr", obj_content, obj_content.length(), 0));
-
-  ASSERT_EQ(0, ioctx.setxattr("has_xattr", "theattr", target_val));
-  ASSERT_EQ(0, ioctx.setxattr("has_wrong_xattr", "theattr", nontarget_val));
-
-  bufferlist filter_bl;
-  std::string filter_name = "plain";
-  ::encode(filter_name, filter_bl);
-  ::encode("_theattr", filter_bl);
-  ::encode(target_str, filter_bl);
-
-  NObjectIterator iter(ioctx.nobjects_begin(filter_bl));
-  bool foundit = false;
-  int k = 0;
-  while (iter != ioctx.nobjects_end()) {
-    foundit = true;
-    // We should only see the object that matches the filter
-    ASSERT_EQ((*iter).get_oid(), "has_xattr");
-    // We should only see it once
-    ASSERT_EQ(k, 0);
-    ++iter;
-    ++k;
-  }
-  ASSERT_TRUE(foundit);
-}
-
-TEST_F(LibRadosListNP, ListObjectsError) {
-  std::string pool_name;
-  rados_t cluster;
-  rados_ioctx_t ioctx;
-  pool_name = get_temp_pool_name();
-  ASSERT_EQ("", create_one_pool(pool_name, &cluster));
-  ASSERT_EQ(0, rados_ioctx_create(cluster, pool_name.c_str(), &ioctx));
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  rados_ioctx_set_namespace(ioctx, "");
-  ASSERT_EQ(0, rados_write(ioctx, "foo", buf, sizeof(buf), 0));
-
-  //ASSERT_EQ(0, rados_pool_delete(cluster, pool_name.c_str()));
-  {
-    char *buf, *st;
-    size_t buflen, stlen;
-    string c = "{\"prefix\":\"osd pool rm\",\"pool\": \"" + pool_name +
-      "\",\"pool2\":\"" + pool_name +
-      "\",\"sure\": \"--yes-i-really-really-mean-it-not-faking\"}";
-    const char *cmd[2] = { c.c_str(), 0 };
-    ASSERT_EQ(0, rados_mon_command(cluster, (const char **)cmd, 1, "", 0, &buf, &buflen, &st, &stlen));
-    ASSERT_EQ(0, rados_wait_for_latest_osdmap(cluster));
-  }
-
-  rados_list_ctx_t ctx;
-  ASSERT_EQ(0, rados_nobjects_list_open(ioctx, &ctx));
-  const char *entry;
-  ASSERT_EQ(-ENOENT, rados_nobjects_list_next(ctx, &entry, NULL, NULL));
-  rados_nobjects_list_close(ctx);
-  rados_ioctx_destroy(ioctx);
-  rados_shutdown(cluster);
-}
-
-
-
-// ---------------------------------------------
-
-TEST_F(LibRadosList, EnumerateObjects) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-
-  const uint32_t n_objects = 16;
-  for (unsigned i=0; i<n_objects; ++i) {
-    ASSERT_EQ(0, rados_write(ioctx, stringify(i).c_str(), buf, sizeof(buf), 0));
-  }
-
-  // Ensure a non-power-of-two PG count to avoid only
-  // touching the easy path.
-  std::string err_str = set_pg_num(&s_cluster, pool_name, 11);
-  ASSERT_TRUE(err_str.empty());
-
-  std::set<std::string> saw_obj;
-  rados_object_list_cursor c = rados_object_list_begin(ioctx);
-  rados_object_list_cursor end = rados_object_list_end(ioctx);
-  while(!rados_object_list_is_end(ioctx, c))
-  {
-    rados_object_list_item results[12];
-    memset(results, 0, sizeof(rados_object_list_item) * 12);
-    rados_object_list_cursor temp_end = rados_object_list_end(ioctx);
-    int r = rados_object_list(ioctx, c, temp_end,
-            12, NULL, 0, results, &c);
-    rados_object_list_cursor_free(ioctx, temp_end);
-    ASSERT_GE(r, 0);
-    for (int i = 0; i < r; ++i) {
-      std::string oid(results[i].oid, results[i].oid_length);
-      if (saw_obj.count(oid)) {
-          std::cerr << "duplicate obj " << oid << std::endl;
-      }
-      ASSERT_FALSE(saw_obj.count(oid));
-      saw_obj.insert(oid);
-    }
-    rados_object_list_free(12, results);
-  }
-  rados_object_list_cursor_free(ioctx, c);
-  rados_object_list_cursor_free(ioctx, end);
-
-  for (unsigned i=0; i<n_objects; ++i) {
-    if (!saw_obj.count(stringify(i))) {
-        std::cerr << "missing object " << i << std::endl;
-    }
-    ASSERT_TRUE(saw_obj.count(stringify(i)));
-  }
-  ASSERT_EQ(n_objects, saw_obj.size());
-}
-
-TEST_F(LibRadosList, EnumerateObjectsSplit) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-
-  const uint32_t n_objects = 16;
-  for (unsigned i=0; i<n_objects; ++i) {
-    ASSERT_EQ(0, rados_write(ioctx, stringify(i).c_str(), buf, sizeof(buf), 0));
-  }
-
-  // Ensure a non-power-of-two PG count to avoid only
-  // touching the easy path.
-  std::string err_str = set_pg_num(&s_cluster, pool_name, 11);
-  ASSERT_TRUE(err_str.empty());
-
-  rados_object_list_cursor begin = rados_object_list_begin(ioctx);
-  rados_object_list_cursor end = rados_object_list_end(ioctx);
-
-  // Step through an odd number of shards
-  unsigned m = 5;
-  std::set<std::string> saw_obj;
-  for (unsigned n = 0; n < m; ++n) {
-      rados_object_list_cursor shard_start = rados_object_list_begin(ioctx);;
-      rados_object_list_cursor shard_end = rados_object_list_end(ioctx);;
-
-      rados_object_list_slice(
-        ioctx,
-        begin,
-        end,
-        n,
-        m,
-        &shard_start,
-        &shard_end);
-      std::cout << "split " << n << "/" << m << " -> "
-		<< *(hobject_t*)shard_start << " "
-		<< *(hobject_t*)shard_end << std::endl;
-
-      rados_object_list_cursor c = shard_start;
-      //while(c < shard_end)
-      while(rados_object_list_cursor_cmp(ioctx, c, shard_end) == -1)
-      {
-        rados_object_list_item results[12];
-        memset(results, 0, sizeof(rados_object_list_item) * 12);
-        int r = rados_object_list(ioctx,
-                c, shard_end,
-                12, NULL, 0, results, &c);
-        ASSERT_GE(r, 0);
-        for (int i = 0; i < r; ++i) {
-          std::string oid(results[i].oid, results[i].oid_length);
-          if (saw_obj.count(oid)) {
-              std::cerr << "duplicate obj " << oid << std::endl;
-          }
-          ASSERT_FALSE(saw_obj.count(oid));
-          saw_obj.insert(oid);
-        }
-        rados_object_list_free(12, results);
-      }
-      rados_object_list_cursor_free(ioctx, shard_start);
-      rados_object_list_cursor_free(ioctx, shard_end);
-  }
-
-  rados_object_list_cursor_free(ioctx, begin);
-  rados_object_list_cursor_free(ioctx, end);
-
-  for (unsigned i=0; i<n_objects; ++i) {
-    if (!saw_obj.count(stringify(i))) {
-        std::cerr << "missing object " << i << std::endl;
-    }
-    ASSERT_TRUE(saw_obj.count(stringify(i)));
-  }
-  ASSERT_EQ(n_objects, saw_obj.size());
-}
-
-TEST_F(LibRadosListPP, EnumerateObjectsPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  const uint32_t n_objects = 16;
-  for (unsigned i=0; i<n_objects; ++i) {
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, sizeof(buf), 0));
-  }
-
-  std::set<std::string> saw_obj;
-  ObjectCursor c = ioctx.object_list_begin();
-  ObjectCursor end = ioctx.object_list_end();
-  while(!ioctx.object_list_is_end(c))
-  {
-    std::vector<ObjectItem> result;
-    int r = ioctx.object_list(c, end, 12, {}, &result, &c);
-    ASSERT_GE(r, 0);
-    ASSERT_EQ(r, (int)result.size());
-    for (int i = 0; i < r; ++i) {
-      auto oid = result[i].oid;
-      if (saw_obj.count(oid)) {
-          std::cerr << "duplicate obj " << oid << std::endl;
-      }
-      ASSERT_FALSE(saw_obj.count(oid));
-      saw_obj.insert(oid);
-    }
-  }
-
-  for (unsigned i=0; i<n_objects; ++i) {
-    if (!saw_obj.count(stringify(i))) {
-        std::cerr << "missing object " << i << std::endl;
-    }
-    ASSERT_TRUE(saw_obj.count(stringify(i)));
-  }
-  ASSERT_EQ(n_objects, saw_obj.size());
-}
-
-TEST_F(LibRadosListPP, EnumerateObjectsSplitPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist bl;
-  bl.append(buf, sizeof(buf));
-
-  const uint32_t n_objects = 16;
-  for (unsigned i=0; i<n_objects; ++i) {
-    ASSERT_EQ(0, ioctx.write(stringify(i), bl, sizeof(buf), 0));
-  }
-
-  ObjectCursor begin = ioctx.object_list_begin();
-  ObjectCursor end = ioctx.object_list_end();
-
-  // Step through an odd number of shards
-  unsigned m = 5;
-  std::set<std::string> saw_obj;
-  for (unsigned n = 0; n < m; ++n) {
-      ObjectCursor shard_start;
-      ObjectCursor shard_end;
-
-      ioctx.object_list_slice(
-        begin,
-        end,
-        n,
-        m,
-        &shard_start,
-        &shard_end);
-
-      ObjectCursor c(shard_start);
-      while(c < shard_end)
-      {
-        std::vector<ObjectItem> result;
-        int r = ioctx.object_list(c, shard_end, 12, {}, &result, &c);
-        ASSERT_GE(r, 0);
-
-        for (const auto & i : result) {
-          const auto &oid = i.oid;
-          if (saw_obj.count(oid)) {
-              std::cerr << "duplicate obj " << oid << std::endl;
-          }
-          ASSERT_FALSE(saw_obj.count(oid));
-          saw_obj.insert(oid);
-        }
-      }
-  }
-
-  for (unsigned i=0; i<n_objects; ++i) {
-    if (!saw_obj.count(stringify(i))) {
-        std::cerr << "missing object " << i << std::endl;
-    }
-    ASSERT_TRUE(saw_obj.count(stringify(i)));
-  }
-  ASSERT_EQ(n_objects, saw_obj.size());
-}
-
-
-TEST_F(LibRadosListPP, EnumerateObjectsFilterPP) {
-  char buf[128];
-  memset(buf, 0xcc, sizeof(buf));
-  bufferlist obj_content;
-  obj_content.append(buf, sizeof(buf));
-
-  std::string target_str = "content";
-
-  // Write xattr bare, no ::encod'ing
-  bufferlist target_val;
-  target_val.append(target_str);
-  bufferlist nontarget_val;
-  nontarget_val.append("rhubarb");
-
-  ASSERT_EQ(0, ioctx.write("has_xattr", obj_content, obj_content.length(), 0));
-  ASSERT_EQ(0, ioctx.write("has_wrong_xattr", obj_content, obj_content.length(), 0));
-  ASSERT_EQ(0, ioctx.write("no_xattr", obj_content, obj_content.length(), 0));
-
-  ASSERT_EQ(0, ioctx.setxattr("has_xattr", "theattr", target_val));
-  ASSERT_EQ(0, ioctx.setxattr("has_wrong_xattr", "theattr", nontarget_val));
-
-  bufferlist filter_bl;
-  std::string filter_name = "plain";
-  ::encode(filter_name, filter_bl);
-  ::encode("_theattr", filter_bl);
-  ::encode(target_str, filter_bl);
-
-  ObjectCursor c = ioctx.object_list_begin();
-  ObjectCursor end = ioctx.object_list_end();
-  bool foundit = false;
-  while(!ioctx.object_list_is_end(c))
-  {
-    std::vector<ObjectItem> result;
-    int r = ioctx.object_list(c, end, 12, filter_bl, &result, &c);
-    ASSERT_GE(r, 0);
-    ASSERT_EQ(r, (int)result.size());
-    for (int i = 0; i < r; ++i) {
-      auto oid = result[i].oid;
-      // We should only see the object that matches the filter
-      ASSERT_EQ(oid, "has_xattr");
-      // We should only see it once
-      ASSERT_FALSE(foundit);
-      foundit = true;
-    }
-  }
-  ASSERT_TRUE(foundit);
-}