Improvement: brpc support higher version of protobuf

src/brpc/esp_message.cpp

@@ -52,6 +52,12 @@ EspMessage* EspMessage::New() const {
     return new EspMessage;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+EspMessage* EspMessage::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<EspMessage>(arena);
+}
+#endif
+
 void EspMessage::Clear() {
     head.body_len = 0;
     body.clear();

src/brpc/esp_message.h

@@ -54,6 +54,9 @@ class EspMessage : public ::google::protobuf::Message {
     // implements Message ----------------------------------------------
 
     EspMessage* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    EspMessage* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const EspMessage& from);

src/brpc/memcache.cpp

@@ -63,6 +63,12 @@ MemcacheRequest* MemcacheRequest::New() const {
     return new MemcacheRequest;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+MemcacheRequest* MemcacheRequest::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<MemcacheRequest>(arena);
+}
+#endif
+
 void MemcacheRequest::Clear() {
     _buf.clear();
     _pipelined_count = 0;
@@ -207,6 +213,13 @@ MemcacheResponse* MemcacheResponse::New() const {
     return new MemcacheResponse;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+MemcacheResponse*
+MemcacheResponse::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<MemcacheResponse>(arena);
+}
+#endif
+
 void MemcacheResponse::Clear() {
 }
 

src/brpc/memcache.h

@@ -90,6 +90,9 @@ class MemcacheRequest : public ::google::protobuf::Message {
 
     // Protobuf methods.
     MemcacheRequest* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    MemcacheRequest* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const MemcacheRequest& from);
@@ -200,6 +203,9 @@ class MemcacheResponse : public ::google::protobuf::Message {
     // implements Message ----------------------------------------------
 
     MemcacheResponse* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    MemcacheResponse* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const MemcacheResponse& from);

src/brpc/nshead_message.cpp

@@ -54,6 +54,12 @@ NsheadMessage* NsheadMessage::New() const {
     return new NsheadMessage;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+NsheadMessage* NsheadMessage::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<NsheadMessage>(arena);
+}
+#endif
+
 void NsheadMessage::Clear() {
     memset(&head, 0, sizeof(head));
     body.clear();

src/brpc/nshead_message.h

@@ -50,6 +50,9 @@ class NsheadMessage : public ::google::protobuf::Message {
     // implements Message ----------------------------------------------
 
     NsheadMessage* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    NsheadMessage* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const NsheadMessage& from);

src/brpc/protocol.cpp

@@ -203,7 +203,11 @@ BUTIL_FORCE_INLINE bool ParsePbFromZeroCopyStreamInlined(
     // According to source code of pb, SetTotalBytesLimit is not a simple set,
     // avoid calling the function when the limit is definitely unreached.
     if (PB_TOTAL_BYETS_LIMITS < FLAGS_max_body_size) {
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+        decoder.SetTotalBytesLimit(INT_MAX);
+#else
         decoder.SetTotalBytesLimit(INT_MAX, -1);
+#endif
     }
     return msg->ParseFromCodedStream(&decoder) && decoder.ConsumedEntireMessage();
 }

src/brpc/redis.cpp

@@ -59,6 +59,12 @@ RedisRequest* RedisRequest::New() const {
     return new RedisRequest;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+RedisRequest* RedisRequest::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<RedisRequest>(arena);
+}
+#endif
+
 void RedisRequest::Clear() {
     _ncommand = 0;
     _has_error = false;
@@ -271,6 +277,12 @@ RedisResponse* RedisResponse::New() const {
     return new RedisResponse;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+RedisResponse* RedisResponse::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<RedisResponse>(arena);
+}
+#endif
+
 void RedisResponse::Clear() {
     _first_reply.Reset();
     _other_replies = NULL;

src/brpc/redis.h

@@ -108,6 +108,9 @@ class RedisRequest : public ::google::protobuf::Message {
 
     // Protobuf methods.
     RedisRequest* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    RedisRequest* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const RedisRequest& from);
@@ -178,6 +181,9 @@ class RedisResponse : public ::google::protobuf::Message {
     // implements Message ----------------------------------------------
 
     RedisResponse* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    RedisResponse* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const RedisResponse& from);

src/brpc/serialized_request.cpp

@@ -53,6 +53,13 @@ SerializedRequest* SerializedRequest::New() const {
     return new SerializedRequest;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+SerializedRequest*
+SerializedRequest::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<SerializedRequest>(arena);
+}
+#endif
+
 void SerializedRequest::Clear() {
     _serialized.clear();
 }

src/brpc/serialized_request.h

@@ -44,6 +44,9 @@ class SerializedRequest : public ::google::protobuf::Message {
     // implements Message ----------------------------------------------
 
     SerializedRequest* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    SerializedRequest* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const SerializedRequest& from);
     void Clear();

src/brpc/thrift_message.cpp

@@ -59,6 +59,13 @@ ThriftFramedMessage* ThriftFramedMessage::New() const {
     return new ThriftFramedMessage;
 }
 
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+ThriftFramedMessage*
+ThriftFramedMessage::New(::google::protobuf::Arena* arena) const {
+    return CreateMaybeMessage<ThriftFramedMessage>(arena);
+}
+#endif
+
 void ThriftFramedMessage::Clear() {
     body.clear();
     if (_own_raw_instance) {

src/brpc/thrift_message.h

@@ -84,6 +84,9 @@ friend class ThriftStub;
     // implements Message ----------------------------------------------
 
     ThriftFramedMessage* New() const;
+#if GOOGLE_PROTOBUF_VERSION >= 3006000
+    ThriftFramedMessage* New(::google::protobuf::Arena* arena) const override;
+#endif
     void CopyFrom(const ::google::protobuf::Message& from);
     void MergeFrom(const ::google::protobuf::Message& from);
     void CopyFrom(const ThriftFramedMessage& from);