X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fauto.c;h=325ddb6b7d49721b1b34d4d955557045097a0ad7;hb=18ace40ddb7271f3f5e71965f74fe11d7754bd8f;hp=a221144f06a75851e39d2779a1c4cad1ddf09d4e;hpb=44bc9cfbcf0794de92da28d9aaaa46d62945ce4e;p=awesomized%2Flibmemcached

diff --git a/libmemcached/auto.c b/libmemcached/auto.c
index a221144f..325ddb6b 100644
--- a/libmemcached/auto.c
+++ b/libmemcached/auto.c
@@ -9,11 +9,11 @@
  *
  */
 
-#include "common.h"
+#include "libmemcached/common.h"
 
 static memcached_return_t text_incr_decr(memcached_st *ptr,
                                          const char *verb,
-                                         const char *master_key, size_t master_key_length,
+                                         const char *group_key, size_t group_key_length,
                                          const char *key, size_t key_length,
                                          uint64_t offset,
                                          uint64_t *value)
@@ -24,20 +24,19 @@ static memcached_return_t text_incr_decr(memcached_st *ptr,
   memcached_server_write_instance_st instance;
   bool no_reply= ptr->flags.no_reply;
 
-  unlikely (memcached_server_count(ptr) == 0)
-    return MEMCACHED_NO_SERVERS;
+  if (memcached_server_count(ptr) == 0)
+    return memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL);
 
   if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
-  server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length);
+  server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
   instance= memcached_server_instance_fetch(ptr, server_key);
 
   int send_length;
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
                         "%s %.*s%.*s %" PRIu64 "%s\r\n", verb,
-                        (int)ptr->prefix_key_length,
-                        ptr->prefix_key,
+                        memcached_print_array(ptr->prefix_key),
                         (int)key_length, key,
                         offset, no_reply ? " noreply" : "");
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
@@ -81,7 +80,7 @@ static memcached_return_t text_incr_decr(memcached_st *ptr,
 }
 
 static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
-                                           const char *master_key, size_t master_key_length,
+                                           const char *group_key, size_t group_key_length,
                                            const char *key, size_t key_length,
                                            uint64_t offset, uint64_t initial,
                                            uint32_t expiration,
@@ -91,10 +90,10 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
   memcached_server_write_instance_st instance;
   bool no_reply= ptr->flags.no_reply;
 
-  unlikely (memcached_server_count(ptr) == 0)
-    return MEMCACHED_NO_SERVERS;
+  if (memcached_server_count(ptr) == 0)
+    return memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL);
 
-  server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length);
+  server_key= memcached_generate_hash_with_redistribution(ptr, group_key, group_key_length);
   instance= memcached_server_instance_fetch(ptr, server_key);
 
   if (no_reply)
@@ -108,10 +107,10 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
 
   request.message.header.request.magic= PROTOCOL_BINARY_REQ;
   request.message.header.request.opcode= cmd;
-  request.message.header.request.keylen= htons((uint16_t)(key_length + ptr->prefix_key_length));
+  request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->prefix_key)));
   request.message.header.request.extlen= 20;
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
-  request.message.header.request.bodylen= htonl((uint32_t)(key_length + ptr->prefix_key_length +  request.message.header.request.extlen));
+  request.message.header.request.bodylen= htonl((uint32_t)(key_length + memcached_array_size(ptr->prefix_key) +request.message.header.request.extlen));
   request.message.body.delta= htonll(offset);
   request.message.body.initial= htonll(initial);
   request.message.body.expiration= htonl((uint32_t) expiration);
@@ -119,7 +118,7 @@ static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
   struct libmemcached_io_vector_st vector[]=
   {
     { .length= sizeof(request.bytes), .buffer= request.bytes },
-    { .length= ptr->prefix_key_length, .buffer= ptr->prefix_key },
+    { .length= memcached_array_size(ptr->prefix_key), .buffer= ptr->prefix_key },
     { .length= key_length, .buffer= key }
   };
 
@@ -140,6 +139,10 @@ memcached_return_t memcached_increment(memcached_st *ptr,
                                        uint32_t offset,
                                        uint64_t *value)
 {
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   return memcached_increment_by_key(ptr, key, key_length, key, key_length, offset, value);
 }
 
