if (load_key)
{
memset(key, 0, MEMCACHED_MAX_KEY);
+ *key_length= 0;
+
for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
{
*key= *string_ptr;
key++;
+ (*key_length)++;
}
}
else /* Skip characters */
char *value;
LIBMEMCACHED_MEMCACHED_GET_START();
+ server_key= memcached_generate_hash(ptr, key, key_length);
+
*value_length= 0;
- *error= memcached_connect(ptr);
+ *error= memcached_connect(ptr, server_key);
if (*error != MEMCACHED_SUCCESS)
goto error;
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
-
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n",
(int)key_length, key);
- if ((send(ptr->hosts[server_key].fd, buffer, send_length, 0) == -1))
+
+ if ((memcached_io_write(ptr, server_key, buffer, send_length, 1)) == -1)
{
*error= MEMCACHED_WRITE_FAILURE;
goto error;
ptr->cursor_server= 0;
memset(buffer, 0, HUGE_STRING_LEN);
- rc= memcached_connect(ptr);
-
- if (rc != MEMCACHED_SUCCESS)
- return rc;
-
cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
{
unsigned int server_key;
- server_key= memcached_generate_hash(keys[x], key_length[x]) % ptr->number_of_hosts;
+ server_key= memcached_generate_hash(ptr, keys[x], key_length[x]);
if (cursor_key_exec[server_key])
{
{
if (cursor_key_exec[x])
{
+ /* We need to doo something about non-connnected hosts in the future */
+ rc= memcached_connect(ptr, x);
+
memcached_string_st *string= cursor_key_exec[x];
memcached_string_append(ptr, string, "\r\n", 2);
- if ((send(ptr->hosts[x].fd, string->string,
- memcached_string_length(ptr, string), 0) == -1))
+ if ((memcached_io_write(ptr, x, string->string,
+ memcached_string_length(ptr, string), 1)) == -1)
{
memcached_quit(ptr);
rc= MEMCACHED_SOME_ERRORS;