X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_functions.c;h=f5e3da13283b665dfff3b595ef617ac149106a04;hb=c29c787187baac1f403668a5dbf8ba481b9a8c8e;hp=6fa1995a4c26f7794e6bb66ee2276a7f69edee6c;hpb=02fa1c85c842e175225f74b0e213a5600d4c03cf;p=m6w6%2Flibmemcached

diff --git a/tests/mem_functions.c b/tests/mem_functions.c
index 6fa1995a..f5e3da13 100644
--- a/tests/mem_functions.c
+++ b/tests/mem_functions.c
@@ -82,12 +82,14 @@ static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unus
 #define TEST_PORT_COUNT 7
 in_port_t test_ports[TEST_PORT_COUNT];
 
-static memcached_return_t  server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
+static memcached_return_t  server_display_function(const memcached_st *ptr __attribute__((unused)),
+                                                   const memcached_server_st *server,
+                                                   void *context)
 {
   /* Do Nothing */
   size_t bigger= *((size_t *)(context));
-  assert(bigger <= server->port);
-  *((size_t *)(context))= server->port;
+  assert(bigger <= memcached_server_port(server));
+  *((size_t *)(context))= memcached_server_port(server);
 
   return MEMCACHED_SUCCESS;
 }
@@ -109,7 +111,7 @@ static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused)))
     test_ports[x]= (in_port_t)random() % 64000;
     rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
     test_true(memcached_server_count(local_memc) == x + 1);
-    test_true(memcached_servers_count(memcached_server_list(local_memc)) == x+1);
+    test_true(memcached_server_list_count(memcached_server_list(local_memc)) == x+1);
     test_true(rc == MEMCACHED_SUCCESS);
   }
 
@@ -128,7 +130,7 @@ static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))
   memcached_return_t rc;
   memcached_server_fn callbacks[1];
   memcached_st *local_memc;
-  memcached_server_instance_st *instance;
+  memcached_server_instance_st instance;
 
   local_memc= memcached_create(NULL);
   test_true(local_memc);
@@ -137,17 +139,17 @@ static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))
 
   rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43043, 0);
   test_true(rc == MEMCACHED_SUCCESS);
-  instance= memcached_server_instance_fetch(local_memc, 0);
-  test_true(instance->port == 43043);
+  instance= memcached_server_instance_by_position(local_memc, 0);
+  test_true(memcached_server_port(instance) == 43043);
 
   rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43042, 0);
   test_true(rc == MEMCACHED_SUCCESS);
 
-  instance= memcached_server_instance_fetch(local_memc, 0);
-  test_true(instance->port == 43042);
+  instance= memcached_server_instance_by_position(local_memc, 0);
+  test_true(memcached_server_port(instance) == 43042);
 
-  instance= memcached_server_instance_fetch(local_memc, 1);
-  test_true(instance->port == 43043);
+  instance= memcached_server_instance_by_position(local_memc, 1);
+  test_true(memcached_server_port(instance) == 43043);
 
   callbacks[0]= server_display_function;
   memcached_server_cursor(local_memc, callbacks, (void *)&bigger,  1);
@@ -158,7 +160,46 @@ static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))
   return TEST_SUCCESS;
 }
 
-static memcached_return_t server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
+static memcached_return_t server_print_callback(const memcached_st *ptr __attribute__((unused)),
+                                                const memcached_server_st *server,
+                                                void *context __attribute__((unused)))
+{
+  (void)server; // Just in case we aren't printing.
+
+#if 0
+  fprintf(stderr, "%s(%d)", memcached_server_name(server), memcached_server_port(server));
+#endif
+
+  return MEMCACHED_SUCCESS;
+}
+
+static test_return_t memcached_server_remove_test(memcached_st *ptr __attribute__((unused)))
+{
+  memcached_return_t rc;
+  memcached_st local_memc;
+  memcached_st *memc;
+  memcached_server_st *servers;
+  memcached_server_fn callbacks[1];
+
+  const char *server_string= "localhost:4444, localhost:4445, localhost:4446, localhost:4447, localhost, memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214";
+
+  memc= memcached_create(&local_memc);
+
+  servers= memcached_servers_parse(server_string);
+
+  rc= memcached_server_push(memc, servers);
+
+  callbacks[0]= server_print_callback;
+  memcached_server_cursor(memc, callbacks, NULL,  1);
+
+  memcached_free(memc);
+
+  return TEST_SUCCESS;
+}
+
+static memcached_return_t server_display_unsort_function(const memcached_st *ptr __attribute__((unused)),
+                                                         const memcached_server_st *server,
+                                                         void *context)
 {
   /* Do Nothing */
   uint32_t x= *((uint32_t *)(context));
@@ -185,7 +226,7 @@ static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused)
     test_ports[x]= (in_port_t)(random() % 64000);
     rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0);
     test_true(memcached_server_count(local_memc) == x+1);
