X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffunction.c;h=99ad776aecc1bc8154c4dc58cca229b885fd925c;hb=618811a49324bf07ee0d3d435bb3843d3d57fd02;hp=91c12f7a0d76dea85a43e3abe7d5a0887945f850;hpb=6bd49a94f43c6ffe3b679f9470d266031d809bf9;p=m6w6%2Flibmemcached

diff --git a/tests/function.c b/tests/function.c
index 91c12f7a..99ad776a 100644
--- a/tests/function.c
+++ b/tests/function.c
@@ -1,6 +1,8 @@
 /*
   Sample test application.
 */
+#include "libmemcached/common.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,8 +13,8 @@
 #include <unistd.h>
 #include <time.h>
 #include "server.h"
-#include "../clients/generator.h"
-#include "../clients/execute.h"
+#include "clients/generator.h"
+#include "clients/execute.h"
 
 #ifndef INT64_MAX
 #define INT64_MAX LONG_MAX
@@ -24,6 +26,11 @@
 
 #include "test.h"
 
+#ifdef HAVE_LIBMEMCACHEDUTIL
+#include <pthread.h>
+#include "libmemcached/memcached_util.h"
+#endif
+
 #define GLOBAL_COUNT 10000
 #define GLOBAL2_COUNT 100
 #define SERVERS_TO_CREATE 5
@@ -204,6 +211,32 @@ static test_return  clone_test(memcached_st *memc)
     memcached_st *clone;
     clone= memcached_clone(NULL, memc);
     assert(clone);
+
+    assert(clone->call_free == memc->call_free);
+    assert(clone->call_malloc == memc->call_malloc);
+    assert(clone->call_realloc == memc->call_realloc);
+    assert(clone->call_calloc == memc->call_calloc);
+    assert(clone->connect_timeout == memc->connect_timeout);
+    assert(clone->delete_trigger == memc->delete_trigger);
+    assert(clone->distribution == memc->distribution);
+    assert(clone->flags == memc->flags);
+    assert(clone->get_key_failure == memc->get_key_failure);
+    assert(clone->hash == memc->hash);
+    assert(clone->hash_continuum == memc->hash_continuum);
+    assert(clone->io_bytes_watermark == memc->io_bytes_watermark);
+    assert(clone->io_msg_watermark == memc->io_msg_watermark);
+    assert(clone->io_key_prefetch == memc->io_key_prefetch);
+    assert(clone->on_cleanup == memc->on_cleanup);
+    assert(clone->on_clone == memc->on_clone);
+    assert(clone->poll_timeout == memc->poll_timeout);
+    assert(clone->rcv_timeout == memc->rcv_timeout);
+    assert(clone->recv_size == memc->recv_size);
+    assert(clone->retry_timeout == memc->retry_timeout);
+    assert(clone->send_size == memc->send_size);
+    assert(clone->server_failure_limit == memc->server_failure_limit);
+    assert(clone->snd_timeout == memc->snd_timeout);
+    assert(clone->user_data == memc->user_data);
+
     memcached_free(clone);
   }
 
@@ -230,6 +263,16 @@ static test_return  clone_test(memcached_st *memc)
   return 0;
 }
 
+static test_return userdata_test(memcached_st *memc)
+{
+  void* foo;
+  assert(memcached_set_user_data(memc, foo) == NULL);
+  assert(memcached_get_user_data(memc) == foo);
+  assert(memcached_set_user_data(memc, NULL) == foo);
+  
+  return TEST_SUCCESS;
+}
+
 static test_return  connection_test(memcached_st *memc)
 {
   memcached_return rc;
@@ -519,11 +562,22 @@ static test_return  add_test(memcached_st *memc)
   return 0;
 }
 
+/*
+** There was a problem of leaking filedescriptors in the initial release
+** of MacOSX 10.5. This test case triggers the problem. On some Solaris
+** systems it seems that the kernel is slow on reclaiming the resources
+** because the connects starts to time out (the test doesn't do much
+** anyway, so just loop 10 iterations)
+*/
 static test_return  add_wrapper(memcached_st *memc)
 {
   unsigned int x;
+  unsigned int max= 10000;
+#ifdef __sun
+  max= 10;
+#endif
 
-  for (x= 0; x < 10000; x++)
+  for (x= 0; x < max; x++)
     add_test(memc);
 
   return 0;
@@ -705,6 +759,7 @@ static test_return  read_through(memcached_st *memc)
   char *string;
   size_t string_length;
   uint32_t flags;
+  memcached_trigger_key cb= (memcached_trigger_key)read_through_trigger;
 
   string= memcached_get(memc, key, strlen(key),
                         &string_length, &flags, &rc);
@@ -713,7 +768,8 @@ static test_return  read_through(memcached_st *memc)
   assert(string_length ==  0);
   assert(!string);
 
-  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, (void *)read_through_trigger);
+  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE,
+                             *(void **)&cb);
   assert(rc == MEMCACHED_SUCCESS);
 
   string= memcached_get(memc, key, strlen(key),
@@ -749,9 +805,9 @@ static test_return  delete_through(memcached_st *memc)
   memcached_trigger_delete_key callback;
   memcached_return rc;
 
-  callback= delete_trigger;
+  callback= (memcached_trigger_delete_key)delete_trigger;
 
-  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, (void*)callback);
+  rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback);
   assert(rc == MEMCACHED_SUCCESS);
 
   return 0;
