rgw: cleanup bucket tags code

Signed-off-by: Chang Liu <liuchang0812@gmail.com>

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 15444fb3b1a05d8143b9348ec9a39313108a84ef..ae1065160ad482aaebfdab63efc6a1b82de58586 100644 (file)
--- 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 c5ad89217216cdf9bb4137059f130bcb5e08bcde..023a9f0d68d2245049f3d9bf9f31e3c2d1726c3a 100644 (file)
--- 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 84ddd943befba2463b1091bc99297fa5a28414de..6079f3fc6af9fa32b952fc0be13629541d0b8b0e 100644 (file)
--- 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);