rgw/sal: remove omap_get_vals() and omap_get_all()

these had no callers above zipper

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc
index e309723c3425d4348d8e3138f588b97cddaaa5b2..7b56b689d408c0e033a4b79a3801c9847f72a3c8 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.cc
+++ b/src/rgw/driver/rados/rgw_sal_rados.cc
@@ -1754,27 +1754,6 @@ void RadosObject::get_raw_obj(rgw_raw_obj* raw_obj)
   store->getRados()->obj_to_raw((bucket->get_info()).placement_rule, get_obj(), raw_obj);
 }
 
-int RadosObject::omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-                                 std::map<std::string, bufferlist> *m,
-                                 bool* pmore, optional_yield y)
-{
-  rgw_raw_obj raw_obj;
-  get_raw_obj(&raw_obj);
-  auto sysobj = store->svc()->sysobj->get_obj(raw_obj);
-
-  return sysobj.omap().get_vals(dpp, marker, count, m, pmore, y);
-}
-
-int RadosObject::omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *m,
-                                optional_yield y)
-{
-  rgw_raw_obj raw_obj;
-  get_raw_obj(&raw_obj);
-  auto sysobj = store->svc()->sysobj->get_obj(raw_obj);
-
-  return sysobj.omap().get_all(dpp, m, y);
-}
-
 int RadosObject::omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
                                          const std::set<std::string>& keys,
                                          Attrs* vals)
@@ -2478,9 +2457,13 @@ int RadosMultipartUpload::list_parts(const DoutPrefixProvider *dpp, CephContext
   map<string, bufferlist> parts_map;
   map<string, bufferlist>::iterator iter;
 
-  std::unique_ptr<rgw::sal::Object> obj = bucket->get_object(
-                     rgw_obj_key(get_meta(), std::string(), RGW_OBJ_NS_MULTIPART));
-  obj->set_in_extra_data(true);
+  rgw_obj_key key(get_meta(), std::string(), RGW_OBJ_NS_MULTIPART);
+  rgw_obj obj(bucket->get_key(), key);
+  obj.in_extra_data = true;
+
+  rgw_raw_obj raw_obj;
+  store->getRados()->obj_to_raw(bucket->get_placement_rule(), obj, &raw_obj);
+  auto sysobj = store->svc()->sysobj->get_obj(raw_obj);
 
   bool sorted_omap = is_v2_upload_id(get_upload_id()) && !assume_unsorted;
 
@@ -2495,10 +2478,10 @@ int RadosMultipartUpload::list_parts(const DoutPrefixProvider *dpp, CephContext
     snprintf(buf, sizeof(buf), "%08d", marker);
     p.append(buf);
 
-    ret = obj->omap_get_vals(dpp, p, num_parts + 1, &parts_map,
+    ret = sysobj.omap().get_vals(dpp, p, num_parts + 1, &parts_map,
                                  nullptr, null_yield);
   } else {
-    ret = obj->omap_get_all(dpp, &parts_map, null_yield);
+    ret = sysobj.omap().get_all(dpp, &parts_map, null_yield);
   }
   if (ret < 0) {
     return ret;

diff --git a/src/rgw/driver/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h
index a9d7273e95cdc61f3c5cc6511ecb968492be62fc..0937d7bfbe175c1e7c7dce4de3657b64162f49fc 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.h
+++ b/src/rgw/driver/rados/rgw_sal_rados.h
@@ -466,11 +466,6 @@ class RadosObject : public StoreObject {
     virtual std::unique_ptr<DeleteOp> get_delete_op() override;
 
     /* OMAP */
-    virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-                             std::map<std::string, bufferlist> *m,
-                             bool* pmore, optional_yield y) override;
-    virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *m,
-                            optional_yield y) override;
     virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
                              const std::set<std::string>& keys,
                              Attrs* vals) override;

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index c5f195f9e98e413e78303ce2661d758c3467954d..4a66acf52b6db9fa413af51ce5a8059562ba87f2 100644 (file)
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -1071,13 +1071,7 @@ class Object {
     /** Get a new DeleteOp for this object */
     virtual std::unique_ptr<DeleteOp> get_delete_op() = 0;
 
-    /** Get @a count OMAP values via listing, starting at @a marker for this object */
-    virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-                             std::map<std::string, bufferlist>* m,
-                             bool* pmore, optional_yield y) = 0;
-    /** Get all OMAP key/value pairs for this object */
-    virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist>* m,
-                            optional_yield y) = 0;
+    // TODO: remove omap APIs. rgw_torrent.cc shouldn't use omap
     /** Get the OMAP values matching the given set of keys */
     virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
                              const std::set<std::string>& keys,