@@ -827,7 +883,6 @@ static test_return  set_test2(memcached_st *memc)
 static test_return  set_test3(memcached_st *memc)
 {
   memcached_return rc;
-  char *key= "foo";
   char *value;
   size_t value_length= 8191;
   unsigned int x;
@@ -838,8 +893,13 @@ static test_return  set_test3(memcached_st *memc)
   for (x= 0; x < value_length; x++)
     value[x] = (char) (x % 127);
 
-  for (x= 0; x < 1; x++)
+  /* The dump test relies on there being at least 32 items in memcached */
+  for (x= 0; x < 32; x++)
   {
+    char key[16];
+
+    sprintf(key, "foo%u", x);
+
     rc= memcached_set(memc, key, strlen(key), 
                       value, value_length,
                       (time_t)0, (uint32_t)0);
@@ -926,6 +986,51 @@ static test_return  get_test4(memcached_st *memc)
   return 0;
 }
 
+/*
+ * This test verifies that memcached_read_one_response doesn't try to
+ * dereference a NIL-pointer if you issue a multi-get and don't read out all
+ * responses before you execute a storage command.
+ */
+static test_return get_test5(memcached_st *memc)
+{
+  /*
+  ** Request the same key twice, to ensure that we hash to the same server
+  ** (so that we have multiple response values queued up) ;-)
+  */
+  char *keys[]= { "key", "key" };
+  size_t lengths[]= { 3, 3 };
+  uint32_t flags;
+  size_t rlen;
+
+  memcached_return rc= memcached_set(memc, keys[0], lengths[0], 
+                                     keys[0], lengths[0], 0, 0);
+  assert(rc == MEMCACHED_SUCCESS);
+  rc= memcached_mget(memc, keys, lengths, 2);
+
+  memcached_result_st results_obj;
+  memcached_result_st *results;
+  results=memcached_result_create(memc, &results_obj);
+  assert(results);
+  results=memcached_fetch_result(memc, &results_obj, &rc);
+  assert(results);
+  memcached_result_free(&results_obj);
+
+  /* Don't read out the second result, but issue a set instead.. */
+  rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  char *val= memcached_get_by_key(memc, keys[0], lengths[0], "yek", 3,
+                                  &rlen, &flags, &rc);
+  assert(val == NULL);
+  assert(rc == MEMCACHED_NOTFOUND);
+  val= memcached_get(memc, keys[0], lengths[0], &rlen, &flags, &rc);
+  assert(val != NULL);
+  assert(rc == MEMCACHED_SUCCESS);
+  free(val);
+
+  return TEST_SUCCESS;
+}
+
 /* Do not copy the style of this code, I just access hosts to testthis function */
 static test_return  stats_servername_test(memcached_st *memc)
 {
@@ -963,6 +1068,28 @@ static test_return  increment_test(memcached_st *memc)
   return 0;
 }
 
+static test_return  increment_with_initial_test(memcached_st *memc)
+{
+  if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
+  {
+    uint64_t new_number;
+    memcached_return rc;
+    char *key= "number";
+    uint64_t initial= 0;
+
+    rc= memcached_increment_with_initial(memc, key, strlen(key),
+                                         1, initial, 0, &new_number);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(new_number == initial);
+
+    rc= memcached_increment_with_initial(memc, key, strlen(key),
+                                         1, initial, 0, &new_number);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(new_number == (initial + 1));
+  }
+  return 0;
+}
+
 static test_return  decrement_test(memcached_st *memc)
 {
   uint64_t new_number;
@@ -988,6 +1115,28 @@ static test_return  decrement_test(memcached_st *memc)
   return 0;
 }
 
+static test_return  decrement_with_initial_test(memcached_st *memc)
+{
+  if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
+  {
+    uint64_t new_number;
+    memcached_return rc;
+    char *key= "number";
+    uint64_t initial= 3;
+
+    rc= memcached_decrement_with_initial(memc, key, strlen(key),
+                                         1, initial, 0, &new_number);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(new_number == initial);
+
+    rc= memcached_decrement_with_initial(memc, key, strlen(key),
+                                         1, initial, 0, &new_number);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(new_number == (initial - 1));
+  }
+  return 0;
+}
+
 static test_return  quit_test(memcached_st *memc)
 {
   memcached_return rc;
@@ -1328,24 +1477,31 @@ static test_return  callback_test(memcached_st *memc)
 
   /* Test Clone Callback */
   {
-    memcached_clone_func temp_function;
+    memcached_clone_func clone_cb= (memcached_clone_func)clone_test_callback;
+    void *clone_cb_ptr= *(void **)&clone_cb;
+    void *temp_function= NULL;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, (void*)clone_test_callback);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION,
+                               clone_cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    temp_function= (memcached_clone_func)memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
-    assert(temp_function == clone_test_callback);
+    temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
+    assert(temp_function == clone_cb_ptr);
   }
 
   /* Test Cleanup Callback */
   {
-    memcached_cleanup_func temp_function;
+    memcached_cleanup_func cleanup_cb=
+      (memcached_cleanup_func)cleanup_test_callback;
+    void *cleanup_cb_ptr= *(void **)&cleanup_cb;
+    void *temp_function= NULL;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, (void*)cleanup_test_callback);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION,
+                               cleanup_cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    temp_function= (memcached_cleanup_func)memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
-    assert(temp_function == cleanup_test_callback);
+    temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc);
+    assert(temp_function == cleanup_cb_ptr);
   }
 
   return 0;
