flags, error);
}
+static memcached_return memcached_mget_by_key_real(memcached_st *ptr,
+ const char *master_key,
+ size_t master_key_length,
+ const char **keys,
+ 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,
}
/* Request the key */
- *error= memcached_mget_by_key(ptr,
+ *error= memcached_mget_by_key_real(ptr,
master_key,
master_key_length,
- (char **)&key, &key_length, 1);
+ (const char **)&key, &key_length, 1, false);
value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
{
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);
}
memcached_return memcached_mget(memcached_st *ptr,
- char **keys, size_t *key_length,
- unsigned int number_of_keys)
+ const char **keys, size_t *key_length,
+ size_t number_of_keys)
{
return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys);
}
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 **keys, size_t *key_length,
+ size_t number_of_keys,
+ bool mget_mode);
-memcached_return memcached_mget_by_key(memcached_st *ptr,
+static memcached_return memcached_mget_by_key_real(memcached_st *ptr,
const char *master_key,
size_t master_key_length,
- char **keys,
+ const char **keys,
size_t *key_length,
- unsigned int number_of_keys)
+ 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;
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 **)&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;
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)
{
return rc;
}
+memcached_return memcached_mget_by_key(memcached_st *ptr,
+ const char *master_key,
+ size_t master_key_length,
+ const char **keys,
+ 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);
+}
+
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 **keys, size_t *key_length,
+ size_t number_of_keys, bool mget_mode)
{
memcached_return rc= MEMCACHED_NOTFOUND;
uint32_t x;
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],
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
memcached_io_reset(&ptr->hosts[x]);
rc= MEMCACHED_SOME_ERRORS;
}
- memcached_server_response_increment(&ptr->hosts[x]);
}
}
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)
+ const char **keys, size_t *key_length,
+ size_t number_of_keys, bool mget_mode)
{
memcached_return rc= MEMCACHED_NOTFOUND;
uint32_t x;
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;
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], request.bytes,
sizeof(request.bytes), 0) == -1) ||
(memcached_io_write(&ptr->hosts[server], keys[x],
- key_length[x], flush) == -1))
+ key_length[x], (char) flush) == -1))
{
memcached_io_reset(&ptr->hosts[server]);
dead_servers[server]= true;
success= false;
continue;
}
+ /* we just want one pending response per server */
+ memcached_server_response_reset(&ptr->hosts[server]);
memcached_server_response_increment(&ptr->hosts[server]);
}
- if (number_of_keys > 1)
+ if (mget_mode)
{
/*
* Send a noop command to flush the buffers
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)
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 **keys, 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
{
hash[x]= memcached_generate_hash(ptr, keys[x], key_length[x]);
rc= replication_binary_mget(ptr, hash, dead_servers, keys,
- key_length, number_of_keys);
+ key_length, number_of_keys, mget_mode);
ptr->call_free(ptr, hash);
ptr->call_free(ptr, dead_servers);