diff --git a/src/rgw/rgw_sal_daos.cc b/src/rgw/rgw_sal_daos.cc
index 88b1173e5605dcc72a587dcfc291c1270570e84b..b4e3cf93c98d9e6132c51d074178bcf54e217cf1 100644 (file)
--- a/src/rgw/rgw_sal_daos.cc
+++ b/src/rgw/rgw_sal_daos.cc
@@ -1016,19 +1016,6 @@ void DaosObject::gen_rand_obj_instance_name() {
   state.obj.key.set_instance(buf);
 }
 
-int DaosObject::omap_get_vals(const DoutPrefixProvider* dpp,
-                              const std::string& marker, uint64_t count,
-                              std::map<std::string, bufferlist>* m, bool* pmore,
-                              optional_yield y) {
-  return DAOS_NOT_IMPLEMENTED_LOG(dpp);
-}
-
-int DaosObject::omap_get_all(const DoutPrefixProvider* dpp,
-                             std::map<std::string, bufferlist>* m,
-                             optional_yield y) {
-  return DAOS_NOT_IMPLEMENTED_LOG(dpp);
-}
-
 int DaosObject::omap_get_vals_by_keys(const DoutPrefixProvider* dpp,
                                       const std::string& oid,
                                       const std::set<std::string>& keys,

diff --git a/src/rgw/rgw_sal_daos.h b/src/rgw/rgw_sal_daos.h
index 3403b30a488fecc63201d2464d1957ec15eda043..83799e28fafb90a35f16c787d39e8f996ba6d6cd 100644 (file)
--- a/src/rgw/rgw_sal_daos.h
+++ b/src/rgw/rgw_sal_daos.h
@@ -672,13 +672,6 @@ class DaosObject : public StoreObject {
   virtual std::unique_ptr<DeleteOp> get_delete_op() override;
 
   /* OMAP */
-  virtual int omap_get_vals(const DoutPrefixProvider* dpp,
-                            const std::string& marker, uint64_t count,
-                            std::map<std::string, bufferlist>* m, bool* pmore,
-                            optional_yield y) override;
-  virtual int omap_get_all(const DoutPrefixProvider* dpp,
-                           std::map<std::string, bufferlist>* m,
-                           optional_yield y) override;
   virtual int omap_get_vals_by_keys(const DoutPrefixProvider* dpp,
                                     const std::string& oid,
                                     const std::set<std::string>& keys,

diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc
index d9f44dbaf711ca0f1db04294b49dc351d9b671c3..65cf82cbaea52556c8ac85e1df49f68c5cd783ff 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.cc
+++ b/src/rgw/rgw_sal_dbstore.cc
@@ -686,23 +686,6 @@ namespace rgw::sal {
   }
 
 
-  int DBObject::omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-      std::map<std::string, bufferlist> *m,
-      bool* pmore, optional_yield y)
-  {
-    DB::Object op_target(store->getDB(),
-        get_bucket()->get_info(), get_obj());
-    return op_target.obj_omap_get_vals(dpp, marker, count, m, pmore);
-  }
-
-  int DBObject::omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *m,
-      optional_yield y)
-  {
-    DB::Object op_target(store->getDB(),
-        get_bucket()->get_info(), get_obj());
-    return op_target.obj_omap_get_all(dpp, m);
-  }
-
   int DBObject::omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
       const std::set<std::string>& keys,
       Attrs* vals)

diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h
index b2dd3d71e93e27fe2d409407d13becbf930d57be..08e1cf516d4c18218d5a7eea8417305390690fdc 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.h
+++ b/src/rgw/rgw_sal_dbstore.h
@@ -636,11 +636,6 @@ protected:
       virtual std::unique_ptr<DeleteOp> get_delete_op() override;
 
       /* OMAP */
