X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_get.c;h=3436186f24a4803a32bf107e9c0f773489f8f53f;hb=a7a011c2ea4a63368b3a96a332da00820ed402cb;hp=e91db4cf363854f3aa363691c23ece90b274c8ac;hpb=ef9ddf55563059fcf3608bab479e15f28e9ceb0f;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c index e91db4cf..3436186f 100644 --- a/libmemcached/memcached_get.c +++ b/libmemcached/memcached_get.c @@ -14,6 +14,14 @@ char *memcached_get(memcached_st *ptr, const char *key, flags, error); } +static memcached_return memcached_mget_by_key_real(memcached_st *ptr, + const char *master_key, + size_t master_key_length, + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, + bool mget_mode); + char *memcached_get_by_key(memcached_st *ptr, const char *master_key, size_t master_key_length, @@ -34,10 +42,9 @@ char *memcached_get_by_key(memcached_st *ptr, } /* Request the key */ - *error= memcached_mget_by_key(ptr, - master_key, - master_key_length, - (char **)&key, &key_length, 1); + *error= memcached_mget_by_key_real(ptr, master_key, master_key_length, + (const char * const *)&key, + &key_length, 1, false); value= memcached_fetch(ptr, NULL, NULL, value_length, flags, error); @@ -59,7 +66,7 @@ char *memcached_get_by_key(memcached_st *ptr, { if (rc == MEMCACHED_BUFFERED) { - uint8_t latch; /* We use latch to track the state of the original socket */ + uint64_t latch; /* We use latch to track the state of the original socket */ latch= memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS); if (latch == 0) memcached_behavior_set(ptr, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); @@ -102,8 +109,9 @@ char *memcached_get_by_key(memcached_st *ptr, } memcached_return memcached_mget(memcached_st *ptr, - char **keys, size_t *key_length, - unsigned int number_of_keys) + const char * const *keys, + const size_t *key_length, + size_t number_of_keys) { return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys); } @@ -111,19 +119,22 @@ memcached_return memcached_mget(memcached_st *ptr, static memcached_return binary_mget_by_key(memcached_st *ptr, unsigned int master_server_key, bool is_master_key_set, - char **keys, size_t *key_length, - unsigned int number_of_keys); - -memcached_return memcached_mget_by_key(memcached_st *ptr, - const char *master_key, - size_t master_key_length, - char **keys, - size_t *key_length, - unsigned int number_of_keys) + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, + bool mget_mode); + +static memcached_return memcached_mget_by_key_real(memcached_st *ptr, + const char *master_key, + size_t master_key_length, + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, + bool mget_mode) { unsigned int x; memcached_return rc= MEMCACHED_NOTFOUND; - char *get_command= "get "; + const char *get_command= "get "; uint8_t get_command_length= 4; unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */ bool is_master_key_set= false; @@ -145,7 +156,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr, if (master_key && master_key_length) { - if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) + if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((const char * const *)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)) return MEMCACHED_BAD_KEY_PROVIDED; master_server_key= memcached_generate_hash(ptr, master_key, master_key_length); is_master_key_set= true; @@ -173,7 +184,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr, if (ptr->flags & MEM_BINARY_PROTOCOL) return binary_mget_by_key(ptr, master_server_key, is_master_key_set, keys, - key_length, number_of_keys); + key_length, number_of_keys, mget_mode); if (ptr->flags & MEM_SUPPORT_CAS) { @@ -256,11 +267,64 @@ memcached_return memcached_mget_by_key(memcached_st *ptr, return rc; } +memcached_return memcached_mget_by_key(memcached_st *ptr, + const char *master_key, + size_t master_key_length, + const char * const *keys, + const size_t *key_length, + size_t number_of_keys) +{ + return memcached_mget_by_key_real(ptr, master_key, master_key_length, keys, + key_length, number_of_keys, true); +} + +memcached_return memcached_mget_execute(memcached_st *ptr, + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, + memcached_execute_function *callback, + void *context, + unsigned int number_of_callbacks) +{ + return memcached_mget_execute_by_key(ptr, NULL, 0, keys, key_length, + number_of_keys, callback, + context, number_of_callbacks); +} + +memcached_return memcached_mget_execute_by_key(memcached_st *ptr, + const char *master_key, + size_t master_key_length, + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, + memcached_execute_function *callback, + void *context, + unsigned int number_of_callbacks) +{ + if ((ptr->flags & MEM_BINARY_PROTOCOL) == 0) + return MEMCACHED_NOT_SUPPORTED; + + memcached_return rc; + memcached_callback_st *original_callbacks= ptr->callbacks; + memcached_callback_st cb= { + .callback= callback, + .context= context, + .number_of_callback= number_of_callbacks + }; + + ptr->callbacks= &cb; + rc= memcached_mget_by_key(ptr, master_key, master_key_length, keys, + key_length, number_of_keys); + ptr->callbacks= original_callbacks; + return rc; +} + static memcached_return simple_binary_mget(memcached_st *ptr, unsigned int master_server_key, bool is_master_key_set, - char **keys, size_t *key_length, - unsigned int number_of_keys) + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, bool mget_mode) { memcached_return rc= MEMCACHED_NOTFOUND; uint32_t x; @@ -289,10 +353,10 @@ static memcached_return simple_binary_mget(memcached_st *ptr, protocol_binary_request_getk request= {.bytes= {0}}; request.message.header.request.magic= PROTOCOL_BINARY_REQ; - if (number_of_keys == 1) - request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK; - else + if (mget_mode) request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ; + else + request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK; memcached_return vk; vk= memcached_validate_key_length(key_length[x], @@ -306,24 +370,27 @@ static memcached_return simple_binary_mget(memcached_st *ptr, request.message.header.request.keylen= htons((uint16_t)key_length[x]); request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; - request.message.header.request.bodylen= htonl(key_length[x]); + request.message.header.request.bodylen= htonl((uint32_t) key_length[x]); if ((memcached_io_write(&ptr->hosts[server_key], request.bytes, sizeof(request.bytes), 0) == -1) || (memcached_io_write(&ptr->hosts[server_key], keys[x], - key_length[x], flush) == -1)) + key_length[x], (char) flush) == -1)) { memcached_server_response_reset(&ptr->hosts[server_key]); rc= MEMCACHED_SOME_ERRORS; continue; } + + /* We just want one pending response per server */ + memcached_server_response_reset(&ptr->hosts[server_key]); memcached_server_response_increment(&ptr->hosts[server_key]); if ((x > 0 && x == ptr->io_key_prefetch) && memcached_flush_buffers(ptr) != MEMCACHED_SUCCESS) rc= MEMCACHED_SOME_ERRORS; } - if (number_of_keys > 1) + if (mget_mode) { /* * Send a noop command to flush the buffers @@ -350,7 +417,6 @@ static memcached_return simple_binary_mget(memcached_st *ptr, memcached_io_reset(&ptr->hosts[x]); rc= MEMCACHED_SOME_ERRORS; } - memcached_server_response_increment(&ptr->hosts[x]); } } @@ -359,19 +425,19 @@ static memcached_return simple_binary_mget(memcached_st *ptr, } static memcached_return replication_binary_mget(memcached_st *ptr, - uint32_t* hash, bool* dead_servers, - char **keys, size_t *key_length, - unsigned int number_of_keys) + uint32_t* hash, + bool* dead_servers, + const char *const *keys, + const size_t *key_length, + size_t number_of_keys) { memcached_return rc= MEMCACHED_NOTFOUND; uint32_t x; - int flush= number_of_keys == 1; - for (uint32_t replica= 0; replica <= ptr->number_of_replicas; ++replica) { bool success= true; - + for (x= 0; x < number_of_keys; ++x) { if (hash[x] == ptr->number_of_hosts) @@ -396,57 +462,39 @@ static memcached_return replication_binary_mget(memcached_st *ptr, } } - protocol_binary_request_getk request= {.bytes= {0}}; - request.message.header.request.magic= PROTOCOL_BINARY_REQ; - if (number_of_keys == 1) - request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETK; - else - request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ; - - request.message.header.request.keylen= htons((uint16_t)key_length[x]); - request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; - request.message.header.request.bodylen= htonl(key_length[x]); + protocol_binary_request_getk request= { + .message.header.request= { + .magic= PROTOCOL_BINARY_REQ, + .opcode= PROTOCOL_BINARY_CMD_GETK, + .keylen= htons((uint16_t)key_length[x]), + .datatype= PROTOCOL_BINARY_RAW_BYTES, + .bodylen= htonl((uint32_t)key_length[x]) + } + }; + /* + * We need to disable buffering to actually know that the request was + * successfully sent to the server (so that we should expect a result + * back). It would be nice to do this in buffered mode, but then it + * would be complex to handle all error situations if we got to send + * some of the messages, and then we failed on writing out some others + * and we used the callback interface from memcached_mget_execute so + * that we might have processed some of the responses etc. For now, + * just make sure we work _correctly_ + */ if ((memcached_io_write(&ptr->hosts[server], request.bytes, sizeof(request.bytes), 0) == -1) || (memcached_io_write(&ptr->hosts[server], keys[x], - key_length[x], flush) == -1)) + key_length[x], 1) == -1)) { memcached_io_reset(&ptr->hosts[server]); dead_servers[server]= true; success= false; continue; } - memcached_server_response_increment(&ptr->hosts[server]); - } - - if (number_of_keys > 1) - { - /* - * Send a noop command to flush the buffers - */ - protocol_binary_request_noop request= {.bytes= {0}}; - request.message.header.request.magic= PROTOCOL_BINARY_REQ; - request.message.header.request.opcode= PROTOCOL_BINARY_CMD_NOOP; - request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; - for (x= 0; x < ptr->number_of_hosts; x++) - if (memcached_server_response_count(&ptr->hosts[x])) - { - if (memcached_io_write(&ptr->hosts[x], request.bytes, - sizeof(request.bytes), 1) == -1) - { - memcached_io_reset(&ptr->hosts[x]); - dead_servers[x]= true; - success= false; - } - memcached_server_response_increment(&ptr->hosts[x]); - - /* mark all of the messages bound for this server as sent! */ - for (x= 0; x < number_of_keys; ++x) - if (hash[x] == x) - hash[x]= ptr->number_of_hosts; - } + memcached_server_response_increment(&ptr->hosts[server]); + hash[x]= ptr->number_of_hosts; } if (success) @@ -459,15 +507,17 @@ static memcached_return replication_binary_mget(memcached_st *ptr, static memcached_return binary_mget_by_key(memcached_st *ptr, unsigned int master_server_key, bool is_master_key_set, - char **keys, size_t *key_length, - unsigned int number_of_keys) + const char * const *keys, + const size_t *key_length, + size_t number_of_keys, + bool mget_mode) { memcached_return rc; if (ptr->number_of_replicas == 0) { rc= simple_binary_mget(ptr, master_server_key, is_master_key_set, - keys, key_length, number_of_keys); + keys, key_length, number_of_keys, mget_mode); } else {