@@ -1896,9 +2052,10 @@ static test_return  user_supplied_bug10(memcached_st *memc)
   {
     rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0);
 
-    assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED);
+    assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || 
+           rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT);
 
-    if (rc == MEMCACHED_WRITE_FAILURE)
+    if (rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_TIMEOUT)
       x--;
   }
 
@@ -2171,7 +2328,7 @@ static test_return  user_supplied_bug17(memcached_st *memc)
   From Andrei on IRC
 */
 
-test_return user_supplied_bug19(memcached_st *memc)
+static test_return user_supplied_bug19(memcached_st *memc)
 {
   memcached_st *m;
   memcached_server_st *s;
@@ -2192,7 +2349,7 @@ test_return user_supplied_bug19(memcached_st *memc)
 }
 
 /* CAS test from Andei */
-test_return user_supplied_bug20(memcached_st *memc)
+static test_return user_supplied_bug20(memcached_st *memc)
 {
   memcached_return status;
   memcached_result_st *result, result_obj;
@@ -2224,7 +2381,7 @@ test_return user_supplied_bug20(memcached_st *memc)
 }
 
 #include "ketama_test_cases.h"
-test_return user_supplied_bug18(memcached_st *trash)
+static test_return user_supplied_bug18(memcached_st *trash)
 {
   memcached_return rc;
   int value;
@@ -2283,6 +2440,75 @@ test_return user_supplied_bug18(memcached_st *trash)
   return 0;
 }
 
+static test_return auto_eject_hosts(memcached_st *trash)
+{
+  (void) trash;
+
+  memcached_return rc;
+  memcached_st *memc= memcached_create(NULL);
+  assert(memc);
+
+  rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED);
+  assert(value == 1);
+
+  rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH);
+  assert(value == MEMCACHED_HASH_MD5);
+
+    /* server should be removed when in delay */
+  rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS, 1);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS);
+  assert(value == 1);
+
+  memcached_server_st *server_pool;
+  server_pool = memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100");
+  memcached_server_push(memc, server_pool);
+
+  /* verify that the server list was parsed okay. */
+  assert(memc->number_of_hosts == 8);
+  assert(strcmp(server_pool[0].hostname, "10.0.1.1") == 0);
+  assert(server_pool[0].port == 11211);
+  assert(server_pool[0].weight == 600);
+  assert(strcmp(server_pool[2].hostname, "10.0.1.3") == 0);
+  assert(server_pool[2].port == 11211);
+  assert(server_pool[2].weight == 200);
+  assert(strcmp(server_pool[7].hostname, "10.0.1.8") == 0);
+  assert(server_pool[7].port == 11211);
+  assert(server_pool[7].weight == 100);
+
+  memc->hosts[2].next_retry = time(NULL) + 15;
+  memc->next_distribution_rebuild= time(NULL) - 1;
+
+  for (int x= 0; x < 99; x++)
+  {
+    uint32_t server_idx = memcached_generate_hash(memc, test_cases[x].key, strlen(test_cases[x].key));
+    assert(server_idx != 2);
+  }
+
+  /* and re-added when it's back. */
+  memc->hosts[2].next_retry = time(NULL) - 1;
+  memc->next_distribution_rebuild= time(NULL) - 1;
+  run_distribution(memc);
+  for (int x= 0; x < 99; x++)
+  {
+    uint32_t server_idx = memcached_generate_hash(memc, test_cases[x].key, strlen(test_cases[x].key));
+    char *hostname = memc->hosts[server_idx].hostname;
+    assert(strcmp(hostname, test_cases[x].server) == 0);
+  }
+
+  memcached_server_list_free(server_pool);
+  memcached_free(memc);
+
+  return TEST_SUCCESS;
+}
+
 static test_return  result_static(memcached_st *memc)
 {
   memcached_result_st result;
@@ -2346,7 +2572,7 @@ static test_return  string_alloc_with_size_toobig(memcached_st *memc)
 {
   memcached_string_st *string;
 
-  string= memcached_string_create(memc, NULL, INT64_MAX);
+  string= memcached_string_create(memc, NULL, SIZE_MAX);
   assert(string == NULL);
 
   return 0;
@@ -2393,7 +2619,7 @@ static test_return  string_alloc_append_toobig(memcached_st *memc)
     rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
     assert(rc == MEMCACHED_SUCCESS);
   }
-  rc= memcached_string_append(string, buffer, INT64_MAX);
+  rc= memcached_string_append(string, buffer, SIZE_MAX);
   assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE);
   memcached_string_free(string);
 