-    test_true(memcached_servers_count(memcached_server_list(local_memc)) == x+1);
+    test_true(memcached_server_list_count(memcached_server_list(local_memc)) == x+1);
     test_true(rc == MEMCACHED_SUCCESS);
   }
 
@@ -229,10 +270,13 @@ static test_return_t clone_test(memcached_st *memc)
     memc_clone= memcached_clone(NULL, memc);
     test_true(memc_clone);
 
-    test_true(memc_clone->call_free == memc->call_free);
-    test_true(memc_clone->call_malloc == memc->call_malloc);
-    test_true(memc_clone->call_realloc == memc->call_realloc);
-    test_true(memc_clone->call_calloc == memc->call_calloc);
+    { // Test allocators
+      test_true(memc_clone->allocators.free == memc->allocators.free);
+      test_true(memc_clone->allocators.malloc == memc->allocators.malloc);
+      test_true(memc_clone->allocators.realloc == memc->allocators.realloc);
+      test_true(memc_clone->allocators.calloc == memc->allocators.calloc);
+    }
+
     test_true(memc_clone->connect_timeout == memc->connect_timeout);
     test_true(memc_clone->delete_trigger == memc->delete_trigger);
     test_true(memc_clone->distribution == memc->distribution);
@@ -254,8 +298,8 @@ static test_return_t clone_test(memcached_st *memc)
       test_true(memc_clone->flags.randomize_replica_read == memc->flags.randomize_replica_read);
     }
     test_true(memc_clone->get_key_failure == memc->get_key_failure);
-    test_true(memc_clone->hash == memc->hash);
-    test_true(memc_clone->distribution_hash == memc->distribution_hash);
+    test_true(hashkit_compare(&memc_clone->hashkit, &memc->hashkit));
+    test_true(hashkit_compare(&memc_clone->distribution_hashkit, &memc->distribution_hashkit));
     test_true(memc_clone->io_bytes_watermark == memc->io_bytes_watermark);
     test_true(memc_clone->io_msg_watermark == memc->io_msg_watermark);
     test_true(memc_clone->io_key_prefetch == memc->io_key_prefetch);
@@ -328,16 +372,21 @@ static test_return_t error_test(memcached_st *memc)
                         4269430871U, 610793021U, 527273862U, 1437122909U,
                         2300930706U, 2943759320U, 674306647U, 2400528935U,
                         54481931U, 4186304426U, 1741088401U, 2979625118U,
-                        4159057246U, 3425930182U, 2593724503U};
+                        4159057246U, 3425930182U, 2593724503U,  1868899624U};
 
   // You have updated the memcache_error messages but not updated docs/tests.
-  test_true(MEMCACHED_MAXIMUM_RETURN == 39);
+  test_true(MEMCACHED_MAXIMUM_RETURN == 40);
   for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++)
   {
     uint32_t hash_val;
     const char *msg=  memcached_strerror(memc, rc);
     hash_val= memcached_generate_hash_value(msg, strlen(msg),
                                             MEMCACHED_HASH_JENKINS);
+    if (values[rc] != hash_val)
+    {
+      fprintf(stderr, "\n\nYou have updated memcached_return_t without updating the error_test\n");
+      fprintf(stderr, "%u, %s, (%u)\n\n", (uint32_t)rc, memcached_strerror(memc, rc), hash_val);
+    }
     test_true(values[rc] == hash_val);
   }
 
@@ -469,7 +518,7 @@ static test_return_t cas2_test(memcached_st *memc)
 
   results= memcached_fetch_result(memc, &results_obj, &rc);
   test_true(results);
-  test_true(results->cas);
+  test_true(results->item_cas);
   test_true(rc == MEMCACHED_SUCCESS);
   test_true(memcached_result_cas(results));
 
@@ -521,7 +570,7 @@ static test_return_t cas_test(memcached_st *memc)
   test_true(rc == MEMCACHED_SUCCESS);
   uint64_t cas = memcached_result_cas(results);
 
-  #if 0
+#if 0
   results= memcached_fetch_result(memc, &results_obj, &rc);
   test_true(rc == MEMCACHED_END);
   test_true(results == NULL);
@@ -685,8 +734,8 @@ static test_return_t flush_test(memcached_st *memc)
   return TEST_SUCCESS;
 }
 
