X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=43a18a98336a7474f027e5a493e792c8390fec97;hb=2dce97932fbd574db1179add7bc3facc0318186c;hp=93968ad982dc87d17924f5835b7f9a61bbb0b53d;hpb=d283f47cade6fcd1256e738057667fbcca7b06c1;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 93968ad9..43a18a98 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -42,6 +42,7 @@ char *storage_op_string(memcached_storage_action verb)
 }
 
 static inline memcached_return memcached_send(memcached_st *ptr, 
+                                              char *master_key, size_t master_key_length, 
                                               char *key, size_t key_length, 
                                               char *value, size_t value_length, 
                                               time_t expiration,
@@ -62,15 +63,10 @@ static inline memcached_return memcached_send(memcached_st *ptr,
   if (key_length == 0)
     return MEMCACHED_NO_KEY_PROVIDED;
 
-  if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+  if (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
-    
-  server_key= memcached_generate_hash(ptr, key, key_length);
-
-  rc= memcached_connect(ptr, server_key);
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
 
+  server_key= memcached_generate_hash(ptr, master_key, master_key_length);
 
   if (cas)
     write_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
@@ -90,15 +86,9 @@ static inline memcached_return memcached_send(memcached_st *ptr,
     goto error;
   }
 
-  /* 
-    We have to flush after sending the command. Memcached is not smart enough
-    to just keep reading from the socket :(
-  */
-  if ((sent_length= memcached_io_write(ptr, server_key, buffer, write_length, 0)) == -1)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
+  rc=  memcached_do(ptr, server_key, buffer, write_length, 0);
+  if (rc != MEMCACHED_SUCCESS)
     goto error;
-  }
 
   if ((sent_length= memcached_io_write(ptr, server_key, value, value_length, 0)) == -1)
   {
@@ -113,12 +103,11 @@ static inline memcached_return memcached_send(memcached_st *ptr,
 
   if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1)
   {
-    memcached_quit_server(ptr, server_key);
     rc= MEMCACHED_WRITE_FAILURE;
     goto error;
   }
 
-  if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+  if (to_write == 0)
   {
     rc= MEMCACHED_SUCCESS;
     memcached_server_response_increment(ptr, server_key);
@@ -145,8 +134,9 @@ memcached_return memcached_set(memcached_st *ptr, char *key, size_t key_length,
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_SET_START();
-  rc= memcached_send(ptr, key, key_length, value, value_length,
-                         expiration, flags, 0, SET_OP);
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, SET_OP);
   LIBMEMCACHED_MEMCACHED_SET_END();
   return rc;
 }
@@ -159,8 +149,9 @@ memcached_return memcached_add(memcached_st *ptr,
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_ADD_START();
-  rc= memcached_send(ptr, key, key_length, value, value_length,
-                         expiration, flags, 0, ADD_OP);
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, ADD_OP);
   LIBMEMCACHED_MEMCACHED_ADD_END();
   return rc;
 }
@@ -173,8 +164,9 @@ memcached_return memcached_replace(memcached_st *ptr,
 {
   memcached_return rc;
   LIBMEMCACHED_MEMCACHED_REPLACE_START();
-  rc= memcached_send(ptr, key, key_length, value, value_length,
-                         expiration, flags, 0, REPLACE_OP);
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, REPLACE_OP);
   LIBMEMCACHED_MEMCACHED_REPLACE_END();
   return rc;
 }
@@ -186,7 +178,8 @@ memcached_return memcached_prepend(memcached_st *ptr,
                                    uint16_t flags)
 {
   memcached_return rc;
-  rc= memcached_send(ptr, key, key_length, value, value_length,
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
                      expiration, flags, 0, PREPEND_OP);
   return rc;
 }
@@ -198,7 +191,8 @@ memcached_return memcached_append(memcached_st *ptr,
                                   uint16_t flags)
 {
   memcached_return rc;
-  rc= memcached_send(ptr, key, key_length, value, value_length,
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
                      expiration, flags, 0, APPEND_OP);
   return rc;
 }
@@ -211,7 +205,99 @@ memcached_return memcached_cas(memcached_st *ptr,
                                uint64_t cas)
 {
   memcached_return rc;
-  rc= memcached_send(ptr, key, key_length, value, value_length,
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, cas, APPEND_OP);
+  return rc;
+}
+
+memcached_return memcached_set_by_key(memcached_st *ptr, 
+                                      char *master_key, size_t master_key_length, 
+                                      char *key, size_t key_length, 
+                                      char *value, size_t value_length, 
+                                      time_t expiration,
+                                      uint16_t flags)
+{
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_SET_START();
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, SET_OP);
+  LIBMEMCACHED_MEMCACHED_SET_END();
+  return rc;
+}
+
+memcached_return memcached_add_by_key(memcached_st *ptr, 
+                                      char *master_key, size_t master_key_length,
+                                      char *key, size_t key_length,
+                                      char *value, size_t value_length, 
+                                      time_t expiration,
+                                      uint16_t flags)
+{
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_ADD_START();
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, ADD_OP);
+  LIBMEMCACHED_MEMCACHED_ADD_END();
+  return rc;
+}
+
+memcached_return memcached_replace_by_key(memcached_st *ptr, 
+                                          char *master_key, size_t master_key_length,
+                                          char *key, size_t key_length,
+                                          char *value, size_t value_length, 
+                                          time_t expiration,
+                                          uint16_t flags)
+{
+  memcached_return rc;
+  LIBMEMCACHED_MEMCACHED_REPLACE_START();
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, REPLACE_OP);
+  LIBMEMCACHED_MEMCACHED_REPLACE_END();
+  return rc;
+}
+
+memcached_return memcached_prepend_by_key(memcached_st *ptr, 
+                                          char *master_key, size_t master_key_length,
+                                          char *key, size_t key_length,
+                                          char *value, size_t value_length, 
+                                          time_t expiration,
+                                          uint16_t flags)
+{
+  memcached_return rc;
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, PREPEND_OP);
+  return rc;
+}
+
+memcached_return memcached_append_by_key(memcached_st *ptr, 
+                                         char *master_key, size_t master_key_length,
+                                         char *key, size_t key_length,
+                                         char *value, size_t value_length, 
+                                         time_t expiration,
+                                         uint16_t flags)
+{
+  memcached_return rc;
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
+                     expiration, flags, 0, APPEND_OP);
+  return rc;
+}
+
+memcached_return memcached_cas_by_key(memcached_st *ptr, 
+                                      char *master_key, size_t master_key_length,
+                                      char *key, size_t key_length,
+                                      char *value, size_t value_length, 
+                                      time_t expiration,
+                                      uint16_t flags,
+                                      uint64_t cas)
+{
+  memcached_return rc;
+  rc= memcached_send(ptr, key, key_length, 
+                     key, key_length, value, value_length,
                      expiration, flags, cas, APPEND_OP);
   return rc;
 }