From c9d68822756e83badd2cee9a80c24c82078c0c96 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 2 Sep 2016 12:39:10 -0700 Subject: [PATCH] rgw: rename a few methods just rename calls Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rest_client.cc | 8 ++++---- src/rgw/rgw_rest_client.h | 8 ++++---- src/rgw/rgw_rest_conn.cc | 30 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/rgw/rgw_rest_client.cc b/src/rgw/rgw_rest_client.cc index ba3363cbd0499..f4cab8ab21b9e 100644 --- a/src/rgw/rgw_rest_client.cc +++ b/src/rgw/rgw_rest_client.cc @@ -616,17 +616,17 @@ int RGWRESTStreamWriteRequest::complete(string& etag, real_time *mtime) return status; } -int RGWRESTStreamRWRequest::get_obj(RGWAccessKey& key, map& extra_headers, rgw_obj& obj) +int RGWRESTStreamRWRequest::send_request(RGWAccessKey& key, map& extra_headers, rgw_obj& obj, RGWHTTPManager *mgr) { string urlsafe_bucket, urlsafe_object; url_encode(obj.bucket.get_key(':', 0), urlsafe_bucket); url_encode(obj.key.name, urlsafe_object); string resource = urlsafe_bucket + "/" + urlsafe_object; - return get_resource(key, extra_headers, resource); + return send_request(key, extra_headers, resource, mgr); } -int RGWRESTStreamRWRequest::get_resource(RGWAccessKey& key, map& extra_headers, const string& resource, RGWHTTPManager *mgr) +int RGWRESTStreamRWRequest::send_request(RGWAccessKey& key, map& extra_headers, const string& resource, RGWHTTPManager *mgr) { string new_url = url; if (new_url[new_url.size() - 1] != '/') @@ -701,7 +701,7 @@ int RGWRESTStreamRWRequest::get_resource(RGWAccessKey& key, map& return 0; } -int RGWRESTStreamRWRequest::complete(string& etag, real_time *mtime, uint64_t *psize, map& attrs) +int RGWRESTStreamRWRequest::complete_request(string& etag, real_time *mtime, uint64_t *psize, map& attrs) { set_str_from_headers(out_headers, "ETAG", etag); if (status >= 0) { diff --git a/src/rgw/rgw_rest_client.h b/src/rgw/rgw_rest_client.h index e09bb2fd57be7..7a3e126d8622b 100644 --- a/src/rgw/rgw_rest_client.h +++ b/src/rgw/rgw_rest_client.h @@ -103,10 +103,10 @@ public: lock("RGWRESTStreamReadRequest"), cb(_cb), chunk_ofs(0), ofs(0), http_manager(_cct), method(_method), write_ofs(0) { } - ~RGWRESTStreamRWRequest() override {} - int get_obj(RGWAccessKey& key, map& extra_headers, rgw_obj& obj); - int get_resource(RGWAccessKey& key, map& extra_headers, const string& resource, RGWHTTPManager *mgr = NULL); - int complete(string& etag, real_time *mtime, uint64_t *psize, map& attrs); + virtual ~RGWRESTStreamRWRequest() override {} + int send_request(RGWAccessKey& key, map& extra_headers, rgw_obj& obj, RGWHTTPManager *mgr = NULL); + int send_request(RGWAccessKey& key, map& extra_headers, const string& resource, RGWHTTPManager *mgr = NULL); + int complete_request(string& etag, real_time *mtime, uint64_t *psize, map& attrs); void set_outbl(bufferlist& _outbl) { outbl.swap(_outbl); diff --git a/src/rgw/rgw_rest_conn.cc b/src/rgw/rgw_rest_conn.cc index 71a11554d2ce5..0071daf1e6dcc 100644 --- a/src/rgw/rgw_rest_conn.cc +++ b/src/rgw/rgw_rest_conn.cc @@ -203,7 +203,7 @@ int RGWRESTConn::get_obj(const rgw_user& uid, req_info *info /* optional */, rgw set_header(mod_pg_ver, extra_headers, "HTTP_DEST_PG_VER"); } - int r = (*req)->get_obj(key, extra_headers, obj); + int r = (*req)->send_request(key, extra_headers, obj); if (r < 0) { delete *req; *req = nullptr; @@ -215,7 +215,7 @@ int RGWRESTConn::get_obj(const rgw_user& uid, req_info *info /* optional */, rgw int RGWRESTConn::complete_request(RGWRESTStreamRWRequest *req, string& etag, real_time *mtime, uint64_t *psize, map& attrs) { - int ret = req->complete(etag, mtime, psize, attrs); + int ret = req->complete_request(etag, mtime, psize, attrs); delete req; return ret; @@ -249,15 +249,15 @@ int RGWRESTConn::get_resource(const string& resource, headers.insert(extra_headers->begin(), extra_headers->end()); } - ret = req.get_resource(key, headers, resource, mgr); + ret = req.send_request(key, headers, resource, mgr); if (ret < 0) { - ldout(cct, 5) << __func__ << ": get_resource() resource=" << resource << " returned ret=" << ret << dendl; + ldout(cct, 5) << __func__ << ": send_request() resource=" << resource << " returned ret=" << ret << dendl; return ret; } string etag; map attrs; - return req.complete(etag, NULL, NULL, attrs); + return req.complete_request(etag, NULL, NULL, attrs); } RGWRESTReadResource::RGWRESTReadResource(RGWRESTConn *_conn, @@ -296,22 +296,22 @@ void RGWRESTReadResource::init_common(param_vec_t *extra_headers) int RGWRESTReadResource::read() { - int ret = req.get_resource(conn->get_key(), headers, resource, mgr); + int ret = req.send_request(conn->get_key(), headers, resource, mgr); if (ret < 0) { - ldout(cct, 5) << __func__ << ": get_resource() resource=" << resource << " returned ret=" << ret << dendl; + ldout(cct, 5) << __func__ << ": send_request() resource=" << resource << " returned ret=" << ret << dendl; return ret; } string etag; map attrs; - return req.complete(etag, NULL, NULL, attrs); + return req.complete_request(etag, NULL, NULL, attrs); } int RGWRESTReadResource::aio_read() { - int ret = req.get_resource(conn->get_key(), headers, resource, mgr); + int ret = req.send_request(conn->get_key(), headers, resource, mgr); if (ret < 0) { - ldout(cct, 5) << __func__ << ": get_resource() resource=" << resource << " returned ret=" << ret << dendl; + ldout(cct, 5) << __func__ << ": send_request() resource=" << resource << " returned ret=" << ret << dendl; return ret; } @@ -357,23 +357,23 @@ void RGWRESTSendResource::init_common(param_vec_t *extra_headers) int RGWRESTSendResource::send(bufferlist& outbl) { req.set_outbl(outbl); - int ret = req.get_resource(conn->get_key(), headers, resource, mgr); + int ret = req.send_request(conn->get_key(), headers, resource, mgr); if (ret < 0) { - ldout(cct, 5) << __func__ << ": get_resource() resource=" << resource << " returned ret=" << ret << dendl; + ldout(cct, 5) << __func__ << ": send_request() resource=" << resource << " returned ret=" << ret << dendl; return ret; } string etag; map attrs; - return req.complete(etag, NULL, NULL, attrs); + return req.complete_request(etag, NULL, NULL, attrs); } int RGWRESTSendResource::aio_send(bufferlist& outbl) { req.set_outbl(outbl); - int ret = req.get_resource(conn->get_key(), headers, resource, mgr); + int ret = req.send_request(conn->get_key(), headers, resource, mgr); if (ret < 0) { - ldout(cct, 5) << __func__ << ": get_resource() resource=" << resource << " returned ret=" << ret << dendl; + ldout(cct, 5) << __func__ << ": send_request() resource=" << resource << " returned ret=" << ret << dendl; return ret; } -- 2.39.5