*/
char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
size_t *value_length,
- uint16_t *flags,
+ uint32_t *flags,
memcached_return *error)
+{
+ return memcached_get_by_key(ptr, NULL, 0, key, key_length, value_length,
+ flags, error);
+}
+
+char *memcached_get_by_key(memcached_st *ptr,
+ char *master_key, size_t master_key_length,
+ char *key, size_t key_length,
+ size_t *value_length,
+ uint32_t *flags,
+ memcached_return *error)
{
char *value;
+ size_t dummy_length;
+ uint32_t dummy_flags;
+ memcached_return dummy_error;
/* Request the key */
- *error= memcached_mget(ptr, &key, &key_length, 1);
+ *error= memcached_mget_by_key(ptr,
+ master_key,
+ master_key_length,
+ &key, &key_length, 1);
value= memcached_fetch(ptr, NULL, NULL,
value_length, flags, error);
-
/* This is for historical reasons */
if (*error == MEMCACHED_END)
*error= MEMCACHED_NOTFOUND;
if (value == NULL)
return NULL;
- memcached_finish(ptr);
+ (void)memcached_fetch(ptr, NULL, NULL,
+ &dummy_length, &dummy_flags,
+ &dummy_error);
return value;
}
memcached_return memcached_mget(memcached_st *ptr,
char **keys, size_t *key_length,
unsigned int number_of_keys)
+{
+ return memcached_mget_by_key(ptr, NULL, 0, keys, key_length, number_of_keys);
+}
+
+memcached_return memcached_mget_by_key(memcached_st *ptr,
+ char *master_key, size_t master_key_length,
+ char **keys, size_t *key_length,
+ unsigned int number_of_keys)
{
unsigned int x;
memcached_return rc= MEMCACHED_NOTFOUND;
char *get_command= "get ";
- uint8_t get_command_length= 4
+ uint8_t get_command_length= 4;
+ unsigned int master_server_key= 0;
LIBMEMCACHED_MEMCACHED_MGET_START();
ptr->cursor_server= 0;
get_command_length= 5;
}
- memcached_finish(ptr);
+ if (master_key && master_key_length)
+ master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
+
+ /*
+ Here is where we pay for the non-block API. We need to remove any data sitting
+ in the queue before we start our get.
+
+ It might be optimum to bounce the connection if count > some number.
+ */
+ for (x= 0; x < ptr->number_of_hosts; x++)
+ {
+ if (memcached_server_response_count(&ptr->hosts[x]))
+ {
+ char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+
+ if (ptr->flags & MEM_NO_BLOCK)
+ (void)memcached_io_write(&ptr->hosts[x], NULL, 0, 1);
+
+ while(memcached_server_response_count(&ptr->hosts[x]))
+ (void)memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, &ptr->result);
+ }
+ }
/*
If a server fails we warn about errors and start all over with sending keys
{
unsigned int server_key;
- server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
+ if (master_server_key)
+ server_key= master_server_key;
+ else
+ server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
- if (ptr->hosts[server_key].cursor_active == 0)
+ if (memcached_server_response_count(&ptr->hosts[server_key]) == 0)
{
- rc= memcached_connect(ptr, server_key);
+ rc= memcached_connect(&ptr->hosts[server_key]);
+
+ if (rc != MEMCACHED_SUCCESS)
+ continue;
- if ((memcached_io_write(ptr, server_key, get_command, get_command_length, 0)) == -1)
+ if ((memcached_io_write(&ptr->hosts[server_key], get_command, get_command_length, 0)) == -1)
{
rc= MEMCACHED_SOME_ERRORS;
continue;
}
- ptr->hosts[server_key].cursor_active= 1;
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+ memcached_server_response_increment(&ptr->hosts[server_key]);
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 1);
}
- if ((memcached_io_write(ptr, server_key, keys[x], key_length[x], 0)) == -1)
+ if ((memcached_io_write(&ptr->hosts[server_key], keys[x], key_length[x], 0)) == -1)
{
- ptr->hosts[server_key].cursor_active= 0;
+ memcached_server_response_reset(&ptr->hosts[server_key]);
rc= MEMCACHED_SOME_ERRORS;
continue;
}
- if ((memcached_io_write(ptr, server_key, " ", 1, 0)) == -1)
+ if ((memcached_io_write(&ptr->hosts[server_key], " ", 1, 0)) == -1)
{
- ptr->hosts[server_key].cursor_active= 0;
+ memcached_server_response_reset(&ptr->hosts[server_key]);
rc= MEMCACHED_SOME_ERRORS;
continue;
}
*/
for (x= 0; x < ptr->number_of_hosts; x++)
{
- if (ptr->hosts[x].cursor_active == 1)
+ if (memcached_server_response_count(&ptr->hosts[x]))
{
- /* We need to doo something about non-connnected hosts in the future */
- if ((memcached_io_write(ptr, x, "\r\n", 2, 1)) == -1)
+ /* We need to do something about non-connnected hosts in the future */
+ if ((memcached_io_write(&ptr->hosts[x], "\r\n", 2, 1)) == -1)
{
rc= MEMCACHED_SOME_ERRORS;
}