X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstorage.c;h=be0040a4197f6b621f0a900e662c92117ea8b89b;hb=26c65ac524f21cd73a79f3caf45cdb76c9a41bc0;hp=ba66cf878799c3cd5eb7136ca6dbdb87df9a54ec;hpb=ff452398ec3114d6af77aa5d2d77f53b18d980e3;p=awesomized%2Flibmemcached

diff --git a/libmemcached/storage.c b/libmemcached/storage.c
index ba66cf87..be0040a4 100644
--- a/libmemcached/storage.c
+++ b/libmemcached/storage.c
@@ -145,50 +145,45 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
   if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
   {
     rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
-
-  /* Send command header */
-  rc=  memcached_do(instance, buffer, write_length, false);
-  if (rc != MEMCACHED_SUCCESS)
-    goto error;
-
-  /* Send command body */
-  if (memcached_io_write(instance, value, value_length, false) == -1)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
-
-  if (ptr->flags.buffer_requests && verb == SET_OP)
-  {
-    to_write= false;
   }
   else
   {
-    to_write= true;
-  }
+    struct __write_vector_st vector[]= 
+    {
+      { .length= write_length, .buffer= buffer },
+      { .length= value_length, .buffer= value },
+      { .length= 2, .buffer= "\r\n" }
+    }; 
 
-  if (memcached_io_write(instance, "\r\n", 2, to_write) == -1)
-  {
-    rc= MEMCACHED_WRITE_FAILURE;
-    goto error;
-  }
+    if (ptr->flags.buffer_requests && verb == SET_OP)
+    {
+      to_write= false;
+    }
+    else
+    {
+      to_write= true;
+    }
 
-  if (ptr->flags.no_reply)
-    return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
+    /* Send command header */
+    rc=  memcached_vdo(instance, vector, 3, to_write);
+    if (rc == MEMCACHED_SUCCESS)
+    {
 
-  if (to_write == false)
-    return MEMCACHED_BUFFERED;
+      if (ptr->flags.no_reply)
+        return (to_write == false) ? MEMCACHED_BUFFERED : MEMCACHED_SUCCESS;
 
-  rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+      if (to_write == false)
+        return MEMCACHED_BUFFERED;
 
-  if (rc == MEMCACHED_STORED)
-    return MEMCACHED_SUCCESS;
-  else
-    return rc;
+      rc= memcached_response(instance, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+
+      if (rc == MEMCACHED_STORED)
+        return MEMCACHED_SUCCESS;
+      else
+        return rc;
+    }
+  }
 
-error:
   if (rc == MEMCACHED_WRITE_FAILURE)
     memcached_io_reset(instance);
 
@@ -455,7 +450,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
 
   request.message.header.request.magic= PROTOCOL_BINARY_REQ;
   request.message.header.request.opcode= get_com_code(verb, noreply);
-  request.message.header.request.keylen= htons((uint16_t)key_length);
+  request.message.header.request.keylen= htons((uint16_t)(key_length + ptr->prefix_key_length));
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
   if (verb == APPEND_OP || verb == PREPEND_OP)
     send_length -= 8; /* append & prepend does not contain extras! */
@@ -466,7 +461,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
     request.message.body.expiration= htonl((uint32_t)expiration);
   }
 
-  request.message.header.request.bodylen= htonl((uint32_t) (key_length + value_length +
+  request.message.header.request.bodylen= htonl((uint32_t) (key_length + ptr->prefix_key_length + value_length +
                                                             request.message.header.request.extlen));
 
   if (cas)
@@ -488,13 +483,20 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
     }
   }
 
+  struct __write_vector_st vector[]= 
+  {
+    { .length= send_length, .buffer= request.bytes },
+    { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+    { .length= key_length, .buffer= key },
+    { .length= value_length, .buffer= value }
+  }; 
+
   /* write the header */
-  if ((memcached_do(server, (const char*)request.bytes, send_length, false) != MEMCACHED_SUCCESS) ||
-      (memcached_io_write(server, key, key_length, false) == -1) ||
-      (memcached_io_write(server, value, value_length, flush) == -1))
+  memcached_return_t rc;
+  if ((rc= memcached_vdo(server, vector, 4, flush)) != MEMCACHED_SUCCESS)
   {
     memcached_io_reset(server);
-    return MEMCACHED_WRITE_FAILURE;
+    return (rc == MEMCACHED_SUCCESS) ? MEMCACHED_WRITE_FAILURE : rc;
   }
 
   unlikely (verb == SET_OP && ptr->number_of_replicas > 0)
@@ -511,10 +513,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
 
       instance= memcached_server_instance_fetch(ptr, server_key);
 
-      if ((memcached_do(instance, (const char*)request.bytes,
-                        send_length, false) != MEMCACHED_SUCCESS) ||
-          (memcached_io_write(instance, key, key_length, false) == -1) ||
-          (memcached_io_write(instance, value, value_length, flush) == -1))
+      if (memcached_vdo(instance, vector, 4, false) != MEMCACHED_SUCCESS)
       {
         memcached_io_reset(instance);
       }