-static memcached_return_t  server_function(memcached_st *ptr __attribute__((unused)),
-                                           memcached_server_st *server __attribute__((unused)),
+static memcached_return_t  server_function(const memcached_st *ptr __attribute__((unused)),
+                                           const memcached_server_st *server __attribute__((unused)),
                                            void *context __attribute__((unused)))
 {
   /* Do Nothing */
@@ -1159,12 +1208,12 @@ static test_return_t stats_servername_test(memcached_st *memc)
 {
   memcached_return_t rc;
   memcached_stat_st memc_stat;
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc, 0);
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc, 0);
 
   rc= memcached_stat_servername(&memc_stat, NULL,
-                                instance->hostname,
-                                instance->port);
+                                memcached_server_name(instance),
+                                memcached_server_port(instance));
 
   return TEST_SUCCESS;
 }
@@ -1497,7 +1546,7 @@ static test_return_t mget_result_alloc_test(memcached_st *memc)
 }
 
 /* Count the results */
-static memcached_return_t callback_counter(memcached_st *ptr __attribute__((unused)),
+static memcached_return_t callback_counter(const memcached_st *ptr __attribute__((unused)),
                                            memcached_result_st *result __attribute__((unused)),
                                            void *context)
 {
@@ -1692,7 +1741,6 @@ static test_return_t version_string_test(memcached_st *memc __attribute__((unuse
 
 static test_return_t get_stats(memcached_st *memc)
 {
- unsigned int x;
  char **stat_list;
  char **ptr;
  memcached_return_t rc;
@@ -1704,7 +1752,7 @@ static test_return_t get_stats(memcached_st *memc)
  test_true(rc == MEMCACHED_SUCCESS);
  test_true(memc_stat);
 
- for (x= 0; x < memcached_server_count(memc); x++)
+ for (uint32_t x= 0; x < memcached_server_count(memc); x++)
  {
    stat_list= memcached_stat_get_keys(memc, memc_stat+x, &rc);
    test_true(rc == MEMCACHED_SUCCESS);
@@ -2658,22 +2706,19 @@ static test_return_t user_supplied_bug17(memcached_st *memc)
   From Andrei on IRC
 */
 
-static test_return_t user_supplied_bug19(memcached_st *memc)
+static test_return_t user_supplied_bug19(memcached_st *not_used)
 {
-  memcached_st *m;
-  memcached_server_st *s;
+  memcached_st *memc;
+  const memcached_server_st *server;
   memcached_return_t res;
 
-  (void)memc;
-
-  m= memcached_create(NULL);
-  memcached_server_add_with_weight(m, "localhost", 11311, 100);
-  memcached_server_add_with_weight(m, "localhost", 11312, 100);
+  (void)not_used;
 
-  s= memcached_server_by_key(m, "a", 1, &res);
-  memcached_server_free(s);
+  memc= memcached_create(NULL);
+  memcached_server_add_with_weight(memc, "localhost", 11311, 100);
+  memcached_server_add_with_weight(memc, "localhost", 11312, 100);
 
-  memcached_free(m);
+  server= memcached_server_by_key(memc, "a", 1, &res);
 
   return TEST_SUCCESS;
 }
@@ -2760,9 +2805,11 @@ static test_return_t user_supplied_bug18(memcached_st *trash)
   for (x= 0; x < 99; x++)
   {
     uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key));
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, server_idx);
-    char *hostname = instance->hostname;
+
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, server_idx);
+
+    const char *hostname = memcached_server_name(instance);
     test_strcmp(hostname, ketama_test_cases[x].server);
   }
 
@@ -2864,7 +2911,7 @@ static test_return_t user_supplied_bug21(memcached_st *memc)
 static test_return_t auto_eject_hosts(memcached_st *trash)
 {
   (void) trash;
-  memcached_server_instance_st *instance;
+  memcached_server_instance_st instance;
 
   memcached_return_t rc;
   memcached_st *memc= memcached_create(NULL);
@@ -2905,18 +2952,22 @@ static test_return_t auto_eject_hosts(memcached_st *trash)
   test_true(server_pool[7].port == 11211);
   test_true(server_pool[7].weight == 100);
 
-  instance= memcached_server_instance_fetch(memc, 2);
-  instance->next_retry = time(NULL) + 15;
+  instance= memcached_server_instance_by_position(memc, 2);
+  ((memcached_server_write_instance_st)instance)->next_retry = time(NULL) + 15;
   memc->next_distribution_rebuild= time(NULL) - 1;
 
+  /*
+    This would not work if there were only two hosts.
+  */
   for (size_t x= 0; x < 99; x++)
   {
+    memcached_autoeject(memc);
     uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key));
     test_true(server_idx != 2);
   }
 
   /* and re-added when it's back. */
-  instance->next_retry = time(NULL) - 1;
+  ((memcached_server_write_instance_st)instance)->next_retry = time(NULL) - 1;
   memc->next_distribution_rebuild= time(NULL) - 1;
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION,
                          memc->distribution);
@@ -2925,8 +2976,8 @@ static test_return_t auto_eject_hosts(memcached_st *trash)
     uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key));
     // We re-use instance from above.
     instance=
