Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

addressed review feedback.

Browse Source 
moved method computation in a if block only when send_initial_metadata
is true.
pull/7862/head
Makarand Dharmapurikar 9 years ago
parent 432d1db177
commit b94656d20e
1 changed files with 48 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 96
      src/core/lib/channel/http_client_filter.c

96
src/core/lib/channel/http_client_filter.c
Unescape View File

@ -208,57 +208,57 @@ static void hc_mutate_op(grpc_exec_ctx *exec_ctx, grpc_call_element *elem,
call_data *calld = elem->call_data; call_data *calld = elem->call_data;
channel_data *channeld = elem->channel_data; channel_data *channeld = elem->channel_data;
/* Decide which HTTP VERB to use. We use GET if the request is marked if (op->send_initial_metadata != NULL) {
cacheable, and the operation contains both initial metadata and send message, /* Decide which HTTP VERB to use. We use GET if the request is marked
and the payload is below the size threshold, and all the data cacheable, and the operation contains both initial metadata and send
for this request is immediately available. */ message, and the payload is below the size threshold, and all the data
grpc_mdelem *method = GRPC_MDELEM_METHOD_POST; for this request is immediately available. */
calld->send_message_blocked = false; grpc_mdelem *method = GRPC_MDELEM_METHOD_POST;
if (op->send_initial_metadata != NULL && calld->send_message_blocked = false;
(op->send_initial_metadata_flags & if ((op->send_initial_metadata_flags &
GRPC_INITIAL_METADATA_CACHEABLE_REQUEST) && GRPC_INITIAL_METADATA_CACHEABLE_REQUEST) &&
op->send_message != NULL && op->send_message != NULL &&
op->send_message->length < channeld->max_payload_size_for_get) { op->send_message->length < channeld->max_payload_size_for_get) {
method = GRPC_MDELEM_METHOD_GET; method = GRPC_MDELEM_METHOD_GET;
calld->send_message_blocked = true; calld->send_message_blocked = true;
} else if (op->send_initial_metadata_flags & } else if (op->send_initial_metadata_flags &
GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST) { GRPC_INITIAL_METADATA_IDEMPOTENT_REQUEST) {
method = GRPC_MDELEM_METHOD_PUT; method = GRPC_MDELEM_METHOD_PUT;
} }
/* Attempt to read the data from send_message and create a header field. */
if (method == GRPC_MDELEM_METHOD_GET) {
/* allocate memory to hold the entire payload */
calld->payload_bytes = gpr_malloc(op->send_message->length);
GPR_ASSERT(calld->payload_bytes);
/* read slices of send_message and copy into payload_bytes */
calld->send_op = *op;
calld->send_length = op->send_message->length;
calld->send_flags = op->send_message->flags;
continue_send_message(exec_ctx, elem);
if (calld->send_message_blocked == false) { /* Attempt to read the data from send_message and create a header field. */
/* when all the send_message data is available, then create a MDELEM and if (method == GRPC_MDELEM_METHOD_GET) {
append to headers */ /* allocate memory to hold the entire payload */
grpc_mdelem *payload_bin = grpc_mdelem_from_metadata_strings( calld->payload_bytes = gpr_malloc(op->send_message->length);
GRPC_MDSTR_GRPC_PAYLOAD_BIN, GPR_ASSERT(calld->payload_bytes);
grpc_mdstr_from_buffer(calld->payload_bytes,
op->send_message->length)); /* read slices of send_message and copy into payload_bytes */
grpc_metadata_batch_add_tail(op->send_initial_metadata, calld->send_op = *op;
&calld->payload_bin, payload_bin); calld->send_length = op->send_message->length;
calld->on_complete = op->on_complete; calld->send_flags = op->send_message->flags;
op->on_complete = &calld->hc_on_complete; continue_send_message(exec_ctx, elem);
op->send_message = NULL;
} else { if (calld->send_message_blocked == false) {
/* Not all data is available. Fall back to POST. */ /* when all the send_message data is available, then create a MDELEM and
gpr_log(GPR_DEBUG, append to headers */
"Request is marked Cacheable but not all data is available.\ grpc_mdelem *payload_bin = grpc_mdelem_from_metadata_strings(
Falling back to POST"); GRPC_MDSTR_GRPC_PAYLOAD_BIN,
method = GRPC_MDELEM_METHOD_POST; grpc_mdstr_from_buffer(calld->payload_bytes,
op->send_message->length));
grpc_metadata_batch_add_tail(op->send_initial_metadata,
&calld->payload_bin, payload_bin);
calld->on_complete = op->on_complete;
op->on_complete = &calld->hc_on_complete;
op->send_message = NULL;
} else {
/* Not all data is available. Fall back to POST. */
gpr_log(GPR_DEBUG,
"Request is marked Cacheable but not all data is available.\
Falling back to POST");
method = GRPC_MDELEM_METHOD_POST;
}
} }
}
if (op->send_initial_metadata != NULL) {
grpc_metadata_batch_filter(op->send_initial_metadata, client_strip_filter, grpc_metadata_batch_filter(op->send_initial_metadata, client_strip_filter,
elem); elem);
/* Send : prefixed headers, which have to be before any application /* Send : prefixed headers, which have to be before any application

Write Preview
Loading…
Cancel
Save