-      virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-          std::map<std::string, bufferlist> *m,
-          bool* pmore, optional_yield y) override;
-      virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *m,
-          optional_yield y) override;
       virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
           const std::set<std::string>& keys,
           Attrs* vals) override;

diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc
index 2a48cec9c03de473764aebb13c8614857aeadc2c..367b23db25bad25a99608356f7758507334771f4 100644 (file)
--- a/src/rgw/rgw_sal_filter.cc
+++ b/src/rgw/rgw_sal_filter.cc
@@ -1020,20 +1020,6 @@ std::unique_ptr<Object::DeleteOp> FilterObject::get_delete_op()
   return std::make_unique<FilterDeleteOp>(std::move(d));
 }
 
-int FilterObject::omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker,
-                               uint64_t count, std::map<std::string, bufferlist> *m,
-                               bool* pmore, optional_yield y)
-{
-  return next->omap_get_vals(dpp, marker, count, m, pmore, y);
-}
-
-int FilterObject::omap_get_all(const DoutPrefixProvider *dpp,
-                              std::map<std::string, bufferlist> *m,
-                              optional_yield y)
-{
-  return next->omap_get_all(dpp, m, y);
-}
-
 int FilterObject::omap_get_vals_by_keys(const DoutPrefixProvider *dpp,
                                        const std::string& oid,
                                        const std::set<std::string>& keys,

diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h
index cc73d4a60bfd9fb75614b94edbc178194d4e6256..537640edd498a6ad4ab46ff6dafd07ca1c3f2d04 100644 (file)
--- a/src/rgw/rgw_sal_filter.h
+++ b/src/rgw/rgw_sal_filter.h
@@ -658,12 +658,6 @@ public:
   virtual std::unique_ptr<ReadOp> get_read_op() override;
   virtual std::unique_ptr<DeleteOp> get_delete_op() override;
 
-  virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker,
-                           uint64_t count, std::map<std::string, bufferlist>* m,
-                           bool* pmore, optional_yield y) override;
-  virtual int omap_get_all(const DoutPrefixProvider *dpp,
-                          std::map<std::string, bufferlist>* m,
-                          optional_yield y) override;
   virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp,
                                    const std::string& oid,
                                    const std::set<std::string>& keys,

diff --git a/src/rgw/rgw_sal_motr.cc b/src/rgw/rgw_sal_motr.cc
index cc7869627a66669a75c4856b5cd8232ba232d16f..724f6f0f708728577bfea5fe451b0fc025ad6576 100644 (file)
--- a/src/rgw/rgw_sal_motr.cc
+++ b/src/rgw/rgw_sal_motr.cc
@@ -1296,19 +1296,6 @@ void MotrObject::gen_rand_obj_instance_name()
   state.obj.key.set_instance(buf);
 }
 
-int MotrObject::omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-    std::map<std::string, bufferlist> *m,
-    bool* pmore, optional_yield y)
-{
-  return 0;
-}
-
-int MotrObject::omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *m,
-    optional_yield y)
-{
-  return 0;
-}
-
 int MotrObject::omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
     const std::set<std::string>& keys,
     Attrs* vals)

diff --git a/src/rgw/rgw_sal_motr.h b/src/rgw/rgw_sal_motr.h
index 91f67a20b638b34c209bdba3bc3a1ac872453fda..e4659afb812f8916bbcfc490aa65e1e85bce00e0 100644 (file)
--- a/src/rgw/rgw_sal_motr.h
+++ b/src/rgw/rgw_sal_motr.h
@@ -724,11 +724,6 @@ class MotrObject : public StoreObject {
     virtual std::unique_ptr<DeleteOp> get_delete_op() override;
 
     /* OMAP */
-    virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count,
-        std::map<std::string, bufferlist> *m,
-        bool* pmore, optional_yield y) override;
-    virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map<std::string, bufferlist> *m,
-        optional_yield y) override;
     virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid,
         const std::set<std::string>& keys,
         Attrs* vals) override;