Silently ignore the new stats fields

[awesomized/libmemcached] / libmemcached / memcached_auto.c

diff --git a/libmemcached/memcached_auto.c b/libmemcached/memcached_auto.c
index 449d4c4e23b5f6f341986f4885143c9fe63a9366..787ef6875213b57147566ef60dae26308e8ea390 100644 (file)
--- a/libmemcached/memcached_auto.c
+++ b/libmemcached/memcached_auto.c
@@ -10,9 +10,7 @@ static memcached_return memcached_auto(memcached_st *ptr,
   memcached_return rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   unsigned int server_key;
-
-  unlikely (key_length == 0)
-    return MEMCACHED_NO_KEY_PROVIDED;
+  bool no_reply= (ptr->flags & MEM_NOREPLY);
 
   unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
@@ -23,15 +21,15 @@ static memcached_return memcached_auto(memcached_st *ptr,
   server_key= memcached_generate_hash(ptr, key, key_length);
 
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 
-                        "%s %s%.*s %u\r\n", verb, 
+                        "%s %s%.*s %u%s\r\n", verb,
                         ptr->prefix_key,
                         (int)key_length, key,
-                        offset);
+                        offset, no_reply ? " noreply" : "");
   unlikely (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
   rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
-  if (rc != MEMCACHED_SUCCESS)
+  if (no_reply || rc != MEMCACHED_SUCCESS)
     return rc;
 
   rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
@@ -67,19 +65,21 @@ static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd,
                                          uint32_t offset, uint64_t *value) 
 {
   unsigned int server_key;
-
-  unlikely (key_length == 0)
-    return MEMCACHED_NO_KEY_PROVIDED;
+  bool no_reply= (ptr->flags & MEM_NOREPLY);
 
   unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
-    return MEMCACHED_BAD_KEY_PROVIDED;
-
   server_key= memcached_generate_hash(ptr, key, key_length);
 
-  protocol_binary_request_incr request= {0};
+  if (no_reply)
+  {
+    if(cmd == PROTOCOL_BINARY_CMD_DECREMENT)
+      cmd= PROTOCOL_BINARY_CMD_DECREMENTQ;
+    if(cmd == PROTOCOL_BINARY_CMD_INCREMENT)
+      cmd= PROTOCOL_BINARY_CMD_INCREMENTQ;
+  }
+  protocol_binary_request_incr request= {.bytes= {0}};
 
   request.message.header.request.magic= PROTOCOL_BINARY_REQ;
   request.message.header.request.opcode= cmd;
@@ -97,8 +97,10 @@ static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd,
     memcached_io_reset(&ptr->hosts[server_key]);
     return MEMCACHED_WRITE_FAILURE;
   }
- 
-  return memcached_response(&ptr->hosts[server_key], value, sizeof(*value), NULL);
+
+  if (no_reply)
+    return MEMCACHED_SUCCESS;
+  return memcached_response(&ptr->hosts[server_key], (char*)value, sizeof(*value), NULL);
 }
 
 memcached_return memcached_increment(memcached_st *ptr, 
@@ -106,7 +108,9 @@ memcached_return memcached_increment(memcached_st *ptr,
                                      uint32_t offset,
                                      uint64_t *value)
 {
-  memcached_return rc;
+  memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
+  unlikely (rc != MEMCACHED_SUCCESS)
+    return rc;
 
   LIBMEMCACHED_MEMCACHED_INCREMENT_START();
   if (ptr->flags & MEM_BINARY_PROTOCOL) 
@@ -125,7 +129,9 @@ memcached_return memcached_decrement(memcached_st *ptr,
                                      uint32_t offset,
                                      uint64_t *value)
 {
-  memcached_return rc;
+  memcached_return rc= memcached_validate_key_length(key_length, ptr->flags & MEM_BINARY_PROTOCOL);
+  unlikely (rc != MEMCACHED_SUCCESS)
+    return rc;
 
   LIBMEMCACHED_MEMCACHED_DECREMENT_START();
   if (ptr->flags & MEM_BINARY_PROTOCOL)