update sources to v12.1.0

[ceph.git] / ceph / src / rgw / rgw_rest_conn.cc

diff --git a/ceph/src/rgw/rgw_rest_conn.cc b/ceph/src/rgw/rgw_rest_conn.cc
index 71a11554d2ce597835d098fb5f95491a1a2c80f8..efac447282d9129efbb554e1753141b8e803cef6 100644 (file)
--- a/ceph/src/rgw/rgw_rest_conn.cc
+++ b/ceph/src/rgw/rgw_rest_conn.cc
@@ -180,15 +180,15 @@ int RGWRESTConn::get_obj(const rgw_user& uid, req_info *info /* optional */, rgw
   }
   map<string, string> extra_headers;
   if (info) {
-    map<string, string, ltstr_nocase>& orig_map = info->env->get_map();
+    const auto& orig_map = info->env->get_map();
 
     /* add original headers that start with HTTP_X_AMZ_ */
-#define SEARCH_AMZ_PREFIX "HTTP_X_AMZ_"
-    for (map<string, string>::iterator iter = orig_map.lower_bound(SEARCH_AMZ_PREFIX); iter != orig_map.end(); ++iter) {
+    static constexpr char SEARCH_AMZ_PREFIX[] = "HTTP_X_AMZ_";
+    for (auto iter= orig_map.lower_bound(SEARCH_AMZ_PREFIX); iter != orig_map.end(); ++iter) {
       const string& name = iter->first;
       if (name == "HTTP_X_AMZ_DATE") /* dont forward date from original request */
         continue;
-      if (name.compare(0, sizeof(SEARCH_AMZ_PREFIX) - 1, "HTTP_X_AMZ_") != 0)
+      if (name.compare(0, strlen(SEARCH_AMZ_PREFIX), SEARCH_AMZ_PREFIX) != 0)
         break;
       extra_headers[iter->first] = iter->second;
     }
@@ -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<string, string>& attrs)
 {
-  int ret = req->complete(etag, mtime, psize, attrs);
+  int ret = req->complete_request(etag, mtime, psize, attrs);
   delete req;
 
   return ret;
@@ -225,6 +225,7 @@ int RGWRESTConn::get_resource(const string& resource,
                     param_vec_t *extra_params,
                     map<string, string> *extra_headers,
                     bufferlist& bl,
+                     bufferlist *send_data,
                     RGWHTTPManager *mgr)
 {
   string url;
@@ -249,15 +250,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, send_data, 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<string, string> attrs;
-  return req.complete(etag, NULL, NULL, attrs);
+  return req.complete_request(etag, NULL, NULL, attrs);
 }
 
 RGWRESTReadResource::RGWRESTReadResource(RGWRESTConn *_conn,
@@ -296,22 +297,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, nullptr, 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<string, string> 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, nullptr, 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 +358,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, nullptr, 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<string, string> 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, nullptr, 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;
   }