rgw_file: pass bucketname instead of uri for bucket create/delete

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>

diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index c472e41159b031687a7f4b5fa416d98bf556d8ca..17c3830794e3f80f6690342e93e8cc852a5288e8 100644 (file)
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -306,10 +306,8 @@ namespace rgw {
        unref(bkt_fh);
       }
 
-      /* XXXX remove uri and deal with bucket and object names */
-      string uri = "/";
-      uri += name;
-      RGWDeleteBucketRequest req(cct, get_user(), uri);
+      string bname{name};
+      RGWDeleteBucketRequest req(cct, get_user(), bname);
       rc = rgwlib.get_fe()->execute_req(&req);
       if (! rc) {
        rc = req.get_ret();
@@ -534,8 +532,7 @@ namespace rgw {
        return mkr;
       }
 
-      string uri = "/" + bname; /* XXX get rid of URI some day soon */
-      RGWCreateBucketRequest req(get_context(), get_user(), uri);
+      RGWCreateBucketRequest req(get_context(), get_user(), bname);
 
       /* save attrs */
       req.emplace_attr(RGW_ATTR_UNIX_KEY1, std::move(ux_key));

diff --git a/src/rgw/rgw_file.h b/src/rgw/rgw_file.h
index eb3fcf2fc8a0e215d98f68423d2ba9c0330feda0..abd17e97c17de30c1779d9719e60bd88fdf689ee 100644 (file)
--- a/src/rgw/rgw_file.h
+++ b/src/rgw/rgw_file.h
@@ -1536,11 +1536,11 @@ class RGWCreateBucketRequest : public RGWLibRequest,
                               public RGWCreateBucket /* RGWOp */
 {
 public:
-  std::string& uri;
+  const std::string& bucket_name;
 
   RGWCreateBucketRequest(CephContext* _cct, RGWUserInfo *_user,
-                       std::string& _uri)
-    : RGWLibRequest(_cct, _user), uri(_uri) {
+                       std::string& _bname)
+    : RGWLibRequest(_cct, _user), bucket_name(_bname) {
     op = this;
   }
 
@@ -1568,6 +1568,7 @@ public:
     s->info.method = "PUT";
     s->op = OP_PUT;
 
+    string uri = "/" + bucket_name;
     /* XXX derp derp derp */
     s->relative_uri = uri;
     s->info.request_uri = uri; // XXX
@@ -1603,11 +1604,11 @@ class RGWDeleteBucketRequest : public RGWLibRequest,
                               public RGWDeleteBucket /* RGWOp */
 {
 public:
-  std::string& uri;
+  const std::string& bucket_name;
 
   RGWDeleteBucketRequest(CephContext* _cct, RGWUserInfo *_user,
-                       std::string& _uri)
-    : RGWLibRequest(_cct, _user), uri(_uri) {
+                       std::string& _bname)
+    : RGWLibRequest(_cct, _user), bucket_name(_bname) {
     op = this;
   }
 
@@ -1630,6 +1631,7 @@ public:
     s->info.method = "DELETE";
     s->op = OP_DELETE;
 
+    string uri = "/" + bucket_name;
     /* XXX derp derp derp */
     s->relative_uri = uri;
     s->info.request_uri = uri; // XXX