@@ -2457,7 +2683,11 @@ static test_return  generate_data_with_stats(memcached_st *memc)
 
   for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
   {
-      printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes);
+    /* This test was changes so that "make test" would work properlly */
+#ifdef DEBUG
+    printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes);
+#endif
+    assert((unsigned long long)(stat_p + host_index)->bytes);
   }
 
   memcached_stat_free(NULL, stat_p);
@@ -2632,13 +2862,6 @@ static test_return  delete_buffer_generate(memcached_st *memc)
   return 0;
 }
 
-static test_return  free_data(memcached_st *memc __attribute__((unused)))
-{
-  pairs_free(global_pairs);
-
-  return 0;
-}
-
 static test_return  add_host_test1(memcached_st *memc)
 {
   unsigned int x;
@@ -2732,9 +2955,13 @@ static memcached_return  pre_crc(memcached_st *memc)
 
 static memcached_return  pre_hsieh(memcached_st *memc)
 {
+#ifdef HAVE_HSIEH_HASH
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH);
-
   return MEMCACHED_SUCCESS;
+#else
+  (void) memc;
+  return MEMCACHED_FAILURE;
+#endif
 }
 
 static memcached_return  pre_hash_fnv1_64(memcached_st *memc)
@@ -2827,7 +3054,11 @@ static void my_free(memcached_st *ptr __attribute__((unused)), void *mem)
 
 static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t size)
 {
-  return malloc(size);
+  void *ret= malloc(size);
+  if (ret != NULL)
+    memset(ret, 0xff, size);
+
+  return ret;
 }
 
 static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, const size_t size)
@@ -2835,6 +3066,11 @@ static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, co
   return realloc(mem, size);
 }
 
+static void *my_calloc(memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size)
+{
+  return calloc(nelem, size);
+}
+
 static memcached_return set_prefix(memcached_st *memc)
 {
   memcached_return rc;
@@ -2902,40 +3138,72 @@ static memcached_return set_prefix(memcached_st *memc)
   return MEMCACHED_SUCCESS;
 }
 
-static memcached_return  set_memory_alloc(memcached_st *memc)
+static memcached_return deprecated_set_memory_alloc(memcached_st *memc)
 {
+  void *test_ptr= NULL;
+  void *cb_ptr= NULL;
   {
-    memcached_malloc_function test_ptr;
+    memcached_malloc_function malloc_cb= 
+      (memcached_malloc_function)my_malloc;
+    cb_ptr= *(void **)&malloc_cb;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, (void*)&my_malloc);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_malloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &rc);
+    test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &rc);
     assert(rc == MEMCACHED_SUCCESS);
-    assert(test_ptr == my_malloc);
+    assert(test_ptr == cb_ptr);
   }
 
   {
-    memcached_realloc_function test_ptr;
+    memcached_realloc_function realloc_cb= 
+      (memcached_realloc_function)my_realloc;
+    cb_ptr= *(void **)&realloc_cb;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, (void*)&my_realloc);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_realloc_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &rc);
+    test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &rc);
     assert(rc == MEMCACHED_SUCCESS);
-    assert(test_ptr == my_realloc);
+    assert(test_ptr == cb_ptr);
   }
 
   {
-    memcached_free_function test_ptr;
+    memcached_free_function free_cb= 
+      (memcached_free_function)my_free;
+    cb_ptr= *(void **)&free_cb;
     memcached_return rc;
 
-    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, (void*)my_free);
+    rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, cb_ptr);
     assert(rc == MEMCACHED_SUCCESS);
-    test_ptr= (memcached_free_function)memcached_callback_get(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, &rc);
+    test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, &rc);
     assert(rc == MEMCACHED_SUCCESS);
-    assert(test_ptr == my_free);
+    assert(test_ptr == cb_ptr);
   }
