From d43cb3625be58c9da91d33b5bae6578c47a983ef Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sat, 18 Feb 2023 19:36:38 -0500 Subject: [PATCH] rgw/sal: remove omap_get_vals() and omap_get_all() these had no callers above zipper Signed-off-by: Casey Bodley --- src/rgw/driver/rados/rgw_sal_rados.cc | 35 +++++++-------------------- src/rgw/driver/rados/rgw_sal_rados.h | 5 ---- src/rgw/rgw_sal.h | 8 +----- src/rgw/rgw_sal_daos.cc | 13 ---------- src/rgw/rgw_sal_daos.h | 7 ------ src/rgw/rgw_sal_dbstore.cc | 17 ------------- src/rgw/rgw_sal_dbstore.h | 5 ---- src/rgw/rgw_sal_filter.cc | 14 ----------- src/rgw/rgw_sal_filter.h | 6 ----- src/rgw/rgw_sal_motr.cc | 13 ---------- src/rgw/rgw_sal_motr.h | 5 ---- 11 files changed, 10 insertions(+), 118 deletions(-) diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc index e309723c3425..7b56b689d408 100644 --- 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 *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 *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& keys, Attrs* vals) @@ -2478,9 +2457,13 @@ int RadosMultipartUpload::list_parts(const DoutPrefixProvider *dpp, CephContext map parts_map; map::iterator iter; - std::unique_ptr 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 a9d7273e95cd..0937d7bfbe17 100644 --- 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 get_delete_op() override; /* OMAP */ - virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count, - std::map *m, - bool* pmore, optional_yield y) override; - virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map *m, - optional_yield y) override; virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid, const std::set& keys, Attrs* vals) override; diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index c5f195f9e98e..4a66acf52b6d 100644 --- 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 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* 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* 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& keys, diff --git a/src/rgw/rgw_sal_daos.cc b/src/rgw/rgw_sal_daos.cc index 88b1173e5605..b4e3cf93c98d 100644 --- 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* m, bool* pmore, - optional_yield y) { - return DAOS_NOT_IMPLEMENTED_LOG(dpp); -} - -int DaosObject::omap_get_all(const DoutPrefixProvider* dpp, - std::map* 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& keys, diff --git a/src/rgw/rgw_sal_daos.h b/src/rgw/rgw_sal_daos.h index 3403b30a488f..83799e28fafb 100644 --- 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 get_delete_op() override; /* OMAP */ - virtual int omap_get_vals(const DoutPrefixProvider* dpp, - const std::string& marker, uint64_t count, - std::map* m, bool* pmore, - optional_yield y) override; - virtual int omap_get_all(const DoutPrefixProvider* dpp, - std::map* m, - optional_yield y) override; virtual int omap_get_vals_by_keys(const DoutPrefixProvider* dpp, const std::string& oid, const std::set& keys, diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc index d9f44dbaf711..65cf82cbaea5 100644 --- 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 *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 *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& keys, Attrs* vals) diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index b2dd3d71e93e..08e1cf516d4c 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -636,11 +636,6 @@ protected: virtual std::unique_ptr get_delete_op() override; /* OMAP */ - virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count, - std::map *m, - bool* pmore, optional_yield y) override; - virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map *m, - optional_yield y) override; virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid, const std::set& keys, Attrs* vals) override; diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc index 2a48cec9c03d..367b23db25ba 100644 --- a/src/rgw/rgw_sal_filter.cc +++ b/src/rgw/rgw_sal_filter.cc @@ -1020,20 +1020,6 @@ std::unique_ptr FilterObject::get_delete_op() return std::make_unique(std::move(d)); } -int FilterObject::omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, - uint64_t count, std::map *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 *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& keys, diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h index cc73d4a60bfd..537640edd498 100644 --- a/src/rgw/rgw_sal_filter.h +++ b/src/rgw/rgw_sal_filter.h @@ -658,12 +658,6 @@ public: virtual std::unique_ptr get_read_op() override; virtual std::unique_ptr get_delete_op() override; - virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, - uint64_t count, std::map* m, - bool* pmore, optional_yield y) override; - virtual int omap_get_all(const DoutPrefixProvider *dpp, - std::map* m, - optional_yield y) override; virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid, const std::set& keys, diff --git a/src/rgw/rgw_sal_motr.cc b/src/rgw/rgw_sal_motr.cc index cc7869627a66..724f6f0f7087 100644 --- 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 *m, - bool* pmore, optional_yield y) -{ - return 0; -} - -int MotrObject::omap_get_all(const DoutPrefixProvider *dpp, std::map *m, - optional_yield y) -{ - return 0; -} - int MotrObject::omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid, const std::set& keys, Attrs* vals) diff --git a/src/rgw/rgw_sal_motr.h b/src/rgw/rgw_sal_motr.h index 91f67a20b638..e4659afb812f 100644 --- 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 get_delete_op() override; /* OMAP */ - virtual int omap_get_vals(const DoutPrefixProvider *dpp, const std::string& marker, uint64_t count, - std::map *m, - bool* pmore, optional_yield y) override; - virtual int omap_get_all(const DoutPrefixProvider *dpp, std::map *m, - optional_yield y) override; virtual int omap_get_vals_by_keys(const DoutPrefixProvider *dpp, const std::string& oid, const std::set& keys, Attrs* vals) override; -- 2.47.3