uint32_t dummy_flags;
memcached_return dummy_error;
+ unlikely (ptr->flags & MEM_USE_UDP)
+ {
+ *error= MEMCACHED_NOT_SUPPORTED;
+ return NULL;
+ }
+
/* Request the key */
*error= memcached_mget_by_key(ptr,
master_key,
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 rc= MEMCACHED_NOTFOUND;
char *get_command= "get ";
uint8_t get_command_length= 4;
- unsigned int master_server_key= 0;
+ unsigned int master_server_key= (unsigned int)-1; /* 0 is a valid server id! */
+ bool is_master_key_set= false;
+
+ unlikely (ptr->flags & MEM_USE_UDP)
+ return MEMCACHED_NOT_SUPPORTED;
LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
if (ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags & MEM_SUPPORT_CAS)
if (master_key && master_key_length)
{
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((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, keys,
+ return binary_mget_by_key(ptr, master_server_key, is_master_key_set, keys,
key_length, number_of_keys);
/*
{
unsigned int server_key;
- if (master_server_key)
+ if (is_master_key_set)
server_key= master_server_key;
else
server_key= memcached_generate_hash(ptr, keys[x], key_length[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)
{
memcached_return rc= MEMCACHED_NOTFOUND;
- int x;
+ uint32_t x;
int flush= number_of_keys == 1;
{
unsigned int server_key;
- if (master_server_key)
+ if (is_master_key_set)
server_key= master_server_key;
else
server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
else
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_GETKQ;
+ memcached_return vk;
+ vk= memcached_validate_key_length(key_length[x],
+ ptr->flags & MEM_BINARY_PROTOCOL);
+ unlikely (vk != MEMCACHED_SUCCESS)
+ {
+ if (x > 0)
+ memcached_io_reset(&ptr->hosts[server_key]);
+ return vk;
+ }
+
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]);
continue;
}
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)