Skip to content

B
brpc
Commit 585d5393 authored by zhujiashun's avatar zhujiashun
Browse files
Options

Make the descriptor and reflection of esp_message, memcache, 

nshead_message, serialized_request, thrift_message be independent
of protobuf.
parent b564dd56
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 626 deletions
CMakeLists.txt
View file @ 585d5393
......@@ -372,7 +372,7 @@ set(PROTO_FILES idl_options.proto
brpc/policy/mongo.proto
brpc/trackme.proto
brpc/streaming_rpc_meta.proto
brpc/redis_base.proto)
brpc/proto_base.proto)
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/output/include/brpc)
set(PROTOC_FLAGS ${PROTOC_FLAGS} -I${PROTOBUF_INCLUDE_DIR})
compile_proto(PROTO_HDRS PROTO_SRCS ${PROJECT_BINARY_DIR}
......
src/brpc/esp_message.cpp
View file @ 585d5393
......@@ -12,99 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// Generated by the protocol buffer compiler. DO NOT EDIT!
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
#include "esp_message.h"
#include <algorithm>
#include <google/protobuf/stubs/once.h>
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/wire_format_lite_inl.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/reflection_ops.h>
#include <google/protobuf/wire_format.h>
// @@protoc_insertion_point(includes)
#include <google/protobuf/wire_format.h> // WireFormatLite::GetTagWireType
namespace brpc {
namespace {
const ::google::protobuf::Descriptor* EspMessage_descriptor_ = NULL;
} // namespace
void protobuf_AssignDesc_esp_5fmessage_2eproto() {
protobuf_AddDesc_esp_5fmessage_2eproto();
const ::google::protobuf::FileDescriptor* file =
::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
"esp_message.proto");
GOOGLE_CHECK(file != NULL);
EspMessage_descriptor_ = file->message_type(0);
}
namespace {
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
inline void protobuf_AssignDescriptorsOnce() {
::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
&protobuf_AssignDesc_esp_5fmessage_2eproto);
}
void protobuf_RegisterTypes(const ::std::string&) {
protobuf_AssignDescriptorsOnce();
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
EspMessage_descriptor_, &EspMessage::default_instance());
}
} // namespace
void protobuf_ShutdownFile_esp_5fmessage_2eproto() {
delete EspMessage::default_instance_;
}
void protobuf_AddDesc_esp_5fmessage_2eproto() {
static bool already_here = false;
if (already_here) {
return;
}
already_here = true;
GOOGLE_PROTOBUF_VERIFY_VERSION;
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\021esp_message.proto\022\tbaidu.rpc\"\014\n\nEspMessage", 44);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"esp_message.proto", &protobuf_RegisterTypes);
EspMessage::default_instance_ = new EspMessage();
EspMessage::default_instance_->InitAsDefaultInstance();
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_esp_5fmessage_2eproto);
}
// Force AddDescriptors() to be called at static initialization time.
struct StaticDescriptorInitializer_esp_5fmessage_2eproto {
StaticDescriptorInitializer_esp_5fmessage_2eproto() {
protobuf_AddDesc_esp_5fmessage_2eproto();
}
} static_descriptor_initializer_esp_5fmessage_2eproto_;
// ===================================================================
#ifndef _MSC_VER
#endif // !_MSC_VER
EspMessageBase EspMessage::_base;
EspMessage::EspMessage()
: ::google::protobuf::Message() {
SharedCtor();
}
void EspMessage::InitAsDefaultInstance() {
}
EspMessage::EspMessage(const EspMessage& from)
: ::google::protobuf::Message() {
SharedCtor();
......@@ -120,25 +40,17 @@ EspMessage::~EspMessage() {
}
void EspMessage::SharedDtor() {
if (this != default_instance_) {
}
}
const ::google::protobuf::Descriptor* EspMessage::descriptor() {
protobuf_AssignDescriptorsOnce();
return EspMessage_descriptor_;
return _base.GetDescriptor();
}
const EspMessage& EspMessage::default_instance() {
if (default_instance_ == NULL) {
protobuf_AddDesc_esp_5fmessage_2eproto();
}
return *default_instance_;
static EspMessage req;
return req;
}
EspMessage* EspMessage::default_instance_ = NULL;
EspMessage* EspMessage::New() const {
return new EspMessage;
}
......@@ -227,16 +139,10 @@ void EspMessage::Swap(EspMessage* other) {
}
::google::protobuf::Metadata EspMessage::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
metadata.descriptor = EspMessage_descriptor_;
metadata.reflection = NULL;
metadata.descriptor = _base.GetDescriptor();
metadata.reflection = _base.GetReflection();
return metadata;
}
// @@protoc_insertion_point(namespace_scope)
} // namespace brpc
// @@protoc_insertion_point(global_scope)
src/brpc/esp_message.h
View file @ 585d5393
......@@ -17,23 +17,16 @@
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/extension_set.h>
#include <google/protobuf/generated_message_reflection.h>
#include <google/protobuf/message.h>
#include <google/protobuf/generated_message_reflection.h> // dynamic_cast_if_available
#include <google/protobuf/reflection_ops.h> // ReflectionOps::Merge
#include "brpc/esp_head.h"
#include "butil/iobuf.h"
#include "brpc/proto_base.pb.h"
namespace brpc {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_esp_5fmessage_2eproto();
void protobuf_AssignDesc_esp_5fmessage_2eproto();
void protobuf_ShutdownFile_esp_5fmessage_2eproto();
class EspMessage : public ::google::protobuf::Message {
public:
EspHead head;
......@@ -73,17 +66,15 @@ public:
::google::protobuf::uint8* SerializeWithCachedSizesToArray(
::google::protobuf::uint8* output) const;
int GetCachedSize() const { return ByteSize(); }
::google::protobuf::Metadata GetMetadata() const;
protected:
::google::protobuf::Metadata GetMetadata() const override;
private:
void SharedCtor();
void SharedDtor();
friend void protobuf_AddDesc_esp_5fmessage_2eproto();
friend void protobuf_AssignDesc_esp_5fmessage_2eproto();
friend void protobuf_ShutdownFile_esp_5fmessage_2eproto();
void InitAsDefaultInstance();
static EspMessage* default_instance_;
static EspMessageBase _base;
};
} // namespace brpc
......
src/brpc/memcache.cpp
View file @ 585d5393
......@@ -14,119 +14,26 @@
// Authors: Ge,Jun (gejun@baidu.com)
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
#include <algorithm>
#include <google/protobuf/stubs/once.h>
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/wire_format_lite_inl.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/generated_message_reflection.h>
#include <google/protobuf/reflection_ops.h>
#include <google/protobuf/wire_format.h>
#include "butil/string_printf.h"
#include "butil/macros.h"
#include "butil/sys_byteorder.h"
#include "brpc/controller.h"
#include "butil/logging.h"
#include "brpc/memcache.h"
#include "brpc/policy/memcache_binary_header.h"
namespace brpc {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_impl();
void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
void protobuf_AssignDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
void protobuf_ShutdownFile_baidu_2frpc_2fmemcache_5fbase_2eproto();
namespace {
const ::google::protobuf::Descriptor* MemcacheRequest_descriptor_ = NULL;
const ::google::protobuf::Descriptor* MemcacheResponse_descriptor_ = NULL;
} // namespace
void protobuf_AssignDesc_baidu_2frpc_2fmemcache_5fbase_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
const ::google::protobuf::FileDescriptor* file =
::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
"baidu/rpc/memcache_base.proto");
GOOGLE_CHECK(file != NULL);
MemcacheRequest_descriptor_ = file->message_type(0);
MemcacheResponse_descriptor_ = file->message_type(1);
}
namespace {
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
inline void protobuf_AssignDescriptorsOnce() {
::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
&protobuf_AssignDesc_baidu_2frpc_2fmemcache_5fbase_2eproto);
}
void protobuf_RegisterTypes(const ::std::string&) {
protobuf_AssignDescriptorsOnce();
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
MemcacheRequest_descriptor_, &MemcacheRequest::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
MemcacheResponse_descriptor_, &MemcacheResponse::default_instance());
}
} // namespace
void protobuf_ShutdownFile_baidu_2frpc_2fmemcache_5fbase_2eproto() {
delete MemcacheRequest::default_instance_;
delete MemcacheResponse::default_instance_;
}
void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_impl() {
GOOGLE_PROTOBUF_VERIFY_VERSION;
#if GOOGLE_PROTOBUF_VERSION >= 3002000
::google::protobuf::internal::InitProtobufDefaults();
#else
::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
#endif
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\035baidu/rpc/memcache_base.proto\022\tbaidu.r"
"pc\032 google/protobuf/descriptor.proto\"\021\n\017"
"MemcacheRequest\"\022\n\020MemcacheResponseB\003\200\001\001", 120);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"baidu/rpc/memcache_base.proto", &protobuf_RegisterTypes);
MemcacheRequest::default_instance_ = new MemcacheRequest();
MemcacheResponse::default_instance_ = new MemcacheResponse();
MemcacheRequest::default_instance_->InitAsDefaultInstance();
MemcacheResponse::default_instance_->InitAsDefaultInstance();
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_baidu_2frpc_2fmemcache_5fbase_2eproto);
}
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_once);
void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto() {
::google::protobuf::GoogleOnceInit(
&protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_once,
&protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_impl);
}
// Force AddDescriptors() to be called at static initialization time.
struct StaticDescriptorInitializer_baidu_2frpc_2fmemcache_5fbase_2eproto {
StaticDescriptorInitializer_baidu_2frpc_2fmemcache_5fbase_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
}
} static_descriptor_initializer_baidu_2frpc_2fmemcache_5fbase_2eproto_;
// ===================================================================
#ifndef _MSC_VER
#endif // !_MSC_VER
MemcacheRequestBase MemcacheRequest::_base;
MemcacheRequest::MemcacheRequest()
: ::google::protobuf::Message() {
SharedCtor();
}
void MemcacheRequest::InitAsDefaultInstance() {
}
MemcacheRequest::MemcacheRequest(const MemcacheRequest& from)
: ::google::protobuf::Message() {
SharedCtor();
......@@ -143,29 +50,21 @@ MemcacheRequest::~MemcacheRequest() {
}
void MemcacheRequest::SharedDtor() {
if (this != default_instance_) {
}
}
void MemcacheRequest::SetCachedSize(int size) const {
GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
_cached_size_ = size;
GOOGLE_SAFE_CONCURRENT_WRITES_END();
}
const ::google::protobuf::Descriptor* MemcacheRequest::descriptor() {
protobuf_AssignDescriptorsOnce();
return MemcacheRequest_descriptor_;
return _base.GetDescriptor();
}
const MemcacheRequest& MemcacheRequest::default_instance() {
if (default_instance_ == NULL) {
protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
}
return *default_instance_;
static MemcacheRequest req;
return req;
}
MemcacheRequest* MemcacheRequest::default_instance_ = NULL;
MemcacheRequest* MemcacheRequest::New() const {
return new MemcacheRequest;
}
......@@ -230,9 +129,7 @@ void MemcacheRequest::SerializeWithCachedSizes(
int MemcacheRequest::ByteSize() const {
int total_size = _buf.size();
GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
_cached_size_ = total_size;
GOOGLE_SAFE_CONCURRENT_WRITES_END();
return total_size;
}
......@@ -278,26 +175,19 @@ void MemcacheRequest::Swap(MemcacheRequest* other) {
}
::google::protobuf::Metadata MemcacheRequest::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
metadata.descriptor = MemcacheRequest_descriptor_;
metadata.reflection = NULL;
metadata.descriptor = _base.GetDescriptor();
metadata.reflection = _base.GetReflection();
return metadata;
}
// ===================================================================
#ifndef _MSC_VER
#endif // !_MSC_VER
MemcacheResponseBase MemcacheResponse::_base;
MemcacheResponse::MemcacheResponse()
: ::google::protobuf::Message() {
SharedCtor();
}
void MemcacheResponse::InitAsDefaultInstance() {
}
MemcacheResponse::MemcacheResponse(const MemcacheResponse& from)
: ::google::protobuf::Message() {
SharedCtor();
......@@ -313,29 +203,20 @@ MemcacheResponse::~MemcacheResponse() {
}
void MemcacheResponse::SharedDtor() {
if (this != default_instance_) {
}
}
void MemcacheResponse::SetCachedSize(int size) const {
GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
_cached_size_ = size;
GOOGLE_SAFE_CONCURRENT_WRITES_END();
}
const ::google::protobuf::Descriptor* MemcacheResponse::descriptor() {
protobuf_AssignDescriptorsOnce();
return MemcacheResponse_descriptor_;
return _base.GetDescriptor();
}
const MemcacheResponse& MemcacheResponse::default_instance() {
if (default_instance_ == NULL) {
protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
}
return *default_instance_;
static MemcacheResponse res;
return res;
}
MemcacheResponse* MemcacheResponse::default_instance_ = NULL;
MemcacheResponse* MemcacheResponse::New() const {
return new MemcacheResponse;
}
......@@ -377,9 +258,7 @@ void MemcacheResponse::SerializeWithCachedSizes(
int MemcacheResponse::ByteSize() const {
int total_size = _buf.size();
GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
_cached_size_ = total_size;
GOOGLE_SAFE_CONCURRENT_WRITES_END();
return total_size;
}
......@@ -426,10 +305,9 @@ void MemcacheResponse::Swap(MemcacheResponse* other) {
}
::google::protobuf::Metadata MemcacheResponse::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
metadata.descriptor = MemcacheResponse_descriptor_;
metadata.reflection = NULL;
metadata.descriptor = _base.GetDescriptor();
metadata.reflection = _base.GetReflection();
return metadata;
}
......
src/brpc/memcache.h
View file @ 585d5393
......@@ -18,15 +18,11 @@
#define BRPC_MEMCACHE_H
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/extension_set.h>
#include <google/protobuf/generated_message_reflection.h>
#include "google/protobuf/descriptor.pb.h"
#include "google/protobuf/message.h"
#include "butil/iobuf.h"
#include "butil/strings/string_piece.h"
#include "brpc/proto_base.pb.h"
namespace brpc {
......@@ -87,6 +83,9 @@ public:
int pipelined_count() const { return _pipelined_count; }
butil::IOBuf& raw_buffer() { return _buf; }
const butil::IOBuf& raw_buffer() const { return _buf; }
// Protobuf methods.
MemcacheRequest* New() const;
void CopyFrom(const ::google::protobuf::Message& from);
......@@ -106,10 +105,9 @@ public:
static const ::google::protobuf::Descriptor* descriptor();
static const MemcacheRequest& default_instance();
::google::protobuf::Metadata GetMetadata() const;
butil::IOBuf& raw_buffer() { return _buf; }
const butil::IOBuf& raw_buffer() const { return _buf; }
protected:
::google::protobuf::Metadata GetMetadata() const override;
private:
bool GetOrDelete(uint8_t command, const butil::StringPiece& key);
......@@ -127,14 +125,7 @@ private:
int _pipelined_count;
butil::IOBuf _buf;
mutable int _cached_size_;
friend void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_impl();
friend void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
friend void protobuf_AssignDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
friend void protobuf_ShutdownFile_baidu_2frpc_2fmemcache_5fbase_2eproto();
void InitAsDefaultInstance();
static MemcacheRequest* default_instance_;
static MemcacheRequestBase _base;
};
// Response from Memcache.
......@@ -202,6 +193,9 @@ public:
bool PopDecrement(uint64_t* new_value, uint64_t* cas_value);
bool PopTouch();
bool PopVersion(std::string* version);
butil::IOBuf& raw_buffer() { return _buf; }
const butil::IOBuf& raw_buffer() const { return _buf; }
static const char* status_str(Status);
// implements Message ----------------------------------------------
......@@ -223,12 +217,9 @@ public:
static const ::google::protobuf::Descriptor* descriptor();
static const MemcacheResponse& default_instance();
::google::protobuf::Metadata GetMetadata() const;
butil::IOBuf& raw_buffer() { return _buf; }
const butil::IOBuf& raw_buffer() const { return _buf; }
static const char* status_str(Status);
protected:
::google::protobuf::Metadata GetMetadata() const;
private:
bool PopCounter(uint8_t command, uint64_t* new_value, uint64_t* cas_value);
......@@ -242,13 +233,7 @@ private:
butil::IOBuf _buf;
mutable int _cached_size_;
friend void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto_impl();
friend void protobuf_AddDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
friend void protobuf_AssignDesc_baidu_2frpc_2fmemcache_5fbase_2eproto();
friend void protobuf_ShutdownFile_baidu_2frpc_2fmemcache_5fbase_2eproto();
void InitAsDefaultInstance();
static MemcacheResponse* default_instance_;
static MemcacheResponseBase _base;
};
} // namespace brpc
......
src/brpc/nshead_message.cpp
View file @ 585d5393
......@@ -14,104 +14,22 @@
// Authors: Ge,Jun (gejun@baidu.com)
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
#include "brpc/nshead_message.h"
#include <algorithm>
#include "butil/logging.h"
#include <google/protobuf/stubs/once.h>
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/wire_format_lite_inl.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/reflection_ops.h>
#include <google/protobuf/generated_message_reflection.h> // dynamic_cast_if_available
#include <google/protobuf/reflection_ops.h> // ReflectionOps::Merge
#include <google/protobuf/wire_format.h>
#include "brpc/nshead_message.h"
#include "butil/logging.h"
namespace brpc {
namespace {
const ::google::protobuf::Descriptor* NsheadMessage_descriptor_ = NULL;
} // namespace
void protobuf_AssignDesc_baidu_2frpc_2fnshead_5fmessage_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
const ::google::protobuf::FileDescriptor* file =
::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
"baidu/rpc/nshead_message.proto");
GOOGLE_CHECK(file != NULL);
NsheadMessage_descriptor_ = file->message_type(0);
}
namespace {
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
inline void protobuf_AssignDescriptorsOnce() {
::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
&protobuf_AssignDesc_baidu_2frpc_2fnshead_5fmessage_2eproto);
}
void protobuf_RegisterTypes(const ::std::string&) {
protobuf_AssignDescriptorsOnce();
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
NsheadMessage_descriptor_, &NsheadMessage::default_instance());
}
} // namespace
void protobuf_ShutdownFile_baidu_2frpc_2fnshead_5fmessage_2eproto() {
delete NsheadMessage::default_instance_;
}
void protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto_impl() {
GOOGLE_PROTOBUF_VERIFY_VERSION;
#if GOOGLE_PROTOBUF_VERSION >= 3002000
::google::protobuf::internal::InitProtobufDefaults();
#else
::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
#endif
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\036baidu/rpc/nshead_message.proto\022\tbaidu."
"rpc\032 google/protobuf/descriptor.proto\"\017\n"
"\rNsheadMessageB\003\200\001\001", 99);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"baidu/rpc/nshead_message.proto", &protobuf_RegisterTypes);
NsheadMessage::default_instance_ = new NsheadMessage();
NsheadMessage::default_instance_->InitAsDefaultInstance();
::google::protobuf::internal::OnShutdown(
&protobuf_ShutdownFile_baidu_2frpc_2fnshead_5fmessage_2eproto);
}
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto_once);
void protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto() {
::google::protobuf::GoogleOnceInit(
&protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto_once,
&protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto_impl);
}
// Force AddDescriptors() to be called at static initialization time.
struct StaticDescriptorInitializer_baidu_2frpc_2fnshead_5fmessage_2eproto {
StaticDescriptorInitializer_baidu_2frpc_2fnshead_5fmessage_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
}
} static_descriptor_initializer_baidu_2frpc_2fnshead_5fmessage_2eproto_;
// ===================================================================
#ifndef _MSC_VER
#endif // !_MSC_VER
NsheadMessageBase NsheadMessage::_base;
NsheadMessage::NsheadMessage()
: ::google::protobuf::Message() {
SharedCtor();
}
void NsheadMessage::InitAsDefaultInstance() {
}
NsheadMessage::NsheadMessage(const NsheadMessage& from)
: ::google::protobuf::Message() {
SharedCtor();
......@@ -127,23 +45,17 @@ NsheadMessage::~NsheadMessage() {
}
void NsheadMessage::SharedDtor() {
if (this != default_instance_) {
}
}
const ::google::protobuf::Descriptor* NsheadMessage::descriptor() {
protobuf_AssignDescriptorsOnce();
return NsheadMessage_descriptor_;
return _base.GetDescriptor();
}
const NsheadMessage& NsheadMessage::default_instance() {
if (default_instance_ == NULL)
protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
return *default_instance_;
static NsheadMessage message;
return message;
}
NsheadMessage* NsheadMessage::default_instance_ = NULL;
NsheadMessage* NsheadMessage::New() const {
return new NsheadMessage;
}
......@@ -226,10 +138,9 @@ void NsheadMessage::Swap(NsheadMessage* other) {
}
::google::protobuf::Metadata NsheadMessage::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
metadata.descriptor = NsheadMessage_descriptor_;
metadata.reflection = NULL;
metadata.descriptor = _base.GetDescriptor();
metadata.reflection = _base.GetReflection();
return metadata;
}
......
src/brpc/nshead_message.h
View file @ 585d5393
......@@ -19,24 +19,13 @@
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/extension_set.h>
#include <google/protobuf/generated_message_reflection.h>
#include "google/protobuf/descriptor.pb.h"
#include <google/protobuf/message.h>
#include "brpc/nshead.h" // nshead_t
#include "butil/iobuf.h" // IOBuf
#include "butil/iobuf.h" // IOBuf
#include "brpc/proto_base.pb.h"
namespace brpc {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
void protobuf_AssignDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
void protobuf_ShutdownFile_baidu_2frpc_2fnshead_5fmessage_2eproto();
// Representing a nshead request or response.
class NsheadMessage : public ::google::protobuf::Message {
public:
......@@ -76,19 +65,15 @@ public:
::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
int GetCachedSize() const { return ByteSize(); }
protected:
::google::protobuf::Metadata GetMetadata() const;
private:
void SharedCtor();
void SharedDtor();
private:
friend void protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto_impl();
friend void protobuf_AddDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
friend void protobuf_AssignDesc_baidu_2frpc_2fnshead_5fmessage_2eproto();
friend void protobuf_ShutdownFile_baidu_2frpc_2fnshead_5fmessage_2eproto();
void InitAsDefaultInstance();
static NsheadMessage* default_instance_;
static NsheadMessageBase _base;
};
} // namespace brpc
......
src/brpc/redis_base.proto → src/brpc/proto_base.proto
View file @ 585d5393
......@@ -5,3 +5,14 @@ package brpc;
message RedisRequestBase {}
message RedisResponseBase {}
message EspMessageBase {}
message MemcacheRequestBase {}
message MemcacheResponseBase {}
message NsheadMessageBase {}
message SerializedRequestBase {}
message ThriftFramedMessageBase {}
src/brpc/redis.cpp
View file @ 585d5393
......@@ -14,6 +14,8 @@
// Authors: Ge,Jun (gejun@baidu.com)
#include <google/protobuf/generated_message_reflection.h> // dynamic_cast_if_available
#include <google/protobuf/reflection_ops.h> // ReflectionOps::Merge
#include <gflags/gflags.h>
#include <butil/status.h>
#include "brpc/redis.h"
......@@ -23,6 +25,8 @@ namespace brpc {
DEFINE_bool(redis_verbose_crlf2space, false, "[DEBUG] Show \\r\\n as a space");
RedisRequestBase RedisRequest::_base;
RedisRequest::RedisRequest()
: ::google::protobuf::Message() {
SharedCtor();
......@@ -240,6 +244,8 @@ std::ostream& operator<<(std::ostream& os, const RedisRequest& r) {
return os;
}
RedisResponseBase RedisResponse::_base;
RedisResponse::RedisResponse()
: ::google::protobuf::Message() {
SharedCtor();
......
src/brpc/redis.h
View file @ 585d5393
......@@ -20,13 +20,11 @@
#include <string>
#include <google/protobuf/message.h>
#include <google/protobuf/generated_message_reflection.h> // dynamic_cast_if_available
#include <google/protobuf/reflection_ops.h> // ReflectionOps::Merge
#include "butil/iobuf.h"
#include "butil/strings/string_piece.h"
#include "butil/arena.h"
#include "brpc/redis_base.pb.h"
#include "brpc/proto_base.pb.h"
#include "brpc/redis_reply.h"
#include "brpc/parse_result.h"
......@@ -123,10 +121,12 @@ public:
static const ::google::protobuf::Descriptor* descriptor();
static const RedisRequest& default_instance();
::google::protobuf::Metadata GetMetadata() const;
void Print(std::ostream&) const;
protected:
::google::protobuf::Metadata GetMetadata() const override;
private:
void SharedCtor();
void SharedDtor();
......
src/brpc/serialized_request.cpp
View file @ 585d5393
......@@ -14,95 +14,19 @@
// Authors: Ge,Jun (gejun@baidu.com)
#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
#include <google/protobuf/generated_message_reflection.h> // dynamic_cast_if_available
#include "brpc/serialized_request.h"
#include <algorithm>
#include <google/protobuf/stubs/once.h>
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/wire_format_lite_inl.h>
#include <google/protobuf/descriptor.h>
#include <google/protobuf/reflection_ops.h>
#include <google/protobuf/wire_format.h>
#include "butil/logging.h"
namespace brpc {
namespace {
const ::google::protobuf::Descriptor* SerializedRequest_descriptor_ = NULL;
} // namespace
void protobuf_AssignDesc_baidu_2frpc_2fserialized_5frequest_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
const ::google::protobuf::FileDescriptor* file =
::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
"baidu/rpc/serialized_request.proto");
GOOGLE_CHECK(file != NULL);
SerializedRequest_descriptor_ = file->message_type(0);
}
namespace {
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
inline void protobuf_AssignDescriptorsOnce() {
::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
&protobuf_AssignDesc_baidu_2frpc_2fserialized_5frequest_2eproto);
}
void protobuf_RegisterTypes(const ::std::string&) {
protobuf_AssignDescriptorsOnce();
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
SerializedRequest_descriptor_, &SerializedRequest::default_instance());
}
} // namespace
void protobuf_ShutdownFile_baidu_2frpc_2fserialized_5frequest_2eproto() {
delete SerializedRequest::default_instance_;
}
void protobuf_AddDesc_baidu_2frpc_2fserialized_5frequest_2eproto() {
static bool already_here = false;
if (already_here) return;
already_here = true;
GOOGLE_PROTOBUF_VERIFY_VERSION;
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\"baidu/rpc/serialized_request.proto\022\tba"
"idu.rpc\"\023\n\021SerializedRequest", 68);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"baidu/rpc/serialized_request.proto", &protobuf_RegisterTypes);
SerializedRequest::default_instance_ = new SerializedRequest();
SerializedRequest::default_instance_->InitAsDefaultInstance();
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_baidu_2frpc_2fserialized_5frequest_2eproto);
}
// Force AddDescriptors() to be called at static initialization time.
struct StaticDescriptorInitializer_baidu_2frpc_2fserialized_5frequest_2eproto {
StaticDescriptorInitializer_baidu_2frpc_2fserialized_5frequest_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
}
} static_descriptor_initializer_baidu_2frpc_2fserialized_5frequest_2eproto_;
// ===================================================================
#ifndef _MSC_VER
#endif // !_MSC_VER
SerializedRequestBase SerializedRequest::_base;
SerializedRequest::SerializedRequest()
: ::google::protobuf::Message() {
SharedCtor();
}
void SerializedRequest::InitAsDefaultInstance() {
}
SerializedRequest::SerializedRequest(const SerializedRequest& from)
: ::google::protobuf::Message() {
SharedCtor();
......@@ -117,26 +41,20 @@ SerializedRequest::~SerializedRequest() {
}
void SerializedRequest::SharedDtor() {
if (this != default_instance_) {
}
}
void SerializedRequest::SetCachedSize(int /*size*/) const {
CHECK(false) << "You're not supposed to call " << __FUNCTION__;
}
const ::google::protobuf::Descriptor* SerializedRequest::descriptor() {
protobuf_AssignDescriptorsOnce();
return SerializedRequest_descriptor_;
return _base.GetDescriptor();
}
const SerializedRequest& SerializedRequest::default_instance() {
if (default_instance_ == NULL)
protobuf_AddDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
return *default_instance_;
static SerializedRequest req;
return req;
}
SerializedRequest* SerializedRequest::default_instance_ = NULL;
SerializedRequest* SerializedRequest::New() const {
return new SerializedRequest;
}
......@@ -203,10 +121,9 @@ void SerializedRequest::Swap(SerializedRequest* other) {
}
::google::protobuf::Metadata SerializedRequest::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
metadata.descriptor = SerializedRequest_descriptor_;
metadata.reflection = NULL;
metadata.descriptor = _base.GetDescriptor();
metadata.reflection = _base.GetReflection();
return metadata;
}
......
src/brpc/serialized_request.h
View file @ 585d5393
......@@ -17,22 +17,12 @@
#ifndef BRPC_SERIALIZED_REQUEST_H
#define BRPC_SERIALIZED_REQUEST_H
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/extension_set.h>
#include <google/protobuf/generated_message_reflection.h>
#include <google/protobuf/message.h>
#include "butil/iobuf.h"
#include "brpc/proto_base.pb.h"
namespace brpc {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
void protobuf_AssignDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
void protobuf_ShutdownFile_baidu_2frpc_2fserialized_5frequest_2eproto();
class SerializedRequest : public ::google::protobuf::Message {
public:
SerializedRequest();
......@@ -59,9 +49,11 @@ public:
bool IsInitialized() const;
int ByteSize() const;
int GetCachedSize() const { return (int)_serialized.size(); }
::google::protobuf::Metadata GetMetadata() const;
butil::IOBuf& serialized_data() { return _serialized; }
const butil::IOBuf& serialized_data() const { return _serialized; }
protected:
::google::protobuf::Metadata GetMetadata() const;
private:
bool MergePartialFromCodedStream(
......@@ -78,13 +70,7 @@ private:
private:
butil::IOBuf _serialized;
friend void protobuf_AddDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
friend void protobuf_AssignDesc_baidu_2frpc_2fserialized_5frequest_2eproto();
friend void protobuf_ShutdownFile_baidu_2frpc_2fserialized_5frequest_2eproto();
void InitAsDefaultInstance();
static SerializedRequest* default_instance_;
static SerializedRequestBase _base;
};
} // namespace brpc
......
src/brpc/thrift_message.cpp
View file @ 585d5393
......@@ -30,86 +30,13 @@
namespace brpc {
namespace {
const ::google::protobuf::Descriptor* ThriftFramedMessage_descriptor_ = NULL;
} // namespace
void protobuf_AssignDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
const ::google::protobuf::FileDescriptor* file =
::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
"thrift_framed_message.proto");
GOOGLE_CHECK(file != NULL);
ThriftFramedMessage_descriptor_ = file->message_type(0);
}
namespace {
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
inline void protobuf_AssignDescriptorsOnce() {
::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
&protobuf_AssignDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto);
}
void protobuf_RegisterTypes(const ::std::string&) {
protobuf_AssignDescriptorsOnce();
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
ThriftFramedMessage_descriptor_, &ThriftFramedMessage::default_instance());
}
} // namespace
void protobuf_ShutdownFile_baidu_2frpc_2fthrift_framed_5fmessage_2eproto() {
delete ThriftFramedMessage::default_instance_;
}
void protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto_impl() {
GOOGLE_PROTOBUF_VERIFY_VERSION;
#if GOOGLE_PROTOBUF_VERSION >= 3002000
::google::protobuf::internal::InitProtobufDefaults();
#else
::google::protobuf::protobuf_AddDesc_google_2fprotobuf_2fdescriptor_2eproto();
#endif
::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
"\n\033thrift_framed_message.proto\022\004brpc\"\025\n\023ThriftFramedMessage", 58);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"thrift_framed_message.proto", &protobuf_RegisterTypes);
ThriftFramedMessage::default_instance_ = new ThriftFramedMessage();
ThriftFramedMessage::default_instance_->InitAsDefaultInstance();
::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_baidu_2frpc_2fthrift_framed_5fmessage_2eproto);
}
GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto_once);
void protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto() {
::google::protobuf::GoogleOnceInit(
&protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto_once,
&protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto_impl);
}
// Force AddDescriptors() to be called at static initialization time.
struct StaticDescriptorInitializer_baidu_2frpc_2fthrift_framed_5fmessage_2eproto {
StaticDescriptorInitializer_baidu_2frpc_2fthrift_framed_5fmessage_2eproto() {
protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
}
} static_descriptor_initializer_baidu_2frpc_2fthrift_framed_5fmessage_2eproto_;
// ===================================================================
#ifndef _MSC_VER
#endif // !_MSC_VER
ThriftFramedMessageBase ThriftFramedMessage::_base;
ThriftFramedMessage::ThriftFramedMessage()
: ::google::protobuf::Message() {
SharedCtor();
}
void ThriftFramedMessage::InitAsDefaultInstance() {
}
void ThriftFramedMessage::SharedCtor() {
field_id = THRIFT_INVALID_FID;
_own_raw_instance = false;
......@@ -124,23 +51,17 @@ ThriftFramedMessage::~ThriftFramedMessage() {
}
void ThriftFramedMessage::SharedDtor() {
if (this != default_instance_) {
}
}
const ::google::protobuf::Descriptor* ThriftFramedMessage::descriptor() {
protobuf_AssignDescriptorsOnce();
return ThriftFramedMessage_descriptor_;
return _base.GetDescriptor();
}
const ThriftFramedMessage& ThriftFramedMessage::default_instance() {
if (default_instance_ == NULL)
protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
return *default_instance_;
static ThriftFramedMessage message;
return message;
}
ThriftFramedMessage* ThriftFramedMessage::default_instance_ = NULL;
ThriftFramedMessage* ThriftFramedMessage::New() const {
return new ThriftFramedMessage;
}
......@@ -219,10 +140,9 @@ void ThriftFramedMessage::Swap(ThriftFramedMessage* other) {
}
::google::protobuf::Metadata ThriftFramedMessage::GetMetadata() const {
protobuf_AssignDescriptorsOnce();
::google::protobuf::Metadata metadata;
metadata.descriptor = ThriftFramedMessage_descriptor_;
metadata.reflection = NULL;
metadata.descriptor = _base.GetDescriptor();
metadata.reflection = _base.GetReflection();
return metadata;
}
......@@ -236,4 +156,3 @@ void ThriftStub::CallMethod(const char* method_name,
}
} // namespace brpc
src/brpc/thrift_message.h
View file @ 585d5393
......@@ -19,14 +19,7 @@
#include <functional>
#include <string>
#include <google/protobuf/stubs/common.h>
#include <google/protobuf/generated_message_util.h>
#include <google/protobuf/repeated_field.h>
#include <google/protobuf/extension_set.h>
#include <google/protobuf/generated_message_reflection.h>
#include "google/protobuf/descriptor.pb.h"
#include <google/protobuf/message.h>
#include "butil/iobuf.h"
#include "butil/class_name.h"
#include "brpc/channel_base.h"
......@@ -43,11 +36,6 @@ class TProtocol;
namespace brpc {
// Internal implementation detail -- do not call these.
void protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
void protobuf_AssignDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
void protobuf_ShutdownFile_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
class ThriftStub;
static const int16_t THRIFT_INVALID_FID = -1;
......@@ -110,18 +98,13 @@ public:
::google::protobuf::io::CodedOutputStream* output) const;
::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
int GetCachedSize() const { return ByteSize(); }
protected:
::google::protobuf::Metadata GetMetadata() const;
private:
void SharedCtor();
void SharedDtor();
private:
friend void protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto_impl();
friend void protobuf_AddDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
friend void protobuf_AssignDesc_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
friend void protobuf_ShutdownFile_baidu_2frpc_2fthrift_framed_5fmessage_2eproto();
void InitAsDefaultInstance();
static ThriftFramedMessage* default_instance_;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment