rgw: ONLY move RGWDecoratedStreamIO.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/rgw/rgw_client_io.h b/src/rgw/rgw_client_io.h
index e85b47f9c9882b370a6e651d13e0a138540fc238..e30d417dfc1bee3a7e8e4b687eb6ae2e5c6b9c6e 100644 (file)
--- a/src/rgw/rgw_client_io.h
+++ b/src/rgw/rgw_client_io.h
@@ -93,6 +93,95 @@ public:
 };
 
 
+/* Abstract decorator over any implementation of RGWStreamIOEngine. */
+template <typename DecorateeT>
+class RGWDecoratedStreamIO : public RGWStreamIOEngine {
+  template<typename T> friend class RGWDecoratedStreamIO;
+
+  typedef typename std::remove_pointer<DecorateeT>::type DerefedDecorateeT;
+
+  static_assert(std::is_base_of<RGWStreamIOEngine, DerefedDecorateeT>::value,
+                "DecorateeT must be a subclass of RGWStreamIOEngine");
+
+  DecorateeT decoratee;
+
+  /* There is an indirection layer over accessing decoratee to share the same
+   * code base between dynamic and static decorators. The difference is about
+   * what we store internally: pointer to a decorated object versus the whole
+   * object itself. */
+  template <typename T = void,
+            typename std::enable_if<
+    std::is_pointer<DecorateeT>::value, T>::type* = nullptr>
+  DerefedDecorateeT& get_decoratee() {
+    return *decoratee;
+  }
+
+  template <typename T = void,
+            typename std::enable_if<
+    ! std::is_pointer<DecorateeT>::value, T>::type* = nullptr>
+  DerefedDecorateeT& get_decoratee() {
+    return decoratee;
+  }
+
+protected:
+  void init_env(CephContext *cct) override {
+    return get_decoratee().init_env(cct);
+  }
+
+public:
+  RGWDecoratedStreamIO(DecorateeT&& decoratee)
+    : decoratee(std::move(decoratee)) {
+  }
+
+  std::size_t send_status(const int status,
+                          const char* const status_name) override {
+    return get_decoratee().send_status(status, status_name);
+  }
+
+  std::size_t send_100_continue() override {
+    return get_decoratee().send_100_continue();
+  }
+
+  std::size_t send_header(const boost::string_ref& name,
+                          const boost::string_ref& value) override {
+    return get_decoratee().send_header(name, value);
+  }
+
+  std::size_t send_content_length(const uint64_t len) override {
+    return get_decoratee().send_content_length(len);
+  }
+
+  std::size_t send_chunked_transfer_encoding() override {
+    return get_decoratee().send_chunked_transfer_encoding();
+  }
+
+  std::size_t complete_header() override {
+    return get_decoratee().complete_header();
+  }
+
+  std::size_t recv_body(char* const buf, const std::size_t max) override {
+    return get_decoratee().recv_body(buf, max);
+  }
+
+  std::size_t send_body(const char* const buf,
+                        const std::size_t len) override {
+    return get_decoratee().send_body(buf, len);
+  }
+
+  void flush() override {
+    return get_decoratee().flush();
+  }
+
+  RGWEnv& get_env() noexcept override {
+    return get_decoratee().get_env();
+  }
+
+  int complete_request() override {
+    return get_decoratee().complete_request();
+  }
+};
+
+
 /* HTTP IO: compatibility layer */
 class RGWStreamIO : public RGWClientIO,
                     public RGWClientIOAccounter {

diff --git a/src/rgw/rgw_client_io_decoimpl.h b/src/rgw/rgw_client_io_decoimpl.h
index b492383accda2d627c7e5a19fc9362cac8887629..4d1c046dab8f7163d2306e8d1f536c6c5ad589c4 100644 (file)
--- a/src/rgw/rgw_client_io_decoimpl.h
+++ b/src/rgw/rgw_client_io_decoimpl.h
@@ -11,95 +11,6 @@
 #include "rgw_common.h"
 #include "rgw_client_io.h"
 
-/* Abstract decorator over any implementation of RGWStreamIOEngine. */
-template <typename DecorateeT>
-class RGWDecoratedStreamIO : public RGWStreamIOEngine {
-  template<typename T> friend class RGWDecoratedStreamIO;
-
-  typedef typename std::remove_pointer<DecorateeT>::type DerefedDecorateeT;
-
-  static_assert(std::is_base_of<RGWStreamIOEngine, DerefedDecorateeT>::value,
-                "DecorateeT must be a subclass of RGWStreamIOEngine");
-
-  DecorateeT decoratee;
-
-  /* There is an indirection layer over accessing decoratee to share the same
-   * code base between dynamic and static decorators. The difference is about
-   * what we store internally: pointer to a decorated object versus the whole
-   * object itself. */
-  template <typename T = void,
-            typename std::enable_if<
-    std::is_pointer<DecorateeT>::value, T>::type* = nullptr>
-  DerefedDecorateeT& get_decoratee() {
-    return *decoratee;
-  }
-
-  template <typename T = void,
-            typename std::enable_if<
-    ! std::is_pointer<DecorateeT>::value, T>::type* = nullptr>
-  DerefedDecorateeT& get_decoratee() {
-    return decoratee;
-  }
-
-protected:
-  void init_env(CephContext *cct) override {
-    return get_decoratee().init_env(cct);
-  }
-
-public:
-  RGWDecoratedStreamIO(DecorateeT&& decoratee)
-    : decoratee(std::move(decoratee)) {
-  }
-
-  std::size_t send_status(const int status,
-                          const char* const status_name) override {
-    return get_decoratee().send_status(status, status_name);
-  }
-
-  std::size_t send_100_continue() override {
-    return get_decoratee().send_100_continue();
-  }
-
-  std::size_t send_header(const boost::string_ref& name,
-                          const boost::string_ref& value) override {
-    return get_decoratee().send_header(name, value);
-  }
-
-  std::size_t send_content_length(const uint64_t len) override {
-    return get_decoratee().send_content_length(len);
-  }
-
-  std::size_t send_chunked_transfer_encoding() override {
-    return get_decoratee().send_chunked_transfer_encoding();
-  }
-
-  std::size_t complete_header() override {
-    return get_decoratee().complete_header();
-  }
-
-  std::size_t recv_body(char* const buf, const std::size_t max) override {
-    return get_decoratee().recv_body(buf, max);
-  }
-
-  std::size_t send_body(const char* const buf,
-                        const std::size_t len) override {
-    return get_decoratee().send_body(buf, len);
-  }
-
-  void flush() override {
-    return get_decoratee().flush();
-  }
-
-  RGWEnv& get_env() noexcept override {
-    return get_decoratee().get_env();
-  }
-
-  int complete_request() override {
-    return get_decoratee().complete_request();
-  }
-};
-
-
 template <typename T>
 class RGWStreamIOAccountingEngine : public RGWDecoratedStreamIO<T>,
                                     public RGWClientIOAccounter {