X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fresponse.cc;h=061f7401fee84a19dbd462a0564601ebce5a7276;hb=bd53173d0a23c8c2a0dac68056cbd2cc52d5a6ef;hp=ff1d77b1bd7954a4f69bf7c7b0d603baccf138c4;hpb=625e84ebfc422790372bc2984f504bdcb4da779c;p=m6w6%2Flibmemcached diff --git a/libmemcached/response.cc b/libmemcached/response.cc index ff1d77b1..061f7401 100644 --- a/libmemcached/response.cc +++ b/libmemcached/response.cc @@ -1,5 +1,5 @@ /* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: - * + * * Libmemcached library * * Copyright (C) 2011 Data Differential, http://datadifferential.com/ @@ -36,6 +36,7 @@ */ #include +#include static memcached_return_t textual_read_one_response(memcached_server_write_instance_st ptr, char *buffer, size_t buffer_length, @@ -58,15 +59,21 @@ memcached_return_t memcached_read_one_response(memcached_server_write_instance_s memcached_return_t rc; if (ptr->root->flags.binary_protocol) + { rc= binary_read_one_response(ptr, buffer, buffer_length, result); + } else + { rc= textual_read_one_response(ptr, buffer, buffer_length, result); + } unlikely(rc == MEMCACHED_UNKNOWN_READ_FAILURE or rc == MEMCACHED_PROTOCOL_ERROR or rc == MEMCACHED_CLIENT_ERROR or rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE) + { memcached_io_reset(ptr); + } return rc; } @@ -119,7 +126,9 @@ static memcached_return_t textual_value_fetch(memcached_server_write_instance_st ssize_t read_length= 0; if (ptr->root->flags.use_udp) + { return memcached_set_error(*ptr, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT); + } WATCHPOINT_ASSERT(ptr->root); end_ptr= buffer + MEMCACHED_DEFAULT_COMMAND_SIZE; @@ -138,7 +147,7 @@ static memcached_return_t textual_value_fetch(memcached_server_write_instance_st key= result->item_key; result->key_length= 0; - for (prefix_length= memcached_array_size(ptr->root->prefix_key); !(iscntrl(*string_ptr) || isspace(*string_ptr)) ; string_ptr++) + for (prefix_length= memcached_array_size(ptr->root->_namespace); !(iscntrl(*string_ptr) || isspace(*string_ptr)) ; string_ptr++) { if (prefix_length == 0) { @@ -196,7 +205,6 @@ static memcached_return_t textual_value_fetch(memcached_server_write_instance_st /* We add two bytes so that we can walk the \r\n */ if (memcached_failed(memcached_string_check(&result->value, value_length +2))) { - value_length= 0; return memcached_set_error(*ptr, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); } @@ -214,7 +222,7 @@ static memcached_return_t textual_value_fetch(memcached_server_write_instance_st if (memcached_failed(rrc) and rrc == MEMCACHED_IN_PROGRESS) { memcached_quit_server(ptr, true); - return memcached_set_error(*ptr, rrc, MEMCACHED_AT); + return memcached_set_error(*ptr, MEMCACHED_IN_PROGRESS, MEMCACHED_AT); } else if (memcached_failed(rrc)) { @@ -248,7 +256,9 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta char *buffer, size_t buffer_length, memcached_result_st *result) { - memcached_return_t rc= memcached_io_readline(ptr, buffer, buffer_length); + size_t total_read; + memcached_return_t rc= memcached_io_readline(ptr, buffer, buffer_length, total_read); + if (memcached_failed(rc)) { return rc; @@ -274,6 +284,7 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta } case 'O': /* OK */ return MEMCACHED_SUCCESS; + case 'S': /* STORED STATS SERVER_ERROR */ { if (buffer[2] == 'A') /* STORED STATS */ @@ -283,36 +294,33 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta } else if (buffer[1] == 'E') /* SERVER_ERROR */ { - char *rel_ptr; - char *startptr= buffer + 13, *endptr= startptr; + if (total_read == memcached_literal_param_size("SERVER_ERROR")) + { + return MEMCACHED_SERVER_ERROR; + } - while (*endptr != '\r' && *endptr != '\n') endptr++; + if (total_read > memcached_literal_param_size("SERVER_ERROR object too large for cache") and + (memcmp(buffer, memcached_literal_param("SERVER_ERROR object too large for cache")) == 0)) + { + return MEMCACHED_E2BIG; + } - /* - Yes, we could make this "efficent" but to do that we would need - to maintain more state for the size of the buffer. Why waste - memory in the struct, which is important, for something that - rarely should happen? - */ - rel_ptr= (char *)libmemcached_realloc(ptr->root, - ptr->cached_server_error, - (size_t) (endptr - startptr + 1)); - - if (rel_ptr == NULL) + // Move past the basic error message and whitespace + char *startptr= buffer + memcached_literal_param_size("SERVER_ERROR"); + if (startptr[0] == ' ') { - /* If we happened to have some memory, we just null it since we don't know the size */ - if (ptr->cached_server_error) - ptr->cached_server_error[0]= 0; - return MEMCACHED_SERVER_ERROR; + startptr++; } - ptr->cached_server_error= rel_ptr; - memcpy(ptr->cached_server_error, startptr, (size_t) (endptr - startptr)); - ptr->cached_server_error[endptr - startptr]= 0; - return MEMCACHED_SERVER_ERROR; + char *endptr= startptr; + while (*endptr != '\r' && *endptr != '\n') endptr++; + + return memcached_set_error(*ptr, MEMCACHED_SERVER_ERROR, MEMCACHED_AT, startptr, size_t(endptr - startptr)); } else if (buffer[1] == 'T') + { return MEMCACHED_STORED; + } else { WATCHPOINT_STRING(buffer); @@ -321,12 +329,17 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta } case 'D': /* DELETED */ return MEMCACHED_DELETED; + case 'N': /* NOT_FOUND */ { if (buffer[4] == 'F') + { return MEMCACHED_NOTFOUND; + } else if (buffer[4] == 'S') + { return MEMCACHED_NOTSTORED; + } else { WATCHPOINT_STRING(buffer); @@ -336,11 +349,17 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta case 'E': /* PROTOCOL ERROR or END */ { if (buffer[1] == 'N') + { return MEMCACHED_END; + } else if (buffer[1] == 'R') + { return MEMCACHED_PROTOCOL_ERROR; + } else if (buffer[1] == 'X') + { return MEMCACHED_DATA_EXISTS; + } else { WATCHPOINT_STRING(buffer); @@ -348,12 +367,25 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta } } + case 'T': /* TOUCHED */ + { + if (buffer[1] == 'O' and buffer[2] == 'U' + and buffer[3] == 'C' and buffer[4] == 'H' + and buffer[5] == 'E' and buffer[6] == 'D') + { + return MEMCACHED_SUCCESS; + } + } + return MEMCACHED_UNKNOWN_READ_FAILURE; + case 'I': /* CLIENT ERROR */ /* We add back in one because we will need to search for END */ memcached_server_response_increment(ptr); return MEMCACHED_ITEM; + case 'C': /* CLIENT ERROR */ return MEMCACHED_CLIENT_ERROR; + default: { unsigned long long auto_return_value; @@ -396,7 +428,7 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan header.response.cas= memcached_ntohll(header.response.cas); uint32_t bodylen= header.response.bodylen; - if (header.response.status == PROTOCOL_BINARY_RESPONSE_SUCCESS || + if (header.response.status == PROTOCOL_BINARY_RESPONSE_SUCCESS or header.response.status == PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE) { switch (header.response.opcode) @@ -424,19 +456,35 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan bodylen -= header.response.extlen; result->key_length= keylen; - if ((rc= memcached_safe_read(ptr, result->item_key, keylen)) != MEMCACHED_SUCCESS) + if (memcached_failed(rc= memcached_safe_read(ptr, result->item_key, keylen))) { WATCHPOINT_ERROR(rc); return MEMCACHED_UNKNOWN_READ_FAILURE; } + // Only bother with doing this if key_length > 0 + if (result->key_length) + { + if (memcached_array_size(ptr->root->_namespace) and memcached_array_size(ptr->root->_namespace) >= result->key_length) + { + return memcached_set_error(*ptr, MEMCACHED_UNKNOWN_READ_FAILURE, MEMCACHED_AT); + } + + if (memcached_array_size(ptr->root->_namespace)) + { + result->key_length-= memcached_array_size(ptr->root->_namespace); + memmove(result->item_key, result->item_key +memcached_array_size(ptr->root->_namespace), result->key_length); + } + } + bodylen -= keylen; - if (memcached_string_check(&result->value, - bodylen) != MEMCACHED_SUCCESS) + if (memcached_failed(memcached_string_check(&result->value, bodylen))) + { return MEMCACHED_MEMORY_ALLOCATION_FAILURE; + } char *vptr= memcached_string_value_mutable(&result->value); - if ((rc= memcached_safe_read(ptr, vptr, bodylen)) != MEMCACHED_SUCCESS) + if (memcached_failed(rc= memcached_safe_read(ptr, vptr, bodylen))) { WATCHPOINT_ERROR(rc); return MEMCACHED_UNKNOWN_READ_FAILURE; @@ -445,11 +493,14 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan memcached_string_set_length(&result->value, bodylen); } break; + case PROTOCOL_BINARY_CMD_INCREMENT: case PROTOCOL_BINARY_CMD_DECREMENT: { if (bodylen != sizeof(uint64_t) || buffer_length != sizeof(uint64_t)) + { return MEMCACHED_PROTOCOL_ERROR; + } WATCHPOINT_ASSERT(bodylen == buffer_length); uint64_t val; @@ -463,6 +514,7 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan memcpy(buffer, &val, sizeof(val)); } break; + case PROTOCOL_BINARY_CMD_SASL_LIST_MECHS: case PROTOCOL_BINARY_CMD_VERSION: { @@ -487,15 +539,18 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan case PROTOCOL_BINARY_CMD_APPEND: case PROTOCOL_BINARY_CMD_PREPEND: case PROTOCOL_BINARY_CMD_DELETE: + case PROTOCOL_BINARY_CMD_TOUCH: { WATCHPOINT_ASSERT(bodylen == 0); return MEMCACHED_SUCCESS; } + case PROTOCOL_BINARY_CMD_NOOP: { WATCHPOINT_ASSERT(bodylen == 0); return MEMCACHED_END; } + case PROTOCOL_BINARY_CMD_STAT: { if (bodylen == 0) @@ -576,36 +631,45 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan case PROTOCOL_BINARY_CMD_APPENDQ: case PROTOCOL_BINARY_CMD_PREPENDQ: return binary_read_one_response(ptr, buffer, buffer_length, result); + default: break; } } rc= MEMCACHED_SUCCESS; - unlikely(header.response.status != 0) + if (header.response.status != 0) + { switch (header.response.status) { case PROTOCOL_BINARY_RESPONSE_KEY_ENOENT: rc= MEMCACHED_NOTFOUND; break; + case PROTOCOL_BINARY_RESPONSE_KEY_EEXISTS: rc= MEMCACHED_DATA_EXISTS; break; + case PROTOCOL_BINARY_RESPONSE_NOT_STORED: rc= MEMCACHED_NOTSTORED; break; + case PROTOCOL_BINARY_RESPONSE_E2BIG: rc= MEMCACHED_E2BIG; break; + case PROTOCOL_BINARY_RESPONSE_ENOMEM: rc= MEMCACHED_MEMORY_ALLOCATION_FAILURE; break; + case PROTOCOL_BINARY_RESPONSE_AUTH_CONTINUE: rc= MEMCACHED_AUTH_CONTINUE; break; + case PROTOCOL_BINARY_RESPONSE_AUTH_ERROR: rc= MEMCACHED_AUTH_FAILURE; break; + case PROTOCOL_BINARY_RESPONSE_EINVAL: case PROTOCOL_BINARY_RESPONSE_UNKNOWN_COMMAND: default: @@ -613,6 +677,7 @@ static memcached_return_t binary_read_one_response(memcached_server_write_instan rc= MEMCACHED_PROTOCOL_ERROR; break; } + } return rc; }