Merge github.com:grpc/grpc into maxmsgsz
diff --git a/include/grpc++/impl/codegen/call.h b/include/grpc++/impl/codegen/call.h
index dd6c83a..8eac96b 100644
--- a/include/grpc++/impl/codegen/call.h
+++ b/include/grpc++/impl/codegen/call.h
@@ -162,7 +162,7 @@
class CallNoOp {
protected:
void AddOp(grpc_op* ops, size_t* nops) {}
- void FinishOp(bool* status, int max_receive_message_size) {}
+ void FinishOp(bool* status) {}
};
class CallOpSendInitialMetadata {
@@ -200,7 +200,7 @@
op->data.send_initial_metadata.maybe_compression_level.level =
maybe_compression_level_.level;
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (!send_) return;
g_core_codegen_interface->gpr_free(initial_metadata_);
send_ = false;
@@ -240,7 +240,7 @@
// Flags are per-message: clear them after use.
write_options_.Clear();
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (own_buf_) g_core_codegen_interface->grpc_byte_buffer_destroy(send_buf_);
send_buf_ = nullptr;
}
@@ -288,14 +288,12 @@
op->data.recv_message = &recv_buf_;
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (message_ == nullptr) return;
if (recv_buf_) {
if (*status) {
got_message = *status =
- SerializationTraits<R>::Deserialize(recv_buf_, message_,
- max_receive_message_size)
- .ok();
+ SerializationTraits<R>::Deserialize(recv_buf_, message_).ok();
} else {
got_message = false;
g_core_codegen_interface->grpc_byte_buffer_destroy(recv_buf_);
@@ -318,8 +316,7 @@
namespace CallOpGenericRecvMessageHelper {
class DeserializeFunc {
public:
- virtual Status Deserialize(grpc_byte_buffer* buf,
- int max_receive_message_size) = 0;
+ virtual Status Deserialize(grpc_byte_buffer* buf) = 0;
virtual ~DeserializeFunc() {}
};
@@ -327,10 +324,8 @@
class DeserializeFuncType final : public DeserializeFunc {
public:
DeserializeFuncType(R* message) : message_(message) {}
- Status Deserialize(grpc_byte_buffer* buf,
- int max_receive_message_size) override {
- return SerializationTraits<R>::Deserialize(buf, message_,
- max_receive_message_size);
+ Status Deserialize(grpc_byte_buffer* buf) override {
+ return SerializationTraits<R>::Deserialize(buf, message_);
}
~DeserializeFuncType() override {}
@@ -369,13 +364,12 @@
op->data.recv_message = &recv_buf_;
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (!deserialize_) return;
if (recv_buf_) {
if (*status) {
got_message = true;
- *status =
- deserialize_->Deserialize(recv_buf_, max_receive_message_size).ok();
+ *status = deserialize_->Deserialize(recv_buf_).ok();
} else {
got_message = false;
g_core_codegen_interface->grpc_byte_buffer_destroy(recv_buf_);
@@ -409,7 +403,7 @@
op->flags = 0;
op->reserved = NULL;
}
- void FinishOp(bool* status, int max_receive_message_size) { send_ = false; }
+ void FinishOp(bool* status) { send_ = false; }
private:
bool send_;
@@ -445,7 +439,7 @@
op->reserved = NULL;
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (!send_status_available_) return;
g_core_codegen_interface->gpr_free(trailing_metadata_);
send_status_available_ = false;
@@ -478,7 +472,7 @@
op->flags = 0;
op->reserved = NULL;
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (metadata_map_ == nullptr) return;
metadata_map_->FillMap();
metadata_map_ = nullptr;
@@ -509,7 +503,7 @@
op->reserved = NULL;
}
- void FinishOp(bool* status, int max_receive_message_size) {
+ void FinishOp(bool* status) {
if (recv_status_ == nullptr) return;
metadata_map_->FillMap();
*recv_status_ = Status(static_cast<StatusCode>(status_code_),
@@ -544,22 +538,17 @@
/// API.
class CallOpSetInterface : public CompletionQueueTag {
public:
- CallOpSetInterface() : max_receive_message_size_(0) {}
+ CallOpSetInterface() {}
/// Fills in grpc_op, starting from ops[*nops] and moving
/// upwards.
virtual void FillOps(grpc_op* ops, size_t* nops) = 0;
- void set_max_receive_message_size(int max_receive_message_size) {
- max_receive_message_size_ = max_receive_message_size;
- }
-
/// Mark this as belonging to a collection if needed
void SetCollection(std::shared_ptr<CallOpSetCollectionInterface> collection) {
collection_ = collection;
}
protected:
- int max_receive_message_size_;
std::shared_ptr<CallOpSetCollectionInterface> collection_;
};
@@ -591,12 +580,12 @@
}
bool FinalizeResult(void** tag, bool* status) override {
- this->Op1::FinishOp(status, max_receive_message_size_);
- this->Op2::FinishOp(status, max_receive_message_size_);
- this->Op3::FinishOp(status, max_receive_message_size_);
- this->Op4::FinishOp(status, max_receive_message_size_);
- this->Op5::FinishOp(status, max_receive_message_size_);
- this->Op6::FinishOp(status, max_receive_message_size_);
+ this->Op1::FinishOp(status);
+ this->Op2::FinishOp(status);
+ this->Op3::FinishOp(status);
+ this->Op4::FinishOp(status);
+ this->Op5::FinishOp(status);
+ this->Op6::FinishOp(status);
*tag = return_tag_;
collection_.reset(); // drop the ref at this point
return true;
@@ -628,35 +617,19 @@
public:
/* call is owned by the caller */
Call(grpc_call* call, CallHook* call_hook, CompletionQueue* cq)
- : call_hook_(call_hook),
- cq_(cq),
- call_(call),
- max_receive_message_size_(-1) {}
-
- Call(grpc_call* call, CallHook* call_hook, CompletionQueue* cq,
- int max_receive_message_size)
- : call_hook_(call_hook),
- cq_(cq),
- call_(call),
- max_receive_message_size_(max_receive_message_size) {}
+ : call_hook_(call_hook), cq_(cq), call_(call) {}
void PerformOps(CallOpSetInterface* ops) {
- if (max_receive_message_size_ > 0) {
- ops->set_max_receive_message_size(max_receive_message_size_);
- }
call_hook_->PerformOpsOnCall(ops, this);
}
grpc_call* call() const { return call_; }
CompletionQueue* cq() const { return cq_; }
- int max_receive_message_size() { return max_receive_message_size_; }
-
private:
CallHook* call_hook_;
CompletionQueue* cq_;
grpc_call* call_;
- int max_receive_message_size_;
};
} // namespace grpc
diff --git a/include/grpc++/impl/codegen/method_handler_impl.h b/include/grpc++/impl/codegen/method_handler_impl.h
index d5d27e1..83b569c 100644
--- a/include/grpc++/impl/codegen/method_handler_impl.h
+++ b/include/grpc++/impl/codegen/method_handler_impl.h
@@ -52,8 +52,8 @@
void RunHandler(const HandlerParameter& param) final {
RequestType req;
- Status status = SerializationTraits<RequestType>::Deserialize(
- param.request, &req, param.max_receive_message_size);
+ Status status =
+ SerializationTraits<RequestType>::Deserialize(param.request, &req);
ResponseType rsp;
if (status.ok()) {
status = func_(service_, param.server_context, &req, &rsp);
@@ -138,8 +138,8 @@
void RunHandler(const HandlerParameter& param) final {
RequestType req;
- Status status = SerializationTraits<RequestType>::Deserialize(
- param.request, &req, param.max_receive_message_size);
+ Status status =
+ SerializationTraits<RequestType>::Deserialize(param.request, &req);
if (status.ok()) {
ServerWriter<ResponseType> writer(param.call, param.server_context);
diff --git a/include/grpc++/impl/codegen/proto_utils.h b/include/grpc++/impl/codegen/proto_utils.h
index 2f15487..2123b62 100644
--- a/include/grpc++/impl/codegen/proto_utils.h
+++ b/include/grpc++/impl/codegen/proto_utils.h
@@ -203,8 +203,7 @@
}
static Status Deserialize(grpc_byte_buffer* buffer,
- grpc::protobuf::Message* msg,
- int max_receive_message_size) {
+ grpc::protobuf::Message* msg) {
if (buffer == nullptr) {
return Status(StatusCode::INTERNAL, "No payload");
}
@@ -215,10 +214,7 @@
return reader.status();
}
::grpc::protobuf::io::CodedInputStream decoder(&reader);
- if (max_receive_message_size > 0) {
- decoder.SetTotalBytesLimit(max_receive_message_size,
- max_receive_message_size);
- }
+ decoder.SetTotalBytesLimit(INT_MAX, INT_MAX);
if (!msg->ParseFromCodedStream(&decoder)) {
result = Status(StatusCode::INTERNAL, msg->InitializationErrorString());
}
diff --git a/include/grpc++/impl/codegen/rpc_service_method.h b/include/grpc++/impl/codegen/rpc_service_method.h
index 78c54e3..eb8f9a1 100644
--- a/include/grpc++/impl/codegen/rpc_service_method.h
+++ b/include/grpc++/impl/codegen/rpc_service_method.h
@@ -57,17 +57,12 @@
public:
virtual ~MethodHandler() {}
struct HandlerParameter {
- HandlerParameter(Call* c, ServerContext* context, grpc_byte_buffer* req,
- int max_size)
- : call(c),
- server_context(context),
- request(req),
- max_receive_message_size(max_size) {}
+ HandlerParameter(Call* c, ServerContext* context, grpc_byte_buffer* req)
+ : call(c), server_context(context), request(req) {}
Call* call;
ServerContext* server_context;
// Handler required to grpc_byte_buffer_destroy this
grpc_byte_buffer* request;
- int max_receive_message_size;
};
virtual void RunHandler(const HandlerParameter& param) = 0;
};
diff --git a/include/grpc++/impl/codegen/server_interface.h b/include/grpc++/impl/codegen/server_interface.h
index af1bf6f..bd1b36e 100644
--- a/include/grpc++/impl/codegen/server_interface.h
+++ b/include/grpc++/impl/codegen/server_interface.h
@@ -198,9 +198,7 @@
bool FinalizeResult(void** tag, bool* status) override {
bool serialization_status =
*status && payload_ &&
- SerializationTraits<Message>::Deserialize(
- payload_, request_, server_->max_receive_message_size())
- .ok();
+ SerializationTraits<Message>::Deserialize(payload_, request_).ok();
bool ret = RegisteredAsyncRequest::FinalizeResult(tag, status);
*status = serialization_status && *status;
return ret;
diff --git a/include/grpc++/impl/codegen/sync_stream.h b/include/grpc++/impl/codegen/sync_stream.h
index 4d9b074..1f7708b 100644
--- a/include/grpc++/impl/codegen/sync_stream.h
+++ b/include/grpc++/impl/codegen/sync_stream.h
@@ -160,7 +160,7 @@
}
bool NextMessageSize(uint32_t* sz) override {
- *sz = call_.max_receive_message_size();
+ *sz = INT_MAX;
return true;
}
@@ -310,7 +310,7 @@
}
bool NextMessageSize(uint32_t* sz) override {
- *sz = call_.max_receive_message_size();
+ *sz = INT_MAX;
return true;
}
@@ -382,7 +382,7 @@
}
bool NextMessageSize(uint32_t* sz) override {
- *sz = call_->max_receive_message_size();
+ *sz = INT_MAX;
return true;
}
@@ -474,7 +474,7 @@
}
bool NextMessageSize(uint32_t* sz) {
- *sz = call_->max_receive_message_size();
+ *sz = INT_MAX;
return true;
}
diff --git a/include/grpc++/support/byte_buffer.h b/include/grpc++/support/byte_buffer.h
index 1f317df..064a03b 100644
--- a/include/grpc++/support/byte_buffer.h
+++ b/include/grpc++/support/byte_buffer.h
@@ -95,8 +95,7 @@
template <>
class SerializationTraits<ByteBuffer, void> {
public:
- static Status Deserialize(grpc_byte_buffer* byte_buffer, ByteBuffer* dest,
- int max_receive_message_size) {
+ static Status Deserialize(grpc_byte_buffer* byte_buffer, ByteBuffer* dest) {
dest->set_buffer(byte_buffer);
return Status::OK;
}
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index dcc56ee..f6a7f1d 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -186,7 +186,7 @@
public:
explicit CallData(Server* server, SyncRequest* mrd)
: cq_(mrd->cq_),
- call_(mrd->call_, server, &cq_, server->max_receive_message_size_),
+ call_(mrd->call_, server, &cq_),
ctx_(mrd->deadline_, mrd->request_metadata_.metadata,
mrd->request_metadata_.count),
has_request_payload_(mrd->has_request_payload_),
@@ -208,8 +208,8 @@
void Run(std::shared_ptr<GlobalCallbacks> global_callbacks) {
ctx_.BeginCompletionOp(&call_);
global_callbacks->PreSynchronousRequest(&ctx_);
- method_->handler()->RunHandler(MethodHandler::HandlerParameter(
- &call_, &ctx_, request_payload_, call_.max_receive_message_size()));
+ method_->handler()->RunHandler(
+ MethodHandler::HandlerParameter(&call_, &ctx_, request_payload_));
global_callbacks->PostSynchronousRequest(&ctx_);
request_payload_ = nullptr;
void* ignored_tag;
@@ -589,7 +589,7 @@
}
context_->set_call(call_);
context_->cq_ = call_cq_;
- Call call(call_, server_, call_cq_, server_->max_receive_message_size());
+ Call call(call_, server_, call_cq_);
if (*status && call_) {
context_->BeginCompletionOp(&call);
}