Setup for next version (and fixes for util for RPM)

[awesomized/libmemcached] / libmemcached / memcached_behavior.c

diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index ef4907dd24e02502cd96b69b534421cf3c2e7729..fb201d4ed82c4f1f31233f1d8bd7ba279f91a3c8 100644 (file)
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -1,10 +1,11 @@
 #include "common.h" 
+#include <time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/tcp.h>
 
 /* 
-  This function is used to modify the behabior of running client.
+  This function is used to modify the behavior of running client.
 
   We quit all connections so we can reset the sockets.
 */
@@ -23,6 +24,15 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
 {
   switch (flag)
   {
+  case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
+    ptr->io_msg_watermark= (int32_t)data;
+    break;
+  case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
+    ptr->io_bytes_watermark= (int32_t)data;
+    break;
+  case MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH:
+    ptr->io_key_prefetch = (int32_t)data;
+    break;
   case MEMCACHED_BEHAVIOR_SND_TIMEOUT:
     ptr->snd_timeout= (int32_t)data;
     break;     
@@ -33,6 +43,8 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     ptr->server_failure_limit= (uint32_t)data;
     break;     
   case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
+    if (data)
+        set_behavior_flag(ptr, MEM_VERIFY_KEY, 0);
     set_behavior_flag(ptr, MEM_BINARY_PROTOCOL, data);
     break;     
   case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
@@ -41,10 +53,18 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_NO_BLOCK:
     set_behavior_flag(ptr, MEM_NO_BLOCK, data);
     memcached_quit(ptr);
+    break;
   case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
     set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
     memcached_quit(ptr);
     break;
+  case MEMCACHED_BEHAVIOR_USE_UDP:
+    if (ptr->number_of_hosts)
+      return MEMCACHED_FAILURE;
+    set_behavior_flag(ptr, MEM_USE_UDP, data);
+    if (data)
+      set_behavior_flag(ptr,MEM_NOREPLY,data);
+    break;
   case MEMCACHED_BEHAVIOR_TCP_NODELAY:
     set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
     memcached_quit(ptr);
@@ -52,6 +72,10 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_DISTRIBUTION:
     {
       ptr->distribution= (memcached_server_distribution)(data);
+      if (ptr->distribution == MEMCACHED_DISTRIBUTION_RANDOM)
+      {
+        srandom(time(NULL));
+      }
       run_distribution(ptr);
       break;
     }
@@ -79,6 +103,10 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
       break;
     }
   case MEMCACHED_BEHAVIOR_HASH:
+#ifndef HAVE_HSIEH_HASH
+    if ((memcached_hash)(data) == MEMCACHED_HASH_HSIEH)
+      return MEMCACHED_FAILURE;
+#endif
     ptr->hash= (memcached_hash)(data);
     break;
   case MEMCACHED_BEHAVIOR_KETAMA_HASH:
@@ -90,6 +118,8 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     memcached_quit(ptr);
     break;
   case MEMCACHED_BEHAVIOR_VERIFY_KEY:
+    if (ptr->flags & MEM_BINARY_PROTOCOL)
+        break;
     set_behavior_flag(ptr, MEM_VERIFY_KEY, data);
     break;
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
@@ -118,6 +148,15 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     break;
   case MEMCACHED_BEHAVIOR_USER_DATA:
     return MEMCACHED_FAILURE;
+  case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
+    set_behavior_flag(ptr, MEM_HASH_WITH_PREFIX_KEY, data);
+    break;
+  case MEMCACHED_BEHAVIOR_NOREPLY:
+    set_behavior_flag(ptr, MEM_NOREPLY, data);
+    break;
+  case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
+    set_behavior_flag(ptr, MEM_AUTO_EJECT_HOSTS, data);
+    break;
   }
 
   return MEMCACHED_SUCCESS;
@@ -130,6 +169,12 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
 
   switch (flag)
   {
+  case MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK:
+    return ptr->io_msg_watermark;
+  case MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK:
+    return ptr->io_bytes_watermark;
+  case MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH:
+    return ptr->io_key_prefetch;
   case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
     temp_flag= MEM_BINARY_PROTOCOL;
     break;     
@@ -145,6 +190,9 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
     temp_flag= MEM_BUFFER_REQUESTS;
     break;
+  case MEMCACHED_BEHAVIOR_USE_UDP:
+    temp_flag= MEM_USE_UDP;
+    break;
   case MEMCACHED_BEHAVIOR_TCP_NODELAY:
     temp_flag= MEM_TCP_NODELAY;
     break;
@@ -217,6 +265,15 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     }
   case MEMCACHED_BEHAVIOR_USER_DATA:
     return MEMCACHED_FAILURE;
+  case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
+    temp_flag= MEM_HASH_WITH_PREFIX_KEY;
+    break;
+  case MEMCACHED_BEHAVIOR_NOREPLY:
+    temp_flag= MEM_NOREPLY;
+    break;
+  case MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS:
+    temp_flag= MEM_AUTO_EJECT_HOSTS;
+    break;
   }
 
   WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
@@ -224,6 +281,4 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return 1;
   else
     return 0;
-
-  return MEMCACHED_SUCCESS;
 }