+  return MEMCACHED_SUCCESS;
+}
+
+static memcached_return set_memory_alloc(memcached_st *memc)
+{
+  memcached_return rc;
+  rc= memcached_set_memory_allocators(memc, NULL, my_free, 
+                                      my_realloc, my_calloc);
+  assert(rc == MEMCACHED_FAILURE);
+
+  rc= memcached_set_memory_allocators(memc, my_malloc, my_free, 
+                                      my_realloc, my_calloc);
+  
+  memcached_malloc_function mem_malloc;
+  memcached_free_function mem_free;
+  memcached_realloc_function mem_realloc;
+  memcached_calloc_function mem_calloc;
+  memcached_get_memory_allocators(memc, &mem_malloc, &mem_free, 
+                                  &mem_realloc, &mem_calloc);   
+
+  assert(mem_malloc == my_malloc);
+  assert(mem_realloc == my_realloc);
+  assert(mem_calloc == my_calloc);
+  assert(mem_free == my_free);
 
   return MEMCACHED_SUCCESS;
 }
@@ -2945,7 +3213,8 @@ static memcached_return  enable_consistent(memcached_st *memc)
   memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT;
   memcached_hash hash;
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value);
-  pre_hsieh(memc);
+  if (pre_hsieh(memc) != MEMCACHED_SUCCESS)
+    return MEMCACHED_FAILURE;
 
   value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);
   assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT);
