From d1ff8218a167d33851956ae9a845f9e5240c6a80 Mon Sep 17 00:00:00 2001 From: Chang Liu Date: Fri, 17 May 2019 10:53:32 +0800 Subject: [PATCH] rgw: cleanup bucket tags code Signed-off-by: Chang Liu --- src/rgw/rgw_rest_s3.cc | 4 ++-- src/rgw/rgw_rest_s3.h | 7 ------- src/rgw/rgw_tag.h | 5 ++--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 15444fb3b1a05..ae1065160ad48 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -542,10 +542,10 @@ int RGWPutBucketTags_ObjStore_S3::get_params() obj_tags.encode(tags_bl); ldout(s->cct, 20) << "Read " << obj_tags.count() << "tags" << dendl; - // forward bucket cors requests to meta master zone + // forward bucket tags requests to meta master zone if (!store->svc.zone->is_meta_master()) { /* only need to keep this data around if we're not meta master */ - in_data.append(data.c_str(), data.length()); + in_data = std::move(data); } return 0; diff --git a/src/rgw/rgw_rest_s3.h b/src/rgw/rgw_rest_s3.h index c5ad89217216c..023a9f0d68d22 100644 --- a/src/rgw/rgw_rest_s3.h +++ b/src/rgw/rgw_rest_s3.h @@ -86,18 +86,12 @@ class RGWGetBucketTags_ObjStore_S3 : public RGWGetBucketTags_ObjStore { bufferlist tags_bl; public: - RGWGetBucketTags_ObjStore_S3() = default; - ~RGWGetBucketTags_ObjStore_S3() = default; - void send_response_data(bufferlist &bl) override; }; class RGWPutBucketTags_ObjStore_S3 : public RGWPutBucketTags_ObjStore { public: - RGWPutBucketTags_ObjStore_S3() {} - ~RGWPutBucketTags_ObjStore_S3() {} - int get_params() override; void send_response() override; }; @@ -105,7 +99,6 @@ public: class RGWDeleteBucketTags_ObjStore_S3 : public RGWDeleteBucketTags { public: - ~RGWDeleteBucketTags_ObjStore_S3() override {} void send_response() override; }; diff --git a/src/rgw/rgw_tag.h b/src/rgw/rgw_tag.h index 84ddd943befba..6079f3fc6af9f 100644 --- a/src/rgw/rgw_tag.h +++ b/src/rgw/rgw_tag.h @@ -17,14 +17,13 @@ class RGWObjTags tag_map_t tag_map; uint32_t max_obj_tags{10}; - uint32_t max_tag_key_size{128}; - uint32_t max_tag_val_size{256}; + static constexpr uint32_t max_tag_key_size{128}; + static constexpr uint32_t max_tag_val_size{256}; public: RGWObjTags() = default; RGWObjTags(uint32_t max_obj_tags):max_obj_tags(max_obj_tags) {} - virtual ~RGWObjTags() = default; void encode(bufferlist& bl) const { ENCODE_START(1,1,bl); -- 2.39.5