-      memcached_server_instance_fetch(memc, server_idx);
-    char *hostname = instance->hostname;
+      memcached_server_instance_by_position(memc, server_idx);
+    const char *hostname = memcached_server_name(instance);
     test_true(strcmp(hostname, ketama_test_cases[x].server) == 0);
   }
 
@@ -3195,8 +3246,8 @@ static test_return_t generate_data_with_stats(memcached_st *memc)
   {
     /* This test was changes so that "make test" would work properlly */
 #ifdef DEBUG
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, host_index);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, host_index);
 
     printf("\nserver %u|%s|%u bytes: %llu\n", host_index, instance->hostname, instance->port, (unsigned long long)(stat_p + host_index)->bytes);
 #endif
@@ -3396,8 +3447,13 @@ static test_return_t pre_cork(memcached_st *memc)
 {
   memcached_return_t rc;
   bool set= true;
+
   rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set);
 
+#ifdef __APPLE__
+  return TEST_SKIPPED;
+#endif
+
   if (rc == MEMCACHED_SUCCESS)
     return TEST_SUCCESS;
 
@@ -3410,6 +3466,10 @@ static test_return_t pre_cork_and_nonblock(memcached_st *memc)
   
   rc= pre_cork(memc);
 
+#ifdef __APPLE__
+  return TEST_SKIPPED;
+#endif
+
   if (rc != TEST_SUCCESS)
     return rc;
 
@@ -3420,7 +3480,7 @@ static test_return_t pre_nonblock_binary(memcached_st *memc)
 {
   memcached_return_t rc= MEMCACHED_FAILURE;
   memcached_st *memc_clone;
-  memcached_server_instance_st *instance;
+  memcached_server_instance_st instance;
 
   memc_clone= memcached_clone(NULL, memc);
   test_true(memc_clone);
@@ -3428,7 +3488,7 @@ static test_return_t pre_nonblock_binary(memcached_st *memc)
   // will not toggle protocol on an connection.
   memcached_version(memc_clone);
 
-  instance= memcached_server_instance_fetch(memc_clone, 0);
+  instance= memcached_server_instance_by_position(memc_clone, 0);
 
   if (instance->major_version >= 1 && instance->minor_version > 2)
   {
@@ -3556,7 +3616,7 @@ static test_return_t pre_binary(memcached_st *memc)
 {
   memcached_return_t rc= MEMCACHED_FAILURE;
   memcached_st *memc_clone;
-  memcached_server_instance_st *instance;
+  memcached_server_instance_st instance;
 
   memc_clone= memcached_clone(NULL, memc);
   test_true(memc_clone);
@@ -3564,7 +3624,7 @@ static test_return_t pre_binary(memcached_st *memc)
   // will not toggle protocol on an connection.
   memcached_version(memc_clone);
 
-  instance= memcached_server_instance_fetch(memc_clone, 0);
+  instance= memcached_server_instance_by_position(memc_clone, 0);
 
   if (instance->major_version >= 1 && instance->minor_version > 2)
   {
@@ -3615,8 +3675,9 @@ static test_return_t pre_replication_noblock(memcached_st *memc)
 }
 
 
-static void my_free(memcached_st *ptr __attribute__((unused)), void *mem)
+static void my_free(const memcached_st *ptr __attribute__((unused)), void *mem, void *context)
 {
+  (void) context;
 #ifdef HARD_MALLOC_TESTS
   void *real_ptr= (mem == NULL) ? mem : (void*)((caddr_t)mem - 8);
   free(real_ptr);
@@ -3626,8 +3687,9 @@ static void my_free(memcached_st *ptr __attribute__((unused)), void *mem)
 }
 
 
-static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t size)
+static void *my_malloc(const memcached_st *ptr __attribute__((unused)), const size_t size, void *context)
 {
+  (void)context;
 #ifdef HARD_MALLOC_TESTS
   void *ret= malloc(size + 8);
   if (ret != NULL)
@@ -3647,8 +3709,9 @@ static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t s
 }
 
 
-static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, const size_t size)
+static void *my_realloc(const memcached_st *ptr __attribute__((unused)), void *mem, const size_t size, void *context)
 {
+  (void)context;
 #ifdef HARD_MALLOC_TESTS
   void *real_ptr= (mem == NULL) ? NULL : (void*)((caddr_t)mem - 8);
   void *nmem= realloc(real_ptr, size + 8);
@@ -3666,8 +3729,9 @@ static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, co
 }
 
 
-static void *my_calloc(memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size)
+static void *my_calloc(const memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size, void *context)
 {
+  (void)context;
 #ifdef HARD_MALLOC_TESTS
   void *mem= my_malloc(ptr, nelem * size);
   if (mem)
@@ -3805,11 +3869,11 @@ static test_return_t set_memory_alloc(memcached_st *memc)
 {
   memcached_return_t rc;
   rc= memcached_set_memory_allocators(memc, NULL, my_free,
-                                      my_realloc, my_calloc);
+                                      my_realloc, my_calloc, NULL);
   test_true(rc == MEMCACHED_FAILURE);
 
   rc= memcached_set_memory_allocators(memc, my_malloc, my_free,
-                                      my_realloc, my_calloc);
+                                      my_realloc, my_calloc, NULL);
 
   memcached_malloc_fn mem_malloc;
   memcached_free_fn mem_free;
@@ -3871,8 +3935,8 @@ static test_return_t enable_cas(memcached_st *memc)
 {
   unsigned int set= 1;
 
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc, 0);
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc, 0);
 
   memcached_version(memc);
 