@@ -3051,7 +3320,7 @@ static test_return noreply_test(memcached_st *memc)
     for (int x=0; x < 100; ++x)
     {
       char key[10];
-      size_t len=sprintf(key, "%d", x);
+      size_t len= sprintf(key, "%d", x);
       switch (count)
       {
       case 0:
@@ -3079,7 +3348,7 @@ static test_return noreply_test(memcached_st *memc)
     ** way it is supposed to do!!!!
     */
     int no_msg=0;
-    for (int x=0; x < memc->number_of_hosts; ++x)
+    for (uint32_t x=0; x < memc->number_of_hosts; ++x)
       no_msg+=memc->hosts[x].cursor_active;
 
     assert(no_msg == 0);
@@ -3091,7 +3360,7 @@ static test_return noreply_test(memcached_st *memc)
     for (int x=0; x < 100; ++x)
     {
       char key[10];
-      size_t len=sprintf(key, "%d", x);
+      size_t len= sprintf(key, "%d", x);
       size_t length;
       uint32_t flags;
       char* value=memcached_get(memc, key, strlen(key),
@@ -3125,12 +3394,12 @@ static test_return noreply_test(memcached_st *memc)
   uint32_t flags;
   memcached_result_st results_obj;
   memcached_result_st *results;
-  ret=memcached_mget(memc, keys, lengths, 1);
+  ret= memcached_mget(memc, keys, lengths, 1);
   assert(ret == MEMCACHED_SUCCESS);
 
-  results=memcached_result_create(memc, &results_obj);
+  results= memcached_result_create(memc, &results_obj);
   assert(results);
-  results=memcached_fetch_result(memc, &results_obj, &ret);
+  results= memcached_fetch_result(memc, &results_obj, &ret);
   assert(results);
   assert(ret == MEMCACHED_SUCCESS);
   uint64_t cas= memcached_result_cas(results);
@@ -3173,6 +3442,106 @@ static test_return analyzer_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+/* Count the objects */
+static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((unused)),  
+                                              const char *key __attribute__((unused)), 
+                                              size_t key_length __attribute__((unused)), 
+                                              void *context)
+{
+  uint32_t *counter= (uint32_t *)context;
+
+  *counter= *counter + 1;
+
+  return MEMCACHED_SUCCESS;
+}
+
+static test_return dump_test(memcached_st *memc)
+{
+  memcached_return rc;
+  uint32_t counter= 0;
+  memcached_dump_func callbacks[1];
+  test_return main_rc;
+
+  callbacks[0]= &callback_dump_counter;
+
+  /* No support for Binary protocol yet */
+  if (memc->flags & MEM_BINARY_PROTOCOL)
+    return TEST_SUCCESS;
+
+  main_rc= set_test3(memc);
+
+  assert (main_rc == TEST_SUCCESS);
+
+  rc= memcached_dump(memc, callbacks, (void *)&counter, 1);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  /* We may have more then 32 if our previous flush has not completed */
+  assert(counter >= 32);
+
+  return TEST_SUCCESS;
+}
+
+#ifdef HAVE_LIBMEMCACHEDUTIL
+static void* connection_release(void *arg) {
+  struct {
+    memcached_pool_st* pool;
+    memcached_st* mmc;
+  } *resource= arg;
+
+  usleep(250);
+  assert(memcached_pool_push(resource->pool, resource->mmc) == MEMCACHED_SUCCESS);
+  return arg;
+}
+
+static test_return connection_pool_test(memcached_st *memc)
+{
+  memcached_pool_st* pool= memcached_pool_create(memc, 5, 10);
+  assert(pool != NULL);
+  memcached_st* mmc[10];
+  memcached_return rc;
+
+  for (int x= 0; x < 10; ++x) {
+    mmc[x]= memcached_pool_pop(pool, false, &rc);
+    assert(mmc[x] != NULL);
+    assert(rc == MEMCACHED_SUCCESS);
+  }
+
+  assert(memcached_pool_pop(pool, false, &rc) == NULL);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  pthread_t tid;
+  struct {
+    memcached_pool_st* pool;
+    memcached_st* mmc;
+  } item= { .pool = pool, .mmc = mmc[9] };
+  pthread_create(&tid, NULL, connection_release, &item);
+  mmc[9]= memcached_pool_pop(pool, true, &rc);
+  assert(rc == MEMCACHED_SUCCESS);
+  pthread_join(tid, NULL);
+  assert(mmc[9] == item.mmc);
+  const char *key= "key";
+  size_t keylen= strlen(key);
+
+  // verify that I can do ops with all connections
+  rc= memcached_set(mmc[0], key, keylen, "0", 1, 0, 0);
+  assert(rc == MEMCACHED_SUCCESS);
+
+  for (unsigned int x= 0; x < 10; ++x) {
+    uint64_t number_value;
+    rc= memcached_increment(mmc[x], key, keylen, 1, &number_value);
+    assert(rc == MEMCACHED_SUCCESS);
+    assert(number_value == (x+1));
+  }
+
+  // Release them..
+  for (int x= 0; x < 10; ++x)
+    assert(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS);
+
+  assert(memcached_pool_destroy(pool) == memc);
+  return TEST_SUCCESS;
+}
+#endif
+
 static void increment_request_id(uint16_t *id)
 {
   (*id)++;
@@ -3222,6 +3591,8 @@ static memcached_return init_udp(memcached_st *memc)
   unsigned int x= 0;
   memcached_server_st servers[num_hosts];
   memcpy(servers, memc->hosts, sizeof(memcached_server_st) * num_hosts);
+  for (x= 0; x < num_hosts; x++)
+    memcached_server_free(&memc->hosts[x]);
   memc->number_of_hosts= 0;
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1);
   for (x= 0; x < num_hosts; x++)
@@ -3337,7 +3708,7 @@ static test_return udp_set_too_big_test(memcached_st *memc)
   return post_udp_op_check(memc,expected_ids);
 }
 
-test_return udp_delete_test(memcached_st *memc)
+static test_return udp_delete_test(memcached_st *memc)
 {
   unsigned int x= 0;
   unsigned int num_iters= 1025; //request id rolls over at 1024
@@ -3370,7 +3741,7 @@ static test_return udp_buffered_delete_test(memcached_st *memc)
   return udp_delete_test(memc);
 }
 
-test_return udp_verbosity_test(memcached_st *memc)
+static test_return udp_verbosity_test(memcached_st *memc)
 {
   memcached_return rc;
   uint16_t *expected_ids= get_udp_request_ids(memc);
@@ -3383,14 +3754,14 @@ test_return udp_verbosity_test(memcached_st *memc)
   return post_udp_op_check(memc,expected_ids);
 }
 
-test_return udp_quit_test(memcached_st *memc)
+static test_return udp_quit_test(memcached_st *memc)
 {
   uint16_t *expected_ids= get_udp_request_ids(memc);
   memcached_quit(memc);
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_flush_test(memcached_st *memc)
+static test_return udp_flush_test(memcached_st *memc)
 {
   memcached_return rc;
   uint16_t *expected_ids= get_udp_request_ids(memc);
@@ -3403,7 +3774,7 @@ test_return udp_flush_test(memcached_st *memc)
   return post_udp_op_check(memc,expected_ids);
 }
 
-test_return udp_incr_test(memcached_st *memc)
+static test_return udp_incr_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "incr";
@@ -3422,7 +3793,7 @@ test_return udp_incr_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_decr_test(memcached_st *memc)
+static test_return udp_decr_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "decr";
@@ -3442,7 +3813,7 @@ test_return udp_decr_test(memcached_st *memc)
 }
 
 
-test_return udp_stat_test(memcached_st *memc)
+static test_return udp_stat_test(memcached_st *memc)
 {
   memcached_stat_st * rv= NULL;
   memcached_return rc;
@@ -3454,7 +3825,7 @@ test_return udp_stat_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_version_test(memcached_st *memc)
+static test_return udp_version_test(memcached_st *memc)
 {
   memcached_return rc;
   uint16_t *expected_ids = get_udp_request_ids(memc);
@@ -3463,7 +3834,7 @@ test_return udp_version_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_get_test(memcached_st *memc)
+static test_return udp_get_test(memcached_st *memc)
 {
   memcached_return rc;
   char *key= "foo";
@@ -3475,7 +3846,7 @@ test_return udp_get_test(memcached_st *memc)
   return post_udp_op_check(memc, expected_ids);
 }
 
-test_return udp_mixed_io_test(memcached_st *memc)
+static test_return udp_mixed_io_test(memcached_st *memc)
 {
   test_st current_op;
   test_st mixed_io_ops [] ={
@@ -3498,6 +3869,240 @@ test_return udp_mixed_io_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+static test_return hsieh_avaibility_test (memcached_st *memc)
+{
+  memcached_return expected_rc= MEMCACHED_FAILURE;
+#ifdef HAVE_HSIEH_HASH
+  expected_rc= MEMCACHED_SUCCESS;
+#endif
+  memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH,
+                                            (uint64_t)MEMCACHED_HASH_HSIEH);
+  assert(rc == expected_rc);
+  return TEST_SUCCESS;
+}
+
+static char *list[]=
+{
+  "apple",
+  "beat",
+  "carrot",
+  "daikon",
+  "eggplant",
+  "flower",
+  "green",
+  "hide",
+  "ick",
+  "jack",
+  "kick",
+  "lime",
+  "mushrooms",
+  "nectarine",
+  "orange",
+  "peach",
+  "quant",
+  "ripen",
+  "strawberry",
+  "tang",
+  "up",
+  "volumne",
+  "when",
+  "yellow",
+  "zip",
+  NULL
+};
+
+static test_return md5_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  3195025439, 2556848621, 3724893440, 3332385401, 245758794, 2550894432, 
+                        121710495, 3053817768, 1250994555, 1862072655, 2631955953, 2951528551, 
+                        1451250070, 2820856945, 2060845566, 3646985608, 2138080750, 217675895, 
+                        2230934345, 1234361223, 3968582726, 2455685270, 1293568479, 199067604, 
+                        2042482093 };
+
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MD5);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return crc_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  10542, 22009, 14526, 19510, 19432, 10199, 20634, 9369, 11511, 10362,
+                        7893, 31289, 11313, 9354, 7621, 30628, 15218, 25967, 2695, 9380, 
+                        17300, 28156, 9192, 20484, 16925 };
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_CRC);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return fnv1_64_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  473199127, 4148981457, 3971873300, 3257986707, 1722477987, 2991193800, 
+                        4147007314, 3633179701, 1805162104, 3503289120, 3395702895, 3325073042,
+                        2345265314, 3340346032, 2722964135, 1173398992, 2815549194, 2562818319,
+                        224996066, 2680194749, 3035305390, 246890365, 2395624193, 4145193337,
+                        1801941682 };
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  1488911807, 2500855813, 1510099634, 1390325195, 3647689787, 3241528582,
+                        1669328060, 2604311949, 734810122, 1516407546, 560948863, 1767346780,
+                        561034892, 4156330026, 3716417003, 3475297030, 1518272172, 227211583,
+                        3938128828, 126112909, 3043416448, 3131561933, 1328739897, 2455664041,
+                        2272238452 }; 
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_64);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return fnv1_32_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  67176023, 1190179409, 2043204404, 3221866419, 2567703427, 3787535528, 4147287986,
+                        3500475733, 344481048, 3865235296, 2181839183, 119581266, 510234242, 4248244304,
+                        1362796839, 103389328, 1449620010, 182962511, 3554262370, 3206747549, 1551306158,
+                        4127558461, 1889140833, 2774173721, 1180552018 };
+
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_32);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  280767167, 2421315013, 3072375666, 855001899, 459261019, 3521085446, 18738364,
+                        1625305005, 2162232970, 777243802, 3323728671, 132336572, 3654473228, 260679466,
+                        1169454059, 2698319462, 1062177260, 235516991, 2218399068, 405302637, 1128467232,
+                        3579622413, 2138539289, 96429129, 2877453236 };
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_32);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return hsieh_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+#ifdef HAVE_HSIEH_HASH
+  uint32_t values[]= {  3738850110, 3636226060, 3821074029, 3489929160, 3485772682, 80540287,
+                        1805464076, 1895033657, 409795758, 979934958, 3634096985, 1284445480,
+                        2265380744, 707972988, 353823508, 1549198350, 1327930172, 9304163,
+                        4220749037, 2493964934, 2777873870, 2057831732, 1510213931, 2027828987,
+                        3395453351 };
+#else
+  uint32_t values[]= {  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+#endif
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_HSIEH);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return murmur_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= { 473199127, 4148981457, 3971873300, 3257986707, 1722477987, 2991193800,
+                        4147007314, 3633179701, 1805162104, 3503289120, 3395702895, 3325073042,
+                        2345265314, 3340346032, 2722964135, 1173398992, 2815549194, 2562818319,
+                        224996066, 2680194749, 3035305390, 246890365, 2395624193, 4145193337,
+                        1801941682 };
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
+static test_return jenkins_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  char **ptr;
+  uint32_t values[]= {  1442444624, 4253821186, 1885058256, 2120131735, 3261968576, 3515188778,
+                        4232909173, 4288625128, 1812047395, 3689182164, 2502979932, 1214050606,
+                        2415988847, 1494268927, 1025545760, 3920481083, 4153263658, 3824871822,
+                        3072759809, 798622255, 3065432577, 1453328165, 2691550971, 3408888387,
+                        2629893356 };
+
+
+  for (ptr= list, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val; 
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_JENKINS);
+    assert(values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
 test_st udp_setup_server_tests[] ={
   {"set_udp_behavior_test", 0, set_udp_behavior_test},
   {"add_tcp_server_udp_client_test", 0, add_tcp_server_udp_client_test},
@@ -3533,10 +4138,15 @@ test_st tests[] ={
   {"server_sort", 0, server_sort_test},
   {"server_sort2", 0, server_sort2_test},
   {"clone_test", 0, clone_test },
+  {"connection_test", 0, connection_test},
+  {"callback_test", 0, callback_test},
+  {"behavior_test", 0, behavior_test},
+  {"userdata_test", 0, userdata_test},
   {"error", 0, error_test },
   {"set", 0, set_test },
   {"set2", 0, set_test2 },
   {"set3", 0, set_test3 },
+  {"dump", 1, dump_test},
   {"add", 1, add_test },
   {"replace", 1, replace_test },
   {"delete", 1, delete_test },
@@ -3544,9 +4154,12 @@ test_st tests[] ={
   {"get2", 0, get_test2 },
   {"get3", 0, get_test3 },
   {"get4", 0, get_test4 },
+  {"partial mget", 0, get_test5 },
   {"stats_servername", 0, stats_servername_test },
   {"increment", 0, increment_test },
+  {"increment_with_initial", 1, increment_with_initial_test },
   {"decrement", 0, decrement_test },
+  {"decrement_with_initial", 1, decrement_with_initial_test },
   {"quit", 0, quit_test },
   {"mget", 1, mget_test },
   {"mget_result", 1, mget_result_test },
@@ -3565,6 +4178,9 @@ test_st tests[] ={
   {"delete_through", 1, delete_through },
   {"noreply", 1, noreply_test},
   {"analyzer", 1, analyzer_test},
+#ifdef HAVE_LIBMEMCACHEDUTIL
+  {"connectionpool", 1, connection_pool_test },
+#endif
   {0, 0, 0}
 };
 
@@ -3666,7 +4282,31 @@ test_st consistent_weighted_tests[] ={
   {0, 0, 0}
 };
 
+test_st hsieh_availability[] ={
+  {"hsieh_avaibility_test",0,hsieh_avaibility_test},
+  {0, 0, 0}
+};
+
+test_st ketama_auto_eject_hosts[] ={
+  {"auto_eject_hosts", 1, auto_eject_hosts },
+  {0, 0, 0}
+};
+
+test_st hash_tests[] ={
+  {"md5", 0, md5_run },
+  {"crc", 0, crc_run },
+  {"fnv1_64", 0, fnv1_64_run },
+  {"fnv1a_64", 0, fnv1a_64_run },
+  {"fnv1_32", 0, fnv1_32_run },
+  {"fnv1a_32", 0, fnv1a_32_run },
+  {"hsieh", 0, hsieh_run },
+  {"murmur", 0, murmur_run },
+  {"jenkis", 0, jenkins_run },
+  {0, 0, 0}
+};
+
 collection_st collection[] ={
+  {"hsieh_availability",0,0,hsieh_availability},
   {"udp_setup", init_udp, 0, udp_setup_server_tests},
   {"udp_io", init_udp, 0, upd_io_tests},
   {"udp_binary_io", binary_init_udp, 0, upd_io_tests},
@@ -3684,11 +4324,13 @@ collection_st collection[] ={
   {"fnv1_32", pre_hash_fnv1_32, 0, tests},
   {"fnv1a_32", pre_hash_fnv1a_32, 0, tests},
   {"ketama", pre_behavior_ketama, 0, tests},
+  {"ketama_auto_eject_hosts", pre_behavior_ketama, 0, ketama_auto_eject_hosts},
   {"unix_socket", pre_unix_socket, 0, tests},
   {"unix_socket_nodelay", pre_nodelay, 0, tests},
   {"poll_timeout", poll_timeout, 0, tests},
   {"gets", enable_cas, 0, tests},
   {"consistent", enable_consistent, 0, tests},
+  {"deprecated_memory_allocators", deprecated_set_memory_alloc, 0, tests},
   {"memory_allocators", set_memory_alloc, 0, tests},
   {"prefix", set_prefix, 0, tests},
   {"version_1_2_3", check_for_1_2_3, 0, version_1_2_3},
@@ -3708,6 +4350,7 @@ collection_st collection[] ={
   {"consistent_not", 0, 0, consistent_tests},
   {"consistent_ketama", pre_behavior_ketama, 0, consistent_tests},
   {"consistent_ketama_weighted", pre_behavior_ketama_weighted, 0, consistent_weighted_tests},
+  {"test_hashes", 0, 0, hash_tests},
   {0, 0, 0, 0}
 };