From 0c075b127cbe65ab019e7bd5e323a9ab62d665f8 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Fri, 20 Aug 2021 13:30:41 -0400 Subject: [PATCH] RGW Zipper - remove unused create_object() Signed-off-by: Daniel Gryniewicz --- src/rgw/rgw_sal.h | 1 - src/rgw/rgw_sal_dbstore.cc | 5 ----- src/rgw/rgw_sal_dbstore.h | 1 - src/rgw/rgw_sal_rados.cc | 6 ------ src/rgw/rgw_sal_rados.h | 1 - 5 files changed, 14 deletions(-) diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index 92c2bddee6111..2ee306a512191 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -419,7 +419,6 @@ class Bucket { virtual std::unique_ptr get_object(const rgw_obj_key& key) = 0; virtual int list(const DoutPrefixProvider* dpp, ListParams&, int, ListResults&, optional_yield y) = 0; - virtual Object* create_object(const rgw_obj_key& key /* Attributes */) = 0; virtual Attrs& get_attrs(void) { return attrs; } virtual int set_attrs(Attrs a) { attrs = a; return 0; } virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, std::string prefix, std::string delimiter, bool forward_to_master, req_info* req_info, optional_yield y) = 0; diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc index dcb968e6c34c4..898b10dd6505c 100644 --- a/src/rgw/rgw_sal_dbstore.cc +++ b/src/rgw/rgw_sal_dbstore.cc @@ -125,11 +125,6 @@ namespace rgw::sal { return ret; } - Object *DBBucket::create_object(const rgw_obj_key &key) - { - return nullptr; - } - int DBBucket::remove_bucket(const DoutPrefixProvider *dpp, bool delete_children, std::string prefix, std::string delimiter, bool forward_to_master, req_info* req_info, optional_yield y) { int ret; diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h index 2b95af27216e4..50129d9f7ed60 100644 --- a/src/rgw/rgw_sal_dbstore.h +++ b/src/rgw/rgw_sal_dbstore.h @@ -120,7 +120,6 @@ namespace rgw { namespace sal { virtual std::unique_ptr get_object(const rgw_obj_key& k) override; virtual int list(const DoutPrefixProvider *dpp, ListParams&, int, ListResults&, optional_yield y) override; - Object* create_object(const rgw_obj_key& key /* Attributes */) override; virtual int remove_bucket(const DoutPrefixProvider *dpp, bool delete_children, std::string prefix, std::string delimiter, bool forward_to_master, req_info* req_info, optional_yield y) override; virtual int remove_bucket_bypass_gc(int concurrent_max, bool keep_index_consistent, diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 11428f1363ce7..d75069c9727ec 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -223,12 +223,6 @@ int RadosUser::remove_user(const DoutPrefixProvider* dpp, optional_yield y) RGWUserCtl::RemoveParams().set_objv_tracker(&objv_tracker)); } -/* Placeholder */ -Object* RadosBucket::create_object(const rgw_obj_key &key) -{ - return nullptr; -} - RadosBucket::~RadosBucket() {} int RadosBucket::remove_bucket(const DoutPrefixProvider* dpp, diff --git a/src/rgw/rgw_sal_rados.h b/src/rgw/rgw_sal_rados.h index bf8a953919582..f1c73c39745c2 100644 --- a/src/rgw/rgw_sal_rados.h +++ b/src/rgw/rgw_sal_rados.h @@ -267,7 +267,6 @@ class RadosBucket : public Bucket { virtual std::unique_ptr get_object(const rgw_obj_key& k) override; virtual int list(const DoutPrefixProvider* dpp, ListParams&, int, ListResults&, optional_yield y) override; - Object* create_object(const rgw_obj_key& key /* Attributes */) override; virtual int remove_bucket(const DoutPrefixProvider* dpp, bool delete_children, std::string prefix, std::string delimiter, bool forward_to_master, req_info* req_info, optional_yield y) override; virtual int remove_bucket_bypass_gc(int concurrent_max, bool keep_index_consistent, -- 2.39.5