X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffunction.c;h=6549f582f3f3909faf07279e8cb122966effd404;hb=b4de8d3fd063b9017797dd9809ab3acb8a537606;hp=b9e7d303efdbfa121fe44e357dc9b0f1b837a1e2;hpb=17e0b84e30fe82f6a2a995484a502179c73906ea;p=m6w6%2Flibmemcached diff --git a/tests/function.c b/tests/function.c index b9e7d303..6549f582 100644 --- a/tests/function.c +++ b/tests/function.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include "server.h" @@ -41,37 +42,37 @@ static pairs_st *global_pairs; static const char *global_keys[GLOBAL_COUNT]; static size_t global_keys_length[GLOBAL_COUNT]; -static test_return init_test(memcached_st *not_used __attribute__((unused))) +static test_return_t init_test(memcached_st *not_used __attribute__((unused))) { memcached_st memc; (void)memcached_create(&memc); memcached_free(&memc); - return 0; + return TEST_SUCCESS; } -static test_return server_list_null_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unused))) { memcached_server_st *server_list; - memcached_return rc; + memcached_return_t rc; server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, NULL); - assert(server_list == NULL); + test_truth(server_list == NULL); server_list= memcached_server_list_append_with_weight(NULL, "localhost", 0, 0, NULL); - assert(server_list == NULL); + test_truth(server_list == NULL); server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, &rc); - assert(server_list == NULL); + test_truth(server_list == NULL); - return 0; + return TEST_SUCCESS; } #define TEST_PORT_COUNT 7 uint32_t test_ports[TEST_PORT_COUNT]; -static memcached_return server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) +static memcached_return_t server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) { /* Do Nothing */ uint32_t bigger= *((uint32_t *)(context)); @@ -81,25 +82,25 @@ static memcached_return server_display_function(memcached_st *ptr __attribute__ return MEMCACHED_SUCCESS; } -static test_return server_sort_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused))) { uint32_t x; - uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ - memcached_return rc; - memcached_server_function callbacks[1]; + uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + memcached_return_t rc; + memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - assert(local_memc); + test_truth(local_memc); memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); for (x= 0; x < TEST_PORT_COUNT; x++) { test_ports[x]= (uint32_t)random() % 64000; rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); - assert(local_memc->number_of_hosts == x + 1); - assert(local_memc->hosts[0].count == x+1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->number_of_hosts == x + 1); + test_truth(local_memc->hosts[0].count == x+1); + test_truth(rc == MEMCACHED_SUCCESS); } callbacks[0]= server_display_function; @@ -108,29 +109,29 @@ static test_return server_sort_test(memcached_st *ptr __attribute__((unused))) memcached_free(local_memc); - return 0; + return TEST_SUCCESS; } -static test_return server_sort2_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))) { - uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ - memcached_return rc; - memcached_server_function callbacks[1]; + uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + memcached_return_t rc; + memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - assert(local_memc); + test_truth(local_memc); rc= memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43043, 0); - assert(rc == MEMCACHED_SUCCESS); - assert(local_memc->hosts[0].port == 43043); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->hosts[0].port == 43043); rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43042, 0); - assert(rc == MEMCACHED_SUCCESS); - assert(local_memc->hosts[0].port == 43042); - assert(local_memc->hosts[1].port == 43043); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->hosts[0].port == 43042); + test_truth(local_memc->hosts[1].port == 43043); callbacks[0]= server_display_function; memcached_server_cursor(local_memc, callbacks, (void *)&bigger, 1); @@ -138,10 +139,10 @@ static test_return server_sort2_test(memcached_st *ptr __attribute__((unused))) memcached_free(local_memc); - return 0; + return TEST_SUCCESS; } -static memcached_return server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) +static memcached_return_t server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) { /* Do Nothing */ uint32_t x= *((uint32_t *)(context)); @@ -152,25 +153,25 @@ static memcached_return server_display_unsort_function(memcached_st *ptr __attr return MEMCACHED_SUCCESS; } -static test_return server_unsort_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused))) { uint32_t x; - uint32_t counter= 0; /* Prime the value for the assert in server_display_function */ - uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ - memcached_return rc; - memcached_server_function callbacks[1]; + uint32_t counter= 0; /* Prime the value for the test_truth in server_display_function */ + uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + memcached_return_t rc; + memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - assert(local_memc); + test_truth(local_memc); for (x= 0; x < TEST_PORT_COUNT; x++) { test_ports[x]= (uint32_t)(random() % 64000); rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); - assert(local_memc->number_of_hosts == x+1); - assert(local_memc->hosts[0].count == x+1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(local_memc->number_of_hosts == x+1); + test_truth(local_memc->hosts[0].count == x+1); + test_truth(rc == MEMCACHED_SUCCESS); } callbacks[0]= server_display_unsort_function; @@ -184,26 +185,26 @@ static test_return server_unsort_test(memcached_st *ptr __attribute__((unused)) memcached_free(local_memc); - return 0; + return TEST_SUCCESS; } -static test_return allocation_test(memcached_st *not_used __attribute__((unused))) +static test_return_t allocation_test(memcached_st *not_used __attribute__((unused))) { memcached_st *memc; memc= memcached_create(NULL); - assert(memc); + test_truth(memc); memcached_free(memc); - return 0; + return TEST_SUCCESS; } -static test_return clone_test(memcached_st *memc) +static test_return_t clone_test(memcached_st *memc) { /* All null? */ { memcached_st *memc_clone; memc_clone= memcached_clone(NULL, NULL); - assert(memc_clone); + test_truth(memc_clone); memcached_free(memc_clone); } @@ -211,32 +212,50 @@ static test_return clone_test(memcached_st *memc) { memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); - - assert(memc_clone->call_free == memc->call_free); - assert(memc_clone->call_malloc == memc->call_malloc); - assert(memc_clone->call_realloc == memc->call_realloc); - assert(memc_clone->call_calloc == memc->call_calloc); - assert(memc_clone->connect_timeout == memc->connect_timeout); - assert(memc_clone->delete_trigger == memc->delete_trigger); - assert(memc_clone->distribution == memc->distribution); - assert(memc_clone->flags == memc->flags); - assert(memc_clone->get_key_failure == memc->get_key_failure); - assert(memc_clone->hash == memc->hash); - assert(memc_clone->hash_continuum == memc->hash_continuum); - assert(memc_clone->io_bytes_watermark == memc->io_bytes_watermark); - assert(memc_clone->io_msg_watermark == memc->io_msg_watermark); - assert(memc_clone->io_key_prefetch == memc->io_key_prefetch); - assert(memc_clone->on_cleanup == memc->on_cleanup); - assert(memc_clone->on_clone == memc->on_clone); - assert(memc_clone->poll_timeout == memc->poll_timeout); - assert(memc_clone->rcv_timeout == memc->rcv_timeout); - assert(memc_clone->recv_size == memc->recv_size); - assert(memc_clone->retry_timeout == memc->retry_timeout); - assert(memc_clone->send_size == memc->send_size); - assert(memc_clone->server_failure_limit == memc->server_failure_limit); - assert(memc_clone->snd_timeout == memc->snd_timeout); - assert(memc_clone->user_data == memc->user_data); + test_truth(memc_clone); + + test_truth(memc_clone->call_free == memc->call_free); + test_truth(memc_clone->call_malloc == memc->call_malloc); + test_truth(memc_clone->call_realloc == memc->call_realloc); + test_truth(memc_clone->call_calloc == memc->call_calloc); + test_truth(memc_clone->connect_timeout == memc->connect_timeout); + test_truth(memc_clone->delete_trigger == memc->delete_trigger); + test_truth(memc_clone->distribution == memc->distribution); + { // Test all of the flags + test_truth(memc_clone->flags.no_block == memc->flags.no_block); + test_truth(memc_clone->flags.tcp_nodelay == memc->flags.tcp_nodelay); + test_truth(memc_clone->flags.reuse_memory == memc->flags.reuse_memory); + test_truth(memc_clone->flags.use_md5 == memc->flags.use_md5); + test_truth(memc_clone->flags.use_crc == memc->flags.use_crc); + test_truth(memc_clone->flags.use_cache_lookups == memc->flags.use_cache_lookups); + test_truth(memc_clone->flags.support_cas == memc->flags.support_cas); + test_truth(memc_clone->flags.buffer_requests == memc->flags.buffer_requests); + test_truth(memc_clone->flags.use_sort_hosts == memc->flags.use_sort_hosts); + test_truth(memc_clone->flags.verify_key == memc->flags.verify_key); + test_truth(memc_clone->flags.ketama_weighted == memc->flags.ketama_weighted); + test_truth(memc_clone->flags.binary_protocol == memc->flags.binary_protocol); + test_truth(memc_clone->flags.hash_with_prefix_key == memc->flags.hash_with_prefix_key); + test_truth(memc_clone->flags.no_reply == memc->flags.no_reply); + test_truth(memc_clone->flags.use_udp == memc->flags.use_udp); + test_truth(memc_clone->flags.auto_eject_hosts == memc->flags.auto_eject_hosts); + test_truth(memc_clone->flags.randomize_replica_read == memc->flags.randomize_replica_read); + } + test_truth(memc_clone->get_key_failure == memc->get_key_failure); + test_truth(memc_clone->hash == memc->hash); + test_truth(memc_clone->hash_continuum == memc->hash_continuum); + test_truth(memc_clone->io_bytes_watermark == memc->io_bytes_watermark); + test_truth(memc_clone->io_msg_watermark == memc->io_msg_watermark); + test_truth(memc_clone->io_key_prefetch == memc->io_key_prefetch); + test_truth(memc_clone->on_cleanup == memc->on_cleanup); + test_truth(memc_clone->on_clone == memc->on_clone); + test_truth(memc_clone->poll_timeout == memc->poll_timeout); + test_truth(memc_clone->rcv_timeout == memc->rcv_timeout); + test_truth(memc_clone->recv_size == memc->recv_size); + test_truth(memc_clone->retry_timeout == memc->retry_timeout); + test_truth(memc_clone->send_size == memc->send_size); + test_truth(memc_clone->server_failure_limit == memc->server_failure_limit); + test_truth(memc_clone->snd_timeout == memc->snd_timeout); + test_truth(memc_clone->user_data == memc->user_data); memcached_free(memc_clone); } @@ -247,7 +266,7 @@ static test_return clone_test(memcached_st *memc) memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); memc_clone= memcached_clone(&declared_clone, NULL); - assert(memc_clone); + test_truth(memc_clone); memcached_free(memc_clone); } @@ -257,62 +276,78 @@ static test_return clone_test(memcached_st *memc) memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); memc_clone= memcached_clone(&declared_clone, memc); - assert(memc_clone); + test_truth(memc_clone); memcached_free(memc_clone); } - return 0; + return TEST_SUCCESS; } -static test_return userdata_test(memcached_st *memc) +static test_return_t userdata_test(memcached_st *memc) { void* foo= NULL; - assert(memcached_set_user_data(memc, foo) == NULL); - assert(memcached_get_user_data(memc) == foo); - assert(memcached_set_user_data(memc, NULL) == foo); - + test_truth(memcached_set_user_data(memc, foo) == NULL); + test_truth(memcached_get_user_data(memc) == foo); + test_truth(memcached_set_user_data(memc, NULL) == foo); + return TEST_SUCCESS; } -static test_return connection_test(memcached_st *memc) +static test_return_t connection_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_server_add_with_weight(memc, "localhost", 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return error_test(memcached_st *memc) +static test_return_t error_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; + uint32_t values[] = { 851992627U, 2337886783U, 3196981036U, 4001849190U, + 982370485U, 1263635348U, 4242906218U, 3829656100U, + 1891735253U, 334139633U, 2257084983U, 3088286104U, + 13199785U, 2542027183U, 1097051614U, 199566778U, + 2748246961U, 2465192557U, 1664094137U, 2405439045U, + 1842224848U, 692413798U, 3479807801U, 919913813U, + 4269430871U, 610793021U, 527273862U, 1437122909U, + 2300930706U, 2943759320U, 674306647U, 2400528935U, + 54481931U, 4186304426U, 1741088401U, 2979625118U, + 4159057246U, 3425930182U, 2593724503U}; + // You have updated the memcache_error messages but not updated docs/tests. + test_truth(MEMCACHED_MAXIMUM_RETURN == 39); for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++) { - printf("Error %d -> %s\n", rc, memcached_strerror(memc, rc)); + uint32_t hash_val; + const char *msg= memcached_strerror(memc, rc); + hash_val= memcached_generate_hash_value(msg, strlen(msg), + MEMCACHED_HASH_JENKINS); + test_truth(values[rc] == hash_val); } - return 0; + return TEST_SUCCESS; } -static test_return set_test(memcached_st *memc) +static test_return_t set_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - return 0; + return TEST_SUCCESS; } -static test_return append_test(memcached_st *memc) +static test_return_t append_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fig"; const char *in_value= "we"; char *out_value= NULL; @@ -320,36 +355,36 @@ static test_return append_test(memcached_st *memc) uint32_t flags; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), in_value, strlen(in_value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_append(memc, key, strlen(key), + rc= memcached_append(memc, key, strlen(key), " the", strlen(" the"), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_append(memc, key, strlen(key), + rc= memcached_append(memc, key, strlen(key), " people", strlen(" people"), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert(!memcmp(out_value, "we the people", strlen("we the people"))); - assert(strlen("we the people") == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(!memcmp(out_value, "we the people", strlen("we the people"))); + test_truth(strlen("we the people") == value_length); + test_truth(rc == MEMCACHED_SUCCESS); free(out_value); - return 0; + return TEST_SUCCESS; } -static test_return append_binary_test(memcached_st *memc) +static test_return_t append_binary_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "numbers"; unsigned int *store_ptr; unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 }; @@ -359,43 +394,43 @@ static test_return append_binary_test(memcached_st *memc) unsigned int x; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_set(memc, - key, strlen(key), + rc= memcached_set(memc, + key, strlen(key), NULL, 0, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (x= 0; store_list[x] ; x++) { - rc= memcached_append(memc, - key, strlen(key), + rc= memcached_append(memc, + key, strlen(key), (char *)&store_list[x], sizeof(unsigned int), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert((value_length == (sizeof(unsigned int) * x))); - assert(rc == MEMCACHED_SUCCESS); + test_truth((value_length == (sizeof(unsigned int) * x))); + test_truth(rc == MEMCACHED_SUCCESS); store_ptr= (unsigned int *)value; x= 0; while ((size_t)store_ptr < (size_t)(value + value_length)) { - assert(*store_ptr == store_list[x++]); + test_truth(*store_ptr == store_list[x++]); store_ptr++; } free(value); - return 0; + return TEST_SUCCESS; } -static test_return cas2_test(memcached_st *memc) +static test_return_t cas2_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; const char *value= "we the people"; @@ -406,16 +441,16 @@ static test_return cas2_test(memcached_st *memc) unsigned int set= 1; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } rc= memcached_mget(memc, keys, key_length, 3); @@ -423,23 +458,23 @@ static test_return cas2_test(memcached_st *memc) results= memcached_result_create(memc, &results_obj); results= memcached_fetch_result(memc, &results_obj, &rc); - assert(results); - assert(results->cas); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_cas(results)); + test_truth(results); + test_truth(results->cas); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_cas(results)); - assert(!memcmp(value, "we the people", strlen("we the people"))); - assert(strlen("we the people") == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(!memcmp(value, "we the people", strlen("we the people"))); + test_truth(strlen("we the people") == value_length); + test_truth(rc == MEMCACHED_SUCCESS); memcached_result_free(&results_obj); - return 0; + return TEST_SUCCESS; } -static test_return cas_test(memcached_st *memc) +static test_return_t cas_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fun"; size_t key_length= strlen(key); const char *value= "we the people"; @@ -454,52 +489,52 @@ static test_return cas_test(memcached_st *memc) unsigned int set= 1; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, keylengths, 1); results= memcached_result_create(memc, &results_obj); results= memcached_fetch_result(memc, &results_obj, &rc); - assert(results); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_cas(results)); - assert(!memcmp(value, memcached_result_value(results), value_length)); - assert(strlen(memcached_result_value(results)) == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(results); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_cas(results)); + test_truth(!memcmp(value, memcached_result_value(results), value_length)); + test_truth(strlen(memcached_result_value(results)) == value_length); + test_truth(rc == MEMCACHED_SUCCESS); uint64_t cas = memcached_result_cas(results); #if 0 results= memcached_fetch_result(memc, &results_obj, &rc); - assert(rc == MEMCACHED_END); - assert(results == NULL); + test_truth(rc == MEMCACHED_END); + test_truth(results == NULL); #endif - + rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* * The item will have a new cas value, so try to set it again with the old * value. This should fail! */ rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - assert(rc == MEMCACHED_DATA_EXISTS); + test_truth(rc == MEMCACHED_DATA_EXISTS); memcached_result_free(&results_obj); - return 0; + return TEST_SUCCESS; } -static test_return prepend_test(memcached_st *memc) +static test_return_t prepend_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fig"; const char *value= "people"; char *out_value= NULL; @@ -507,62 +542,66 @@ static test_return prepend_test(memcached_st *memc) uint32_t flags; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_prepend(memc, key, strlen(key), + rc= memcached_prepend(memc, key, strlen(key), "the ", strlen("the "), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - rc= memcached_prepend(memc, key, strlen(key), + rc= memcached_prepend(memc, key, strlen(key), "we ", strlen("we "), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert(!memcmp(out_value, "we the people", strlen("we the people"))); - assert(strlen("we the people") == value_length); - assert(rc == MEMCACHED_SUCCESS); + test_truth(!memcmp(out_value, "we the people", strlen("we the people"))); + test_truth(strlen("we the people") == value_length); + test_truth(rc == MEMCACHED_SUCCESS); free(out_value); - return 0; + return TEST_SUCCESS; } -/* +/* Set the value, then quit to make sure it is flushed. Come back in and test that add fails. */ -static test_return add_test(memcached_st *memc) +static test_return_t add_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; unsigned long long setting_value; setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); - rc= memcached_add(memc, key, strlen(key), + rc= memcached_add(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); /* Too many broken OS'es have broken loopback in async, so we can't be sure of the result */ if (setting_value) - assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED); + { + test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED); + } else - assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); + { + test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); + } - return 0; + return TEST_SUCCESS; } /* @@ -572,69 +611,72 @@ static test_return add_test(memcached_st *memc) ** 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) +static test_return_t add_wrapper(memcached_st *memc) { unsigned int x; unsigned int max= 10000; #ifdef __sun max= 10; #endif +#ifdef __APPLE__ + max= 10; +#endif for (x= 0; x < max; x++) add_test(memc); - return 0; + return TEST_SUCCESS; } -static test_return replace_test(memcached_st *memc) +static test_return_t replace_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; const char *original= "first we insert some data"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), original, strlen(original), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - rc= memcached_replace(memc, key, strlen(key), + rc= memcached_replace(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return delete_test(memcached_st *memc) +static test_return_t delete_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_delete(memc, key, strlen(key), (time_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - return 0; + return TEST_SUCCESS; } -static test_return flush_test(memcached_st *memc) +static test_return_t flush_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static memcached_return server_function(memcached_st *ptr __attribute__((unused)), - memcached_server_st *server __attribute__((unused)), +static memcached_return_t server_function(memcached_st *ptr __attribute__((unused)), + memcached_server_st *server __attribute__((unused)), void *context __attribute__((unused))) { /* Do Nothing */ @@ -642,20 +684,20 @@ static memcached_return server_function(memcached_st *ptr __attribute__((unused return MEMCACHED_SUCCESS; } -static test_return memcached_server_cursor_test(memcached_st *memc) +static test_return_t memcached_server_cursor_test(memcached_st *memc) { char context[8]; strcpy(context, "foo bad"); - memcached_server_function callbacks[1]; + memcached_server_fn callbacks[1]; callbacks[0]= server_function; memcached_server_cursor(memc, callbacks, context, 1); - return 0; + return TEST_SUCCESS; } -static test_return bad_key_test(memcached_st *memc) +static test_return_t bad_key_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo bad"; char *string; size_t string_length; @@ -665,41 +707,41 @@ static test_return bad_key_test(memcached_st *memc) size_t max_keylen= 0xffff; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); + test_truth(memc_clone); rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* All keys are valid in the binary protocol (except for length) */ - if (memcached_behavior_get(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 0) + if (memcached_behavior_get(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 0) { string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(string_length == 0); + test_truth(!string); set= 0; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); /* Test multi key for bad keys */ const char *keys[] = { "GoodKey", "Bad Key", "NotMine" }; size_t key_lengths[] = { 7, 7, 7 }; set= 1; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc_clone, keys, key_lengths, 3); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); rc= memcached_mget_by_key(memc_clone, "foo daddy", 9, keys, key_lengths, 1); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); max_keylen= 250; @@ -708,23 +750,23 @@ static test_return bad_key_test(memcached_st *memc) binary protocol */ rc= memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); char *longkey= malloc(max_keylen + 1); - if (longkey != NULL) + if (longkey != NULL) { memset(longkey, 'a', max_keylen + 1); string= memcached_get(memc_clone, longkey, max_keylen, &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); string= memcached_get(memc_clone, longkey, max_keylen + 1, &string_length, &flags, &rc); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(string_length == 0); + test_truth(!string); free(longkey); } @@ -733,69 +775,69 @@ static test_return bad_key_test(memcached_st *memc) /* Make sure zero length keys are marked as bad */ set= 1; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_get(memc_clone, key, 0, &string_length, &flags, &rc); - assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_truth(string_length == 0); + test_truth(!string); memcached_free(memc_clone); - return 0; + return TEST_SUCCESS; } #define READ_THROUGH_VALUE "set for me" -static memcached_return read_through_trigger(memcached_st *memc __attribute__((unused)), - char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), +static memcached_return_t read_through_trigger(memcached_st *memc __attribute__((unused)), + char *key __attribute__((unused)), + size_t key_length __attribute__((unused)), memcached_result_st *result) { - + return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE)); } -static test_return read_through(memcached_st *memc) +static test_return_t read_through(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *string; size_t string_length; uint32_t flags; - memcached_trigger_key cb= (memcached_trigger_key)read_through_trigger; + memcached_trigger_key_fn cb= (memcached_trigger_key_fn)read_through_trigger; string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, *(void **)&cb); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == strlen(READ_THROUGH_VALUE)); - assert(!strcmp(READ_THROUGH_VALUE, string)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == strlen(READ_THROUGH_VALUE)); + test_truth(!strcmp(READ_THROUGH_VALUE, string)); free(string); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == strlen(READ_THROUGH_VALUE)); - assert(!strcmp(READ_THROUGH_VALUE, string)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == strlen(READ_THROUGH_VALUE)); + test_truth(!strcmp(READ_THROUGH_VALUE, string)); free(string); - return 0; + return TEST_SUCCESS; } -static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused)), - const char *key, +static memcached_return_t delete_trigger(memcached_st *ptr __attribute__((unused)), + const char *key, size_t key_length __attribute__((unused))) { assert(key); @@ -803,70 +845,70 @@ static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused) return MEMCACHED_SUCCESS; } -static test_return delete_through(memcached_st *memc) +static test_return_t delete_through(memcached_st *memc) { - memcached_trigger_delete_key callback; - memcached_return rc; + memcached_trigger_delete_key_fn callback; + memcached_return_t rc; - callback= (memcached_trigger_delete_key)delete_trigger; + callback= (memcached_trigger_delete_key_fn)delete_trigger; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return get_test(memcached_st *memc) +static test_return_t get_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *string; size_t string_length; uint32_t flags; rc= memcached_delete(memc, key, strlen(key), (time_t)0); - assert(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND); + test_truth(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_NOTFOUND); - assert(string_length == 0); - assert(!string); + test_truth(rc == MEMCACHED_NOTFOUND); + test_truth(string_length == 0); + test_truth(!string); - return 0; + return TEST_SUCCESS; } -static test_return get_test2(memcached_st *memc) +static test_return_t get_test2(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; char *string; size_t string_length; uint32_t flags; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(string); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == strlen(value)); - assert(!memcmp(string, value, string_length)); + test_truth(string); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == strlen(value)); + test_truth(!memcmp(string, value, string_length)); free(string); - return 0; + return TEST_SUCCESS; } -static test_return set_test2(memcached_st *memc) +static test_return_t set_test2(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "train in the brain"; size_t value_length= strlen(value); @@ -874,24 +916,24 @@ static test_return set_test2(memcached_st *memc) for (x= 0; x < 10; x++) { - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } - return 0; + return TEST_SUCCESS; } -static test_return set_test3(memcached_st *memc) +static test_return_t set_test3(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; char *value; size_t value_length= 8191; unsigned int x; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -903,20 +945,20 @@ static test_return set_test3(memcached_st *memc) sprintf(key, "foo%u", x); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } free(value); - return 0; + return TEST_SUCCESS; } -static test_return get_test3(memcached_st *memc) +static test_return_t get_test3(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *value; size_t value_length= 8191; @@ -926,33 +968,33 @@ static test_return get_test3(memcached_st *memc) uint32_t x; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string); - assert(string_length == value_length); - assert(!memcmp(string, value, string_length)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string); + test_truth(string_length == value_length); + test_truth(!memcmp(string, value, string_length)); free(string); free(value); - return 0; + return TEST_SUCCESS; } -static test_return get_test4(memcached_st *memc) +static test_return_t get_test4(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *value; size_t value_length= 8191; @@ -962,31 +1004,31 @@ static test_return get_test4(memcached_st *memc) uint32_t x; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); for (x= 0; x < 10; x++) { string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string); - assert(string_length == value_length); - assert(!memcmp(string, value, string_length)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string); + test_truth(string_length == value_length); + test_truth(!memcmp(string, value, string_length)); free(string); } free(value); - return 0; + return TEST_SUCCESS; } /* @@ -994,7 +1036,7 @@ static test_return get_test4(memcached_st *memc) * 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) +static test_return_t get_test5(memcached_st *memc) { /* ** Request the same key twice, to ensure that we hash to the same server @@ -1005,164 +1047,334 @@ static test_return get_test5(memcached_st *memc) uint32_t flags; size_t rlen; - memcached_return rc= memcached_set(memc, keys[0], lengths[0], + memcached_return_t rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(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); + test_truth(results); results=memcached_fetch_result(memc, &results_obj, &rc); - assert(results); + test_truth(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); + test_truth(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); + test_truth(val == NULL); + test_truth(rc == MEMCACHED_NOTFOUND); val= memcached_get(memc, keys[0], lengths[0], &rlen, &flags, &rc); - assert(val != NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(val != NULL); + test_truth(rc == MEMCACHED_SUCCESS); free(val); return TEST_SUCCESS; } +static test_return_t mget_end(memcached_st *memc) +{ + const char *keys[]= { "foo", "foo2" }; + size_t lengths[]= { 3, 4 }; + const char *values[]= { "fjord", "41" }; + + memcached_return_t rc; + + // Set foo and foo2 + for (int i= 0; i < 2; i++) + { + rc= memcached_set(memc, keys[i], lengths[i], values[i], strlen(values[i]), + (time_t)0, (uint32_t)0); + test_truth(rc == MEMCACHED_SUCCESS); + } + + char *string; + size_t string_length; + uint32_t flags; + + // retrieve both via mget + rc= memcached_mget(memc, keys, lengths, 2); + test_truth(rc == MEMCACHED_SUCCESS); + + char key[MEMCACHED_MAX_KEY]; + size_t key_length; + + // this should get both + for (int i = 0; i < 2; i++) + { + string= memcached_fetch(memc, key, &key_length, &string_length, + &flags, &rc); + test_truth(rc == MEMCACHED_SUCCESS); + int val = 0; + if (key_length == 4) + val= 1; + test_truth(string_length == strlen(values[val])); + test_truth(strncmp(values[val], string, string_length) == 0); + free(string); + } + + // this should indicate end + string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); + test_truth(rc == MEMCACHED_END); + + // now get just one + rc= memcached_mget(memc, keys, lengths, 1); + test_truth(rc == MEMCACHED_SUCCESS); + + string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); + test_truth(key_length == lengths[0]); + test_truth(strncmp(keys[0], key, key_length) == 0); + test_truth(string_length == strlen(values[0])); + test_truth(strncmp(values[0], string, string_length) == 0); + test_truth(rc == MEMCACHED_SUCCESS); + free(string); + + // this should indicate end + string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); + test_truth(rc == MEMCACHED_END); + + 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) +static test_return_t stats_servername_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_stat_st memc_stat; rc= memcached_stat_servername(&memc_stat, NULL, - memc->hosts[0].hostname, + memc->hosts[0].hostname, memc->hosts[0].port); - return 0; + return TEST_SUCCESS; } -static test_return increment_test(memcached_st *memc) +static test_return_t increment_test(memcached_st *memc) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *key= "number"; const char *value= "0"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_increment(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 1); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); rc= memcached_increment(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 2); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); - return 0; + return TEST_SUCCESS; } -static test_return increment_with_initial_test(memcached_st *memc) +static test_return_t increment_with_initial_test(memcached_st *memc) { if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const 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); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(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)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial + 1)); } - return 0; + return TEST_SUCCESS; } -static test_return decrement_test(memcached_st *memc) +static test_return_t decrement_test(memcached_st *memc) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const char *key= "number"; const char *value= "3"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_decrement(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 2); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); rc= memcached_decrement(memc, key, strlen(key), 1, &new_number); - assert(rc == MEMCACHED_SUCCESS); - assert(new_number == 1); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); - return 0; + return TEST_SUCCESS; } -static test_return decrement_with_initial_test(memcached_st *memc) +static test_return_t decrement_with_initial_test(memcached_st *memc) { if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; - memcached_return rc; + memcached_return_t rc; const 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); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(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)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial - 1)); + } + return TEST_SUCCESS; +} + +static test_return_t increment_by_key_test(memcached_st *memc) +{ + uint64_t new_number; + memcached_return_t rc; + const char *master_key= "foo"; + const char *key= "number"; + const char *value= "0"; + + rc= memcached_set_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), + 1, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); + + rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), + 1, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); + + return TEST_SUCCESS; +} + +static test_return_t increment_with_initial_by_key_test(memcached_st *memc) +{ + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) + { + uint64_t new_number; + memcached_return_t rc; + const char *master_key= "foo"; + const char *key= "number"; + uint64_t initial= 0; + + rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, initial, 0, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == initial); + + rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, initial, 0, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial + 1)); + } + return TEST_SUCCESS; +} + +static test_return_t decrement_by_key_test(memcached_st *memc) +{ + uint64_t new_number; + memcached_return_t rc; + const char *master_key= "foo"; + const char *key= "number"; + const char *value= "3"; + + rc= memcached_set_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + rc= memcached_decrement_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 2); + + rc= memcached_decrement_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == 1); + + return TEST_SUCCESS; +} + +static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) +{ + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) + { + uint64_t new_number; + memcached_return_t rc; + const char *master_key= "foo"; + const char *key= "number"; + uint64_t initial= 3; + + rc= memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, initial, 0, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == initial); + + rc= memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, initial, 0, &new_number); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(new_number == (initial - 1)); } - return 0; + return TEST_SUCCESS; } -static test_return quit_test(memcached_st *memc) +static test_return_t quit_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "fudge"; const char *value= "sanford and sun"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)10, (uint32_t)3); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - return 0; + return TEST_SUCCESS; } -static test_return mget_result_test(memcached_st *memc) +static test_return_t mget_result_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1171,55 +1383,55 @@ static test_return mget_result_test(memcached_st *memc) memcached_result_st *results; results= memcached_result_create(memc, &results_obj); - assert(results); - assert(&results_obj == results); + test_truth(results); + test_truth(&results_obj == results); /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL) { - assert(results); + test_truth(results); } while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL) - assert(!results); - assert(rc == MEMCACHED_END); + test_truth(!results); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, &results_obj, &rc))) { - assert(results); - assert(&results_obj == results); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_key_length(results) == memcached_result_length(results)); - assert(!memcmp(memcached_result_key_value(results), - memcached_result_value(results), + test_truth(results); + test_truth(&results_obj == results); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_key_length(results) == memcached_result_length(results)); + test_truth(!memcmp(memcached_result_key_value(results), + memcached_result_value(results), memcached_result_length(results))); } memcached_result_free(&results_obj); - return 0; + return TEST_SUCCESS; } -static test_return mget_result_alloc_test(memcached_st *memc) +static test_return_t mget_result_alloc_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1228,48 +1440,48 @@ static test_return mget_result_alloc_test(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, NULL, &rc)) != NULL) { - assert(results); + test_truth(results); } - assert(!results); - assert(rc == MEMCACHED_END); + test_truth(!results); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); x= 0; while ((results= memcached_fetch_result(memc, NULL, &rc))) { - assert(results); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_result_key_length(results) == memcached_result_length(results)); - assert(!memcmp(memcached_result_key_value(results), - memcached_result_value(results), + test_truth(results); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcached_result_key_length(results) == memcached_result_length(results)); + test_truth(!memcmp(memcached_result_key_value(results), + memcached_result_value(results), memcached_result_length(results))); memcached_result_free(results); x++; } - return 0; + return TEST_SUCCESS; } /* Count the results */ -static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)), - memcached_result_st *result __attribute__((unused)), +static memcached_return_t callback_counter(memcached_st *ptr __attribute__((unused)), + memcached_result_st *result __attribute__((unused)), void *context) { unsigned int *counter= (unsigned int *)context; @@ -1279,40 +1491,40 @@ static memcached_return callback_counter(memcached_st *ptr __attribute__((unused return MEMCACHED_SUCCESS; } -static test_return mget_result_function(memcached_st *memc) +static test_return_t mget_result_function(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; unsigned int counter; - memcached_execute_function callbacks[1]; + memcached_execute_fn callbacks[1]; /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); callbacks[0]= &callback_counter; counter= 0; - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - assert(counter == 3); + test_truth(counter == 3); - return 0; + return TEST_SUCCESS; } -static test_return mget_test(memcached_st *memc) +static test_return_t mget_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1325,93 +1537,157 @@ static test_return mget_test(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - assert(return_value); + test_truth(return_value); } - assert(!return_value); - assert(return_value_length == 0); - assert(rc == MEMCACHED_END); + test_truth(!return_value); + test_truth(return_value_length == 0); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); x= 0; - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - assert(return_key_length == return_value_length); - assert(!memcmp(return_value, return_key, return_value_length)); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(return_key_length == return_value_length); + test_truth(!memcmp(return_value, return_key, return_value_length)); free(return_value); x++; } - return 0; + return TEST_SUCCESS; +} + +static test_return_t mget_execute(memcached_st *memc) +{ + bool binary= false; + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) + binary= true; + + /* + * I only want to hit _one_ server so I know the number of requests I'm + * sending in the pipeline. + */ + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + + int max_keys= binary ? 20480 : 1; + + + char **keys= calloc((size_t)max_keys, sizeof(char*)); + size_t *key_length=calloc((size_t)max_keys, sizeof(size_t)); + + /* First add all of the items.. */ + char blob[1024] = {0}; + memcached_return_t rc; + for (int x= 0; x < max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + keys[x]= strdup(k); + test_truth(keys[x] != NULL); + rc= memcached_add(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + + /* Try to get all of them with a large multiget */ + unsigned int counter= 0; + memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; + rc= memcached_mget_execute(memc, (const char**)keys, key_length, + (size_t)max_keys, callbacks, &counter, 1); + + if (binary) + { + test_truth(rc == MEMCACHED_SUCCESS); + + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + test_truth(rc == MEMCACHED_END); + + /* Verify that we got all of the items */ + test_truth(counter == (unsigned int)max_keys); + } + else + { + test_truth(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(counter == 0); + } + + /* Release all allocated resources */ + for (int x= 0; x < max_keys; ++x) + free(keys[x]); + free(keys); + free(key_length); + + memc->number_of_hosts= number_of_hosts; + return TEST_SUCCESS; } -static test_return get_stats_keys(memcached_st *memc) +static test_return_t get_stats_keys(memcached_st *memc) { char **list; char **ptr; memcached_stat_st memc_stat; - memcached_return rc; + memcached_return_t rc; list= memcached_stat_get_keys(memc, &memc_stat, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (ptr= list; *ptr; ptr++) - assert(*ptr); + test_truth(*ptr); fflush(stdout); free(list); - return 0; + return TEST_SUCCESS; } -static test_return version_string_test(memcached_st *memc __attribute__((unused))) +static test_return_t version_string_test(memcached_st *memc __attribute__((unused))) { const char *version_string; version_string= memcached_lib_version(); - assert(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); + test_truth(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); - return 0; + return TEST_SUCCESS; } -static test_return get_stats(memcached_st *memc) +static test_return_t get_stats(memcached_st *memc) { unsigned int x; char **list; char **ptr; - memcached_return rc; + memcached_return_t rc; memcached_stat_st *memc_stat; memc_stat= memcached_stat(memc, NULL, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); - assert(rc == MEMCACHED_SUCCESS); - assert(memc_stat); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memc_stat); for (x= 0; x < memcached_server_count(memc); x++) { list= memcached_stat_get_keys(memc, memc_stat+x, &rc); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); for (ptr= list; *ptr; ptr++); free(list); @@ -1419,150 +1695,170 @@ static test_return get_stats(memcached_st *memc) memcached_stat_free(NULL, memc_stat); - return 0; + return TEST_SUCCESS; } -static test_return add_host_test(memcached_st *memc) +static test_return_t add_host_test(memcached_st *memc) { unsigned int x; memcached_server_st *servers; - memcached_return rc; + memcached_return_t rc; char servername[]= "0.example.com"; servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); - assert(servers); - assert(1 == memcached_server_list_count(servers)); + test_truth(servers); + test_truth(1 == memcached_server_list_count(servers)); for (x= 2; x < 20; x++) { char buffer[SMALL_STRING_LEN]; snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); - servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, + servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(x == memcached_server_list_count(servers)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(x == memcached_server_list_count(servers)); } rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); - return 0; + return TEST_SUCCESS; } -static memcached_return clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused))) +static memcached_return_t clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused))) { return MEMCACHED_SUCCESS; } -static memcached_return cleanup_test_callback(memcached_st *ptr __attribute__((unused))) +static memcached_return_t cleanup_test_callback(memcached_st *ptr __attribute__((unused))) { return MEMCACHED_SUCCESS; } -static test_return callback_test(memcached_st *memc) +static test_return_t callback_test(memcached_st *memc) { /* Test User Data */ { int x= 5; int *test_ptr; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_USER_DATA, &x); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); test_ptr= (int *)memcached_callback_get(memc, MEMCACHED_CALLBACK_USER_DATA, &rc); - assert(*test_ptr == x); + test_truth(*test_ptr == x); } /* Test Clone Callback */ { - memcached_clone_func clone_cb= (memcached_clone_func)clone_test_callback; + memcached_clone_fn clone_cb= (memcached_clone_fn)clone_test_callback; void *clone_cb_ptr= *(void **)&clone_cb; void *temp_function= NULL; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, clone_cb_ptr); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc); - assert(temp_function == clone_cb_ptr); + test_truth(temp_function == clone_cb_ptr); } /* Test Cleanup Callback */ { - memcached_cleanup_func cleanup_cb= - (memcached_cleanup_func)cleanup_test_callback; + memcached_cleanup_fn cleanup_cb= + (memcached_cleanup_fn)cleanup_test_callback; void *cleanup_cb_ptr= *(void **)&cleanup_cb; void *temp_function= NULL; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, cleanup_cb_ptr); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc); - assert(temp_function == cleanup_cb_ptr); + test_truth(temp_function == cleanup_cb_ptr); } - return 0; + return TEST_SUCCESS; } /* We don't test the behavior itself, we test the switches */ -static test_return behavior_test(memcached_st *memc) +static test_return_t behavior_test(memcached_st *memc) { uint64_t value; uint32_t set= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - assert(value == 1); + test_truth(value == 1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY); - assert(value == 1); + test_truth(value == 1); set= MEMCACHED_HASH_MD5; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(value == MEMCACHED_HASH_MD5); set= 0; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - assert(value == 0); + test_truth(value == 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY); - assert(value == 0); + test_truth(value == 0); set= MEMCACHED_HASH_DEFAULT; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - assert(value == MEMCACHED_HASH_DEFAULT); + test_truth(value == MEMCACHED_HASH_DEFAULT); set= MEMCACHED_HASH_CRC; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - assert(value == MEMCACHED_HASH_CRC); + test_truth(value == MEMCACHED_HASH_CRC); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE); - assert(value > 0); + test_truth(value > 0); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); - assert(value > 0); + test_truth(value > 0); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, value + 1); - assert((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); - return 0; + test_truth((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); + return TEST_SUCCESS; +} + +static test_return_t fetch_all_results(memcached_st *memc) +{ + memcached_return_t rc= MEMCACHED_SUCCESS; + char return_key[MEMCACHED_MAX_KEY]; + size_t return_key_length; + char *return_value; + size_t return_value_length; + uint32_t flags; + + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + &return_value_length, &flags, &rc))) + { + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); + free(return_value); + } + + return ((rc == MEMCACHED_END) || (rc == MEMCACHED_SUCCESS)) ? TEST_SUCCESS : TEST_FAILURE; } /* Test case provided by Cal Haldenbrand */ -static test_return user_supplied_bug1(memcached_st *memc) +static test_return_t user_supplied_bug1(memcached_st *memc) { unsigned int setter= 1; unsigned int x; @@ -1570,8 +1866,8 @@ static test_return user_supplied_bug1(memcached_st *memc) unsigned long long total= 0; uint32_t size= 0; char key[10]; - char randomstuff[6 * 1024]; - memcached_return rc; + char randomstuff[6 * 1024]; + memcached_return_t rc; memset(randomstuff, 0, 6 * 1024); @@ -1589,28 +1885,28 @@ static test_return user_supplied_bug1(memcached_st *memc) size= (uint32_t)(rand() % ( 5 * 1024 ) ) + 400; memset(randomstuff, 0, 6 * 1024); - assert(size < 6 * 1024); /* Being safe here */ + test_truth(size < 6 * 1024); /* Being safe here */ - for (j= 0 ; j < size ;j++) + for (j= 0 ; j < size ;j++) randomstuff[j] = (signed char) ((rand() % 26) + 97); total += size; sprintf(key, "%d", x); - rc = memcached_set(memc, key, strlen(key), + rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); /* If we fail, lets try again */ if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_BUFFERED) - rc = memcached_set(memc, key, strlen(key), + rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } - return 0; + return TEST_SUCCESS; } /* Test case provided by Cal Haldenbrand */ -static test_return user_supplied_bug2(memcached_st *memc) +static test_return_t user_supplied_bug2(memcached_st *memc) { int errors; unsigned int setter; @@ -1633,7 +1929,7 @@ static test_return user_supplied_bug2(memcached_st *memc) for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++) { - memcached_return rc= MEMCACHED_SUCCESS; + memcached_return_t rc= MEMCACHED_SUCCESS; char buffer[SMALL_STRING_LEN]; uint32_t flags= 0; size_t val_len= 0; @@ -1643,14 +1939,14 @@ static test_return user_supplied_bug2(memcached_st *memc) snprintf(buffer, SMALL_STRING_LEN, "%u", x); getval= memcached_get(memc, buffer, strlen(buffer), - &val_len, &flags, &rc); - if (rc != MEMCACHED_SUCCESS) + &val_len, &flags, &rc); + if (rc != MEMCACHED_SUCCESS) { if (rc == MEMCACHED_NOTFOUND) errors++; else { - assert(rc); + test_truth(rc); } continue; @@ -1660,14 +1956,14 @@ static test_return user_supplied_bug2(memcached_st *memc) free(getval); } - return 0; + return TEST_SUCCESS; } /* Do a large mget() over all the keys we think exist */ #define KEY_COUNT 3000 // * 1024576 -static test_return user_supplied_bug3(memcached_st *memc) +static test_return_t user_supplied_bug3(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; unsigned int setter; unsigned int x; char **keys; @@ -1685,9 +1981,8 @@ static test_return user_supplied_bug3(memcached_st *memc) getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); #endif - keys= (char **)malloc(sizeof(char *) * KEY_COUNT); - assert(keys); - memset(keys, 0, (sizeof(char *) * KEY_COUNT)); + keys= calloc(KEY_COUNT, sizeof(char *)); + test_truth(keys); for (x= 0; x < KEY_COUNT; x++) { char buffer[30]; @@ -1698,36 +1993,21 @@ static test_return user_supplied_bug3(memcached_st *memc) } rc= memcached_mget(memc, (const char **)keys, key_lengths, KEY_COUNT); - assert(rc == MEMCACHED_SUCCESS); - - /* Turn this into a help function */ - { - char return_key[MEMCACHED_MAX_KEY]; - size_t return_key_length; - char *return_value; - size_t return_value_length; - uint32_t flags; + test_truth(rc == MEMCACHED_SUCCESS); - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, - &return_value_length, &flags, &rc))) - { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - free(return_value); - } - } + test_truth(fetch_all_results(memc) == TEST_SUCCESS); for (x= 0; x < KEY_COUNT; x++) free(keys[x]); free(keys); - return 0; + return TEST_SUCCESS; } /* Make sure we behave properly if server list has no values */ -static test_return user_supplied_bug4(memcached_st *memc) +static test_return_t user_supplied_bug4(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1747,50 +2027,50 @@ static test_return user_supplied_bug4(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - assert(return_value); + test_truth(return_value); } - assert(!return_value); - assert(return_value_length == 0); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(!return_value); + test_truth(return_value_length == 0); + test_truth(rc == MEMCACHED_NO_SERVERS); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_NO_SERVERS); + test_truth(rc == MEMCACHED_NO_SERVERS); x= 0; - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - assert(return_key_length == return_value_length); - assert(!memcmp(return_value, return_key, return_value_length)); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(return_key_length == return_value_length); + test_truth(!memcmp(return_value, return_key, return_value_length)); free(return_value); x++; } - return 0; + return TEST_SUCCESS; } #define VALUE_SIZE_BUG5 1048064 -static test_return user_supplied_bug5(memcached_st *memc) +static test_return_t user_supplied_bug5(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; char return_key[MEMCACHED_MAX_KEY]; @@ -1807,48 +2087,48 @@ static test_return user_supplied_bug5(memcached_st *memc) memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); - assert(value == NULL); + &value_length, &flags, &rc); + test_truth(value == NULL); rc= memcached_mget(memc, keys, key_length, 4); count= 0; - while ((value= memcached_fetch(memc, return_key, &return_key_length, + while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; - assert(count == 0); + test_truth(count == 0); for (x= 0; x < 4; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } for (x= 0; x < 10; x++) { value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); - assert(value); + &value_length, &flags, &rc); + test_truth(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); count= 0; - while ((value= memcached_fetch(memc, return_key, &return_key_length, + while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) { count++; free(value); } - assert(count == 4); + test_truth(count == 4); } - return 0; + return TEST_SUCCESS; } -static test_return user_supplied_bug6(memcached_st *memc) +static test_return_t user_supplied_bug6(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; char return_key[MEMCACHED_MAX_KEY]; @@ -1865,55 +2145,55 @@ static test_return user_supplied_bug6(memcached_st *memc) memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); - assert(value == NULL); - assert(rc == MEMCACHED_NOTFOUND); + &value_length, &flags, &rc); + test_truth(value == NULL); + test_truth(rc == MEMCACHED_NOTFOUND); rc= memcached_mget(memc, keys, key_length, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); count= 0; - while ((value= memcached_fetch(memc, return_key, &return_key_length, + while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; - assert(count == 0); - assert(rc == MEMCACHED_END); + test_truth(count == 0); + test_truth(rc == MEMCACHED_END); for (x= 0; x < 4; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } for (x= 0; x < 2; x++) { value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); - assert(value); + &value_length, &flags, &rc); + test_truth(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); count= 3; /* We test for purge of partial complete fetches */ for (count= 3; count; count--) { - value= memcached_fetch(memc, return_key, &return_key_length, + value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(!(memcmp(value, insert_data, value_length))); - assert(value_length); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(!(memcmp(value, insert_data, value_length))); + test_truth(value_length); free(value); } } - return 0; + return TEST_SUCCESS; } -static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused))) +static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused))) { - memcached_return rc; + memcached_return_t rc; memcached_st *mine; memcached_st *memc_clone; @@ -1921,14 +2201,14 @@ static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused) const char *server_list= "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"; servers= memcached_servers_parse(server_list); - assert(servers); + test_truth(servers); mine= memcached_create(NULL); rc= memcached_server_push(mine, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); - assert(mine); + test_truth(mine); memc_clone= memcached_clone(NULL, mine); memcached_quit(mine); @@ -1938,13 +2218,13 @@ static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused) memcached_free(mine); memcached_free(memc_clone); - return 0; + return TEST_SUCCESS; } /* Test flag store/retrieve */ -static test_return user_supplied_bug7(memcached_st *memc) +static test_return_t user_supplied_bug7(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys= "036790384900"; size_t key_length= strlen(keys); char return_key[MEMCACHED_MAX_KEY]; @@ -1961,34 +2241,34 @@ static test_return user_supplied_bug7(memcached_st *memc) memcached_flush(memc, 0); flags= 245; - rc= memcached_set(memc, keys, key_length, + rc= memcached_set(memc, keys, key_length, insert_data, VALUE_SIZE_BUG5, (time_t)0, flags); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); flags= 0; value= memcached_get(memc, keys, key_length, - &value_length, &flags, &rc); - assert(flags == 245); - assert(value); + &value_length, &flags, &rc); + test_truth(flags == 245); + test_truth(value); free(value); rc= memcached_mget(memc, &keys, &key_length, 1); flags= 0; - value= memcached_fetch(memc, return_key, &return_key_length, + value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); - assert(flags == 245); - assert(value); + test_truth(flags == 245); + test_truth(value); free(value); - return 0; + return TEST_SUCCESS; } -static test_return user_supplied_bug9(memcached_st *memc) +static test_return_t user_supplied_bug9(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"}; size_t key_length[3]; unsigned int x; @@ -2008,37 +2288,37 @@ static test_return user_supplied_bug9(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } rc= memcached_mget(memc, keys, key_length, 3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* We need to empty the server before continueing test */ - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - assert(return_value); + test_truth(return_value); free(return_value); count++; } - assert(count == 3); + test_truth(count == 3); - return 0; + return TEST_SUCCESS; } /* We are testing with aggressive timeout to get failures */ -static test_return user_supplied_bug10(memcached_st *memc) +static test_return_t user_supplied_bug10(memcached_st *memc) { const char *key= "foo"; char *value; size_t value_length= 512; unsigned int x; size_t key_len= 3; - memcached_return rc; + memcached_return_t rc; unsigned int set= 1; memcached_st *mclone= memcached_clone(NULL, memc); int32_t timeout; @@ -2058,7 +2338,7 @@ 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 || + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT); if (rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_TIMEOUT) @@ -2068,20 +2348,20 @@ static test_return user_supplied_bug10(memcached_st *memc) free(value); memcached_free(mclone); - return 0; + return TEST_SUCCESS; } /* We are looking failures in the async protocol */ -static test_return user_supplied_bug11(memcached_st *memc) +static test_return_t user_supplied_bug11(memcached_st *memc) { const char *key= "foo"; char *value; size_t value_length= 512; unsigned int x; size_t key_len= 3; - memcached_return rc; + memcached_return_t rc; unsigned int set= 1; int32_t timeout; memcached_st *mclone= memcached_clone(NULL, memc); @@ -2094,7 +2374,7 @@ static test_return user_supplied_bug11(memcached_st *memc) timeout= (int32_t)memcached_behavior_get(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); - assert(timeout == -1); + test_truth(timeout == -1); value = (char*)malloc(value_length * sizeof(char)); @@ -2109,60 +2389,64 @@ static test_return user_supplied_bug11(memcached_st *memc) free(value); memcached_free(mclone); - return 0; + return TEST_SUCCESS; } /* Bug found where incr was not returning MEMCACHED_NOTFOUND when object did not exist. */ -static test_return user_supplied_bug12(memcached_st *memc) +static test_return_t user_supplied_bug12(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint32_t flags; size_t value_length; char *value; uint64_t number_value; value= memcached_get(memc, "autoincrement", strlen("autoincrement"), - &value_length, &flags, &rc); - assert(value == NULL); - assert(rc == MEMCACHED_NOTFOUND); + &value_length, &flags, &rc); + test_truth(value == NULL); + test_truth(rc == MEMCACHED_NOTFOUND); rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value); - assert(value == NULL); + test_truth(value == NULL); /* The binary protocol will set the key if it doesn't exist */ - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1) - assert(rc == MEMCACHED_SUCCESS); + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1) + { + test_truth(rc == MEMCACHED_SUCCESS); + } else - assert(rc == MEMCACHED_NOTFOUND); + { + test_truth(rc == MEMCACHED_NOTFOUND); + } rc= memcached_set(memc, "autoincrement", strlen("autoincrement"), "1", 1, 0, 0); value= memcached_get(memc, "autoincrement", strlen("autoincrement"), - &value_length, &flags, &rc); - assert(value); - assert(rc == MEMCACHED_SUCCESS); + &value_length, &flags, &rc); + test_truth(value); + test_truth(rc == MEMCACHED_SUCCESS); free(value); rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value); - assert(number_value == 2); - assert(rc == MEMCACHED_SUCCESS); + test_truth(number_value == 2); + test_truth(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } /* Bug found where command total one more than MEMCACHED_MAX_BUFFER set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169 */ -static test_return user_supplied_bug13(memcached_st *memc) +static test_return_t user_supplied_bug13(memcached_st *memc) { char key[] = "key34567890"; char *overflow; - memcached_return rc; + memcached_return_t rc; size_t overflowSize; char commandFirst[]= "set key34567890 0 0 "; @@ -2177,16 +2461,16 @@ static test_return user_supplied_bug13(memcached_st *memc) for (testSize= overflowSize - 1; testSize < overflowSize + 1; testSize++) { overflow= malloc(testSize); - assert(overflow != NULL); + test_truth(overflow != NULL); memset(overflow, 'x', testSize); rc= memcached_set(memc, key, strlen(key), overflow, testSize, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); free(overflow); } - return 0; + return TEST_SUCCESS; } @@ -2196,11 +2480,11 @@ static test_return user_supplied_bug13(memcached_st *memc) set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169 */ -static test_return user_supplied_bug14(memcached_st *memc) +static test_return_t user_supplied_bug14(memcached_st *memc) { size_t setter= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter); - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; char *value; size_t value_length= 18000; @@ -2211,40 +2495,40 @@ static test_return user_supplied_bug14(memcached_st *memc) size_t current_length; value = (char*)malloc(value_length); - assert(value); + test_truth(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); for (current_length= 0; current_length < value_length; current_length++) { - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, current_length, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(string_length == current_length); - assert(!memcmp(string, value, string_length)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(string_length == current_length); + test_truth(!memcmp(string, value, string_length)); free(string); } free(value); - return 0; + return TEST_SUCCESS; } /* Look for zero length value problems */ -static test_return user_supplied_bug15(memcached_st *memc) +static test_return_t user_supplied_bug15(memcached_st *memc) { uint32_t x; - memcached_return rc; + memcached_return_t rc; const char *key= "mykey"; char *value; size_t length; @@ -2252,62 +2536,63 @@ static test_return user_supplied_bug15(memcached_st *memc) for (x= 0; x < 2; x++) { - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), NULL, 0, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(value == NULL); - assert(length == 0); - assert(flags == 0); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(value == NULL); + test_truth(length == 0); + test_truth(flags == 0); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(value == NULL); - assert(length == 0); - assert(flags == 0); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(value == NULL); + test_truth(length == 0); + test_truth(flags == 0); } - return 0; + return TEST_SUCCESS; } /* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */ -static test_return user_supplied_bug16(memcached_st *memc) +static test_return_t user_supplied_bug16(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "mykey"; char *value; size_t length; uint32_t flags; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), NULL, 0, (time_t)0, UINT32_MAX); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(value == NULL); - assert(length == 0); - assert(flags == UINT32_MAX); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(value == NULL); + test_truth(length == 0); + test_truth(flags == UINT32_MAX); - return 0; + return TEST_SUCCESS; } +#ifndef __sun /* Check the validity of chinese key*/ -static test_return user_supplied_bug17(memcached_st *memc) +static test_return_t user_supplied_bug17(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "豆瓣"; const char *value="我们在炎热抑郁的夏天无法停止豆瓣"; char *value2; @@ -2318,28 +2603,29 @@ static test_return user_supplied_bug17(memcached_st *memc) value, strlen(value), (time_t)0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value2= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - assert(length==strlen(value)); - assert(rc == MEMCACHED_SUCCESS); - assert(memcmp(value, value2, length)==0); + test_truth(length==strlen(value)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memcmp(value, value2, length)==0); free(value2); - return 0; + return TEST_SUCCESS; } +#endif /* From Andrei on IRC */ -static test_return user_supplied_bug19(memcached_st *memc) +static test_return_t user_supplied_bug19(memcached_st *memc) { memcached_st *m; memcached_server_st *s; - memcached_return res; + memcached_return_t res; (void)memc; @@ -2352,13 +2638,13 @@ static test_return user_supplied_bug19(memcached_st *memc) memcached_free(m); - return 0; + return TEST_SUCCESS; } /* CAS test from Andei */ -static test_return user_supplied_bug20(memcached_st *memc) +static test_return_t user_supplied_bug20(memcached_st *memc) { - memcached_return status; + memcached_return_t status; memcached_result_st *result, result_obj; const char *key = "abc"; size_t key_len = strlen("abc"); @@ -2368,29 +2654,29 @@ static test_return user_supplied_bug20(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1); status = memcached_set(memc, key, key_len, value, value_len, (time_t)0, (uint32_t)0); - assert(status == MEMCACHED_SUCCESS); + test_truth(status == MEMCACHED_SUCCESS); status = memcached_mget(memc, &key, &key_len, 1); - assert(status == MEMCACHED_SUCCESS); + test_truth(status == MEMCACHED_SUCCESS); result= memcached_result_create(memc, &result_obj); - assert(result); + test_truth(result); memcached_result_create(memc, &result_obj); result= memcached_fetch_result(memc, &result_obj, &status); - assert(result); - assert(status == MEMCACHED_SUCCESS); + test_truth(result); + test_truth(status == MEMCACHED_SUCCESS); memcached_result_free(result); - return 0; + return TEST_SUCCESS; } #include "ketama_test_cases.h" -static test_return user_supplied_bug18(memcached_st *trash) +static test_return_t user_supplied_bug18(memcached_st *trash) { - memcached_return rc; + memcached_return_t rc; uint64_t value; int x; memcached_server_st *server_pool; @@ -2399,193 +2685,357 @@ static test_return user_supplied_bug18(memcached_st *trash) (void)trash; memc= memcached_create(NULL); - assert(memc); - + test_truth(memc); + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - assert(value == 1); + test_truth(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(value == MEMCACHED_HASH_MD5); 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); + test_truth(memc->number_of_hosts == 8); + test_truth(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); + test_truth(server_pool[0].port == 11211); + test_truth(server_pool[0].weight == 600); + test_truth(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); + test_truth(server_pool[2].port == 11211); + test_truth(server_pool[2].weight == 200); + test_truth(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); + test_truth(server_pool[7].port == 11211); + test_truth(server_pool[7].weight == 100); /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets * us test the boundary wraparound. */ - assert(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + test_truth(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); /* verify the standard ketama set. */ for (x= 0; x < 99; x++) { - uint32_t server_idx = memcached_generate_hash(memc, test_cases[x].key, strlen(test_cases[x].key)); + uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); char *hostname = memc->hosts[server_idx].hostname; - assert(strcmp(hostname, test_cases[x].server) == 0); + test_truth(strcmp(hostname, ketama_test_cases[x].server) == 0); } memcached_server_list_free(server_pool); memcached_free(memc); - return 0; + return TEST_SUCCESS; +} + +/* Large mget() of missing keys with binary proto + * + * If many binary quiet commands (such as getq's in an mget) fill the output + * buffer and the server chooses not to respond, memcached_flush hangs. See + * http://lists.tangent.org/pipermail/libmemcached/2009-August/000918.html + */ + +/* sighandler_t function that always asserts false */ +static void fail(int unused __attribute__((unused))) +{ + assert(0); +} + + +static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) +{ + memcached_return_t rc; + unsigned int x; + char **keys; + size_t* key_lengths; + void (*oldalarm)(int); + memcached_st *memc_clone; + + memc_clone= memcached_clone(NULL, memc); + test_truth(memc_clone); + + /* only binproto uses getq for mget */ + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); + + /* empty the cache to ensure misses (hence non-responses) */ + rc= memcached_flush(memc_clone, 0); + test_truth(rc == MEMCACHED_SUCCESS); + + key_lengths= calloc(key_count, sizeof(size_t)); + keys= calloc(key_count, sizeof(char *)); + test_truth(keys); + for (x= 0; x < key_count; x++) + { + char buffer[30]; + + snprintf(buffer, 30, "%u", x); + keys[x]= strdup(buffer); + key_lengths[x]= strlen(keys[x]); + } + + oldalarm= signal(SIGALRM, fail); + alarm(5); + + rc= memcached_mget(memc_clone, (const char **)keys, key_lengths, key_count); + test_truth(rc == MEMCACHED_SUCCESS); + + alarm(0); + signal(SIGALRM, oldalarm); + + test_truth(fetch_all_results(memc) == TEST_SUCCESS); + + for (x= 0; x < key_count; x++) + free(keys[x]); + free(keys); + free(key_lengths); + + memcached_free(memc_clone); + + return TEST_SUCCESS; +} + +static memcached_return_t pre_binary(memcached_st *memc); + +static test_return_t user_supplied_bug21(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + test_return_t rc; + + /* should work as of r580 */ + rc= _user_supplied_bug21(memc, 10); + test_truth(rc == TEST_SUCCESS); + + /* should fail as of r580 */ + rc= _user_supplied_bug21(memc, 1000); + test_truth(rc == TEST_SUCCESS); + + return TEST_SUCCESS; } -static test_return auto_eject_hosts(memcached_st *trash) +static test_return_t auto_eject_hosts(memcached_st *trash) { (void) trash; - memcached_return rc; + memcached_return_t rc; memcached_st *memc= memcached_create(NULL); - assert(memc); + test_truth(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - assert(value == 1); + test_truth(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - assert(value == MEMCACHED_HASH_MD5); + test_truth(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); + test_truth(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS); - assert(value == 1); + test_truth(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); + test_truth(memc->number_of_hosts == 8); + test_truth(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); + test_truth(server_pool[0].port == 11211); + test_truth(server_pool[0].weight == 600); + test_truth(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); + test_truth(server_pool[2].port == 11211); + test_truth(server_pool[2].weight == 200); + test_truth(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); + test_truth(server_pool[7].port == 11211); + test_truth(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); + uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); + test_truth(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); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, + memc->distribution); for (int x= 0; x < 99; x++) { - uint32_t server_idx = memcached_generate_hash(memc, test_cases[x].key, strlen(test_cases[x].key)); + uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); char *hostname = memc->hosts[server_idx].hostname; - assert(strcmp(hostname, test_cases[x].server) == 0); + test_truth(strcmp(hostname, ketama_test_cases[x].server) == 0); + } + + memcached_server_list_free(server_pool); + memcached_free(memc); + + return TEST_SUCCESS; +} + +static test_return_t output_ketama_weighted_keys(memcached_st *trash) +{ + (void) trash; + + memcached_return_t rc; + memcached_st *memc= memcached_create(NULL); + test_truth(memc); + + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); + test_truth(rc == MEMCACHED_SUCCESS); + + uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); + test_truth(value == 1); + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); + test_truth(rc == MEMCACHED_SUCCESS); + + value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); + test_truth(value == MEMCACHED_HASH_MD5); + + + test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE, + MEMCACHED_KETAMA_COMPAT_SPY) == MEMCACHED_SUCCESS); + + memcached_server_st *server_pool; + server_pool = memcached_servers_parse("10.0.1.1:11211,10.0.1.2:11211,10.0.1.3:11211,10.0.1.4:11211,10.0.1.5:11211,10.0.1.6:11211,10.0.1.7:11211,10.0.1.8:11211,192.168.1.1:11211,192.168.100.1:11211"); + memcached_server_push(memc, server_pool); + + FILE *fp; + if ((fp = fopen("ketama_keys.txt", "w"))) + { + // noop + } else { + printf("cannot write to file ketama_keys.txt"); + return TEST_FAILURE; } + for (int x= 0; x < 10000; x++) + { + char key[10]; + sprintf(key, "%d", x); + + uint32_t server_idx = memcached_generate_hash(memc, key, strlen(key)); + char *hostname = memc->hosts[server_idx].hostname; + unsigned int port = memc->hosts[server_idx].port; + fprintf(fp, "key %s is on host /%s:%u\n", key, hostname, port); + } + fclose(fp); memcached_server_list_free(server_pool); memcached_free(memc); return TEST_SUCCESS; } -static test_return result_static(memcached_st *memc) + +static test_return_t result_static(memcached_st *memc) { memcached_result_st result; memcached_result_st *result_ptr; result_ptr= memcached_result_create(memc, &result); - assert(result.is_allocated == false); - assert(result_ptr); + test_truth(result.options.is_allocated == false); + test_truth(memcached_is_initialized(&result) == true); + test_truth(result_ptr); + test_truth(result_ptr == &result); + memcached_result_free(&result); - return 0; + test_truth(result.options.is_allocated == false); + test_truth(memcached_is_initialized(&result) == false); + + return TEST_SUCCESS; } -static test_return result_alloc(memcached_st *memc) +static test_return_t result_alloc(memcached_st *memc) { - memcached_result_st *result; + memcached_result_st *result_ptr; - result= memcached_result_create(memc, NULL); - assert(result); - memcached_result_free(result); + result_ptr= memcached_result_create(memc, NULL); + test_truth(result_ptr); + test_truth(result_ptr->options.is_allocated == true); + test_truth(memcached_is_initialized(result_ptr) == true); + memcached_result_free(result_ptr); - return 0; + return TEST_SUCCESS; } -static test_return string_static_null(memcached_st *memc) +static test_return_t string_static_null(memcached_st *memc) { memcached_string_st string; memcached_string_st *string_ptr; string_ptr= memcached_string_create(memc, &string, 0); - assert(string.is_allocated == false); - assert(string_ptr); + test_truth(string.options.is_initialized == true); + test_truth(string_ptr); + + /* The following two better be the same! */ + test_truth(memcached_is_allocated(string_ptr) == false); + test_truth(memcached_is_allocated(&string) == false); + test_truth(&string == string_ptr); + + test_truth(string.options.is_initialized == true); + test_truth(memcached_is_initialized(&string) == true); memcached_string_free(&string); + test_truth(memcached_is_initialized(&string) == false); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_null(memcached_st *memc) +static test_return_t string_alloc_null(memcached_st *memc) { memcached_string_st *string; string= memcached_string_create(memc, NULL, 0); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_with_size(memcached_st *memc) +static test_return_t string_alloc_with_size(memcached_st *memc) { memcached_string_st *string; string= memcached_string_create(memc, NULL, 1024); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_with_size_toobig(memcached_st *memc) +static test_return_t string_alloc_with_size_toobig(memcached_st *memc) { memcached_string_st *string; string= memcached_string_create(memc, NULL, SIZE_MAX); - assert(string == NULL); + test_truth(string == NULL); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_append(memcached_st *memc) +static test_return_t string_alloc_append(memcached_st *memc) { unsigned int x; char buffer[SMALL_STRING_LEN]; @@ -2595,22 +3045,25 @@ static test_return string_alloc_append(memcached_st *memc) memset(buffer, 6, SMALL_STRING_LEN); string= memcached_string_create(memc, NULL, 100); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); for (x= 0; x < 1024; x++) { - memcached_return rc; + memcached_return_t rc; rc= memcached_string_append(string, buffer, SMALL_STRING_LEN); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } + test_truth(memcached_is_allocated(string) == true); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_append_toobig(memcached_st *memc) +static test_return_t string_alloc_append_toobig(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; unsigned int x; char buffer[SMALL_STRING_LEN]; memcached_string_st *string; @@ -2619,28 +3072,31 @@ static test_return string_alloc_append_toobig(memcached_st *memc) memset(buffer, 6, SMALL_STRING_LEN); string= memcached_string_create(memc, NULL, 100); - assert(string); + test_truth(string); + test_truth(memcached_is_allocated(string) == true); + test_truth(memcached_is_initialized(string) == true); for (x= 0; x < 1024; x++) { rc= memcached_string_append(string, buffer, SMALL_STRING_LEN); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } rc= memcached_string_append(string, buffer, SIZE_MAX); - assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); + test_truth(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); + test_truth(memcached_is_allocated(string) == true); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return cleanup_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t cleanup_pairs(memcached_st *memc __attribute__((unused))) { pairs_free(global_pairs); - return 0; + return TEST_SUCCESS; } -static test_return generate_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t generate_pairs(memcached_st *memc __attribute__((unused))) { unsigned long long x; global_pairs= pairs_generate(GLOBAL_COUNT, 400); @@ -2648,14 +3104,14 @@ static test_return generate_pairs(memcached_st *memc __attribute__((unused))) for (x= 0; x < global_count; x++) { - global_keys[x]= global_pairs[x].key; + global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length; } - return 0; + return TEST_SUCCESS; } -static test_return generate_large_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t generate_large_pairs(memcached_st *memc __attribute__((unused))) { unsigned long long x; global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10); @@ -2663,30 +3119,30 @@ static test_return generate_large_pairs(memcached_st *memc __attribute__((unuse for (x= 0; x < global_count; x++) { - global_keys[x]= global_pairs[x].key; + global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length; } - return 0; + return TEST_SUCCESS; } -static test_return generate_data(memcached_st *memc) +static test_return_t generate_data(memcached_st *memc) { execute_set(memc, global_pairs, global_count); - return 0; + return TEST_SUCCESS; } -static test_return generate_data_with_stats(memcached_st *memc) +static test_return_t generate_data_with_stats(memcached_st *memc) { memcached_stat_st *stat_p; - memcached_return rc; + memcached_return_t rc; uint32_t host_index= 0; execute_set(memc, global_pairs, global_count); //TODO: hosts used size stats stat_p= memcached_stat(memc, NULL, &rc); - assert(stat_p); + test_truth(stat_p); for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++) { @@ -2694,14 +3150,14 @@ static test_return generate_data_with_stats(memcached_st *memc) #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); + test_truth((unsigned long long)(stat_p + host_index)->bytes); } memcached_stat_free(NULL, stat_p); - return 0; + return TEST_SUCCESS; } -static test_return generate_buffer_data(memcached_st *memc) +static test_return_t generate_buffer_data(memcached_st *memc) { size_t latch= 0; @@ -2709,17 +3165,17 @@ static test_return generate_buffer_data(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, latch); generate_data(memc); - return 0; + return TEST_SUCCESS; } -static test_return get_read_count(memcached_st *memc) +static test_return_t get_read_count(memcached_st *memc) { unsigned int x; - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - assert(memc_clone); + test_truth(memc_clone); memcached_server_add_with_weight(memc_clone, "localhost", 6666, 0); @@ -2740,18 +3196,17 @@ static test_return get_read_count(memcached_st *memc) free(return_value); } } - fprintf(stderr, "\t%u -> %u", global_count, count); } memcached_free(memc_clone); - return 0; + return TEST_SUCCESS; } -static test_return get_read(memcached_st *memc) +static test_return_t get_read(memcached_st *memc) { unsigned int x; - memcached_return rc; + memcached_return_t rc; { char *return_value; @@ -2763,49 +3218,34 @@ static test_return get_read(memcached_st *memc) return_value= memcached_get(memc, global_keys[x], global_keys_length[x], &return_value_length, &flags, &rc); /* - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); + test_truth(return_value); + test_truth(rc == MEMCACHED_SUCCESS); */ if (rc == MEMCACHED_SUCCESS && return_value) free(return_value); } } - return 0; + return TEST_SUCCESS; } -static test_return mget_read(memcached_st *memc) +static test_return_t mget_read(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - assert(rc == MEMCACHED_SUCCESS); - /* Turn this into a help function */ - { - char return_key[MEMCACHED_MAX_KEY]; - size_t return_key_length; - char *return_value; - size_t return_value_length; - uint32_t flags; - - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, - &return_value_length, &flags, &rc))) - { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - free(return_value); - } - } + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(fetch_all_results(memc) == TEST_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return mget_read_result(memcached_st *memc) +static test_return_t mget_read_result(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* Turn this into a help function */ { memcached_result_st results_obj; @@ -2815,33 +3255,33 @@ static test_return mget_read_result(memcached_st *memc) while ((results= memcached_fetch_result(memc, &results_obj, &rc))) { - assert(results); - assert(rc == MEMCACHED_SUCCESS); + test_truth(results); + test_truth(rc == MEMCACHED_SUCCESS); } memcached_result_free(&results_obj); } - return 0; + return TEST_SUCCESS; } -static test_return mget_read_function(memcached_st *memc) +static test_return_t mget_read_function(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; unsigned int counter; - memcached_execute_function callbacks[1]; + memcached_execute_fn callbacks[1]; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); callbacks[0]= &callback_counter; counter= 0; - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - return 0; + return TEST_SUCCESS; } -static test_return delete_generate(memcached_st *memc) +static test_return_t delete_generate(memcached_st *memc) { unsigned int x; @@ -2850,10 +3290,10 @@ static test_return delete_generate(memcached_st *memc) (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); } - return 0; + return TEST_SUCCESS; } -static test_return delete_buffer_generate(memcached_st *memc) +static test_return_t delete_buffer_generate(memcached_st *memc) { size_t latch= 0; unsigned int x; @@ -2866,51 +3306,51 @@ static test_return delete_buffer_generate(memcached_st *memc) (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); } - return 0; + return TEST_SUCCESS; } -static test_return add_host_test1(memcached_st *memc) +static test_return_t add_host_test1(memcached_st *memc) { unsigned int x; - memcached_return rc; + memcached_return_t rc; char servername[]= "0.example.com"; memcached_server_st *servers; servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); - assert(servers); - assert(1 == memcached_server_list_count(servers)); + test_truth(servers); + test_truth(1 == memcached_server_list_count(servers)); for (x= 2; x < 20; x++) { char buffer[SMALL_STRING_LEN]; snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); - servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, + servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(x == memcached_server_list_count(servers)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(x == memcached_server_list_count(servers)); } rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); rc= memcached_server_push(memc, servers); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); - return 0; + return TEST_SUCCESS; } -static memcached_return pre_nonblock(memcached_st *memc) +static memcached_return_t pre_nonblock(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); return MEMCACHED_SUCCESS; } -static memcached_return pre_nonblock_binary(memcached_st *memc) +static memcached_return_t pre_nonblock_binary(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; + memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); @@ -2919,7 +3359,7 @@ static memcached_return pre_nonblock_binary(memcached_st *memc) // will not toggle protocol on an connection. memcached_version(memc_clone); - if (memc_clone->hosts[0].major_version >= 1 && memc_clone->hosts[0].minor_version > 2) + if (memc_clone->hosts[0].major_version >= 1 && memc_clone->hosts[0].minor_version > 2) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); @@ -2931,14 +3371,14 @@ static memcached_return pre_nonblock_binary(memcached_st *memc) return rc; } -static memcached_return pre_murmur(memcached_st *memc) +static memcached_return_t pre_murmur(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR); return MEMCACHED_SUCCESS; } -static memcached_return pre_jenkins(memcached_st *memc) +static memcached_return_t pre_jenkins(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_JENKINS); @@ -2946,21 +3386,21 @@ static memcached_return pre_jenkins(memcached_st *memc) } -static memcached_return pre_md5(memcached_st *memc) +static memcached_return_t pre_md5(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MD5); return MEMCACHED_SUCCESS; } -static memcached_return pre_crc(memcached_st *memc) +static memcached_return_t pre_crc(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_CRC); return MEMCACHED_SUCCESS; } -static memcached_return pre_hsieh(memcached_st *memc) +static memcached_return_t pre_hsieh(memcached_st *memc) { #ifdef HAVE_HSIEH_HASH memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); @@ -2971,37 +3411,37 @@ static memcached_return pre_hsieh(memcached_st *memc) #endif } -static memcached_return pre_hash_fnv1_64(memcached_st *memc) +static memcached_return_t pre_hash_fnv1_64(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_64); return MEMCACHED_SUCCESS; } -static memcached_return pre_hash_fnv1a_64(memcached_st *memc) +static memcached_return_t pre_hash_fnv1a_64(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_64); return MEMCACHED_SUCCESS; } -static memcached_return pre_hash_fnv1_32(memcached_st *memc) +static memcached_return_t pre_hash_fnv1_32(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_32); return MEMCACHED_SUCCESS; } -static memcached_return pre_hash_fnv1a_32(memcached_st *memc) +static memcached_return_t pre_hash_fnv1a_32(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_32); return MEMCACHED_SUCCESS; } -static memcached_return pre_behavior_ketama(memcached_st *memc) +static memcached_return_t pre_behavior_ketama(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint64_t value; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1); @@ -3013,9 +3453,9 @@ static memcached_return pre_behavior_ketama(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return pre_behavior_ketama_weighted(memcached_st *memc) +static memcached_return_t pre_behavior_ketama_weighted(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint64_t value; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); @@ -3032,9 +3472,9 @@ static memcached_return pre_behavior_ketama_weighted(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return pre_binary(memcached_st *memc) +static memcached_return_t pre_binary(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; + memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); @@ -3043,7 +3483,7 @@ static memcached_return pre_binary(memcached_st *memc) // will not toggle protocol on an connection. memcached_version(memc_clone); - if (memc_clone->hosts[0].major_version >= 1 && memc_clone->hosts[0].minor_version > 2) + if (memc_clone->hosts[0].major_version >= 1 && memc_clone->hosts[0].minor_version > 2) { rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); assert(rc == MEMCACHED_SUCCESS); @@ -3051,31 +3491,32 @@ static memcached_return pre_binary(memcached_st *memc) } memcached_free(memc_clone); + return rc; } -static memcached_return pre_replication(memcached_st *memc) +static memcached_return_t pre_replication(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; - if (pre_binary(memc) == MEMCACHED_SUCCESS) - { - /* - * Make sure that we store the item on all servers - * (master + replicas == number of servers) - */ - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, - memc->number_of_hosts - 1); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memc->number_of_hosts - 1); - } + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return MEMCACHED_FAILURE; + + /* + * Make sure that we store the item on all servers + * (master + replicas == number of servers) + */ + memcached_return_t rc; + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, + memc->number_of_hosts - 1); + assert(rc == MEMCACHED_SUCCESS); + assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memc->number_of_hosts - 1); return rc; } -static memcached_return pre_replication_noblock(memcached_st *memc) +static memcached_return_t pre_replication_noblock(memcached_st *memc) { - memcached_return rc= MEMCACHED_FAILURE; - if (pre_replication(memc) == MEMCACHED_SUCCESS && + memcached_return_t rc= MEMCACHED_FAILURE; + if (pre_replication(memc) == MEMCACHED_SUCCESS && pre_nonblock(memc) == MEMCACHED_SUCCESS) rc= MEMCACHED_SUCCESS; @@ -3106,9 +3547,9 @@ static void *my_calloc(memcached_st *ptr __attribute__((unused)), size_t nelem, return calloc(nelem, size); } -static memcached_return set_prefix(memcached_st *memc) +static memcached_return_t set_prefix(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "mine"; char *value; @@ -3176,15 +3617,15 @@ static memcached_return set_prefix(memcached_st *memc) } #ifdef MEMCACHED_ENABLE_DEPRECATED -static memcached_return deprecated_set_memory_alloc(memcached_st *memc) +static memcached_return_t deprecated_set_memory_alloc(memcached_st *memc) { void *test_ptr= NULL; void *cb_ptr= NULL; { - memcached_malloc_function malloc_cb= - (memcached_malloc_function)my_malloc; + memcached_malloc_fn malloc_cb= + (memcached_malloc_fn)my_malloc; cb_ptr= *(void **)&malloc_cb; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, cb_ptr); assert(rc == MEMCACHED_SUCCESS); @@ -3194,10 +3635,10 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } { - memcached_realloc_function realloc_cb= - (memcached_realloc_function)my_realloc; + memcached_realloc_fn realloc_cb= + (memcached_realloc_fn)my_realloc; cb_ptr= *(void **)&realloc_cb; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, cb_ptr); assert(rc == MEMCACHED_SUCCESS); @@ -3207,10 +3648,10 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } { - memcached_free_function free_cb= - (memcached_free_function)my_free; + memcached_free_fn free_cb= + (memcached_free_fn)my_free; cb_ptr= *(void **)&free_cb; - memcached_return rc; + memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, cb_ptr); assert(rc == MEMCACHED_SUCCESS); @@ -3222,22 +3663,22 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } #endif -static memcached_return set_memory_alloc(memcached_st *memc) +static memcached_return_t set_memory_alloc(memcached_st *memc) { - memcached_return rc; - rc= memcached_set_memory_allocators(memc, NULL, my_free, + memcached_return_t 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, + 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); + + memcached_malloc_fn mem_malloc; + memcached_free_fn mem_free; + memcached_realloc_fn mem_realloc; + memcached_calloc_fn 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); @@ -3247,31 +3688,31 @@ static memcached_return set_memory_alloc(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return enable_consistent(memcached_st *memc) +static memcached_return_t enable_consistent(memcached_st *memc) { - memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT; - memcached_hash hash; + memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT; + memcached_hash_t hash; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); if (pre_hsieh(memc) != MEMCACHED_SUCCESS) return MEMCACHED_FAILURE; - value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); + value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT); - hash= (memcached_hash)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); + hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); assert(hash == MEMCACHED_HASH_HSIEH); return MEMCACHED_SUCCESS; } -static memcached_return enable_cas(memcached_st *memc) +static memcached_return_t enable_cas(memcached_st *memc) { unsigned int set= 1; memcached_version(memc); - if ((memc->hosts[0].major_version >= 1 && (memc->hosts[0].minor_version == 2 && memc->hosts[0].micro_version >= 4)) + if ((memc->hosts[0].major_version >= 1 && (memc->hosts[0].minor_version == 2 && memc->hosts[0].micro_version >= 4)) || memc->hosts[0].minor_version > 2) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); @@ -3282,7 +3723,7 @@ static memcached_return enable_cas(memcached_st *memc) return MEMCACHED_FAILURE; } -static memcached_return check_for_1_2_3(memcached_st *memc) +static memcached_return_t check_for_1_2_3(memcached_st *memc) { memcached_version(memc); @@ -3293,9 +3734,9 @@ static memcached_return check_for_1_2_3(memcached_st *memc) return MEMCACHED_FAILURE; } -static memcached_return pre_unix_socket(memcached_st *memc) +static memcached_return_t pre_unix_socket(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; struct stat buf; memcached_server_list_free(memc->hosts); @@ -3310,7 +3751,7 @@ static memcached_return pre_unix_socket(memcached_st *memc) return rc; } -static memcached_return pre_nodelay(memcached_st *memc) +static memcached_return_t pre_nodelay(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 0); @@ -3318,7 +3759,7 @@ static memcached_return pre_nodelay(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return pre_settimer(memcached_st *memc) +static memcached_return_t pre_settimer(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000); @@ -3326,7 +3767,7 @@ static memcached_return pre_settimer(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return poll_timeout(memcached_st *memc) +static memcached_return_t poll_timeout(memcached_st *memc) { size_t timeout; @@ -3334,25 +3775,25 @@ static memcached_return poll_timeout(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout); - timeout= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); + timeout= (size_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); assert(timeout == 100); return MEMCACHED_SUCCESS; } -static test_return noreply_test(memcached_st *memc) +static test_return_t noreply_test(memcached_st *memc) { - memcached_return ret; + memcached_return_t ret; ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1); - assert(ret == MEMCACHED_SUCCESS); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NOREPLY) == 1); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS) == 1); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS) == 1); + test_truth(ret == MEMCACHED_SUCCESS); + test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NOREPLY) == 1); + test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS) == 1); + test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS) == 1); for (int count=0; count < 5; ++count) { @@ -3378,10 +3819,10 @@ static test_return noreply_test(memcached_st *memc) ret=memcached_prepend(memc, key, len, key, len, 0, 0); break; default: - assert(count); + test_truth(count); break; } - assert(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); + test_truth(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); } /* @@ -3393,8 +3834,8 @@ static test_return noreply_test(memcached_st *memc) for (uint32_t x=0; x < memc->number_of_hosts; ++x) no_msg+=(int)(memc->hosts[x].cursor_active); - assert(no_msg == 0); - assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_truth(no_msg == 0); + test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); /* ** Now validate that all items was set properly! @@ -3407,23 +3848,23 @@ static test_return noreply_test(memcached_st *memc) uint32_t flags; char* value=memcached_get(memc, key, strlen(key), &length, &flags, &ret); - assert(ret == MEMCACHED_SUCCESS && value != NULL); + test_truth(ret == MEMCACHED_SUCCESS && value != NULL); switch (count) { case 0: /* FALLTHROUGH */ case 1: /* FALLTHROUGH */ case 2: - assert(strncmp(value, key, len) == 0); - assert(len == length); + test_truth(strncmp(value, key, len) == 0); + test_truth(len == length); break; case 3: - assert(length == len * 2); + test_truth(length == len * 2); break; case 4: - assert(length == len * 3); + test_truth(length == len * 3); break; default: - assert(count); + test_truth(count); break; } free(value); @@ -3440,46 +3881,46 @@ static test_return noreply_test(memcached_st *memc) memcached_result_st results_obj; memcached_result_st *results; ret= memcached_mget(memc, keys, lengths, 1); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); results= memcached_result_create(memc, &results_obj); - assert(results); + test_truth(results); results= memcached_fetch_result(memc, &results_obj, &ret); - assert(results); - assert(ret == MEMCACHED_SUCCESS); + test_truth(results); + test_truth(ret == MEMCACHED_SUCCESS); uint64_t cas= memcached_result_cas(results); memcached_result_free(&results_obj); ret= memcached_cas(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0, cas); - assert(ret == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); /* * The item will have a new cas value, so try to set it again with the old * value. This should fail! */ ret= memcached_cas(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0, cas); - assert(ret == MEMCACHED_SUCCESS); - assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_truth(ret == MEMCACHED_SUCCESS); + test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); char* value=memcached_get(memc, keys[0], lengths[0], &length, &flags, &ret); - assert(ret == MEMCACHED_SUCCESS && value != NULL); + test_truth(ret == MEMCACHED_SUCCESS && value != NULL); free(value); return TEST_SUCCESS; } -static test_return analyzer_test(memcached_st *memc) +static test_return_t analyzer_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_stat_st *memc_stat; memcached_analysis_st *report; memc_stat= memcached_stat(memc, NULL, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(memc_stat); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(memc_stat); - report= memcached_analyze(memc, memc_stat, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(report); + report= memcached_analyze(memc, memc_stat, &rc); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(report); free(report); memcached_stat_free(NULL, memc_stat); @@ -3488,9 +3929,9 @@ static test_return analyzer_test(memcached_st *memc) } /* 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)), +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) { uint32_t *counter= (uint32_t *)context; @@ -3500,34 +3941,35 @@ static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((u return MEMCACHED_SUCCESS; } -static test_return dump_test(memcached_st *memc) +static test_return_t dump_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint32_t counter= 0; - memcached_dump_func callbacks[1]; - test_return main_rc; + memcached_dump_fn callbacks[1]; + test_return_t main_rc; callbacks[0]= &callback_dump_counter; /* No support for Binary protocol yet */ - if (memc->flags & MEM_BINARY_PROTOCOL) + if (memc->flags.binary_protocol) return TEST_SUCCESS; main_rc= set_test3(memc); - assert (main_rc == TEST_SUCCESS); + test_truth (main_rc == TEST_SUCCESS); rc= memcached_dump(memc, callbacks, (void *)&counter, 1); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* We may have more then 32 if our previous flush has not completed */ - assert(counter >= 32); + test_truth(counter >= 32); return TEST_SUCCESS; } #ifdef HAVE_LIBMEMCACHEDUTIL -static void* connection_release(void *arg) { +static void* connection_release(void *arg) +{ struct { memcached_pool_st* pool; memcached_st* mmc; @@ -3538,21 +3980,21 @@ static void* connection_release(void *arg) { return arg; } -static test_return connection_pool_test(memcached_st *memc) +static test_return_t connection_pool_test(memcached_st *memc) { memcached_pool_st* pool= memcached_pool_create(memc, 5, 10); - assert(pool != NULL); + test_truth(pool != NULL); memcached_st* mmc[10]; - memcached_return rc; + memcached_return_t rc; for (int x= 0; x < 10; ++x) { mmc[x]= memcached_pool_pop(pool, false, &rc); - assert(mmc[x] != NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(mmc[x] != NULL); + test_truth(rc == MEMCACHED_SUCCESS); } - assert(memcached_pool_pop(pool, false, &rc) == NULL); - assert(rc == MEMCACHED_SUCCESS); + test_truth(memcached_pool_pop(pool, false, &rc) == NULL); + test_truth(rc == MEMCACHED_SUCCESS); pthread_t tid; struct { @@ -3561,40 +4003,63 @@ static test_return connection_pool_test(memcached_st *memc) } 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); + test_truth(rc == MEMCACHED_SUCCESS); pthread_join(tid, NULL); - assert(mmc[9] == item.mmc); + test_truth(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); + test_truth(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)); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(number_value == (x+1)); } // Release them.. for (int x= 0; x < 10; ++x) - assert(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); + test_truth(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); + + + /* verify that I can set behaviors on the pool when I don't have all + * of the connections in the pool. It should however be enabled + * when I push the item into the pool + */ + mmc[0]= memcached_pool_pop(pool, false, &rc); + test_truth(mmc[0] != NULL); + + rc= memcached_pool_behavior_set(pool, MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK, 9999); + test_truth(rc == MEMCACHED_SUCCESS); + + mmc[1]= memcached_pool_pop(pool, false, &rc); + test_truth(mmc[1] != NULL); - assert(memcached_pool_destroy(pool) == memc); + test_truth(memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + test_truth(memcached_pool_push(pool, mmc[1]) == MEMCACHED_SUCCESS); + test_truth(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); + + mmc[0]= memcached_pool_pop(pool, false, &rc); + test_truth(memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + test_truth(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); + + + test_truth(memcached_pool_destroy(pool) == memc); return TEST_SUCCESS; } #endif -static test_return replication_set_test(memcached_st *memc) +static test_return_t replication_set_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone= memcached_clone(NULL, memc); memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); rc= memcached_set(memc, "bubba", 5, "0", 1, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); /* ** We are using the quiet commands to store the replicas, so we need @@ -3608,7 +4073,7 @@ static test_return replication_set_test(memcached_st *memc) ** to the server and wait for the response ;-) If you use the test code ** as an example for your own code, please note that you shouldn't need ** to do this ;-) - */ + */ memcached_quit(memc); /* @@ -3622,10 +4087,10 @@ static test_return replication_set_test(memcached_st *memc) char key[2]= { [0]= (char)x }; size_t len; uint32_t flags; - char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, + char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(val != NULL); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(val != NULL); free(val); } @@ -3634,16 +4099,16 @@ static test_return replication_set_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return replication_get_test(memcached_st *memc) +static test_return_t replication_get_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; /* * Don't do the following in your code. I am abusing the internal details * within the library, and this is not a supported interface. * This is to verify correct behavior in the library */ - for (uint32_t host= 0; host < memc->number_of_hosts; ++host) + for (uint32_t host= 0; host < memc->number_of_hosts; ++host) { memcached_st *memc_clone= memcached_clone(NULL, memc); memc_clone->hosts[host].port= 0; @@ -3653,10 +4118,10 @@ static test_return replication_get_test(memcached_st *memc) char key[2]= { [0]= (char)x }; size_t len; uint32_t flags; - char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, + char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); - assert(rc == MEMCACHED_SUCCESS); - assert(val != NULL); + test_truth(rc == MEMCACHED_SUCCESS); + test_truth(val != NULL); free(val); } @@ -3666,9 +4131,9 @@ static test_return replication_get_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return replication_mget_test(memcached_st *memc) +static test_return_t replication_mget_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone= memcached_clone(NULL, memc); memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); @@ -3678,7 +4143,7 @@ static test_return replication_mget_test(memcached_st *memc) for (int x=0; x< 4; ++x) { rc= memcached_set(memc, keys[x], len[x], "0", 1, 0, 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } /* @@ -3693,7 +4158,7 @@ static test_return replication_mget_test(memcached_st *memc) ** to the server and wait for the response ;-) If you use the test code ** as an example for your own code, please note that you shouldn't need ** to do this ;-) - */ + */ memcached_quit(memc); /* @@ -3702,7 +4167,7 @@ static test_return replication_mget_test(memcached_st *memc) * This is to verify correct behavior in the library */ memcached_result_st result_obj; - for (uint32_t host= 0; host < memc_clone->number_of_hosts; host++) + for (uint32_t host= 0; host < memc_clone->number_of_hosts; host++) { memcached_st *new_clone= memcached_clone(NULL, memc); new_clone->hosts[host].port= 0; @@ -3712,29 +4177,71 @@ static test_return replication_mget_test(memcached_st *memc) const char key[2]= { [0]= (const char)x }; rc= memcached_mget_by_key(new_clone, key, 1, keys, len, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(new_clone, &result_obj); - assert(results); + test_truth(results); int hits= 0; while ((results= memcached_fetch_result(new_clone, &result_obj, &rc)) != NULL) { hits++; } - assert(hits == 4); + test_truth(hits == 4); memcached_result_free(&result_obj); } memcached_free(new_clone); } + memcached_free(memc_clone); + + return TEST_SUCCESS; +} + +static test_return_t replication_randomize_mget_test(memcached_st *memc) +{ + memcached_result_st result_obj; + memcached_return_t rc; + memcached_st *memc_clone= memcached_clone(NULL, memc); + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 3); + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ, 1); + + const char *keys[]= { "key1", "key2", "key3", "key4", "key5", "key6", "key7" }; + size_t len[]= { 4, 4, 4, 4, 4, 4, 4 }; + + for (int x=0; x< 7; ++x) + { + rc= memcached_set(memc, keys[x], len[x], "1", 1, 0, 0); + test_truth(rc == MEMCACHED_SUCCESS); + } + + memcached_quit(memc); + + for (int x=0; x< 7; ++x) { + const char key[2]= { [0]= (const char)x }; + + rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 7); + test_truth(rc == MEMCACHED_SUCCESS); + + memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); + test_truth(results); + + int hits= 0; + while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) + { + ++hits; + } + test_truth(hits == 7); + memcached_result_free(&result_obj); + } + memcached_free(memc_clone); return TEST_SUCCESS; } -static test_return replication_delete_test(memcached_st *memc) +static test_return_t replication_delete_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; memcached_st *memc_clone= memcached_clone(NULL, memc); /* Delete the items from all of the servers except 1 */ uint64_t repl= memcached_behavior_get(memc, @@ -3747,7 +4254,7 @@ static test_return replication_delete_test(memcached_st *memc) for (int x=0; x< 4; ++x) { rc= memcached_delete_by_key(memc, keys[0], len[0], keys[x], len[x], 0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); } /* @@ -3756,7 +4263,7 @@ static test_return replication_delete_test(memcached_st *memc) * This is to verify correct behavior in the library */ uint32_t hash= memcached_generate_hash(memc, keys[0], len[0]); - for (uint32_t x= 0; x < (repl + 1); ++x) + for (uint32_t x= 0; x < (repl + 1); ++x) { memc_clone->hosts[hash].port= 0; if (++hash == memc_clone->number_of_hosts) @@ -3764,24 +4271,24 @@ static test_return replication_delete_test(memcached_st *memc) } memcached_result_st result_obj; - for (uint32_t host= 0; host < memc_clone->number_of_hosts; ++host) + for (uint32_t host= 0; host < memc_clone->number_of_hosts; ++host) { for (int x= 'a'; x <= 'z'; ++x) { const char key[2]= { [0]= (const char)x }; rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 4); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); - assert(results); + test_truth(results); int hits= 0; while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) { ++hits; } - assert(hits == 4); + test_truth(hits == 4); memcached_result_free(&result_obj); } } @@ -3809,7 +4316,7 @@ static uint16_t *get_udp_request_ids(memcached_st *memc) return ids; } -static test_return post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ids) +static test_return_t post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ids) { unsigned int x; memcached_server_st *cur_server = memc->hosts; @@ -3817,8 +4324,8 @@ static test_return post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ for (x= 0; x < memc->number_of_hosts; x++) { - assert(cur_server[x].cursor_active == 0); - assert(cur_req_ids[x] == expected_req_ids[x]); + test_truth(cur_server[x].cursor_active == 0); + test_truth(cur_req_ids[x] == expected_req_ids[x]); } free(expected_req_ids); free(cur_req_ids); @@ -3830,7 +4337,7 @@ static test_return post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ ** There is a little bit of a hack here, instead of removing ** the servers, I just set num host to 0 and them add then new udp servers **/ -static memcached_return init_udp(memcached_st *memc) +static memcached_return_t init_udp(memcached_st *memc) { memcached_version(memc); /* For the time being, only support udp test for >= 1.2.6 && < 1.3 */ @@ -3856,61 +4363,63 @@ static memcached_return init_udp(memcached_st *memc) return MEMCACHED_SUCCESS; } -static memcached_return binary_init_udp(memcached_st *memc) +static memcached_return_t binary_init_udp(memcached_st *memc) { pre_binary(memc); return init_udp(memc); } /* Make sure that I cant add a tcp server to a udp client */ -static test_return add_tcp_server_udp_client_test(memcached_st *memc) +static test_return_t add_tcp_server_udp_client_test(memcached_st *memc) { memcached_server_st server; memcached_server_clone(&server, &memc->hosts[0]); - assert(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); - assert(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); + test_truth(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); + test_truth(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); return TEST_SUCCESS; } /* Make sure that I cant add a udp server to a tcp client */ -static test_return add_udp_server_tcp_client_test(memcached_st *memc) +static test_return_t add_udp_server_tcp_client_test(memcached_st *memc) { memcached_server_st server; memcached_server_clone(&server, &memc->hosts[0]); - assert(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); + test_truth(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); memcached_st tcp_client; memcached_create(&tcp_client); - assert(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); + test_truth(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); + return TEST_SUCCESS; } -static test_return set_udp_behavior_test(memcached_st *memc) +static test_return_t set_udp_behavior_test(memcached_st *memc) { memcached_quit(memc); memc->number_of_hosts= 0; - run_distribution(memc); - assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS); - assert(memc->flags & MEM_USE_UDP); - assert(memc->flags & MEM_NOREPLY);; - - assert(memc->number_of_hosts == 0); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution); + test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS); + test_truth(memc->flags.use_udp); + test_truth(memc->flags.no_reply); + + test_truth(memc->number_of_hosts == 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0); - assert(!(memc->flags & MEM_USE_UDP)); + test_truth(! (memc->flags.use_udp)); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0); - assert(!(memc->flags & MEM_NOREPLY)); + test_truth(! (memc->flags.no_reply)); + return TEST_SUCCESS; } -static test_return udp_set_test(memcached_st *memc) +static test_return_t udp_set_test(memcached_st *memc) { unsigned int x= 0; unsigned int num_iters= 1025; //request id rolls over at 1024 for (x= 0; x < num_iters;x++) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; const char *value= "when we sanitize"; uint16_t *expected_ids= get_udp_request_ids(memc); @@ -3919,7 +4428,7 @@ static test_return udp_set_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); /** NB, the check below assumes that if new write_ptr is less than * the original write_ptr that we have flushed. For large payloads, this * maybe an invalid assumption, but for the small payload we have it is OK @@ -3927,179 +4436,181 @@ static test_return udp_set_test(memcached_st *memc) if (rc == MEMCACHED_SUCCESS || memc->hosts[server_key].write_buffer_offset < init_offset) increment_request_id(&expected_ids[server_key]); - + if (rc == MEMCACHED_SUCCESS) { - assert(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } + test_truth(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); + } else { - assert(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - assert(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); } - assert(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); + test_truth(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); } return TEST_SUCCESS; } -static test_return udp_buffered_set_test(memcached_st *memc) +static test_return_t udp_buffered_set_test(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); return udp_set_test(memc); } -static test_return udp_set_too_big_test(memcached_st *memc) +static test_return_t udp_set_too_big_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "bar"; char value[MAX_UDP_DATAGRAM_LENGTH]; uint16_t *expected_ids= get_udp_request_ids(memc); rc= memcached_set(memc, key, strlen(key), value, MAX_UDP_DATAGRAM_LENGTH, (time_t)0, (uint32_t)0); - assert(rc == MEMCACHED_WRITE_FAILURE); + test_truth(rc == MEMCACHED_WRITE_FAILURE); return post_udp_op_check(memc,expected_ids); } -static test_return udp_delete_test(memcached_st *memc) +static test_return_t udp_delete_test(memcached_st *memc) { unsigned int x= 0; unsigned int num_iters= 1025; //request id rolls over at 1024 for (x= 0; x < num_iters;x++) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; uint16_t *expected_ids=get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); size_t init_offset= memc->hosts[server_key].write_buffer_offset; rc= memcached_delete(memc, key, strlen(key), 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); if (rc == MEMCACHED_SUCCESS || memc->hosts[server_key].write_buffer_offset < init_offset) increment_request_id(&expected_ids[server_key]); if (rc == MEMCACHED_SUCCESS) - assert(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); + { + test_truth(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); + } else { - assert(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - assert(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); + test_truth(memc->hosts[server_key].write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); } - assert(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); + test_truth(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); } return TEST_SUCCESS; } -static test_return udp_buffered_delete_test(memcached_st *memc) +static test_return_t udp_buffered_delete_test(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); return udp_delete_test(memc); } -static test_return udp_verbosity_test(memcached_st *memc) +static test_return_t udp_verbosity_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int x; for (x= 0; x < memc->number_of_hosts;x++) increment_request_id(&expected_ids[x]); rc= memcached_verbosity(memc,3); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc,expected_ids); } -static test_return udp_quit_test(memcached_st *memc) +static test_return_t 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); } -static test_return udp_flush_test(memcached_st *memc) +static test_return_t udp_flush_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int x; - for (x= 0; x < memc->number_of_hosts;x++) + for (x= 0; x < memc->number_of_hosts;x++) increment_request_id(&expected_ids[x]); rc= memcached_flush(memc,0); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc,expected_ids); } -static test_return udp_incr_test(memcached_st *memc) +static test_return_t udp_incr_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "incr"; const char *value= "1"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - - assert(rc == MEMCACHED_SUCCESS); + + test_truth(rc == MEMCACHED_SUCCESS); uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); increment_request_id(&expected_ids[server_key]); uint64_t newvalue; rc= memcached_increment(memc, key, strlen(key), 1, &newvalue); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc, expected_ids); } -static test_return udp_decr_test(memcached_st *memc) +static test_return_t udp_decr_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "decr"; const char *value= "1"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - - assert(rc == MEMCACHED_SUCCESS); + + test_truth(rc == MEMCACHED_SUCCESS); uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); increment_request_id(&expected_ids[server_key]); uint64_t newvalue; rc= memcached_decrement(memc, key, strlen(key), 1, &newvalue); - assert(rc == MEMCACHED_SUCCESS); + test_truth(rc == MEMCACHED_SUCCESS); return post_udp_op_check(memc, expected_ids); } -static test_return udp_stat_test(memcached_st *memc) +static test_return_t udp_stat_test(memcached_st *memc) { memcached_stat_st * rv= NULL; - memcached_return rc; + memcached_return_t rc; char args[]= ""; uint16_t *expected_ids = get_udp_request_ids(memc); rv = memcached_stat(memc, args, &rc); free(rv); - assert(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); return post_udp_op_check(memc, expected_ids); } -static test_return udp_version_test(memcached_st *memc) +static test_return_t udp_version_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; uint16_t *expected_ids = get_udp_request_ids(memc); rc = memcached_version(memc); - assert(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); return post_udp_op_check(memc, expected_ids); } -static test_return udp_get_test(memcached_st *memc) +static test_return_t udp_get_test(memcached_st *memc) { - memcached_return rc; + memcached_return_t rc; const char *key= "foo"; size_t vlen; uint16_t *expected_ids = get_udp_request_ids(memc); char *val= memcached_get(memc, key, strlen(key), &vlen, (uint32_t)0, &rc); - assert(rc == MEMCACHED_NOT_SUPPORTED); - assert(val == NULL); + test_truth(rc == MEMCACHED_NOT_SUPPORTED); + test_truth(val == NULL); return post_udp_op_check(memc, expected_ids); } -static test_return udp_mixed_io_test(memcached_st *memc) +static test_return_t udp_mixed_io_test(memcached_st *memc) { test_st current_op; test_st mixed_io_ops [] ={ @@ -4117,20 +4628,20 @@ static test_return udp_mixed_io_test(memcached_st *memc) for (x= 0; x < 500; x++) { current_op= mixed_io_ops[random() % 9]; - assert(current_op.function(memc) == TEST_SUCCESS); + test_truth(current_op.function(memc) == TEST_SUCCESS); } return TEST_SUCCESS; } -static test_return hsieh_avaibility_test (memcached_st *memc) +static test_return_t hsieh_avaibility_test (memcached_st *memc) { - memcached_return expected_rc= MEMCACHED_FAILURE; + memcached_return_t expected_rc= MEMCACHED_FAILURE; #ifdef HAVE_HSIEH_HASH expected_rc= MEMCACHED_SUCCESS; #endif - memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, + memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH); - assert(rc == expected_rc); + test_truth(rc == expected_rc); return TEST_SUCCESS; } @@ -4164,42 +4675,42 @@ static const char *list[]= NULL }; -static test_return md5_run (memcached_st *memc __attribute__((unused))) +static test_return_t md5_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; uint32_t values[]= { 3195025439U, 2556848621U, 3724893440U, 3332385401U, 245758794U, 2550894432U, 121710495U, 3053817768U, - 1250994555U, 1862072655U, 2631955953U, 2951528551U, + 1250994555U, 1862072655U, 2631955953U, 2951528551U, 1451250070U, 2820856945U, 2060845566U, 3646985608U, 2138080750U, 217675895U, 2230934345U, 1234361223U, - 3968582726U, 2455685270U, 1293568479U, 199067604U, + 3968582726U, 2455685270U, 1293568479U, 199067604U, 2042482093U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MD5); - assert(values[x] == hash_val); + test_truth(values[x] == hash_val); } return TEST_SUCCESS; } -static test_return crc_run (memcached_st *memc __attribute__((unused))) +static test_return_t crc_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; uint32_t values[]= { 10542U, 22009U, 14526U, 19510U, 19432U, 10199U, 20634U, 9369U, 11511U, 10362U, 7893U, 31289U, 11313U, 9354U, - 7621U, 30628U, 15218U, 25967U, 2695U, 9380U, + 7621U, 30628U, 15218U, 25967U, 2695U, 9380U, 17300U, 28156U, 9192U, 20484U, 16925U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_CRC); assert(values[x] == hash_val); @@ -4208,21 +4719,21 @@ static test_return crc_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1_64_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1_64_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; - uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U, - 1722477987U, 2991193800U, 4147007314U, 3633179701U, + uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U, + 1722477987U, 2991193800U, 4147007314U, 3633179701U, 1805162104U, 3503289120U, 3395702895U, 3325073042U, 2345265314U, 3340346032U, 2722964135U, 1173398992U, - 2815549194U, 2562818319U, 224996066U, 2680194749U, + 2815549194U, 2562818319U, 224996066U, 2680194749U, 3035305390U, 246890365U, 2395624193U, 4145193337U, 1801941682U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64); assert(values[x] == hash_val); @@ -4231,21 +4742,21 @@ static test_return fnv1_64_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1a_64_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; - uint32_t values[]= { 1488911807U, 2500855813U, 1510099634U, 1390325195U, - 3647689787U, 3241528582U, 1669328060U, 2604311949U, + uint32_t values[]= { 1488911807U, 2500855813U, 1510099634U, 1390325195U, + 3647689787U, 3241528582U, 1669328060U, 2604311949U, 734810122U, 1516407546U, 560948863U, 1767346780U, 561034892U, 4156330026U, 3716417003U, 3475297030U, - 1518272172U, 227211583U, 3938128828U, 126112909U, + 1518272172U, 227211583U, 3938128828U, 126112909U, 3043416448U, 3131561933U, 1328739897U, 2455664041U, - 2272238452U }; + 2272238452U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_64); assert(values[x] == hash_val); @@ -4254,13 +4765,13 @@ static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1_32_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1_32_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; - uint32_t values[]= { 67176023U, 1190179409U, 2043204404U, 3221866419U, + uint32_t values[]= { 67176023U, 1190179409U, 2043204404U, 3221866419U, 2567703427U, 3787535528U, 4147287986U, 3500475733U, - 344481048U, 3865235296U, 2181839183U, 119581266U, + 344481048U, 3865235296U, 2181839183U, 119581266U, 510234242U, 4248244304U, 1362796839U, 103389328U, 1449620010U, 182962511U, 3554262370U, 3206747549U, 1551306158U, 4127558461U, 1889140833U, 2774173721U, @@ -4269,7 +4780,7 @@ static test_return fnv1_32_run (memcached_st *memc __attribute__((unused))) for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_32); assert(values[x] == hash_val); @@ -4278,7 +4789,7 @@ static test_return fnv1_32_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1a_32_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; @@ -4292,7 +4803,7 @@ static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused))) for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_32); assert(values[x] == hash_val); @@ -4301,7 +4812,7 @@ static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return hsieh_run (memcached_st *memc __attribute__((unused))) +static test_return_t hsieh_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; @@ -4317,7 +4828,7 @@ static test_return hsieh_run (memcached_st *memc __attribute__((unused))) for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_HSIEH); assert(values[x] == hash_val); @@ -4326,7 +4837,7 @@ static test_return hsieh_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return murmur_run (memcached_st *memc __attribute__((unused))) +static test_return_t murmur_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; @@ -4340,7 +4851,7 @@ static test_return murmur_run (memcached_st *memc __attribute__((unused))) for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64); assert(values[x] == hash_val); @@ -4349,7 +4860,7 @@ static test_return murmur_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return jenkins_run (memcached_st *memc __attribute__((unused))) +static test_return_t jenkins_run (memcached_st *memc __attribute__((unused))) { uint32_t x; const char **ptr; @@ -4364,7 +4875,7 @@ static test_return jenkins_run (memcached_st *memc __attribute__((unused))) for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_JENKINS); assert(values[x] == hash_val); @@ -4373,6 +4884,561 @@ static test_return jenkins_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } + +static test_return_t ketama_compatibility_libmemcached(memcached_st *trash) +{ + memcached_return_t rc; + uint64_t value; + int x; + memcached_server_st *server_pool; + memcached_st *memc; + + (void)trash; + + memc= memcached_create(NULL); + assert(memc); + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); + assert(rc == MEMCACHED_SUCCESS); + + value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); + assert(value == 1); + + assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE, + MEMCACHED_KETAMA_COMPAT_LIBMEMCACHED) == MEMCACHED_SUCCESS); + + assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE) == + MEMCACHED_KETAMA_COMPAT_LIBMEMCACHED); + + 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); + + /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets + * us test the boundary wraparound. + */ + assert(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + + /* verify the standard ketama set. */ + 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)); + char *hostname = memc->hosts[server_idx].hostname; + assert(strcmp(hostname, ketama_test_cases[x].server) == 0); + } + + memcached_server_list_free(server_pool); + memcached_free(memc); + + return TEST_SUCCESS; +} + +static test_return_t ketama_compatibility_spymemcached(memcached_st *trash) +{ + memcached_return_t rc; + uint64_t value; + int x; + memcached_server_st *server_pool; + memcached_st *memc; + + (void)trash; + + memc= memcached_create(NULL); + assert(memc); + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); + assert(rc == MEMCACHED_SUCCESS); + + value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); + assert(value == 1); + + assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE, + MEMCACHED_KETAMA_COMPAT_SPY) == MEMCACHED_SUCCESS); + + assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_COMPAT_MODE) == + MEMCACHED_KETAMA_COMPAT_SPY); + + 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); + + /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets + * us test the boundary wraparound. + */ + assert(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + + /* 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)); + char *hostname = memc->hosts[server_idx].hostname; + assert(strcmp(hostname, ketama_test_cases_spy[x].server) == 0); + } + + memcached_server_list_free(server_pool); + memcached_free(memc); + + return TEST_SUCCESS; +} + +static test_return_t regression_bug_434484(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + memcached_return_t ret; + const char *key= "regression_bug_434484"; + size_t keylen= strlen(key); + + ret= memcached_append(memc, key, keylen, key, keylen, 0, 0); + assert(ret == MEMCACHED_NOTSTORED); + + size_t size= 2048 * 1024; + void *data= calloc(1, size); + assert(data != NULL); + ret= memcached_set(memc, key, keylen, data, size, 0, 0); + assert(ret == MEMCACHED_E2BIG); + free(data); + + return TEST_SUCCESS; +} + +static test_return_t regression_bug_434843(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + memcached_return_t rc; + unsigned int counter= 0; + memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; + + /* + * I only want to hit only _one_ server so I know the number of requests I'm + * sending in the pipleine to the server. Let's try to do a multiget of + * 1024 (that should satisfy most users don't you think?). Future versions + * will include a mget_execute function call if you need a higher number. + */ + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + const size_t max_keys= 1024; + char **keys= calloc(max_keys, sizeof(char*)); + size_t *key_length=calloc(max_keys, sizeof(size_t)); + + for (int x= 0; x < (int)max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + keys[x]= strdup(k); + assert(keys[x] != NULL); + } + + /* + * Run two times.. the first time we should have 100% cache miss, + * and the second time we should have 100% cache hits + */ + for (int y= 0; y < 2; ++y) + { + rc= memcached_mget(memc, (const char**)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + if (y == 0) + { + /* The first iteration should give me a 100% cache miss. verify that*/ + assert(counter == 0); + char blob[1024]= { 0 }; + for (int x= 0; x < (int)max_keys; ++x) + { + rc= memcached_add(memc, keys[x], key_length[x], + blob, sizeof(blob), 0, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + } + else + { + /* Verify that we received all of the key/value pairs */ + assert(counter == (unsigned int)max_keys); + } + } + + /* Release allocated resources */ + for (size_t x= 0; x < max_keys; ++x) + free(keys[x]); + free(keys); + free(key_length); + + memc->number_of_hosts= number_of_hosts; + return TEST_SUCCESS; +} + +static test_return_t regression_bug_434843_buffered(memcached_st *memc) +{ + memcached_return_t rc; + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); + assert(rc == MEMCACHED_SUCCESS); + + return regression_bug_434843(memc); +} + +static test_return_t regression_bug_421108(memcached_st *memc) +{ + memcached_return_t rc; + memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); + assert(rc == MEMCACHED_SUCCESS); + + char *bytes= memcached_stat_get_value(memc, memc_stat, "bytes", &rc); + assert(rc == MEMCACHED_SUCCESS); + assert(bytes != NULL); + char *bytes_read= memcached_stat_get_value(memc, memc_stat, + "bytes_read", &rc); + assert(rc == MEMCACHED_SUCCESS); + assert(bytes_read != NULL); + + char *bytes_written= memcached_stat_get_value(memc, memc_stat, + "bytes_written", &rc); + assert(rc == MEMCACHED_SUCCESS); + assert(bytes_written != NULL); + + assert(strcmp(bytes, bytes_read) != 0); + assert(strcmp(bytes, bytes_written) != 0); + + /* Release allocated resources */ + free(bytes); + free(bytes_read); + free(bytes_written); + memcached_stat_free(NULL, memc_stat); + return TEST_SUCCESS; +} + +/* + * The test case isn't obvious so I should probably document why + * it works the way it does. Bug 442914 was caused by a bug + * in the logic in memcached_purge (it did not handle the case + * where the number of bytes sent was equal to the watermark). + * In this test case, create messages so that we hit that case + * and then disable noreply mode and issue a new command to + * verify that it isn't stuck. If we change the format for the + * delete command or the watermarks, we need to update this + * test.... + */ +static test_return_t regression_bug_442914(memcached_st *memc) +{ + memcached_return_t rc; + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); + assert(rc == MEMCACHED_SUCCESS); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1); + + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + + char k[250]; + size_t len; + + for (int x= 0; x < 250; ++x) + { + len= (size_t)snprintf(k, sizeof(k), "%0250u", x); + rc= memcached_delete(memc, k, len, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + + len= (size_t)snprintf(k, sizeof(k), "%037u", 251); + rc= memcached_delete(memc, k, len, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0); + assert(rc == MEMCACHED_SUCCESS); + rc= memcached_delete(memc, k, len, 0); + assert(rc == MEMCACHED_NOTFOUND); + + memc->number_of_hosts= number_of_hosts; + + return TEST_SUCCESS; +} + +static test_return_t regression_bug_447342(memcached_st *memc) +{ + if (memc->number_of_hosts < 3 || pre_replication(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + memcached_return_t rc; + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2); + assert(rc == MEMCACHED_SUCCESS); + + const size_t max_keys= 100; + char **keys= calloc(max_keys, sizeof(char*)); + size_t *key_length=calloc(max_keys, sizeof(size_t)); + + for (int x= 0; x < (int)max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + keys[x]= strdup(k); + assert(keys[x] != NULL); + rc= memcached_set(memc, k, key_length[x], k, key_length[x], 0, 0); + assert(rc == MEMCACHED_SUCCESS); + } + + /* + ** We are using the quiet commands to store the replicas, so we need + ** to ensure that all of them are processed before we can continue. + ** In the test we go directly from storing the object to trying to + ** receive the object from all of the different servers, so we + ** could end up in a race condition (the memcached server hasn't yet + ** processed the quiet command from the replication set when it process + ** the request from the other client (created by the clone)). As a + ** workaround for that we call memcached_quit to send the quit command + ** to the server and wait for the response ;-) If you use the test code + ** as an example for your own code, please note that you shouldn't need + ** to do this ;-) + */ + memcached_quit(memc); + + /* Verify that all messages are stored, and we didn't stuff too much + * into the servers + */ + rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + + unsigned int counter= 0; + memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + /* Verify that we received all of the key/value pairs */ + assert(counter == (unsigned int)max_keys); + + memcached_quit(memc); + /* + * Don't do the following in your code. I am abusing the internal details + * within the library, and this is not a supported interface. + * This is to verify correct behavior in the library. Fake that two servers + * are dead.. + */ + unsigned int port0= memc->hosts[0].port; + unsigned int port2= memc->hosts[2].port; + memc->hosts[0].port= 0; + memc->hosts[2].port= 0; + + rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + + counter= 0; + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + assert(counter == (unsigned int)max_keys); + + /* restore the memc handle */ + memc->hosts[0].port= port0; + memc->hosts[2].port= port2; + + memcached_quit(memc); + + /* Remove half of the objects */ + for (int x= 0; x < (int)max_keys; ++x) + if (x & 1) + { + rc= memcached_delete(memc, keys[x], key_length[x], 0); + assert(rc == MEMCACHED_SUCCESS); + } + + memcached_quit(memc); + memc->hosts[0].port= 0; + memc->hosts[2].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); + assert(rc == MEMCACHED_SUCCESS); + + counter= 0; + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + assert(counter == (unsigned int)(max_keys >> 1)); + + /* Release allocated resources */ + for (size_t x= 0; x < max_keys; ++x) + free(keys[x]); + free(keys); + free(key_length); + + /* restore the memc handle */ + memc->hosts[0].port= port0; + memc->hosts[2].port= port2; + return TEST_SUCCESS; +} + +static test_return_t regression_bug_463297(memcached_st *memc) +{ + memcached_st *memc_clone= memcached_clone(NULL, memc); + assert(memc_clone != NULL); + assert(memcached_version(memc_clone) == MEMCACHED_SUCCESS); + + if (memc_clone->hosts[0].major_version > 1 || + (memc_clone->hosts[0].major_version == 1 && + memc_clone->hosts[0].minor_version > 2)) + { + /* Binary protocol doesn't support deferred delete */ + memcached_st *bin_clone= memcached_clone(NULL, memc); + assert(bin_clone != NULL); + assert(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS); + assert(memcached_delete(bin_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); + memcached_free(bin_clone); + + memcached_quit(memc_clone); + + /* If we know the server version, deferred delete should fail + * with invalid arguments */ + assert(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); + + /* If we don't know the server version, we should get a protocol error */ + memcached_return_t rc= memcached_delete(memc, "foo", 3, 1); + /* but there is a bug in some of the memcached servers (1.4) that treats + * the counter as noreply so it doesn't send the proper error message + */ + assert(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + + /* And buffered mode should be disabled and we should get protocol error */ + assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS); + rc= memcached_delete(memc, "foo", 3, 1); + assert(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + + /* Same goes for noreply... */ + assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS); + rc= memcached_delete(memc, "foo", 3, 1); + assert(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + + /* but a normal request should go through (and be buffered) */ + assert((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED); + assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + + assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS); + /* unbuffered noreply should be success */ + assert(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS); + /* unbuffered with reply should be not found... */ + assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS); + assert(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND); + } + + memcached_free(memc_clone); + return TEST_SUCCESS; +} + + +/* Test memcached_server_get_last_disconnect + * For a working server set, shall be NULL + * For a set of non existing server, shall not be NULL + */ +static test_return_t test_get_last_disconnect(memcached_st *memc) +{ + memcached_return_t rc; + memcached_server_st *disconnected_server; + + /* With the working set of server */ + const char *key= "marmotte"; + const char *value= "milka"; + + rc= memcached_set(memc, key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + disconnected_server = memcached_server_get_last_disconnect(memc); + assert(disconnected_server == NULL); + + /* With a non existing server */ + memcached_st *mine; + memcached_server_st *servers; + + const char *server_list= "localhost:9"; + + servers= memcached_servers_parse(server_list); + assert(servers); + mine= memcached_create(NULL); + rc= memcached_server_push(mine, servers); + assert(rc == MEMCACHED_SUCCESS); + memcached_server_list_free(servers); + assert(mine); + + rc= memcached_set(mine, key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + assert(rc != MEMCACHED_SUCCESS); + + disconnected_server = memcached_server_get_last_disconnect(mine); + assert(disconnected_server != NULL); + assert(disconnected_server->port == 9); + assert(strncmp(disconnected_server->hostname,"localhost",9) == 0); + + memcached_quit(mine); + memcached_free(mine); + + return TEST_SUCCESS; +} + +/* + * This test ensures that the failure counter isn't incremented during + * normal termination of the memcached instance. + */ +static test_return_t wrong_failure_counter_test(memcached_st *memc) +{ + memcached_return_t rc; + + /* Set value to force connection to the server */ + const char *key= "marmotte"; + const char *value= "milka"; + + /* + * Please note that I'm abusing the internal structures in libmemcached + * in a non-portable way and you shouldn't be doing this. I'm only + * doing this in order to verify that the library works the way it should + */ + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + + /* Ensure that we are connected to the server by setting a value */ + rc= memcached_set(memc, key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + + /* 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 + */ + memc->hosts[0].server_failure_counter= 0; + + memcached_quit(memc); + + /* Verify that it memcached_quit didn't increment the failure counter + * Please note that this isn't bullet proof, because an error could + * occur... + */ + assert(memc->hosts[0].server_failure_counter == 0); + + /* restore the instance */ + memc->number_of_hosts= number_of_hosts; + + 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}, @@ -4430,11 +5496,17 @@ test_st tests[] ={ {"increment_with_initial", 1, increment_with_initial_test }, {"decrement", 0, decrement_test }, {"decrement_with_initial", 1, decrement_with_initial_test }, + {"increment_by_key", 0, increment_by_key_test }, + {"increment_with_initial_by_key", 1, increment_with_initial_by_key_test }, + {"decrement_by_key", 0, decrement_by_key_test }, + {"decrement_with_initial_by_key", 1, decrement_with_initial_by_key_test }, {"quit", 0, quit_test }, {"mget", 1, mget_test }, {"mget_result", 1, mget_result_test }, {"mget_result_alloc", 1, mget_result_alloc_test }, {"mget_result_function", 1, mget_result_function }, + {"mget_execute", 1, mget_execute }, + {"mget_end", 0, mget_end }, {"get_stats", 0, get_stats }, {"add_host_test", 0, add_host_test }, {"add_host_test_1", 0, add_host_test1 }, @@ -4451,6 +5523,7 @@ test_st tests[] ={ #ifdef HAVE_LIBMEMCACHEDUTIL {"connectionpool", 1, connection_pool_test }, #endif + {"test_get_last_disconnect", 1, test_get_last_disconnect}, {0, 0, 0} }; @@ -4502,8 +5575,8 @@ test_st user_tests[] ={ {"user_supplied_bug15", 1, user_supplied_bug15 }, {"user_supplied_bug16", 1, user_supplied_bug16 }, #ifndef __sun - /* - ** It seems to be something weird with the character sets.. + /* + ** It seems to be something weird with the character sets.. ** value_fetch is unable to parse the value line (iscntrl "fails"), so I ** guess I need to find out how this is supposed to work.. Perhaps I need ** to run the test in a specific locale (I tried zh_CN.UTF-8 without success, @@ -4514,6 +5587,8 @@ test_st user_tests[] ={ {"user_supplied_bug18", 1, user_supplied_bug18 }, {"user_supplied_bug19", 1, user_supplied_bug19 }, {"user_supplied_bug20", 1, user_supplied_bug20 }, + {"user_supplied_bug21", 1, user_supplied_bug21 }, + {"wrong_failure_counter_test", 1, wrong_failure_counter_test}, {0, 0, 0} }; @@ -4522,6 +5597,30 @@ test_st replication_tests[]= { {"get", 0, replication_get_test }, {"mget", 0, replication_mget_test }, {"delete", 0, replication_delete_test }, + {"rand_mget", 0, replication_randomize_mget_test }, + {0, 0, 0} +}; + +/* + * The following test suite is used to verify that we don't introduce + * regression bugs. If you want more information about the bug / test, + * you should look in the bug report at + * http://bugs.launchpad.net/libmemcached + */ +test_st regression_tests[]= { + {"lp:434484", 1, regression_bug_434484 }, + {"lp:434843", 1, regression_bug_434843 }, + {"lp:434843 buffered", 1, regression_bug_434843_buffered }, + {"lp:421108", 1, regression_bug_421108 }, + {"lp:442914", 1, regression_bug_442914 }, + {"lp:447342", 1, regression_bug_447342 }, + {"lp:463297", 1, regression_bug_463297 }, + {0, 0, 0} +}; + +test_st ketama_compatibility[]= { + {"libmemcached", 1, ketama_compatibility_libmemcached }, + {"spymemcached", 1, ketama_compatibility_spymemcached }, {0, 0, 0} }; @@ -4567,6 +5666,7 @@ test_st hsieh_availability[] ={ test_st ketama_auto_eject_hosts[] ={ {"auto_eject_hosts", 1, auto_eject_hosts }, + {"output_ketama_weighted_keys", 1, output_ketama_weighted_keys }, {0, 0, 0} }; @@ -4630,9 +5730,11 @@ 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}, + {"ketama_compat", 0, 0, ketama_compatibility}, {"test_hashes", 0, 0, hash_tests}, {"replication", pre_replication, 0, replication_tests}, {"replication_noblock", pre_replication_noblock, 0, replication_tests}, + {"regression", 0, 0, regression_tests}, {0, 0, 0, 0} }; @@ -4646,8 +5748,7 @@ void *world_create(void) { server_startup_st *construct; - construct= (server_startup_st *)malloc(sizeof(server_startup_st)); - memset(construct, 0, sizeof(server_startup_st)); + construct= calloc(sizeof(server_startup_st), 1); construct->count= SERVERS_TO_CREATE; construct->udp= 0; server_startup(construct);