@@ -3890,8 +3954,9 @@ static test_return_t enable_cas(memcached_st *memc)
 static test_return_t check_for_1_2_3(memcached_st *memc)
 {
   memcached_version(memc);
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc, 0);
+
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc, 0);
 
   if ((instance->major_version >= 1 && (instance->minor_version == 2 && instance->micro_version >= 4))
       || instance->minor_version > 2)
@@ -3997,8 +4062,8 @@ static test_return_t noreply_test(memcached_st *memc)
     int no_msg=0;
     for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
     {
-      memcached_server_instance_st *instance=
-        memcached_server_instance_fetch(memc, x);
+      memcached_server_instance_st instance=
+        memcached_server_instance_by_position(memc, x);
       no_msg+=(int)(instance->cursor_active);
     }
 
@@ -4098,10 +4163,10 @@ static test_return_t analyzer_test(memcached_st *memc)
 }
 
 /* Count the objects */
-static memcached_return_t callback_dump_counter(memcached_st *ptr __attribute__((unused)),
-                                              const char *key __attribute__((unused)),
-                                              size_t key_length __attribute__((unused)),
-                                              void *context)
+static memcached_return_t callback_dump_counter(const memcached_st *ptr __attribute__((unused)),
+                                                const char *key __attribute__((unused)),
+                                                size_t key_length __attribute__((unused)),
+                                                void *context)
 {
   size_t *counter= (size_t *)context;
 
@@ -4284,10 +4349,10 @@ static test_return_t replication_get_test(memcached_st *memc)
   for (uint32_t host= 0; host < memcached_server_count(memc); ++host)
   {
     memcached_st *memc_clone= memcached_clone(NULL, memc);
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc_clone, host);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc_clone, host);
 
-    instance->port= 0;
+    ((memcached_server_write_instance_st)instance)->port= 0;
 
     for (int x= 'a'; x <= 'z'; ++x)
     {
@@ -4346,9 +4411,9 @@ static test_return_t replication_mget_test(memcached_st *memc)
   for (uint32_t host= 0; host < memc_clone->number_of_hosts; host++)
   {
     memcached_st *new_clone= memcached_clone(NULL, memc);
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(new_clone, host);
-    instance->port= 0;
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(new_clone, host);
+    ((memcached_server_write_instance_st)instance)->port= 0;
 
     for (int x= 'a'; x <= 'z'; ++x)
     {
@@ -4444,10 +4509,10 @@ static test_return_t replication_delete_test(memcached_st *memc)
   uint32_t hash= memcached_generate_hash(memc, keys[0], len[0]);
   for (uint32_t x= 0; x < (repl + 1); ++x)
   {
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc_clone, x);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc_clone, x);
 
-    instance->port= 0;
+    ((memcached_server_write_instance_st)instance)->port= 0;
     if (++hash == memc_clone->number_of_hosts)
       hash= 0;
   }
@@ -4493,10 +4558,10 @@ static uint16_t *get_udp_request_ids(memcached_st *memc)
 
   for (uint32_t x= 0; x < memcached_server_count(memc); x++)
   {
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, x);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, x);
 
-    ids[x]= get_udp_datagram_request_id((struct udp_datagram_header_st *) instance->write_buffer);
+    ids[x]= get_udp_datagram_request_id((struct udp_datagram_header_st *) ((memcached_server_instance_st )instance)->write_buffer);
   }
 
   return ids;
