adapt callback.h after pb3.7 & remove unnecessary files

src/brpc/callback.h

@@ -10,6 +10,11 @@
 #define BRPC_CALLBACK_H
 
 #include <google/protobuf/stubs/common.h>  // Closure
+#if GOOGLE_PROTOBUF_VERSION >= 3007000
+// After protobuf 3.7.0, callback.h is removed from common.h, we need to explicitly
+// include this file.
+#include <google/protobuf/stubs/callback.h>
+#endif
 
 namespace brpc {
 

src/brpc/memcache.cpp

@@ -15,7 +15,6 @@
 // Authors: Ge,Jun (gejun@baidu.com)
 
 #include <algorithm>
-#include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
 #include "butil/string_printf.h"

src/brpc/memcache.h

@@ -18,7 +18,7 @@
 #define BRPC_MEMCACHE_H
 
 #include <string>
-#include "google/protobuf/message.h"
+#include <google/protobuf/message.h>
 
 #include "butil/iobuf.h"
 #include "butil/strings/string_piece.h"

src/brpc/nshead_message.h

@@ -17,8 +17,6 @@
 #ifndef BRPC_NSHEAD_MESSAGE_H
 #define BRPC_NSHEAD_MESSAGE_H
 
-#include <string>
-
 #include <google/protobuf/message.h>
 #include "brpc/nshead.h"                     // nshead_t
 #include "butil/iobuf.h"                     // IOBuf

src/brpc/progressive_attachment.h

@@ -17,7 +17,7 @@
 #ifndef BRPC_PROGRESSIVE_ATTACHMENT_H
 #define BRPC_PROGRESSIVE_ATTACHMENT_H
 
-#include <google/protobuf/stubs/callback.h>
+#include "brpc/callback.h"
 #include "butil/atomicops.h"
 #include "butil/iobuf.h"
 #include "butil/endpoint.h"       // butil::EndPoint
@@ -25,7 +25,6 @@
 #include "brpc/socket_id.h"       // SocketUniquePtr
 #include "brpc/shared_object.h"   // SharedObject
 
-
 namespace brpc {
 
 class ProgressiveAttachment : public SharedObject {

src/brpc/proto_base.proto

 syntax="proto2";
-import "google/protobuf/descriptor.proto";
 
 package brpc;
 

src/brpc/redis.cpp

@@ -16,7 +16,7 @@
 
 #include <google/protobuf/reflection_ops.h>                 // ReflectionOps::Merge
 #include <gflags/gflags.h>
-#include <butil/status.h>
+#include "butil/status.h"
 #include "brpc/redis.h"
 #include "brpc/redis_command.h"
 

src/brpc/redis.h

@@ -17,10 +17,7 @@
 #ifndef BRPC_REDIS_H
 #define BRPC_REDIS_H
 
-#include <string>
-
 #include <google/protobuf/message.h>
-
 #include "butil/iobuf.h"
 #include "butil/strings/string_piece.h"
 #include "butil/arena.h"
@@ -193,7 +190,9 @@ public:
 
     static const ::google::protobuf::Descriptor* descriptor();
     static const RedisResponse& default_instance();
-    ::google::protobuf::Metadata GetMetadata() const;
+
+protected:
+    ::google::protobuf::Metadata GetMetadata() const override;
 
 private:
     void SharedCtor();

src/brpc/thrift_message.h

@@ -17,8 +17,6 @@
 #ifndef BRPC_THRIFT_MESSAGE_H
 #define BRPC_THRIFT_MESSAGE_H
 
-#include <functional>
-#include <string>
 #include <google/protobuf/message.h>
 #include "butil/iobuf.h"
 #include "butil/class_name.h"