From: Daniel Gryniewicz Date: Fri, 19 Mar 2021 18:30:08 +0000 (-0400) Subject: RGW Zipper - consistendly use std::string X-Git-Tag: v17.1.0~2223^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68b899bf7b9d23d94e969ff1c54ee585e534374f;p=ceph.git RGW Zipper - consistendly use std::string Signed-off-by: Daniel Gryniewicz --- diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h index e2b23cdb5ca6..e4f351d2f2f5 100644 --- a/src/rgw/rgw_sal.h +++ b/src/rgw/rgw_sal.h @@ -43,7 +43,7 @@ namespace rgw { } struct RGWUsageIter { - string read_iter; + std::string read_iter; uint32_t index; RGWUsageIter() : index(0) {} @@ -180,12 +180,12 @@ class Store { virtual int get_raw_chunk_size(const DoutPrefixProvider* dpp, const rgw_raw_obj& obj, uint64_t* chunk_size) = 0; virtual int log_usage(map& usage_info) = 0; - virtual int log_op(string& oid, bufferlist& bl) = 0; - virtual int register_to_service_map(const string& daemon_type, - const map& meta) = 0; + virtual int log_op(std::string& oid, bufferlist& bl) = 0; + virtual int register_to_service_map(const std::string& daemon_type, + const map& meta) = 0; virtual void get_quota(RGWQuotaInfo& bucket_quota, RGWQuotaInfo& user_quota) = 0; - virtual int list_raw_objects(const rgw_pool& pool, const string& prefix_filter, - int max, RGWListRawObjsCtx& ctx, std::list& oids, + virtual int list_raw_objects(const rgw_pool& pool, const std::string& prefix_filter, + int max, RGWListRawObjsCtx& ctx, std::list& oids, bool* is_truncated) = 0; virtual int set_buckets_enabled(const DoutPrefixProvider* dpp, vector& buckets, bool enabled) = 0; virtual uint64_t get_new_req_id() = 0; @@ -196,32 +196,32 @@ class Store { optional_yield y) = 0; virtual RGWDataSyncStatusManager* get_data_sync_manager(const rgw_zone_id& source_zone) = 0; virtual void wakeup_meta_sync_shards(set& shard_ids) = 0; - virtual void wakeup_data_sync_shards(const rgw_zone_id& source_zone, map >& shard_ids) = 0; + virtual void wakeup_data_sync_shards(const rgw_zone_id& source_zone, map >& shard_ids) = 0; virtual int clear_usage() = 0; virtual int read_all_usage(uint64_t start_epoch, uint64_t end_epoch, uint32_t max_entries, bool* is_truncated, RGWUsageIter& usage_iter, map& usage) = 0; virtual int trim_all_usage(uint64_t start_epoch, uint64_t end_epoch) = 0; - virtual int get_config_key_val(string name, bufferlist* bl) = 0; - virtual int put_system_obj(const rgw_pool& pool, const string& oid, + virtual int get_config_key_val(std::string name, bufferlist* bl) = 0; + virtual int put_system_obj(const rgw_pool& pool, const std::string& oid, bufferlist& data, bool exclusive, RGWObjVersionTracker* objv_tracker, real_time set_mtime, - optional_yield y, map* pattrs = nullptr) = 0; + optional_yield y, map* pattrs = nullptr) = 0; virtual int get_system_obj(const DoutPrefixProvider* dpp, - const rgw_pool& pool, const string& key, + const rgw_pool& pool, const std::string& key, bufferlist& bl, RGWObjVersionTracker* objv_tracker, real_time* pmtime, - optional_yield y, map* pattrs = nullptr, + optional_yield y, map* pattrs = nullptr, rgw_cache_entry_info* cache_info = nullptr, boost::optional refresh_version = boost::none) = 0; - virtual int delete_system_obj(const rgw_pool& pool, const string& oid, + virtual int delete_system_obj(const rgw_pool& pool, const std::string& oid, RGWObjVersionTracker* objv_tracker, optional_yield y) = 0; - virtual int meta_list_keys_init(const string& section, const string& marker, void** phandle) = 0; - virtual int meta_list_keys_next(void* handle, int max, list& keys, bool* truncated) = 0; + virtual int meta_list_keys_init(const std::string& section, const std::string& marker, void** phandle) = 0; + virtual int meta_list_keys_next(void* handle, int max, list& keys, bool* truncated) = 0; virtual void meta_list_keys_complete(void* handle) = 0; virtual std::string meta_get_marker(void* handle) = 0; - virtual int meta_remove(const DoutPrefixProvider* dpp, string& metadata_key, optional_yield y) = 0; + virtual int meta_remove(const DoutPrefixProvider* dpp, std::string& metadata_key, optional_yield y) = 0; virtual const RGWSyncModuleInstanceRef& get_sync_module() = 0; virtual std::string get_host_id() = 0; @@ -549,7 +549,7 @@ class Object { Attrs* rmattrs{nullptr}; const bufferlist* data{nullptr}; RGWObjManifest* manifest{nullptr}; - const string* ptag{nullptr}; + const std::string* ptag{nullptr}; std::list* remove_objs{nullptr}; ceph::real_time set_mtime; ACLOwner owner; @@ -560,7 +560,7 @@ class Object { std::optional olh_epoch; ceph::real_time delete_at; bool canceled{false}; - const string* user_data{nullptr}; + const std::string* user_data{nullptr}; rgw_zone_set* zones_trace{nullptr}; bool modify_tail{false}; bool completeMultipart{false}; @@ -581,7 +581,7 @@ class Object { ACLOwner obj_owner; int versioning_status{0}; uint64_t olh_epoch{0}; - string marker_version_id; + std::string marker_version_id; uint32_t bilog_flags{0}; list* remove_objs{nullptr}; ceph::real_time expiration_time; @@ -595,7 +595,7 @@ class Object { struct Result { bool delete_marker{false}; - string version_id; + std::string version_id; } result; virtual ~DeleteOp() = default; @@ -655,7 +655,7 @@ class Object { AttrsMod attrs_mod, bool copy_if_newer, Attrs& attrs, RGWObjCategory category, uint64_t olh_epoch, boost::optional delete_at, - string* version_id, string* tag, string* etag, + std::string* version_id, std::string* tag, std::string* etag, void (*progress_cb)(off_t, void *), void* progress_data, const DoutPrefixProvider* dpp, optional_yield y) = 0; virtual RGWAccessControlPolicy& get_acl(void) = 0; @@ -729,10 +729,10 @@ class Object { virtual std::unique_ptr get_stat_op(RGWObjectCtx*) = 0; /* OMAP */ - virtual int omap_get_vals(const string& marker, uint64_t count, - std::map* m, + virtual int omap_get_vals(const std::string& marker, uint64_t count, + std::map* m, bool* pmore, optional_yield y) = 0; - virtual int omap_get_all(std::map* m, + virtual int omap_get_all(std::map* m, optional_yield y) = 0; virtual int omap_get_vals_by_keys(const std::string& oid, const std::set& keys, @@ -816,14 +816,14 @@ public: Lifecycle() = default; virtual ~Lifecycle() = default; - virtual int get_entry(const string& oid, const std::string& marker, LCEntry& entry) = 0; - virtual int get_next_entry(const string& oid, std::string& marker, LCEntry& entry) = 0; - virtual int set_entry(const string& oid, const LCEntry& entry) = 0; - virtual int list_entries(const string& oid, const string& marker, + virtual int get_entry(const std::string& oid, const std::string& marker, LCEntry& entry) = 0; + virtual int get_next_entry(const std::string& oid, std::string& marker, LCEntry& entry) = 0; + virtual int set_entry(const std::string& oid, const LCEntry& entry) = 0; + virtual int list_entries(const std::string& oid, const std::string& marker, uint32_t max_entries, vector& entries) = 0; - virtual int rm_entry(const string& oid, const LCEntry& entry) = 0; - virtual int get_head(const string& oid, LCHead& head) = 0; - virtual int put_head(const string& oid, const LCHead& head) = 0; + virtual int rm_entry(const std::string& oid, const LCEntry& entry) = 0; + virtual int get_head(const std::string& oid, LCHead& head) = 0; + virtual int put_head(const std::string& oid, const LCHead& head) = 0; virtual LCSerializer* get_serializer(const std::string& lock_name, const std::string& oid, const std::string& cookie) = 0; }; @@ -901,15 +901,15 @@ class Zone { virtual ~Zone() = default; virtual const RGWZoneGroup& get_zonegroup() = 0; - virtual int get_zonegroup(const string& id, RGWZoneGroup& zonegroup) = 0; + virtual int get_zonegroup(const std::string& id, RGWZoneGroup& zonegroup) = 0; virtual const RGWZoneParams& get_params() = 0; virtual const rgw_zone_id& get_id() = 0; virtual const RGWRealm& get_realm() = 0; virtual const std::string& get_name() const = 0; virtual bool is_writeable() = 0; - virtual bool get_redirect_endpoint(string* endpoint) = 0; + virtual bool get_redirect_endpoint(std::string* endpoint) = 0; virtual bool has_zonegroup_api(const std::string& api) const = 0; - virtual const string& get_current_period_id() = 0; + virtual const std::string& get_current_period_id() = 0; }; } } // namespace rgw::sal diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 4b200b77d034..6ad17e12378a 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -120,8 +120,8 @@ int RadosCompletions::drain() return ret; } -int RadosUser::list_buckets(const DoutPrefixProvider* dpp, const string& marker, - const string& end_marker, uint64_t max, bool need_stats, +int RadosUser::list_buckets(const DoutPrefixProvider* dpp, const std::string& marker, + const std::string& end_marker, uint64_t max, bool need_stats, BucketList &buckets, optional_yield y) { RGWUserBuckets ulist; @@ -367,7 +367,7 @@ int RadosBucket::update_container_stats(const DoutPrefixProvider* dpp) if (ret < 0) return ret; - map::iterator iter = m.find(info.bucket.name); + map::iterator iter = m.find(info.bucket.name); if (iter == m.end()) return -EINVAL; @@ -417,7 +417,7 @@ int RadosBucket::unlink(const DoutPrefixProvider* dpp, User* new_user, optional_ int RadosBucket::chown(const DoutPrefixProvider* dpp, User* new_user, User* old_user, optional_yield y, const std::string* marker) { - string obj_marker; + std::string obj_marker; if (marker == nullptr) marker = &obj_marker; @@ -684,9 +684,9 @@ int RadosStore::get_bucket(const DoutPrefixProvider* dpp, User* u, const std::st int RadosStore::create_bucket(const DoutPrefixProvider* dpp, User& u, const rgw_bucket& b, - const string& zonegroup_id, + const std::string& zonegroup_id, rgw_placement_rule& placement_rule, - string& swift_ver_location, + std::string& swift_ver_location, const RGWQuotaInfo * pquota_info, const RGWAccessControlPolicy& policy, Attrs& attrs, @@ -820,7 +820,7 @@ int RadosStore::forward_request_to_master(User* user, obj_version* objv, } ldout(ctx(), 0) << "sending request to master zonegroup" << dendl; bufferlist response; - string uid_str = user->get_id().to_str(); + std::string uid_str = user->get_id().to_str(); #define MAX_REST_RESPONSE (128 * 1024) // we expect a very small response int ret = svc()->zone->get_master_conn()->forward(rgw_user(uid_str), info, objv, MAX_REST_RESPONSE, @@ -925,7 +925,7 @@ int RadosStore::log_usage(map& usage_info) return rados->log_usage(usage_info); } -int RadosStore::log_op(string& oid, bufferlist& bl) +int RadosStore::log_op(std::string& oid, bufferlist& bl) { rgw_raw_obj obj(svc()->zone->get_zone_params().log_pool, oid); @@ -941,8 +941,8 @@ int RadosStore::log_op(string& oid, bufferlist& bl) return ret; } -int RadosStore::register_to_service_map(const string& daemon_type, - const map& meta) +int RadosStore::register_to_service_map(const std::string& daemon_type, + const map& meta) { return rados->register_to_service_map(daemon_type, meta); } @@ -953,8 +953,8 @@ void RadosStore::get_quota(RGWQuotaInfo& bucket_quota, RGWQuotaInfo& user_quota) user_quota = svc()->quota->get_user_quota(); } -int RadosStore::list_raw_objects(const rgw_pool& pool, const string& prefix_filter, - int max, RGWListRawObjsCtx& ctx, list& oids, +int RadosStore::list_raw_objects(const rgw_pool& pool, const std::string& prefix_filter, + int max, RGWListRawObjsCtx& ctx, list& oids, bool* is_truncated) { return rados->list_raw_objects(pool, prefix_filter, max, ctx, oids, is_truncated); @@ -999,25 +999,25 @@ int RadosStore::trim_all_usage(uint64_t start_epoch, uint64_t end_epoch) return rados->trim_usage(uid, bucket_name, start_epoch, end_epoch); } -int RadosStore::get_config_key_val(string name, bufferlist* bl) +int RadosStore::get_config_key_val(std::string name, bufferlist* bl) { return svc()->config_key->get(name, true, bl); } -int RadosStore::put_system_obj(const rgw_pool& pool, const string& oid, +int RadosStore::put_system_obj(const rgw_pool& pool, const std::string& oid, bufferlist& data, bool exclusive, RGWObjVersionTracker* objv_tracker, real_time set_mtime, - optional_yield y, map* pattrs) + optional_yield y, map* pattrs) { auto obj_ctx = svc()->sysobj->init_obj_ctx(); return rgw_put_system_obj(obj_ctx, pool, oid, data, exclusive, objv_tracker, set_mtime, y, pattrs); } int RadosStore::get_system_obj(const DoutPrefixProvider* dpp, - const rgw_pool& pool, const string& key, + const rgw_pool& pool, const std::string& key, bufferlist& bl, RGWObjVersionTracker* objv_tracker, real_time* pmtime, - optional_yield y, map* pattrs, + optional_yield y, map* pattrs, rgw_cache_entry_info* cache_info, boost::optional refresh_version) { @@ -1025,18 +1025,18 @@ int RadosStore::get_system_obj(const DoutPrefixProvider* dpp, return rgw_get_system_obj(obj_ctx, pool, key, bl, objv_tracker, pmtime, y, dpp, pattrs, cache_info, refresh_version); } -int RadosStore::delete_system_obj(const rgw_pool& pool, const string& oid, +int RadosStore::delete_system_obj(const rgw_pool& pool, const std::string& oid, RGWObjVersionTracker* objv_tracker, optional_yield y) { return rgw_delete_system_obj(svc()->sysobj, pool, oid, objv_tracker, y); } -int RadosStore::meta_list_keys_init(const string& section, const string& marker, void** phandle) +int RadosStore::meta_list_keys_init(const std::string& section, const std::string& marker, void** phandle) { return ctl()->meta.mgr->list_keys_init(section, marker, phandle); } -int RadosStore::meta_list_keys_next(void* handle, int max, list& keys, bool* truncated) +int RadosStore::meta_list_keys_next(void* handle, int max, list& keys, bool* truncated) { return ctl()->meta.mgr->list_keys_next(handle, max, keys, truncated); } @@ -1051,7 +1051,7 @@ std::string RadosStore::meta_get_marker(void* handle) return ctl()->meta.mgr->get_marker(handle); } -int RadosStore::meta_remove(const DoutPrefixProvider* dpp, string& metadata_key, optional_yield y) +int RadosStore::meta_remove(const DoutPrefixProvider* dpp, std::string& metadata_key, optional_yield y) { return ctl()->meta.mgr->remove(metadata_key, y, dpp); } @@ -1225,8 +1225,8 @@ 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 string& marker, uint64_t count, - std::map *m, +int RadosObject::omap_get_vals(const std::string& marker, uint64_t count, + std::map *m, bool* pmore, optional_yield y) { auto obj_ctx = store->svc()->sysobj->init_obj_ctx(); @@ -1237,7 +1237,7 @@ int RadosObject::omap_get_vals(const string& marker, uint64_t count, return sysobj.omap().get_vals(marker, count, m, pmore, y); } -int RadosObject::omap_get_all(std::map *m, +int RadosObject::omap_get_all(std::map *m, optional_yield y) { auto obj_ctx = store->svc()->sysobj->init_obj_ctx(); @@ -1510,9 +1510,9 @@ int RadosObject::copy_object(RGWObjectCtx& obj_ctx, RGWObjCategory category, uint64_t olh_epoch, boost::optional delete_at, - string* version_id, - string* tag, - string* etag, + std::string* version_id, + std::string* tag, + std::string* etag, void (*progress_cb)(off_t, void *), void* progress_data, const DoutPrefixProvider* dpp, @@ -1666,7 +1666,7 @@ int LCRadosSerializer::try_lock(utime_t dur, optional_yield y) return lock.lock_exclusive(ioctx, oid); } -int RadosLifecycle::get_entry(const string& oid, const std::string& marker, +int RadosLifecycle::get_entry(const std::string& oid, const std::string& marker, LCEntry& entry) { cls_rgw_lc_entry cls_entry; @@ -1679,7 +1679,7 @@ int RadosLifecycle::get_entry(const string& oid, const std::string& marker, return ret; } -int RadosLifecycle::get_next_entry(const string& oid, std::string& marker, +int RadosLifecycle::get_next_entry(const std::string& oid, std::string& marker, LCEntry& entry) { cls_rgw_lc_entry cls_entry; @@ -1693,7 +1693,7 @@ int RadosLifecycle::get_next_entry(const string& oid, std::string& marker, return ret; } -int RadosLifecycle::set_entry(const string& oid, const LCEntry& entry) +int RadosLifecycle::set_entry(const std::string& oid, const LCEntry& entry) { cls_rgw_lc_entry cls_entry; @@ -1704,7 +1704,7 @@ int RadosLifecycle::set_entry(const string& oid, const LCEntry& entry) return cls_rgw_lc_set_entry(*store->getRados()->get_lc_pool_ctx(), oid, cls_entry); } -int RadosLifecycle::list_entries(const string& oid, const string& marker, +int RadosLifecycle::list_entries(const std::string& oid, const std::string& marker, uint32_t max_entries, vector& entries) { entries.clear(); @@ -1722,7 +1722,7 @@ int RadosLifecycle::list_entries(const string& oid, const string& marker, return ret; } -int RadosLifecycle::rm_entry(const string& oid, const LCEntry& entry) +int RadosLifecycle::rm_entry(const std::string& oid, const LCEntry& entry) { cls_rgw_lc_entry cls_entry; @@ -1733,7 +1733,7 @@ int RadosLifecycle::rm_entry(const string& oid, const LCEntry& entry) return cls_rgw_lc_rm_entry(*store->getRados()->get_lc_pool_ctx(), oid, cls_entry); } -int RadosLifecycle::get_head(const string& oid, LCHead& head) +int RadosLifecycle::get_head(const std::string& oid, LCHead& head) { cls_rgw_lc_obj_head cls_head; int ret = cls_rgw_lc_get_head(*store->getRados()->get_lc_pool_ctx(), oid, cls_head); @@ -1744,7 +1744,7 @@ int RadosLifecycle::get_head(const string& oid, LCHead& head) return ret; } -int RadosLifecycle::put_head(const string& oid, const LCHead& head) +int RadosLifecycle::put_head(const std::string& oid, const LCHead& head) { cls_rgw_lc_obj_head cls_head; @@ -1884,7 +1884,7 @@ const RGWZoneGroup& RadosZone::get_zonegroup() return store->svc()->zone->get_zonegroup(); } -int RadosZone::get_zonegroup(const string& id, RGWZoneGroup& zonegroup) +int RadosZone::get_zonegroup(const std::string& id, RGWZoneGroup& zonegroup) { return store->svc()->zone->get_zonegroup(id, zonegroup); } @@ -1924,7 +1924,7 @@ bool RadosZone::has_zonegroup_api(const std::string& api) const return store->svc()->zone->has_zonegroup_api(api); } -const string& RadosZone::get_current_period_id() +const std::string& RadosZone::get_current_period_id() { return store->svc()->zone->get_current_period_id(); } diff --git a/src/rgw/rgw_sal_rados.h b/src/rgw/rgw_sal_rados.h index 7119d8786627..c54d726c24cb 100644 --- a/src/rgw/rgw_sal_rados.h +++ b/src/rgw/rgw_sal_rados.h @@ -164,7 +164,7 @@ class RadosObject : public Object { AttrsMod attrs_mod, bool copy_if_newer, Attrs& attrs, RGWObjCategory category, uint64_t olh_epoch, boost::optional delete_at, - string* version_id, string* tag, string* etag, + std::string* version_id, std::string* tag, std::string* etag, void (*progress_cb)(off_t, void *), void* progress_data, const DoutPrefixProvider* dpp, optional_yield y) override; virtual RGWAccessControlPolicy& get_acl(void) override { return acls; } @@ -215,10 +215,10 @@ class RadosObject : public Object { virtual std::unique_ptr get_stat_op(RGWObjectCtx*) override; /* OMAP */ - virtual int omap_get_vals(const string& marker, uint64_t count, - std::map *m, + virtual int omap_get_vals(const std::string& marker, uint64_t count, + std::map *m, bool* pmore, optional_yield y) override; - virtual int omap_get_all(std::map *m, + virtual int omap_get_all(std::map *m, optional_yield y) override; virtual int omap_get_vals_by_keys(const std::string& oid, const std::set& keys, @@ -337,15 +337,15 @@ class RadosZone : public Zone { ~RadosZone() = default; virtual const RGWZoneGroup& get_zonegroup() override; - virtual int get_zonegroup(const string& id, RGWZoneGroup& zonegroup) override; + virtual int get_zonegroup(const std::string& id, RGWZoneGroup& zonegroup) override; virtual const RGWZoneParams& get_params() override; virtual const rgw_zone_id& get_id() override; virtual const RGWRealm& get_realm() override; virtual const std::string& get_name() const override; virtual bool is_writeable() override; - virtual bool get_redirect_endpoint(string* endpoint) override; + virtual bool get_redirect_endpoint(std::string* endpoint) override; virtual bool has_zonegroup_api(const std::string& api) const override; - virtual const string& get_current_period_id() override; + virtual const std::string& get_current_period_id() override; }; class RadosStore : public Store { @@ -412,12 +412,12 @@ class RadosStore : public Store { virtual int get_raw_chunk_size(const DoutPrefixProvider* dpp, const rgw_raw_obj& obj, uint64_t* chunk_size) override; virtual int log_usage(map& usage_info) override; - virtual int log_op(string& oid, bufferlist& bl) override; - virtual int register_to_service_map(const string& daemon_type, - const map& meta) override; + virtual int log_op(std::string& oid, bufferlist& bl) override; + virtual int register_to_service_map(const std::string& daemon_type, + const map& meta) override; virtual void get_quota(RGWQuotaInfo& bucket_quota, RGWQuotaInfo& user_quota) override; - virtual int list_raw_objects(const rgw_pool& pool, const string& prefix_filter, - int max, RGWListRawObjsCtx& ctx, std::list& oids, + virtual int list_raw_objects(const rgw_pool& pool, const std::string& prefix_filter, + int max, RGWListRawObjsCtx& ctx, std::list& oids, bool* is_truncated) override; virtual int set_buckets_enabled(const DoutPrefixProvider* dpp, vector& buckets, bool enabled) override; virtual uint64_t get_new_req_id() override { return rados->get_new_req_id(); } @@ -428,33 +428,33 @@ class RadosStore : public Store { optional_yield y) override; virtual RGWDataSyncStatusManager* get_data_sync_manager(const rgw_zone_id& source_zone) override; virtual void wakeup_meta_sync_shards(set& shard_ids) override { rados->wakeup_meta_sync_shards(shard_ids); } - virtual void wakeup_data_sync_shards(const rgw_zone_id& source_zone, map >& shard_ids) override { rados->wakeup_data_sync_shards(source_zone, shard_ids); } + virtual void wakeup_data_sync_shards(const rgw_zone_id& source_zone, map >& shard_ids) override { rados->wakeup_data_sync_shards(source_zone, shard_ids); } virtual int clear_usage() override { return rados->clear_usage(); } virtual int read_all_usage(uint64_t start_epoch, uint64_t end_epoch, uint32_t max_entries, bool* is_truncated, RGWUsageIter& usage_iter, map& usage) override; virtual int trim_all_usage(uint64_t start_epoch, uint64_t end_epoch) override; - virtual int get_config_key_val(string name, bufferlist* bl) override; - virtual int put_system_obj(const rgw_pool& pool, const string& oid, + virtual int get_config_key_val(std::string name, bufferlist* bl) override; + virtual int put_system_obj(const rgw_pool& pool, const std::string& oid, bufferlist& data, bool exclusive, RGWObjVersionTracker* objv_tracker, real_time set_mtime, - optional_yield y, map *pattrs = nullptr) + optional_yield y, map *pattrs = nullptr) override; virtual int get_system_obj(const DoutPrefixProvider* dpp, - const rgw_pool& pool, const string& key, + const rgw_pool& pool, const std::string& key, bufferlist& bl, RGWObjVersionTracker* objv_tracker, real_time* pmtime, - optional_yield y, map *pattrs = nullptr, + optional_yield y, map *pattrs = nullptr, rgw_cache_entry_info* cache_info = nullptr, boost::optional refresh_version = boost::none) override; - virtual int delete_system_obj(const rgw_pool& pool, const string& oid, + virtual int delete_system_obj(const rgw_pool& pool, const std::string& oid, RGWObjVersionTracker* objv_tracker, optional_yield y) override; - virtual int meta_list_keys_init(const string& section, const string& marker, void** phandle) override; - virtual int meta_list_keys_next(void* handle, int max, list& keys, bool* truncated) override; + virtual int meta_list_keys_init(const std::string& section, const std::string& marker, void** phandle) override; + virtual int meta_list_keys_next(void* handle, int max, list& keys, bool* truncated) override; virtual void meta_list_keys_complete(void* handle) override; virtual std::string meta_get_marker(void* handle) override; - virtual int meta_remove(const DoutPrefixProvider* dpp, string& metadata_key, optional_yield y) override; + virtual int meta_remove(const DoutPrefixProvider* dpp, std::string& metadata_key, optional_yield y) override; virtual const RGWSyncModuleInstanceRef& get_sync_module() { return rados->get_sync_module(); } virtual std::string get_host_id() { return rados->host_id; } @@ -519,14 +519,14 @@ class RadosLifecycle : public Lifecycle { public: RadosLifecycle(RadosStore* _st) : store(_st) {} - virtual int get_entry(const string& oid, const std::string& marker, LCEntry& entry) override; - virtual int get_next_entry(const string& oid, std::string& marker, LCEntry& entry) override; - virtual int set_entry(const string& oid, const LCEntry& entry) override; - virtual int list_entries(const string& oid, const string& marker, + virtual int get_entry(const std::string& oid, const std::string& marker, LCEntry& entry) override; + virtual int get_next_entry(const std::string& oid, std::string& marker, LCEntry& entry) override; + virtual int set_entry(const std::string& oid, const LCEntry& entry) override; + virtual int list_entries(const std::string& oid, const std::string& marker, uint32_t max_entries, vector& entries) override; - virtual int rm_entry(const string& oid, const LCEntry& entry) override; - virtual int get_head(const string& oid, LCHead& head) override; - virtual int put_head(const string& oid, const LCHead& head) override; + virtual int rm_entry(const std::string& oid, const LCEntry& entry) override; + virtual int get_head(const std::string& oid, LCHead& head) override; + virtual int put_head(const std::string& oid, const LCHead& head) override; virtual LCSerializer* get_serializer(const std::string& lock_name, const std::string& oid, const std::string& cookie) override; };