@@ -4525,8 +4590,8 @@ static test_return_t post_udp_op_check(memcached_st *memc, uint16_t *expected_re
 static test_return_t init_udp(memcached_st *memc)
 {
   memcached_version(memc);
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc, 0);
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc, 0);
 
   /* For the time being, only support udp test for >= 1.2.6 && < 1.3 */
   if (instance->major_version != 1 || instance->minor_version != 2
@@ -4538,18 +4603,18 @@ static test_return_t init_udp(memcached_st *memc)
   memcpy(servers, memcached_server_list(memc), sizeof(memcached_server_st) * num_hosts);
   for (uint32_t x= 0; x < num_hosts; x++)
   {
-    memcached_server_instance_st *set_instance=
-      memcached_server_instance_fetch(memc, x);
+   memcached_server_instance_st set_instance=
+     memcached_server_instance_by_position(memc, x);
 
-    memcached_server_free(set_instance);
+    memcached_server_free(((memcached_server_write_instance_st)set_instance));
   }
 
   memc->number_of_hosts= 0;
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1);
   for (uint32_t x= 0; x < num_hosts; x++)
   {
-    memcached_server_instance_st *set_instance=
-      memcached_server_instance_fetch(memc, x);
+    memcached_server_instance_st set_instance=
+      memcached_server_instance_by_position(memc, x);
 
     test_true(memcached_server_add_udp(memc, servers[x].hostname, servers[x].port) == MEMCACHED_SUCCESS);
     test_true(set_instance->write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH);
@@ -4575,8 +4640,8 @@ static test_return_t add_tcp_server_udp_client_test(memcached_st *memc)
   (void)memc;
 #if 0
   memcached_server_st server;
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc, 0);
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc, 0);
   memcached_server_clone(&server, &memc->hosts[0]);
   test_true(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS);
   test_true(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL);
@@ -4590,8 +4655,8 @@ static test_return_t add_udp_server_tcp_client_test(memcached_st *memc)
   (void)memc;
 #if 0
   memcached_server_st server;
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc, 0);
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc, 0);
   memcached_server_clone(&server, &memc->hosts[0]);
   test_true(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS);
 
@@ -4634,8 +4699,8 @@ static test_return_t udp_set_test(memcached_st *memc)
     const char *value= "when we sanitize";
     uint16_t *expected_ids= get_udp_request_ids(memc);
     unsigned int server_key= memcached_generate_hash(memc, key, strlen(key));
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, server_key);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, server_key);
     size_t init_offset= instance->write_buffer_offset;
 
     rc= memcached_set(memc, key, strlen(key),
@@ -4694,8 +4759,8 @@ static test_return_t udp_delete_test(memcached_st *memc)
     const char *key= "foo";
     uint16_t *expected_ids=get_udp_request_ids(memc);
     unsigned int server_key= memcached_generate_hash(memc, key, strlen(key));
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, server_key);
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, server_key);
     size_t init_offset= instance->write_buffer_offset;
 
     rc= memcached_delete(memc, key, strlen(key), 0);
@@ -4899,6 +4964,22 @@ static test_return_t hsieh_avaibility_test (memcached_st *memc)
   return TEST_SUCCESS;
 }
 