@@ -148,11 +151,15 @@ memcached_return_t memcached_decrement(memcached_st *ptr,
                                        uint32_t offset,
                                        uint64_t *value)
 {
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   return memcached_decrement_by_key(ptr, key, key_length, key, key_length, offset, value);
 }
 
 memcached_return_t memcached_increment_by_key(memcached_st *ptr,
-                                              const char *master_key, size_t master_key_length,
+                                              const char *group_key, size_t group_key_length,
                                               const char *key, size_t key_length,
                                               uint64_t offset,
                                               uint64_t *value)
@@ -161,17 +168,21 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr,
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
 
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   LIBMEMCACHED_MEMCACHED_INCREMENT_START();
   if (ptr->flags.binary_protocol)
   {
     rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT,
-                         master_key, master_key_length, key, key_length,
+                         group_key, group_key_length, key, key_length,
                          (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD,
                          value);
   }
   else
   {
-     rc= text_incr_decr(ptr, "incr", master_key, master_key_length, key, key_length, offset, value);
+     rc= text_incr_decr(ptr, "incr", group_key, group_key_length, key, key_length, offset, value);
   }
 
   LIBMEMCACHED_MEMCACHED_INCREMENT_END();
@@ -180,7 +191,7 @@ memcached_return_t memcached_increment_by_key(memcached_st *ptr,
 }
 
 memcached_return_t memcached_decrement_by_key(memcached_st *ptr,
-                                              const char *master_key, size_t master_key_length,
+                                              const char *group_key, size_t group_key_length,
                                               const char *key, size_t key_length,
                                               uint64_t offset,
                                               uint64_t *value)
@@ -189,17 +200,21 @@ memcached_return_t memcached_decrement_by_key(memcached_st *ptr,
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
 
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   LIBMEMCACHED_MEMCACHED_DECREMENT_START();
   if (ptr->flags.binary_protocol)
   {
     rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT,
-                         master_key, master_key_length, key, key_length,
+                         group_key, group_key_length, key, key_length,
                          (uint64_t)offset, 0, MEMCACHED_EXPIRATION_NOT_ADD,
                          value);
   }
   else
   {
-    rc= text_incr_decr(ptr, "decr", master_key, master_key_length, key, key_length, offset, value);
+    rc= text_incr_decr(ptr, "decr", group_key, group_key_length, key, key_length, offset, value);
   }
 
   LIBMEMCACHED_MEMCACHED_DECREMENT_END();
@@ -215,14 +230,18 @@ memcached_return_t memcached_increment_with_initial(memcached_st *ptr,
                                                     time_t expiration,
                                                     uint64_t *value)
 {
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   return memcached_increment_with_initial_by_key(ptr, key, key_length,
                                                  key, key_length,
                                                  offset, initial, expiration, value);
 }
 
 memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr,
-                                                         const char *master_key,
-                                                         size_t master_key_length,
+                                                         const char *group_key,
+                                                         size_t group_key_length,
                                                          const char *key,
                                                          size_t key_length,
                                                          uint64_t offset,
@@ -234,10 +253,14 @@ memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr,
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
 
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
   if (ptr->flags.binary_protocol)
     rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT,
-                         master_key, master_key_length, key, key_length,
+                         group_key, group_key_length, key, key_length,
                          offset, initial, (uint32_t)expiration,
                          value);
   else
@@ -256,14 +279,18 @@ memcached_return_t memcached_decrement_with_initial(memcached_st *ptr,
                                                     time_t expiration,
                                                     uint64_t *value)
 {
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   return memcached_decrement_with_initial_by_key(ptr, key, key_length,
                                                  key, key_length,
                                                  offset, initial, expiration, value);
 }
 
 memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr,
-                                                           const char *master_key,
-                                                           size_t master_key_length,
+                                                           const char *group_key,
+                                                           size_t group_key_length,
                                                            const char *key,
                                                            size_t key_length,
                                                            uint64_t offset,
@@ -275,11 +302,15 @@ memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr,
   unlikely (rc != MEMCACHED_SUCCESS)
     return rc;
 
+  uint64_t local_value;
+  if (! value)
+    value= &local_value;
+
   LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
   if (ptr->flags.binary_protocol)
   {
     rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_DECREMENT,
-                         master_key, master_key_length, key, key_length,
+                         group_key, group_key_length, key, key_length,
                          offset, initial, (uint32_t)expiration,
                          value);
   }