Commit c1b47d80 authored by Giorgio Azzinnaro's avatar Giorgio Azzinnaro

bumping up protobuf version to 3.5

parent f99a63bc
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.0)
project(ProfaneDB)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
......
......@@ -2,4 +2,4 @@ add_subdirectory(profanedb)
# Only install headers and proto files
install(DIRECTORY profanedb DESTINATION include
FILES_MATCHING REGEX "^.*\.(hpp|h|proto)$")
FILES_MATCHING REGEX "^.*\\.(hpp|h|proto)$")
......@@ -2,7 +2,7 @@
ProfaneDB/protobuf build - master
======
f415123843fb9513a4ad6794a3635ee42e82e601
552295886bdcdccbb08c537f96438d1ba05a07b3
*built by giorgio.azzinnaro@gmail.com on Sat Jul 8 16:51:00 UTC 2017*
*built by giorgio.azzinnaro@gmail.com on Sun Dec 31 04:25:43 UTC 2017*
......@@ -28,50 +28,62 @@ std::unique_ptr< Db::Stub> Db::NewStub(const std::shared_ptr< ::grpc::ChannelInt
}
Db::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel)
: channel_(channel), rpcmethod_Get_(Db_method_names[0], ::grpc::RpcMethod::NORMAL_RPC, channel)
, rpcmethod_Put_(Db_method_names[1], ::grpc::RpcMethod::NORMAL_RPC, channel)
, rpcmethod_Delete_(Db_method_names[2], ::grpc::RpcMethod::NORMAL_RPC, channel)
: channel_(channel), rpcmethod_Get_(Db_method_names[0], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
, rpcmethod_Put_(Db_method_names[1], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
, rpcmethod_Delete_(Db_method_names[2], ::grpc::internal::RpcMethod::NORMAL_RPC, channel)
{}
::grpc::Status Db::Stub::Get(::grpc::ClientContext* context, const ::profanedb::protobuf::GetReq& request, ::profanedb::protobuf::GetResp* response) {
return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_Get_, context, request, response);
return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_Get_, context, request, response);
}
::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::GetResp>* Db::Stub::AsyncGetRaw(::grpc::ClientContext* context, const ::profanedb::protobuf::GetReq& request, ::grpc::CompletionQueue* cq) {
return ::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::GetResp>::Create(channel_.get(), cq, rpcmethod_Get_, context, request);
return ::grpc::internal::ClientAsyncResponseReaderFactory< ::profanedb::protobuf::GetResp>::Create(channel_.get(), cq, rpcmethod_Get_, context, request, true);
}
::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::GetResp>* Db::Stub::PrepareAsyncGetRaw(::grpc::ClientContext* context, const ::profanedb::protobuf::GetReq& request, ::grpc::CompletionQueue* cq) {
return ::grpc::internal::ClientAsyncResponseReaderFactory< ::profanedb::protobuf::GetResp>::Create(channel_.get(), cq, rpcmethod_Get_, context, request, false);
}
::grpc::Status Db::Stub::Put(::grpc::ClientContext* context, const ::profanedb::protobuf::PutReq& request, ::profanedb::protobuf::PutResp* response) {
return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_Put_, context, request, response);
return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_Put_, context, request, response);
}
::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::PutResp>* Db::Stub::AsyncPutRaw(::grpc::ClientContext* context, const ::profanedb::protobuf::PutReq& request, ::grpc::CompletionQueue* cq) {
return ::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::PutResp>::Create(channel_.get(), cq, rpcmethod_Put_, context, request);
return ::grpc::internal::ClientAsyncResponseReaderFactory< ::profanedb::protobuf::PutResp>::Create(channel_.get(), cq, rpcmethod_Put_, context, request, true);
}
::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::PutResp>* Db::Stub::PrepareAsyncPutRaw(::grpc::ClientContext* context, const ::profanedb::protobuf::PutReq& request, ::grpc::CompletionQueue* cq) {
return ::grpc::internal::ClientAsyncResponseReaderFactory< ::profanedb::protobuf::PutResp>::Create(channel_.get(), cq, rpcmethod_Put_, context, request, false);
}
::grpc::Status Db::Stub::Delete(::grpc::ClientContext* context, const ::profanedb::protobuf::DelReq& request, ::profanedb::protobuf::DelResp* response) {
return ::grpc::BlockingUnaryCall(channel_.get(), rpcmethod_Delete_, context, request, response);
return ::grpc::internal::BlockingUnaryCall(channel_.get(), rpcmethod_Delete_, context, request, response);
}
::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::DelResp>* Db::Stub::AsyncDeleteRaw(::grpc::ClientContext* context, const ::profanedb::protobuf::DelReq& request, ::grpc::CompletionQueue* cq) {
return ::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::DelResp>::Create(channel_.get(), cq, rpcmethod_Delete_, context, request);
return ::grpc::internal::ClientAsyncResponseReaderFactory< ::profanedb::protobuf::DelResp>::Create(channel_.get(), cq, rpcmethod_Delete_, context, request, true);
}
::grpc::ClientAsyncResponseReader< ::profanedb::protobuf::DelResp>* Db::Stub::PrepareAsyncDeleteRaw(::grpc::ClientContext* context, const ::profanedb::protobuf::DelReq& request, ::grpc::CompletionQueue* cq) {
return ::grpc::internal::ClientAsyncResponseReaderFactory< ::profanedb::protobuf::DelResp>::Create(channel_.get(), cq, rpcmethod_Delete_, context, request, false);
}
Db::Service::Service() {
AddMethod(new ::grpc::RpcServiceMethod(
AddMethod(new ::grpc::internal::RpcServiceMethod(
Db_method_names[0],
::grpc::RpcMethod::NORMAL_RPC,
new ::grpc::RpcMethodHandler< Db::Service, ::profanedb::protobuf::GetReq, ::profanedb::protobuf::GetResp>(
::grpc::internal::RpcMethod::NORMAL_RPC,
new ::grpc::internal::RpcMethodHandler< Db::Service, ::profanedb::protobuf::GetReq, ::profanedb::protobuf::GetResp>(
std::mem_fn(&Db::Service::Get), this)));
AddMethod(new ::grpc::RpcServiceMethod(
AddMethod(new ::grpc::internal::RpcServiceMethod(
Db_method_names[1],
::grpc::RpcMethod::NORMAL_RPC,
new ::grpc::RpcMethodHandler< Db::Service, ::profanedb::protobuf::PutReq, ::profanedb::protobuf::PutResp>(
::grpc::internal::RpcMethod::NORMAL_RPC,
new ::grpc::internal::RpcMethodHandler< Db::Service, ::profanedb::protobuf::PutReq, ::profanedb::protobuf::PutResp>(
std::mem_fn(&Db::Service::Put), this)));
AddMethod(new ::grpc::RpcServiceMethod(
AddMethod(new ::grpc::internal::RpcServiceMethod(
Db_method_names[2],
::grpc::RpcMethod::NORMAL_RPC,
new ::grpc::RpcMethodHandler< Db::Service, ::profanedb::protobuf::DelReq, ::profanedb::protobuf::DelResp>(
::grpc::internal::RpcMethod::NORMAL_RPC,
new ::grpc::internal::RpcMethodHandler< Db::Service, ::profanedb::protobuf::DelReq, ::profanedb::protobuf::DelResp>(
std::mem_fn(&Db::Service::Delete), this)));
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -38,7 +38,6 @@
namespace grpc {
class CompletionQueue;
class Channel;
class RpcService;
class ServerCompletionQueue;
class ServerContext;
} // namespace grpc
......
This diff is collapsed.
......@@ -8,12 +8,12 @@
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION < 3003000
#if GOOGLE_PROTOBUF_VERSION < 3005000
#error This file was generated by a newer version of protoc which is
#error incompatible with your Protocol Buffer headers. Please update
#error your headers.
#endif
#if 3003000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#if 3005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
#error This file was generated by an older version of protoc which is
#error incompatible with your Protocol Buffer headers. Please
#error regenerate this file with a newer version of protoc.
......@@ -31,109 +31,33 @@
#include <google/protobuf/unknown_field_set.h>
#include <google/protobuf/descriptor.pb.h>
// @@protoc_insertion_point(includes)
namespace google {
namespace protobuf {
class DescriptorProto;
class DescriptorProtoDefaultTypeInternal;
extern DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_;
class DescriptorProto_ExtensionRange;
class DescriptorProto_ExtensionRangeDefaultTypeInternal;
extern DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_;
class DescriptorProto_ReservedRange;
class DescriptorProto_ReservedRangeDefaultTypeInternal;
extern DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_;
class EnumDescriptorProto;
class EnumDescriptorProtoDefaultTypeInternal;
extern EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_;
class EnumOptions;
class EnumOptionsDefaultTypeInternal;
extern EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_;
class EnumValueDescriptorProto;
class EnumValueDescriptorProtoDefaultTypeInternal;
extern EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_;
class EnumValueOptions;
class EnumValueOptionsDefaultTypeInternal;
extern EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_;
class FieldDescriptorProto;
class FieldDescriptorProtoDefaultTypeInternal;
extern FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_;
class FieldOptions;
class FieldOptionsDefaultTypeInternal;
extern FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
class FileDescriptorProto;
class FileDescriptorProtoDefaultTypeInternal;
extern FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_;
class FileDescriptorSet;
class FileDescriptorSetDefaultTypeInternal;
extern FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_;
class FileOptions;
class FileOptionsDefaultTypeInternal;
extern FileOptionsDefaultTypeInternal _FileOptions_default_instance_;
class GeneratedCodeInfo;
class GeneratedCodeInfoDefaultTypeInternal;
extern GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_;
class GeneratedCodeInfo_Annotation;
class GeneratedCodeInfo_AnnotationDefaultTypeInternal;
extern GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_;
class MessageOptions;
class MessageOptionsDefaultTypeInternal;
extern MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_;
class MethodDescriptorProto;
class MethodDescriptorProtoDefaultTypeInternal;
extern MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_;
class MethodOptions;
class MethodOptionsDefaultTypeInternal;
extern MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_;
class OneofDescriptorProto;
class OneofDescriptorProtoDefaultTypeInternal;
extern OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_;
class OneofOptions;
class OneofOptionsDefaultTypeInternal;
extern OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_;
class ServiceDescriptorProto;
class ServiceDescriptorProtoDefaultTypeInternal;
extern ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_;
class ServiceOptions;
class ServiceOptionsDefaultTypeInternal;
extern ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_;
class SourceCodeInfo;
class SourceCodeInfoDefaultTypeInternal;
extern SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_;
class SourceCodeInfo_Location;
class SourceCodeInfo_LocationDefaultTypeInternal;
extern SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_;
class UninterpretedOption;
class UninterpretedOptionDefaultTypeInternal;
extern UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_;
class UninterpretedOption_NamePart;
class UninterpretedOption_NamePartDefaultTypeInternal;
extern UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_;
} // namespace protobuf
} // namespace google
namespace profanedb {
namespace protobuf {
class FieldOptions;
class FieldOptionsDefaultTypeInternal;
extern FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
} // namespace protobuf
} // namespace profanedb
namespace profanedb {
namespace protobuf {
namespace protobuf_profanedb_2fprotobuf_2foptions_2eproto {
// Internal implementation detail -- do not call these.
// Internal implementation detail -- do not use these members.
struct TableStruct {
static const ::google::protobuf::internal::ParseTableField entries[];
static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
static const ::google::protobuf::internal::ParseTable schema[];
static const ::google::protobuf::internal::ParseTable schema[1];
static const ::google::protobuf::internal::FieldMetadata field_metadata[];
static const ::google::protobuf::internal::SerializationTable serialization_table[];
static const ::google::protobuf::uint32 offsets[];
static void InitDefaultsImpl();
static void Shutdown();
};
void AddDescriptors();
void InitDefaults();
void InitDefaultsFieldOptionsImpl();
void InitDefaultsFieldOptions();
inline void InitDefaults() {
InitDefaultsFieldOptions();
}
} // namespace protobuf_profanedb_2fprotobuf_2foptions_2eproto
namespace profanedb {
namespace protobuf {
class FieldOptions;
class FieldOptionsDefaultTypeInternal;
extern FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
} // namespace protobuf
} // namespace profanedb
namespace profanedb {
namespace protobuf {
// ===================================================================
......@@ -148,11 +72,24 @@ class FieldOptions : public ::google::protobuf::Message /* @@protoc_insertion_po
CopyFrom(from);
return *this;
}
#if LANG_CXX11
FieldOptions(FieldOptions&& from) noexcept
: FieldOptions() {
*this = ::std::move(from);
}
inline FieldOptions& operator=(FieldOptions&& from) noexcept {
if (GetArenaNoVirtual() == from.GetArenaNoVirtual()) {
if (this != &from) InternalSwap(&from);
} else {
CopyFrom(from);
}
return *this;
}
#endif
inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
return _internal_metadata_.unknown_fields();
}
inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
return _internal_metadata_.mutable_unknown_fields();
}
......@@ -160,6 +97,7 @@ class FieldOptions : public ::google::protobuf::Message /* @@protoc_insertion_po
static const ::google::protobuf::Descriptor* descriptor();
static const FieldOptions& default_instance();
static void InitAsDefaultInstance(); // FOR INTERNAL USE ONLY
static inline const FieldOptions* internal_default_instance() {
return reinterpret_cast<const FieldOptions*>(
&_FieldOptions_default_instance_);
......@@ -168,6 +106,9 @@ class FieldOptions : public ::google::protobuf::Message /* @@protoc_insertion_po
0;
void Swap(FieldOptions* other);
friend void swap(FieldOptions& a, FieldOptions& b) {
a.Swap(&b);
}
// implements Message ----------------------------------------------
......@@ -225,7 +166,8 @@ class FieldOptions : public ::google::protobuf::Message /* @@protoc_insertion_po
::google::protobuf::internal::HasBits<1> _has_bits_;
mutable int _cached_size_;
bool key_;
friend struct protobuf_profanedb_2fprotobuf_2foptions_2eproto::TableStruct;
friend struct ::protobuf_profanedb_2fprotobuf_2foptions_2eproto::TableStruct;
friend void ::protobuf_profanedb_2fprotobuf_2foptions_2eproto::InitDefaultsFieldOptionsImpl();
};
// ===================================================================
......@@ -236,7 +178,10 @@ extern ::google::protobuf::internal::ExtensionIdentifier< ::google::protobuf::Fi
// ===================================================================
#if !PROTOBUF_INLINE_NOT_IN_HEADERS
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif // __GNUC__
// FieldOptions
// optional bool key = 1;
......@@ -263,11 +208,12 @@ inline void FieldOptions::set_key(bool value) {
// @@protoc_insertion_point(field_set:profanedb.protobuf.FieldOptions.key)
}
#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif // __GNUC__
// @@protoc_insertion_point(namespace_scope)
} // namespace protobuf
} // namespace profanedb
......
......@@ -38,7 +38,6 @@
namespace grpc {
class CompletionQueue;
class Channel;
class RpcService;
class ServerCompletionQueue;
class ServerContext;
} // namespace grpc
......
This diff is collapsed.
This diff is collapsed.
......@@ -27,6 +27,7 @@
#include <boost/random/uniform_int_distribution.hpp>
#include <google/protobuf/message.h>
#include <google/protobuf/stubs/port.h>
namespace profanedb {
namespace util {
......
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