+static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused)))
+{
+  uint32_t x;
+  const char **ptr;
+
+  for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val;
+
+    hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_DEFAULT);
+    test_true(one_at_a_time_values[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
 static test_return_t md5_run (memcached_st *memc __attribute__((unused)))
 {
   uint32_t x;
@@ -5049,6 +5130,81 @@ static test_return_t jenkins_run (memcached_st *memc __attribute__((unused)))
   return TEST_SUCCESS;
 }
 
+static uint32_t hash_md5_test_function(const char *string, size_t string_length, void *context)
+{
+  (void)context;
+  return libhashkit_md5(string, string_length);
+}
+
+static uint32_t hash_crc_test_function(const char *string, size_t string_length, void *context)
+{
+  (void)context;
+  return libhashkit_crc32(string, string_length);
+}
+
+static test_return_t memcached_get_hashkit_test (memcached_st *memc)
+{
+  uint32_t x;
+  const char **ptr;
+  hashkit_st *kit;
+  hashkit_return_t hash_rc;
+
+  uint32_t md5_hosts[]= {4U, 1U, 0U, 1U, 4U, 2U, 0U, 3U, 0U, 0U, 3U, 1U, 0U, 0U, 1U, 3U, 0U, 0U, 0U, 3U, 1U, 0U, 4U, 4U, 3U};
+  uint32_t crc_hosts[]= {2U, 4U, 1U, 0U, 2U, 4U, 4U, 4U, 1U, 2U, 3U, 4U, 3U, 4U, 1U, 3U, 3U, 2U, 0U, 0U, 0U, 1U, 2U, 4U, 0U};
+
+  kit= memcached_get_hashkit(memc);
+
+  hash_rc= hashkit_set_custom_function(kit, hash_md5_test_function, NULL);
+  test_true(hash_rc == HASHKIT_SUCCESS);
+
+  /*
+    Verify Setting the hash.
+  */
+  for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val;
+
+    hash_val= hashkit_digest(kit, *ptr, strlen(*ptr));
+    test_true(md5_values[x] == hash_val);
+  }
+
+  
+  /*
+    Now check memcached_st.
+  */
+  for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val;
+
+    hash_val= memcached_generate_hash(memc, *ptr, strlen(*ptr));
+    test_true(md5_hosts[x] == hash_val);
+  }
+
+  hash_rc= hashkit_set_custom_function(kit, hash_crc_test_function, NULL);
+  test_true(hash_rc == HASHKIT_SUCCESS);
+
+  /*
+    Verify Setting the hash.
+  */
+  for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val;
+
+    hash_val= hashkit_digest(kit, *ptr, strlen(*ptr));
+    test_true(crc_values[x] == hash_val);
+  }
+
+  for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++)
+  {
+    uint32_t hash_val;
+
+    hash_val= memcached_generate_hash(memc, *ptr, strlen(*ptr));
+    test_true(crc_hosts[x] == hash_val);
+  }
+
+  return TEST_SUCCESS;
+}
+
 
 static test_return_t ketama_compatibility_libmemcached(memcached_st *trash)
 {
@@ -5097,9 +5253,9 @@ static test_return_t ketama_compatibility_libmemcached(memcached_st *trash)
   for (x= 0; x < 99; x++)
   {
     uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key));
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, server_idx);
-    char *hostname = instance->hostname;
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, server_idx);
+    const char *hostname = memcached_server_name(instance);
 
     test_strcmp(hostname, ketama_test_cases[x].server);
   }
@@ -5155,10 +5311,13 @@ static test_return_t ketama_compatibility_spymemcached(memcached_st *trash)
   /* verify the standard ketama set. */
   for (x= 0; x < 99; x++)
   {
-    uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases_spy[x].key, strlen(ketama_test_cases_spy[x].key));
-    memcached_server_instance_st *instance=
-      memcached_server_instance_fetch(memc, server_idx);
-    char *hostname = instance->hostname;
+    uint32_t server_idx= memcached_generate_hash(memc, ketama_test_cases_spy[x].key, strlen(ketama_test_cases_spy[x].key));
+
+    memcached_server_instance_st instance=
+      memcached_server_instance_by_position(memc, server_idx);
+
+    const char *hostname= memcached_server_name(instance);
+
     test_strcmp(hostname, ketama_test_cases_spy[x].server);
   }
 
@@ -5359,8 +5518,8 @@ static test_return_t regression_bug_442914(memcached_st *memc)
 
 static test_return_t regression_bug_447342(memcached_st *memc)
 {
-  memcached_server_instance_st *instance_one;
-  memcached_server_instance_st *instance_two;
+  memcached_server_instance_st instance_one;
+  memcached_server_instance_st instance_two;
 
   if (memcached_server_count(memc) < 3 || pre_replication(memc) != MEMCACHED_SUCCESS)
     return TEST_SKIPPED;
@@ -5419,13 +5578,13 @@ static test_return_t regression_bug_447342(memcached_st *memc)
    * This is to verify correct behavior in the library. Fake that two servers
    * are dead..
    */
-  instance_one= memcached_server_instance_fetch(memc, 0);
-  instance_two= memcached_server_instance_fetch(memc, 2);
+  instance_one= memcached_server_instance_by_position(memc, 0);
+  instance_two= memcached_server_instance_by_position(memc, 2);
   in_port_t port0= instance_one->port;
   in_port_t port2= instance_two->port;
 
-  instance_one->port= 0;
-  instance_two->port= 0;
+  ((memcached_server_write_instance_st)instance_one)->port= 0;
+  ((memcached_server_write_instance_st)instance_two)->port= 0;
 
   rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys);
   test_true(rc == MEMCACHED_SUCCESS);
@@ -5435,8 +5594,8 @@ static test_return_t regression_bug_447342(memcached_st *memc)
   test_true(counter == (unsigned int)max_keys);
 
   /* restore the memc handle */
-  instance_one->port= port0;
-  instance_two->port= port2;
+  ((memcached_server_write_instance_st)instance_one)->port= port0;
+  ((memcached_server_write_instance_st)instance_two)->port= port2;
 
   memcached_quit(memc);
 
