From 3c0621b6ca334a08759c0532d981c7dc0d496291 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Sun, 7 Nov 2021 09:46:11 -0500 Subject: [PATCH] cls/rgw: RGWObjCategory to string Signed-off-by: Casey Bodley --- src/cls/rgw/cls_rgw_types.cc | 12 ++++++++++++ src/cls/rgw/cls_rgw_types.h | 5 +++++ src/rgw/rgw_bucket.cc | 3 +-- src/rgw/rgw_common.h | 18 ------------------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc index 261e8b177d0..91ebe86eb43 100644 --- a/src/cls/rgw/cls_rgw_types.cc +++ b/src/cls/rgw/cls_rgw_types.cc @@ -116,6 +116,18 @@ RGWModifyOp parse_modify_op(std::string_view name) } } +std::string_view to_string(RGWObjCategory c) +{ + switch (c) { + case RGWObjCategory::None: return "rgw.none"; + case RGWObjCategory::Main: return "rgw.main"; + case RGWObjCategory::Shadow: return "rgw.shadow"; + case RGWObjCategory::MultiMeta: return "rgw.multimeta"; + case RGWObjCategory::CloudTiered: return "rgw.cloudtiered"; + default: return "unknown"; + } +} + void rgw_bucket_pending_info::generate_test_instances(list& o) { rgw_bucket_pending_info *i = new rgw_bucket_pending_info; diff --git a/src/cls/rgw/cls_rgw_types.h b/src/cls/rgw/cls_rgw_types.h index 57db49645a9..67a93d47d1e 100644 --- a/src/cls/rgw/cls_rgw_types.h +++ b/src/cls/rgw/cls_rgw_types.h @@ -184,6 +184,11 @@ enum class RGWObjCategory : uint8_t { CloudTiered = 4, // b-i entries which are tiered to external cloud }; +std::string_view to_string(RGWObjCategory c); + +inline std::ostream& operator<<(std::ostream& out, RGWObjCategory c) { + return out << to_string(c); +} struct rgw_bucket_dir_entry_meta { RGWObjCategory category; diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 07f89d94986..f3bb7f55d5c 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -462,8 +462,7 @@ static void dump_bucket_usage(map& stats, Forma formatter->open_object_section("usage"); for (iter = stats.begin(); iter != stats.end(); ++iter) { RGWStorageStats& s = iter->second; - const char *cat_name = rgw_obj_category_name(iter->first); - formatter->open_object_section(cat_name); + formatter->open_object_section(to_string(iter->first)); s.dump(formatter); formatter->close_section(); } diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 0a038d7e99c..6dfc1a7255c 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1965,24 +1965,6 @@ static inline void append_rand_alpha(CephContext *cct, const std::string& src, s dest.append(buf); } -static inline const char *rgw_obj_category_name(RGWObjCategory category) -{ - switch (category) { - case RGWObjCategory::None: - return "rgw.none"; - case RGWObjCategory::Main: - return "rgw.main"; - case RGWObjCategory::Shadow: - return "rgw.shadow"; - case RGWObjCategory::MultiMeta: - return "rgw.multimeta"; - case RGWObjCategory::CloudTiered: - return "rgw.cloudtiered"; - } - - return "unknown"; -} - static inline uint64_t rgw_rounded_kb(uint64_t bytes) { return (bytes + 1023) / 1024; -- 2.39.5