Remove `include/grpcpp/impl/codegen/message_allocator.h` (#31246)

include/grpcpp/impl/codegen/message_allocator.h

@@ -19,55 +19,9 @@
 #ifndef GRPCPP_IMPL_CODEGEN_MESSAGE_ALLOCATOR_H
 #define GRPCPP_IMPL_CODEGEN_MESSAGE_ALLOCATOR_H
 
-// IWYU pragma: private, include <grpcpp/support/message_allocator.h>
+// IWYU pragma: private
 
-namespace grpc {
-
-// NOTE: This is an API for advanced users who need custom allocators.
-// Per rpc struct for the allocator. This is the interface to return to user.
-class RpcAllocatorState {
- public:
-  virtual ~RpcAllocatorState() = default;
-  // Optionally deallocate request early to reduce the size of working set.
-  // A custom MessageAllocator needs to be registered to make use of this.
-  // This is not abstract because implementing it is optional.
-  virtual void FreeRequest() {}
-};
-
-// This is the interface returned by the allocator.
-// grpc library will call the methods to get request/response pointers and to
-// release the object when it is done.
-template <typename RequestT, typename ResponseT>
-class MessageHolder : public RpcAllocatorState {
- public:
-  // Release this object. For example, if the custom allocator's
-  // AllocateMessasge creates an instance of a subclass with new, the Release()
-  // should do a "delete this;".
-  virtual void Release() = 0;
-  RequestT* request() { return request_; }
-  ResponseT* response() { return response_; }
-
- protected:
-  void set_request(RequestT* request) { request_ = request; }
-  void set_response(ResponseT* response) { response_ = response; }
-
- private:
-  // NOTE: subclasses should set these pointers.
-  RequestT* request_;
-  ResponseT* response_;
-};
-
-// A custom allocator can be set via the generated code to a callback unary
-// method, such as SetMessageAllocatorFor_Echo(custom_allocator). The allocator
-// needs to be alive for the lifetime of the server.
-// Implementations need to be thread-safe.
-template <typename RequestT, typename ResponseT>
-class MessageAllocator {
- public:
-  virtual ~MessageAllocator() = default;
-  virtual MessageHolder<RequestT, ResponseT>* AllocateMessages() = 0;
-};
-
-}  // namespace grpc
+/// TODO(chengyuc): Remove this file after solving compatibility.
+#include <grpcpp/support/message_allocator.h>
 
 #endif  // GRPCPP_IMPL_CODEGEN_MESSAGE_ALLOCATOR_H

include/grpcpp/support/message_allocator.h

@@ -19,6 +19,53 @@
 #ifndef GRPCPP_SUPPORT_MESSAGE_ALLOCATOR_H
 #define GRPCPP_SUPPORT_MESSAGE_ALLOCATOR_H
 
-#include <grpcpp/impl/codegen/message_allocator.h>  // IWYU pragma: export
+namespace grpc {
+
+// NOTE: This is an API for advanced users who need custom allocators.
+// Per rpc struct for the allocator. This is the interface to return to user.
+class RpcAllocatorState {
+ public:
+  virtual ~RpcAllocatorState() = default;
+  // Optionally deallocate request early to reduce the size of working set.
+  // A custom MessageAllocator needs to be registered to make use of this.
+  // This is not abstract because implementing it is optional.
+  virtual void FreeRequest() {}
+};
+
+// This is the interface returned by the allocator.
+// grpc library will call the methods to get request/response pointers and to
+// release the object when it is done.
+template <typename RequestT, typename ResponseT>
+class MessageHolder : public RpcAllocatorState {
+ public:
+  // Release this object. For example, if the custom allocator's
+  // AllocateMessasge creates an instance of a subclass with new, the Release()
+  // should do a "delete this;".
+  virtual void Release() = 0;
+  RequestT* request() { return request_; }
+  ResponseT* response() { return response_; }
+
+ protected:
+  void set_request(RequestT* request) { request_ = request; }
+  void set_response(ResponseT* response) { response_ = response; }
+
+ private:
+  // NOTE: subclasses should set these pointers.
+  RequestT* request_;
+  ResponseT* response_;
+};
+
+// A custom allocator can be set via the generated code to a callback unary
+// method, such as SetMessageAllocatorFor_Echo(custom_allocator). The allocator
+// needs to be alive for the lifetime of the server.
+// Implementations need to be thread-safe.
+template <typename RequestT, typename ResponseT>
+class MessageAllocator {
+ public:
+  virtual ~MessageAllocator() = default;
+  virtual MessageHolder<RequestT, ResponseT>* AllocateMessages() = 0;
+};
+
+}  // namespace grpc
 
 #endif  // GRPCPP_SUPPORT_MESSAGE_ALLOCATOR_H

src/compiler/cpp_generator.cc

@@ -143,7 +143,7 @@ std::string GetHeaderIncludes(grpc_generator::File* file,
         "grpcpp/support/client_callback.h",
         "grpcpp/client_context.h",
         "grpcpp/impl/codegen/completion_queue.h",
-        "grpcpp/impl/codegen/message_allocator.h",
+        "grpcpp/support/message_allocator.h",
         "grpcpp/impl/codegen/method_handler.h",
         "grpcpp/impl/codegen/proto_utils.h",
         "grpcpp/impl/codegen/rpc_method.h",
@@ -1653,7 +1653,7 @@ std::string GetSourceIncludes(grpc_generator::File* file,
         "grpcpp/impl/codegen/channel_interface.h",
         "grpcpp/impl/codegen/client_unary_call.h",
         "grpcpp/support/client_callback.h",
-        "grpcpp/impl/codegen/message_allocator.h",
+        "grpcpp/support/message_allocator.h",
         "grpcpp/impl/codegen/method_handler.h",
         "grpcpp/impl/codegen/rpc_service_method.h",
         "grpcpp/impl/codegen/server_callback.h",

test/cpp/codegen/compiler_test_golden

@@ -33,7 +33,7 @@
 #include <grpcpp/support/client_callback.h>
 #include <grpcpp/client_context.h>
 #include <grpcpp/impl/codegen/completion_queue.h>
-#include <grpcpp/impl/codegen/message_allocator.h>
+#include <grpcpp/support/message_allocator.h>
 #include <grpcpp/impl/codegen/method_handler.h>
 #include <grpcpp/impl/codegen/proto_utils.h>
 #include <grpcpp/impl/codegen/rpc_method.h>