@@ -5451,8 +5610,8 @@ static test_return_t regression_bug_447342(memcached_st *memc)
   }
 
   memcached_quit(memc);
-  instance_one->port= 0;
-  instance_two->port= 0;
+  ((memcached_server_write_instance_st)instance_one)->port= 0;
+  ((memcached_server_write_instance_st)instance_two)->port= 0;
 
   /* now retry the command, this time we should have cache misses */
   rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys);
@@ -5471,8 +5630,8 @@ static test_return_t regression_bug_447342(memcached_st *memc)
   free(key_length);
 
   /* restore the memc handle */
-  instance_one->port= port0;
-  instance_two->port= port2;
+  ((memcached_server_write_instance_st)instance_one)->port= port0;
+  ((memcached_server_write_instance_st)instance_two)->port= port2;
 
   return TEST_SUCCESS;
 }
@@ -5483,8 +5642,8 @@ static test_return_t regression_bug_463297(memcached_st *memc)
   test_true(memc_clone != NULL);
   test_true(memcached_version(memc_clone) == MEMCACHED_SUCCESS);
 
-  memcached_server_instance_st *instance=
-    memcached_server_instance_fetch(memc_clone, 0);
+  memcached_server_instance_st instance=
+    memcached_server_instance_by_position(memc_clone, 0);
 
   if (instance->major_version > 1 ||
       (instance->major_version == 1 &&
@@ -5545,7 +5704,7 @@ static test_return_t regression_bug_463297(memcached_st *memc)
 static test_return_t test_get_last_disconnect(memcached_st *memc)
 {
   memcached_return_t rc;
-  memcached_server_st *disconnected_server;
+  memcached_server_instance_st disconnected_server;
 
   /* With the working set of server */
   const char *key= "marmotte";
@@ -5580,8 +5739,8 @@ static test_return_t test_get_last_disconnect(memcached_st *memc)
 
   disconnected_server = memcached_server_get_last_disconnect(mine);
   test_true(disconnected_server != NULL);
-  test_true(disconnected_server->port == 9);
-  test_true(strncmp(disconnected_server->hostname,"localhost",9) == 0);
+  test_true(memcached_server_port(disconnected_server)== 9);
+  test_true(strncmp(memcached_server_name(disconnected_server),"localhost",9) == 0);
 
   memcached_quit(mine);
   memcached_free(mine);
@@ -5596,7 +5755,7 @@ static test_return_t test_get_last_disconnect(memcached_st *memc)
 static test_return_t wrong_failure_counter_test(memcached_st *memc)
 {
   memcached_return_t rc;
-  memcached_server_instance_st *instance;
+  memcached_server_instance_st instance;
 
   /* Set value to force connection to the server */
   const char *key= "marmotte";
@@ -5617,12 +5776,12 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc)
   test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
 
 
-  instance= memcached_server_instance_fetch(memc, 0);
+  instance= memcached_server_instance_by_position(memc, 0);
   /* The test is to see that the memcached_quit doesn't increase the
    * the server failure conter, so let's ensure that it is zero
    * before sending quit
    */
-  instance->server_failure_counter= 0;
+  ((memcached_server_write_instance_st)instance)->server_failure_counter= 0;
 
   memcached_quit(memc);
 
@@ -5757,6 +5916,7 @@ test_st tests[] ={
   {"server_unsort", 0, (test_callback_fn)server_unsort_test},
   {"server_sort", 0, (test_callback_fn)server_sort_test},
   {"server_sort2", 0, (test_callback_fn)server_sort2_test},
+  {"memcached_server_remove", 0, (test_callback_fn)memcached_server_remove_test},
   {"clone_test", 0, (test_callback_fn)clone_test },
   {"connection_test", 0, (test_callback_fn)connection_test},
   {"callback_test", 0, (test_callback_fn)callback_test},
@@ -5966,6 +6126,7 @@ test_st ketama_auto_eject_hosts[] ={
 };
 
 test_st hash_tests[] ={
+  {"one_at_a_time_run", 0, (test_callback_fn)one_at_a_time_run },
   {"md5", 0, (test_callback_fn)md5_run },
   {"crc", 0, (test_callback_fn)crc_run },
   {"fnv1_64", 0, (test_callback_fn)fnv1_64_run },
@@ -5975,6 +6136,7 @@ test_st hash_tests[] ={
   {"hsieh", 0, (test_callback_fn)hsieh_run },
   {"murmur", 0, (test_callback_fn)murmur_run },
   {"jenkis", 0, (test_callback_fn)jenkins_run },
+  {"memcached_get_hashkit", 0, (test_callback_fn)memcached_get_hashkit_test },
   {0, 0, (test_callback_fn)0}
 };