os/ObjectStore: kill hobject_t convenience wrappers

These are dangerous and no longer needed.

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

diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc
index 5869be535c02409e89df7e70d036a3d62b3766cc..717df74ee3c769c849932c8e4e2096a7b12e0907 100644 (file)
--- a/src/os/ObjectStore.cc
+++ b/src/os/ObjectStore.cc
@@ -113,49 +113,3 @@ int ObjectStore::queue_transactions(
   return queue_transactions(osr, tls, _onreadable, _oncommit,
                            onreadable_sync, op);
 }
-
-int ObjectStore::collection_list(coll_t c, vector<hobject_t>& o)
-{
-  vector<ghobject_t> go;
-  int ret = collection_list(c, go);
-  if (ret == 0) {
-    o.reserve(go.size());
-    for (vector<ghobject_t>::iterator i = go.begin(); i != go.end() ; ++i)
-      o.push_back(i->hobj);
-  }
-  return ret;
-}
-
-int ObjectStore::collection_list_partial(coll_t c, hobject_t start,
-                             int min, int max, snapid_t snap,
-                                     vector<hobject_t> *ls, hobject_t *next)
-{
-  vector<ghobject_t> go;
-  ghobject_t gnext, gstart(start);
-  int ret = collection_list_partial(c, gstart, min, max, snap, &go, &gnext);
-  if (ret == 0) {
-    *next = gnext.hobj;
-    ls->reserve(go.size());
-    for (vector<ghobject_t>::iterator i = go.begin(); i != go.end() ; ++i)
-      ls->push_back(i->hobj);
-  }
-  return ret;
-}
-
-int ObjectStore::collection_list_range(coll_t c, hobject_t start, hobject_t end,
-                           snapid_t seq, vector<hobject_t> *ls)
-{
-  vector<ghobject_t> go;
-  // Starts with the smallest shard id and generation to
-  // make sure the result list has the marker object
-  ghobject_t gstart(start, 0, shard_id_t(0));
-  // Exclusive end, choose the smallest end ghobject
-  ghobject_t gend(end, 0, shard_id_t(0));
-  int ret = collection_list_range(c, gstart, gend, seq, &go);
-  if (ret == 0) {
-    ls->reserve(go.size());
-    for (vector<ghobject_t>::iterator i = go.begin(); i != go.end() ; ++i)
-      ls->push_back(i->hobj);
-  }
-  return ret;
-}

diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h
index e7d889c3c1d78ffcf7d49cb2fcab4a5167e7a1e2..3a14a60f0588be6d165890bf52c3b219ed57d09b 100644 (file)
--- a/src/os/ObjectStore.h
+++ b/src/os/ObjectStore.h
@@ -2066,16 +2066,6 @@ public:
   virtual int collection_list_range(coll_t c, ghobject_t start, ghobject_t end,
                                    snapid_t seq, vector<ghobject_t> *ls) = 0;
 
-  //TODO: Remove
-  int collection_list(coll_t c, vector<hobject_t>& o);
-
-  int collection_list_partial(coll_t c, hobject_t start,
-                                     int min, int max, snapid_t snap,
-                                     vector<hobject_t> *ls, hobject_t *next);
-
-  int collection_list_range(coll_t c, hobject_t start, hobject_t end,
-                                   snapid_t seq, vector<hobject_t> *ls);
-
   /// OMAP
   /// Get omap contents
   virtual int omap_get(