RGW/standalone: removed RGWSystemMetaObj from rgw_zone

Signed-off-by: Ali Masarwa <[email protected]>

Author: AliMasarweh

src/rgw/driver/rados/rgw_zone.cc

@@ -59,53 +59,6 @@ void RGWDefaultSystemMetaObjInfo::decode_json(JSONObj *obj) {
   JSONDecoder::decode_json("default_id", default_id, obj);
 }
 
-int RGWSystemMetaObj::rename(const DoutPrefixProvider *dpp, const string& new_name, optional_yield y)
-{
-  string new_id;
-  int ret = read_id(dpp, new_name, new_id, y);
-  if (!ret) {
-    return -EEXIST;
-  }
-  if (ret < 0 && ret != -ENOENT) {
-    ldpp_dout(dpp, 0) << "Error read_id " << new_name << ": " << cpp_strerror(-ret) << dendl;
-    return ret;
-  }
-  string old_name = name;
-  name = new_name;
-  ret = update(dpp, y);
-  if (ret < 0) {
-    ldpp_dout(dpp, 0) << "Error storing new obj info " << new_name << ": " << cpp_strerror(-ret) << dendl;
-    return ret;
-  }
-  ret = store_name(dpp, true, y);
-  if (ret < 0) {
-    ldpp_dout(dpp, 0) << "Error storing new name " << new_name << ": " << cpp_strerror(-ret) << dendl;
-    return ret;
-  }
-  /* delete old name */
-  rgw_pool pool(get_pool(cct));
-  string oid = get_names_oid_prefix() + old_name;
-  rgw_raw_obj old_name_obj(pool, oid);
-  auto sysobj = sysobj_svc->get_obj(old_name_obj);
-  ret = sysobj.wop().remove(dpp, y);
-  if (ret < 0) {
-    ldpp_dout(dpp, 0) << "Error delete old obj name  " << old_name << ": " << cpp_strerror(-ret) << dendl;
-    return ret;
-  }
-
-  return ret;
-}
-
-int RGWSystemMetaObj::read(const DoutPrefixProvider *dpp, optional_yield y)
-{
-  int ret = read_id(dpp, name, id, y);
-  if (ret < 0) {
-    return ret;
-  }
-
-  return read_info(dpp, id, y);
-}
-
 const string& RGWZoneParams::get_compression_type(const rgw_placement_rule& placement_rule) const
 {
   static const std::string NONE{"none"};

src/rgw/driver/rados/rgw_zone.h

@@ -10,93 +10,6 @@
 #include "rgw_sync_policy.h"
 
 
-class RGWSyncModulesManager;
-
-class RGWSI_SysObj;
-class RGWSI_Zone;
-
-class RGWSystemMetaObj {
-public:
-  std::string id;
-  std::string name;
-
-  CephContext *cct{nullptr};
-  RGWSI_SysObj *sysobj_svc{nullptr};
-  RGWSI_Zone *zone_svc{nullptr};
-
-  int store_name(const DoutPrefixProvider *dpp, bool exclusive, optional_yield y);
-  int store_info(const DoutPrefixProvider *dpp, bool exclusive, optional_yield y);
-  int read_info(const DoutPrefixProvider *dpp, const std::string& obj_id, optional_yield y, bool old_format = false);
-  int read_id(const DoutPrefixProvider *dpp, const std::string& obj_name, std::string& obj_id, optional_yield y);
-  int read_default(const DoutPrefixProvider *dpp, 
-                   RGWDefaultSystemMetaObjInfo& default_info,
-		   const std::string& oid,
-		   optional_yield y);
-  /* read and use default id */
-  int use_default(const DoutPrefixProvider *dpp, optional_yield y, bool old_format = false);
-
-public:
-  RGWSystemMetaObj() {}
-  RGWSystemMetaObj(const std::string& _name): name(_name) {}
-  RGWSystemMetaObj(const std::string& _id, const std::string& _name) : id(_id), name(_name) {}
-  RGWSystemMetaObj(CephContext *_cct, RGWSI_SysObj *_sysobj_svc) {
-    reinit_instance(_cct, _sysobj_svc);
-  }
-  RGWSystemMetaObj(const std::string& _name, CephContext *_cct, RGWSI_SysObj *_sysobj_svc): name(_name) {
-    reinit_instance(_cct, _sysobj_svc);
-  }
-
-  const std::string& get_name() const { return name; }
-  const std::string& get_id() const { return id; }
-
-  void set_name(const std::string& _name) { name = _name;}
-  void set_id(const std::string& _id) { id = _id;}
-  void clear_id() { id.clear(); }
-
-  virtual ~RGWSystemMetaObj() {}
-
-  virtual void encode(bufferlist& bl) const {
-    ENCODE_START(1, 1, bl);
-    encode(id, bl);
-    encode(name, bl);
-    ENCODE_FINISH(bl);
-  }
-
-  virtual void decode(bufferlist::const_iterator& bl) {
-    DECODE_START(1, bl);
-    decode(id, bl);
-    decode(name, bl);
-    DECODE_FINISH(bl);
-  }
-
-  void reinit_instance(CephContext *_cct, RGWSI_SysObj *_sysobj_svc);
-  int init(const DoutPrefixProvider *dpp, CephContext *_cct, RGWSI_SysObj *_sysobj_svc,
-	   optional_yield y,
-	   bool setup_obj = true, bool old_format = false);
-  virtual int read_default_id(const DoutPrefixProvider *dpp, std::string& default_id, optional_yield y,
-			      bool old_format = false);
-  virtual int set_as_default(const DoutPrefixProvider *dpp, optional_yield y, bool exclusive = false);
-  int delete_default();
-  virtual int create(const DoutPrefixProvider *dpp, optional_yield y, bool exclusive = true);
-  int delete_obj(const DoutPrefixProvider *dpp, optional_yield y, bool old_format = false);
-  int rename(const DoutPrefixProvider *dpp, const std::string& new_name, optional_yield y);
-  int update(const DoutPrefixProvider *dpp, optional_yield y) { return store_info(dpp, false, y);}
-  int update_name(const DoutPrefixProvider *dpp, optional_yield y) { return store_name(dpp, false, y);}
-  int read(const DoutPrefixProvider *dpp, optional_yield y);
-  int write(const DoutPrefixProvider *dpp, bool exclusive, optional_yield y);
-
-  virtual rgw_pool get_pool(CephContext *cct) const = 0;
-  virtual const std::string get_default_oid(bool old_format = false) const = 0;
-  virtual const std::string& get_names_oid_prefix() const = 0;
-  virtual const std::string& get_info_oid_prefix(bool old_format = false) const = 0;
-  virtual std::string get_predefined_id(CephContext *cct) const = 0;
-  virtual const std::string& get_predefined_name(CephContext *cct) const = 0;
-
-  void dump(Formatter *f) const;
-  void decode_json(JSONObj *obj);
-};
-WRITE_CLASS_ENCODER(RGWSystemMetaObj)
-
 struct RGWZoneParams {
   std::string id;
   std::string name;