X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_functions.c;h=68d40d921482bdde66576f924b891a9e5f262eea;hb=519261ca98528ebc5d854ed839f400aa03a3dc5c;hp=1c2a80fd3b37e6b95f313e01471d0b6b153089bb;hpb=9af5349a4723594200c3e1d2100a09bbf67d4ba0;p=awesomized%2Flibmemcached diff --git a/tests/mem_functions.c b/tests/mem_functions.c index 1c2a80fd..68d40d92 100644 --- a/tests/mem_functions.c +++ b/tests/mem_functions.c @@ -52,7 +52,7 @@ static pairs_st *global_pairs; static const char *global_keys[GLOBAL_COUNT]; static size_t global_keys_length[GLOBAL_COUNT]; -static test_return_t init_test(memcached_st *not_used __attribute__((unused))) +static test_return_t init_test(memcached_st *not_used __attribute__((unused))) { memcached_st memc; @@ -62,55 +62,59 @@ static test_return_t init_test(memcached_st *not_used __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t 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_t rc; server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, NULL); - test_truth(server_list == NULL); + test_true(server_list == NULL); server_list= memcached_server_list_append_with_weight(NULL, "localhost", 0, 0, NULL); - test_truth(server_list == NULL); + test_true(server_list == NULL); server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, &rc); - test_truth(server_list == NULL); + test_true(server_list == NULL); return TEST_SUCCESS; } #define TEST_PORT_COUNT 7 -uint32_t test_ports[TEST_PORT_COUNT]; +in_port_t test_ports[TEST_PORT_COUNT]; -static memcached_return_t server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) +static memcached_return_t server_display_function(const memcached_st *ptr __attribute__((unused)), + const memcached_server_st *server, + void *context) { /* Do Nothing */ - uint32_t bigger= *((uint32_t *)(context)); - assert(bigger <= server->port); - *((uint32_t *)(context))= server->port; + size_t bigger= *((size_t *)(context)); + assert(bigger <= memcached_server_port(server)); + *((size_t *)(context))= memcached_server_port(server); return MEMCACHED_SUCCESS; } -static test_return_t 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 test_truth in server_display_function */ + size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ + memcached_return_t rc; memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - test_truth(local_memc); + test_true(local_memc); memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); - for (x= 0; x < TEST_PORT_COUNT; x++) + for (size_t x= 0; x < TEST_PORT_COUNT; x++) { - test_ports[x]= (uint32_t)random() % 64000; + test_ports[x]= (in_port_t)random() % 64000; rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); - test_truth(memcached_server_count(local_memc) == x + 1); - test_truth(memcached_servers_count(memcached_server_list(local_memc)) == x+1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(memcached_server_count(local_memc) == x + 1); +#if 0 // Rewrite + test_true(memcached_server_list_count(memcached_server_list(local_memc)) == x+1); +#endif + test_true(rc == MEMCACHED_SUCCESS); } callbacks[0]= server_display_function; @@ -122,32 +126,32 @@ static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused)) return TEST_SUCCESS; } -static test_return_t 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 test_truth in server_display_function */ + size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ memcached_return_t rc; memcached_server_fn callbacks[1]; memcached_st *local_memc; - memcached_server_instance_st *instance; + memcached_server_instance_st instance; local_memc= memcached_create(NULL); - test_truth(local_memc); + test_true(local_memc); rc= memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43043, 0); - test_truth(rc == MEMCACHED_SUCCESS); - instance= memcached_server_instance_fetch(local_memc, 0); - test_truth(instance->port == 43043); + test_true(rc == MEMCACHED_SUCCESS); + instance= memcached_server_instance_by_position(local_memc, 0); + test_true(memcached_server_port(instance) == 43043); rc= memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43042, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); - instance= memcached_server_instance_fetch(local_memc, 0); - test_truth(instance->port == 43042); + instance= memcached_server_instance_by_position(local_memc, 0); + test_true(memcached_server_port(instance) == 43042); - instance= memcached_server_instance_fetch(local_memc, 1); - test_truth(instance->port == 43043); + instance= memcached_server_instance_by_position(local_memc, 1); + test_true(memcached_server_port(instance) == 43043); callbacks[0]= server_display_function; memcached_server_cursor(local_memc, callbacks, (void *)&bigger, 1); @@ -158,7 +162,46 @@ static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused) return TEST_SUCCESS; } -static memcached_return_t server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) +static memcached_return_t server_print_callback(const memcached_st *ptr __attribute__((unused)), + const memcached_server_st *server, + void *context __attribute__((unused))) +{ + (void)server; // Just in case we aren't printing. + +#if 0 + fprintf(stderr, "%s(%d)", memcached_server_name(server), memcached_server_port(server)); +#endif + + return MEMCACHED_SUCCESS; +} + +static test_return_t memcached_server_remove_test(memcached_st *ptr __attribute__((unused))) +{ + memcached_return_t rc; + memcached_st local_memc; + memcached_st *memc; + memcached_server_st *servers; + memcached_server_fn callbacks[1]; + + const char *server_string= "localhost:4444, localhost:4445, localhost:4446, localhost:4447, localhost, memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214"; + + memc= memcached_create(&local_memc); + + servers= memcached_servers_parse(server_string); + + rc= memcached_server_push(memc, servers); + + callbacks[0]= server_print_callback; + memcached_server_cursor(memc, callbacks, NULL, 1); + + memcached_free(memc); + + return TEST_SUCCESS; +} + +static memcached_return_t server_display_unsort_function(const memcached_st *ptr __attribute__((unused)), + const memcached_server_st *server, + void *context) { /* Do Nothing */ uint32_t x= *((uint32_t *)(context)); @@ -169,25 +212,26 @@ static memcached_return_t server_display_unsort_function(memcached_st *ptr __att return MEMCACHED_SUCCESS; } -static test_return_t 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 test_truth in server_display_function */ - uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */ + size_t counter= 0; /* Prime the value for the test_true in server_display_function */ + size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ memcached_return_t rc; memcached_server_fn callbacks[1]; memcached_st *local_memc; local_memc= memcached_create(NULL); - test_truth(local_memc); + test_true(local_memc); - for (x= 0; x < TEST_PORT_COUNT; x++) + for (size_t x= 0; x < TEST_PORT_COUNT; x++) { - test_ports[x]= (uint32_t)(random() % 64000); + test_ports[x]= (in_port_t)(random() % 64000); rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); - test_truth(memcached_server_count(local_memc) == x+1); - test_truth(memcached_servers_count(memcached_server_list(local_memc)) == x+1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(memcached_server_count(local_memc) == x+1); +#if 0 // Rewrite + test_true(memcached_server_list_count(memcached_server_list(local_memc)) == x+1); +#endif + test_true(rc == MEMCACHED_SUCCESS); } callbacks[0]= server_display_unsort_function; @@ -204,23 +248,23 @@ static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused return TEST_SUCCESS; } -static test_return_t 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); - test_truth(memc); + test_true(memc); memcached_free(memc); return TEST_SUCCESS; } -static test_return_t 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); - test_truth(memc_clone); + test_true(memc_clone); memcached_free(memc_clone); } @@ -228,48 +272,51 @@ static test_return_t clone_test(memcached_st *memc) { memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - 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_true(memc_clone); + + { // Test allocators + test_true(memc_clone->allocators.free == memc->allocators.free); + test_true(memc_clone->allocators.malloc == memc->allocators.malloc); + test_true(memc_clone->allocators.realloc == memc->allocators.realloc); + test_true(memc_clone->allocators.calloc == memc->allocators.calloc); + } + + test_true(memc_clone->connect_timeout == memc->connect_timeout); + test_true(memc_clone->delete_trigger == memc->delete_trigger); + test_true(memc_clone->distribution == memc->distribution); { // 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_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_true(memc_clone->flags.no_block == memc->flags.no_block); + test_true(memc_clone->flags.tcp_nodelay == memc->flags.tcp_nodelay); + test_true(memc_clone->flags.reuse_memory == memc->flags.reuse_memory); + test_true(memc_clone->flags.use_cache_lookups == memc->flags.use_cache_lookups); + test_true(memc_clone->flags.support_cas == memc->flags.support_cas); + test_true(memc_clone->flags.buffer_requests == memc->flags.buffer_requests); + test_true(memc_clone->flags.use_sort_hosts == memc->flags.use_sort_hosts); + test_true(memc_clone->flags.verify_key == memc->flags.verify_key); + test_true(memc_clone->flags.ketama_weighted == memc->flags.ketama_weighted); + test_true(memc_clone->flags.binary_protocol == memc->flags.binary_protocol); + test_true(memc_clone->flags.hash_with_prefix_key == memc->flags.hash_with_prefix_key); + test_true(memc_clone->flags.no_reply == memc->flags.no_reply); + test_true(memc_clone->flags.use_udp == memc->flags.use_udp); + test_true(memc_clone->flags.auto_eject_hosts == memc->flags.auto_eject_hosts); + test_true(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->distribution_hash == memc->distribution_hash); - 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); + test_true(memc_clone->get_key_failure == memc->get_key_failure); + test_true(hashkit_compare(&memc_clone->hashkit, &memc->hashkit)); + test_true(hashkit_compare(&memc_clone->distribution_hashkit, &memc->distribution_hashkit)); + test_true(memc_clone->io_bytes_watermark == memc->io_bytes_watermark); + test_true(memc_clone->io_msg_watermark == memc->io_msg_watermark); + test_true(memc_clone->io_key_prefetch == memc->io_key_prefetch); + test_true(memc_clone->on_cleanup == memc->on_cleanup); + test_true(memc_clone->on_clone == memc->on_clone); + test_true(memc_clone->poll_timeout == memc->poll_timeout); + test_true(memc_clone->rcv_timeout == memc->rcv_timeout); + test_true(memc_clone->recv_size == memc->recv_size); + test_true(memc_clone->retry_timeout == memc->retry_timeout); + test_true(memc_clone->send_size == memc->send_size); + test_true(memc_clone->server_failure_limit == memc->server_failure_limit); + test_true(memc_clone->snd_timeout == memc->snd_timeout); + test_true(memc_clone->user_data == memc->user_data); memcached_free(memc_clone); } @@ -280,7 +327,7 @@ static test_return_t clone_test(memcached_st *memc) memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); memc_clone= memcached_clone(&declared_clone, NULL); - test_truth(memc_clone); + test_true(memc_clone); memcached_free(memc_clone); } @@ -290,7 +337,7 @@ static test_return_t clone_test(memcached_st *memc) memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); memc_clone= memcached_clone(&declared_clone, memc); - test_truth(memc_clone); + test_true(memc_clone); memcached_free(memc_clone); } @@ -300,24 +347,24 @@ static test_return_t clone_test(memcached_st *memc) static test_return_t userdata_test(memcached_st *memc) { void* foo= NULL; - 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); + test_true(memcached_set_user_data(memc, foo) == NULL); + test_true(memcached_get_user_data(memc) == foo); + test_true(memcached_set_user_data(memc, NULL) == foo); return TEST_SUCCESS; } -static test_return_t connection_test(memcached_st *memc) +static test_return_t connection_test(memcached_st *memc) { memcached_return_t rc; rc= memcached_server_add_with_weight(memc, "localhost", 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } -static test_return_t error_test(memcached_st *memc) +static test_return_t error_test(memcached_st *memc) { memcached_return_t rc; uint32_t values[] = { 851992627U, 2337886783U, 3196981036U, 4001849190U, @@ -329,23 +376,29 @@ static test_return_t error_test(memcached_st *memc) 4269430871U, 610793021U, 527273862U, 1437122909U, 2300930706U, 2943759320U, 674306647U, 2400528935U, 54481931U, 4186304426U, 1741088401U, 2979625118U, - 4159057246U, 3425930182U, 2593724503U}; + 4159057246U, 3425930182U, 2593724503U, 1868899624U, + 1769812374U, 2302537950U, 1110330676U }; // You have updated the memcache_error messages but not updated docs/tests. - test_truth(MEMCACHED_MAXIMUM_RETURN == 39); + test_true(MEMCACHED_MAXIMUM_RETURN == 43); for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++) { uint32_t hash_val; const char *msg= memcached_strerror(memc, rc); hash_val= memcached_generate_hash_value(msg, strlen(msg), MEMCACHED_HASH_JENKINS); - test_truth(values[rc] == hash_val); + if (values[rc] != hash_val) + { + fprintf(stderr, "\n\nYou have updated memcached_return_t without updating the error_test\n"); + fprintf(stderr, "%u, %s, (%u)\n\n", (uint32_t)rc, memcached_strerror(memc, rc), hash_val); + } + test_true(values[rc] == hash_val); } return TEST_SUCCESS; } -static test_return_t set_test(memcached_st *memc) +static test_return_t set_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -354,12 +407,12 @@ static test_return_t set_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } -static test_return_t append_test(memcached_st *memc) +static test_return_t append_test(memcached_st *memc) { memcached_return_t rc; const char *key= "fig"; @@ -369,80 +422,77 @@ static test_return_t append_test(memcached_st *memc) uint32_t flags; rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_set(memc, key, strlen(key), in_value, strlen(in_value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_append(memc, key, strlen(key), " the", strlen(" the"), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_append(memc, key, strlen(key), " people", strlen(" people"), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - 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); + test_true(!memcmp(out_value, "we the people", strlen("we the people"))); + test_true(strlen("we the people") == value_length); + test_true(rc == MEMCACHED_SUCCESS); free(out_value); return TEST_SUCCESS; } -static test_return_t append_binary_test(memcached_st *memc) +static test_return_t append_binary_test(memcached_st *memc) { memcached_return_t rc; const char *key= "numbers"; - unsigned int *store_ptr; - unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 }; - char *value; + uint32_t store_list[] = { 23, 56, 499, 98, 32847, 0 }; + uint32_t *value; size_t value_length; uint32_t flags; - unsigned int x; + uint32_t x; rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_set(memc, key, strlen(key), NULL, 0, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); for (x= 0; store_list[x] ; x++) { rc= memcached_append(memc, key, strlen(key), - (char *)&store_list[x], sizeof(unsigned int), + (char *)&store_list[x], sizeof(uint32_t), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } - value= memcached_get(memc, key, strlen(key), + value= (uint32_t *)memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - test_truth((value_length == (sizeof(unsigned int) * x))); - test_truth(rc == MEMCACHED_SUCCESS); + test_true((value_length == (sizeof(uint32_t) * x))); + test_true(rc == MEMCACHED_SUCCESS); - store_ptr= (unsigned int *)value; - x= 0; - while ((size_t)store_ptr < (size_t)(value + value_length)) + for (uint32_t counter= x, *ptr= value; counter; counter--) { - test_truth(*store_ptr == store_list[x++]); - store_ptr++; + test_true(*ptr == store_list[x - counter]); + ptr++; } free(value); return TEST_SUCCESS; } -static test_return_t cas2_test(memcached_st *memc) +static test_return_t cas2_test(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; @@ -455,7 +505,7 @@ static test_return_t cas2_test(memcached_st *memc) unsigned int set= 1; rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); @@ -464,7 +514,7 @@ static test_return_t cas2_test(memcached_st *memc) rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } rc= memcached_mget(memc, keys, key_length, 3); @@ -472,21 +522,21 @@ static test_return_t cas2_test(memcached_st *memc) results= memcached_result_create(memc, &results_obj); results= memcached_fetch_result(memc, &results_obj, &rc); - test_truth(results); - test_truth(results->cas); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memcached_result_cas(results)); + test_true(results); + test_true(results->item_cas); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_result_cas(results)); - test_truth(!memcmp(value, "we the people", strlen("we the people"))); - test_truth(strlen("we the people") == value_length); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(!memcmp(value, "we the people", strlen("we the people"))); + test_true(strlen("we the people") == value_length); + test_true(rc == MEMCACHED_SUCCESS); memcached_result_free(&results_obj); return TEST_SUCCESS; } -static test_return_t cas_test(memcached_st *memc) +static test_return_t cas_test(memcached_st *memc) { memcached_return_t rc; const char *key= "fun"; @@ -503,50 +553,50 @@ static test_return_t cas_test(memcached_st *memc) unsigned int set= 1; rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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); - 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); + test_true(results); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_result_cas(results)); + test_true(!memcmp(value, memcached_result_value(results), value_length)); + test_true(strlen(memcached_result_value(results)) == value_length); + test_true(rc == MEMCACHED_SUCCESS); uint64_t cas = memcached_result_cas(results); - #if 0 +#if 0 results= memcached_fetch_result(memc, &results_obj, &rc); - test_truth(rc == MEMCACHED_END); - test_truth(results == NULL); + test_true(rc == MEMCACHED_END); + test_true(results == NULL); #endif rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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); - test_truth(rc == MEMCACHED_DATA_EXISTS); + test_true(rc == MEMCACHED_DATA_EXISTS); memcached_result_free(&results_obj); return TEST_SUCCESS; } -static test_return_t prepend_test(memcached_st *memc) +static test_return_t prepend_test(memcached_st *memc) { memcached_return_t rc; const char *key= "fig"; @@ -556,28 +606,28 @@ static test_return_t prepend_test(memcached_st *memc) uint32_t flags; rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_prepend(memc, key, strlen(key), "the ", strlen("the "), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_prepend(memc, key, strlen(key), "we ", strlen("we "), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - 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); + test_true(!memcmp(out_value, "we the people", strlen("we the people"))); + test_true(strlen("we the people") == value_length); + test_true(rc == MEMCACHED_SUCCESS); free(out_value); return TEST_SUCCESS; @@ -587,7 +637,7 @@ static test_return_t prepend_test(memcached_st *memc) Set the value, then quit to make sure it is flushed. Come back in and test that add fails. */ -static test_return_t add_test(memcached_st *memc) +static test_return_t add_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -599,7 +649,7 @@ static test_return_t add_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); rc= memcached_add(memc, key, strlen(key), value, strlen(value), @@ -608,11 +658,11 @@ static test_return_t add_test(memcached_st *memc) /* Too many broken OS'es have broken loopback in async, so we can't be sure of the result */ if (setting_value) { - test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED); + test_true(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_STORED); } else { - test_truth(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); + test_true(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); } return TEST_SUCCESS; @@ -625,7 +675,7 @@ static test_return_t 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_t add_wrapper(memcached_st *memc) +static test_return_t add_wrapper(memcached_st *memc) { unsigned int x; unsigned int max= 10000; @@ -642,7 +692,7 @@ static test_return_t add_wrapper(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t replace_test(memcached_st *memc) +static test_return_t replace_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -652,17 +702,17 @@ static test_return_t replace_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), original, strlen(original), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_replace(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } -static test_return_t delete_test(memcached_st *memc) +static test_return_t delete_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -671,26 +721,26 @@ static test_return_t delete_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_delete(memc, key, strlen(key), (time_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } -static test_return_t flush_test(memcached_st *memc) +static test_return_t flush_test(memcached_st *memc) { memcached_return_t rc; rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } -static memcached_return_t server_function(memcached_st *ptr __attribute__((unused)), - memcached_server_st *server __attribute__((unused)), +static memcached_return_t server_function(const memcached_st *ptr __attribute__((unused)), + const memcached_server_st *server __attribute__((unused)), void *context __attribute__((unused))) { /* Do Nothing */ @@ -698,7 +748,7 @@ static memcached_return_t server_function(memcached_st *ptr __attribute__((unus return MEMCACHED_SUCCESS; } -static test_return_t 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"); @@ -709,7 +759,7 @@ static test_return_t memcached_server_cursor_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t bad_key_test(memcached_st *memc) +static test_return_t bad_key_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo bad"; @@ -725,41 +775,41 @@ static test_return_t bad_key_test(memcached_st *memc) return TEST_SKIPPED; memc_clone= memcached_clone(NULL, memc); - test_truth(memc_clone); + test_true(memc_clone); rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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) { string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); - test_truth(string_length == 0); - test_truth(!string); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(string_length == 0); + test_true(!string); set= 0; rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_NOTFOUND); - test_truth(string_length == 0); - test_truth(!string); + test_true(rc == MEMCACHED_NOTFOUND); + test_true(string_length == 0); + test_true(!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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc_clone, keys, key_lengths, 3); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); rc= memcached_mget_by_key(memc_clone, "foo daddy", 9, keys, key_lengths, 1); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); max_keylen= 250; @@ -768,7 +818,7 @@ static test_return_t bad_key_test(memcached_st *memc) binary protocol */ rc= memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); char *longkey= malloc(max_keylen + 1); if (longkey != NULL) @@ -776,15 +826,15 @@ static test_return_t bad_key_test(memcached_st *memc) memset(longkey, 'a', max_keylen + 1); string= memcached_get(memc_clone, longkey, max_keylen, &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_NOTFOUND); - test_truth(string_length == 0); - test_truth(!string); + test_true(rc == MEMCACHED_NOTFOUND); + test_true(string_length == 0); + test_true(!string); string= memcached_get(memc_clone, longkey, max_keylen + 1, &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); - test_truth(string_length == 0); - test_truth(!string); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(string_length == 0); + test_true(!string); free(longkey); } @@ -793,12 +843,12 @@ static test_return_t 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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); string= memcached_get(memc_clone, key, 0, &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); - test_truth(string_length == 0); - test_truth(!string); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(string_length == 0); + test_true(!string); memcached_free(memc_clone); @@ -827,28 +877,28 @@ static test_return_t read_through(memcached_st *memc) string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(rc == MEMCACHED_NOTFOUND); test_false(string_length); test_false(string); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, *(void **)&cb); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(string_length == strlen(READ_THROUGH_VALUE)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(string_length == strlen(READ_THROUGH_VALUE)); test_strcmp(READ_THROUGH_VALUE, string); free(string); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(string_length == strlen(READ_THROUGH_VALUE)); - test_truth(!strcmp(READ_THROUGH_VALUE, string)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(string_length == strlen(READ_THROUGH_VALUE)); + test_true(!strcmp(READ_THROUGH_VALUE, string)); free(string); return TEST_SUCCESS; @@ -863,7 +913,7 @@ static memcached_return_t delete_trigger(memcached_st *ptr __attribute__((unuse return MEMCACHED_SUCCESS; } -static test_return_t delete_through(memcached_st *memc) +static test_return_t delete_through(memcached_st *memc) { memcached_trigger_delete_key_fn callback; memcached_return_t rc; @@ -871,12 +921,12 @@ static test_return_t delete_through(memcached_st *memc) callback= (memcached_trigger_delete_key_fn)delete_trigger; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } -static test_return_t get_test(memcached_st *memc) +static test_return_t get_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -885,19 +935,19 @@ static test_return_t get_test(memcached_st *memc) uint32_t flags; rc= memcached_delete(memc, key, strlen(key), (time_t)0); - test_truth(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND); + test_true(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(rc == MEMCACHED_NOTFOUND); test_false(string_length); test_false(string); return TEST_SUCCESS; } -static test_return_t get_test2(memcached_st *memc) +static test_return_t get_test2(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -909,22 +959,22 @@ static test_return_t get_test2(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(string); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(string_length == strlen(value)); - test_truth(!memcmp(string, value, string_length)); + test_true(string); + test_true(rc == MEMCACHED_SUCCESS); + test_true(string_length == strlen(value)); + test_true(!memcmp(string, value, string_length)); free(string); return TEST_SUCCESS; } -static test_return_t set_test2(memcached_st *memc) +static test_return_t set_test2(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -937,13 +987,13 @@ static test_return_t set_test2(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } return TEST_SUCCESS; } -static test_return_t set_test3(memcached_st *memc) +static test_return_t set_test3(memcached_st *memc) { memcached_return_t rc; char *value; @@ -951,7 +1001,7 @@ static test_return_t set_test3(memcached_st *memc) unsigned int x; value = (char*)malloc(value_length); - test_truth(value); + test_true(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -966,7 +1016,7 @@ static test_return_t set_test3(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } free(value); @@ -974,7 +1024,7 @@ static test_return_t set_test3(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t get_test3(memcached_st *memc) +static test_return_t get_test3(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -986,7 +1036,7 @@ static test_return_t get_test3(memcached_st *memc) uint32_t x; value = (char*)malloc(value_length); - test_truth(value); + test_true(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -994,15 +1044,15 @@ static test_return_t get_test3(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(string); - test_truth(string_length == value_length); - test_truth(!memcmp(string, value, string_length)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(string); + test_true(string_length == value_length); + test_true(!memcmp(string, value, string_length)); free(string); free(value); @@ -1010,7 +1060,7 @@ static test_return_t get_test3(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t get_test4(memcached_st *memc) +static test_return_t get_test4(memcached_st *memc) { memcached_return_t rc; const char *key= "foo"; @@ -1022,7 +1072,7 @@ static test_return_t get_test4(memcached_st *memc) uint32_t x; value = (char*)malloc(value_length); - test_truth(value); + test_true(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -1030,17 +1080,17 @@ static test_return_t get_test4(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); for (x= 0; x < 10; x++) { string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(string); - test_truth(string_length == value_length); - test_truth(!memcmp(string, value, string_length)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(string); + test_true(string_length == value_length); + test_true(!memcmp(string, value, string_length)); free(string); } @@ -1067,34 +1117,34 @@ static test_return_t get_test5(memcached_st *memc) memcached_return_t rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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); - test_truth(results); + test_true(results); results=memcached_fetch_result(memc, &results_obj, &rc); - test_truth(results); + test_true(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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); char *val= memcached_get_by_key(memc, keys[0], lengths[0], "yek", 3, &rlen, &flags, &rc); - test_truth(val == NULL); - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(val == NULL); + test_true(rc == MEMCACHED_NOTFOUND); val= memcached_get(memc, keys[0], lengths[0], &rlen, &flags, &rc); - test_truth(val != NULL); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(val != NULL); + test_true(rc == MEMCACHED_SUCCESS); free(val); return TEST_SUCCESS; } -static test_return_t mget_end(memcached_st *memc) +static test_return_t mget_end(memcached_st *memc) { const char *keys[]= { "foo", "foo2" }; size_t lengths[]= { 3, 4 }; @@ -1107,7 +1157,7 @@ static test_return_t mget_end(memcached_st *memc) { rc= memcached_set(memc, keys[i], lengths[i], values[i], strlen(values[i]), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } char *string; @@ -1116,7 +1166,7 @@ static test_return_t mget_end(memcached_st *memc) // retrieve both via mget rc= memcached_mget(memc, keys, lengths, 2); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); char key[MEMCACHED_MAX_KEY]; size_t key_length; @@ -1126,54 +1176,58 @@ static test_return_t mget_end(memcached_st *memc) { string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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); + test_true(string_length == strlen(values[val])); + test_true(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); + test_true(rc == MEMCACHED_END); // now get just one rc= memcached_mget(memc, keys, lengths, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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); + test_true(key_length == lengths[0]); + test_true(strncmp(keys[0], key, key_length) == 0); + test_true(string_length == strlen(values[0])); + test_true(strncmp(values[0], string, string_length) == 0); + test_true(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); + test_true(rc == MEMCACHED_END); return TEST_SUCCESS; } /* Do not copy the style of this code, I just access hosts to testthis function */ -static test_return_t stats_servername_test(memcached_st *memc) +static test_return_t stats_servername_test(memcached_st *memc) { memcached_return_t rc; memcached_stat_st memc_stat; - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT + if (memcached_get_sasl_callbacks(memc) != NULL) + return TEST_SKIPPED; +#endif rc= memcached_stat_servername(&memc_stat, NULL, - instance->hostname, - instance->port); + memcached_server_name(instance), + memcached_server_port(instance)); return TEST_SUCCESS; } -static test_return_t increment_test(memcached_st *memc) +static test_return_t increment_test(memcached_st *memc) { uint64_t new_number; memcached_return_t rc; @@ -1183,22 +1237,22 @@ static test_return_t increment_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_increment(memc, key, strlen(key), 1, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == 1); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == 1); rc= memcached_increment(memc, key, strlen(key), 1, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == 2); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == 2); return TEST_SUCCESS; } -static test_return_t 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) { @@ -1209,18 +1263,18 @@ static test_return_t increment_with_initial_test(memcached_st *memc) rc= memcached_increment_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == initial); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == initial); rc= memcached_increment_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == (initial + 1)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == (initial + 1)); } return TEST_SUCCESS; } -static test_return_t decrement_test(memcached_st *memc) +static test_return_t decrement_test(memcached_st *memc) { uint64_t new_number; memcached_return_t rc; @@ -1230,22 +1284,22 @@ static test_return_t decrement_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_decrement(memc, key, strlen(key), 1, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == 2); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == 2); rc= memcached_decrement(memc, key, strlen(key), 1, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == 1); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == 1); return TEST_SUCCESS; } -static test_return_t 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) { @@ -1256,18 +1310,18 @@ static test_return_t decrement_with_initial_test(memcached_st *memc) rc= memcached_decrement_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == initial); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == initial); rc= memcached_decrement_with_initial(memc, key, strlen(key), 1, initial, 0, &new_number); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(new_number == (initial - 1)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == (initial - 1)); } return TEST_SUCCESS; } -static test_return_t increment_by_key_test(memcached_st *memc) +static test_return_t increment_by_key_test(memcached_st *memc) { uint64_t new_number; memcached_return_t rc; @@ -1279,22 +1333,22 @@ static test_return_t increment_by_key_test(memcached_st *memc) key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(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); + test_true(rc == MEMCACHED_SUCCESS); + test_true(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); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == 2); return TEST_SUCCESS; } -static test_return_t increment_with_initial_by_key_test(memcached_st *memc) +static test_return_t increment_with_initial_by_key_test(memcached_st *memc) { if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { @@ -1307,19 +1361,19 @@ static test_return_t increment_with_initial_by_key_test(memcached_st *memc) 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); + test_true(rc == MEMCACHED_SUCCESS); + test_true(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)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == (initial + 1)); } return TEST_SUCCESS; } -static test_return_t decrement_by_key_test(memcached_st *memc) +static test_return_t decrement_by_key_test(memcached_st *memc) { uint64_t new_number; memcached_return_t rc; @@ -1331,24 +1385,24 @@ static test_return_t decrement_by_key_test(memcached_st *memc) key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(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); + test_true(rc == MEMCACHED_SUCCESS); + test_true(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); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == 1); return TEST_SUCCESS; } -static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) +static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) { if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { @@ -1361,19 +1415,19 @@ static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) 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); + test_true(rc == MEMCACHED_SUCCESS); + test_true(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)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(new_number == (initial - 1)); } return TEST_SUCCESS; } -static test_return_t quit_test(memcached_st *memc) +static test_return_t quit_test(memcached_st *memc) { memcached_return_t rc; const char *key= "fudge"; @@ -1382,18 +1436,18 @@ static test_return_t quit_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)10, (uint32_t)3); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } -static test_return_t mget_result_test(memcached_st *memc) +static test_return_t mget_result_test(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; @@ -1404,43 +1458,43 @@ static test_return_t mget_result_test(memcached_st *memc) memcached_result_st *results; results= memcached_result_create(memc, &results_obj); - test_truth(results); - test_truth(&results_obj == results); + test_true(results); + test_true(&results_obj == results); /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL) { - test_truth(results); + test_true(results); } while ((results= memcached_fetch_result(memc, &results_obj, &rc)) != NULL) - test_truth(!results); - test_truth(rc == MEMCACHED_END); + test_true(!results); + test_true(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, &results_obj, &rc))) { - 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), + test_true(results); + test_true(&results_obj == results); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_result_key_length(results) == memcached_result_length(results)); + test_true(!memcmp(memcached_result_key_value(results), memcached_result_value(results), memcached_result_length(results))); } @@ -1450,7 +1504,7 @@ static test_return_t mget_result_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t mget_result_alloc_test(memcached_st *memc) +static test_return_t mget_result_alloc_test(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; @@ -1461,36 +1515,36 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); while ((results= memcached_fetch_result(memc, NULL, &rc)) != NULL) { - test_truth(results); + test_true(results); } - test_truth(!results); - test_truth(rc == MEMCACHED_END); + test_true(!results); + test_true(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); x= 0; while ((results= memcached_fetch_result(memc, NULL, &rc))) { - 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), + test_true(results); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_result_key_length(results) == memcached_result_length(results)); + test_true(!memcmp(memcached_result_key_value(results), memcached_result_value(results), memcached_result_length(results))); memcached_result_free(results); @@ -1501,24 +1555,24 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) } /* Count the results */ -static memcached_return_t callback_counter(memcached_st *ptr __attribute__((unused)), +static memcached_return_t callback_counter(const memcached_st *ptr __attribute__((unused)), memcached_result_st *result __attribute__((unused)), void *context) { - unsigned int *counter= (unsigned int *)context; + size_t *counter= (size_t *)context; *counter= *counter + 1; return MEMCACHED_SUCCESS; } -static test_return_t mget_result_function(memcached_st *memc) +static test_return_t mget_result_function(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; - unsigned int counter; + size_t counter; memcached_execute_fn callbacks[1]; /* We need to empty the server before continueing test */ @@ -1528,22 +1582,22 @@ static test_return_t mget_result_function(memcached_st *memc) rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); callbacks[0]= &callback_counter; counter= 0; rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - test_truth(counter == 3); + test_true(counter == 3); return TEST_SUCCESS; } -static test_return_t mget_test(memcached_st *memc) +static test_return_t mget_test(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; @@ -1558,39 +1612,39 @@ static test_return_t mget_test(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - test_truth(return_value); + test_true(return_value); } - test_truth(!return_value); - test_truth(return_value_length == 0); - test_truth(rc == MEMCACHED_END); + test_true(!return_value); + test_true(return_value_length == 0); + test_true(rc == MEMCACHED_END); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); x= 0; 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); - test_truth(return_key_length == return_value_length); - test_truth(!memcmp(return_value, return_key, return_value_length)); + test_true(return_value); + test_true(rc == MEMCACHED_SUCCESS); + test_true(return_key_length == return_value_length); + test_true(!memcmp(return_value, return_key, return_value_length)); free(return_value); x++; } @@ -1601,6 +1655,7 @@ static test_return_t mget_test(memcached_st *memc) static test_return_t mget_execute(memcached_st *memc) { bool binary= false; + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) binary= true; @@ -1611,50 +1666,53 @@ static test_return_t mget_execute(memcached_st *memc) uint32_t number_of_hosts= memc->number_of_hosts; memc->number_of_hosts= 1; - int max_keys= binary ? 20480 : 1; + size_t 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)); + char **keys= calloc(max_keys, sizeof(char*)); + size_t *key_length=calloc(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) + for (size_t x= 0; x < max_keys; ++x) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); keys[x]= strdup(k); - test_truth(keys[x] != NULL); + test_true(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); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } /* Try to get all of them with a large multiget */ - unsigned int counter= 0; + size_t 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); + max_keys, callbacks, &counter, 1); if (binary) { - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - test_truth(rc == MEMCACHED_END); + test_true(rc == MEMCACHED_END); /* Verify that we got all of the items */ - test_truth(counter == (unsigned int)max_keys); + test_true(counter == max_keys); } else { - test_truth(rc == MEMCACHED_NOT_SUPPORTED); - test_truth(counter == 0); + test_true(rc == MEMCACHED_NOT_SUPPORTED); + test_true(counter == 0); } /* Release all allocated resources */ - for (int x= 0; x < max_keys; ++x) + for (size_t x= 0; x < max_keys; ++x) + { free(keys[x]); + } free(keys); free(key_length); @@ -1662,7 +1720,7 @@ static test_return_t mget_execute(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t get_stats_keys(memcached_st *memc) +static test_return_t get_stats_keys(memcached_st *memc) { char **stat_list; char **ptr; @@ -1670,44 +1728,43 @@ static test_return_t get_stats_keys(memcached_st *memc) memcached_return_t rc; stat_list= memcached_stat_get_keys(memc, &memc_stat, &rc); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); for (ptr= stat_list; *ptr; ptr++) - test_truth(*ptr); + test_true(*ptr); free(stat_list); return TEST_SUCCESS; } -static test_return_t 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(); - test_truth(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); + test_true(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); return TEST_SUCCESS; } -static test_return_t get_stats(memcached_st *memc) +static test_return_t get_stats(memcached_st *memc) { - unsigned int x; char **stat_list; char **ptr; memcached_return_t rc; memcached_stat_st *memc_stat; memc_stat= memcached_stat(memc, NULL, &rc); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memc_stat); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memc_stat); - for (x= 0; x < memcached_server_count(memc); x++) + for (uint32_t x= 0; x < memcached_server_count(memc); x++) { stat_list= memcached_stat_get_keys(memc, memc_stat+x, &rc); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); for (ptr= stat_list; *ptr; ptr++); free(stat_list); @@ -1718,7 +1775,7 @@ static test_return_t get_stats(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t add_host_test(memcached_st *memc) +static test_return_t add_host_test(memcached_st *memc) { unsigned int x; memcached_server_st *servers; @@ -1726,8 +1783,8 @@ static test_return_t add_host_test(memcached_st *memc) char servername[]= "0.example.com"; servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); - test_truth(servers); - test_truth(1 == memcached_server_list_count(servers)); + test_true(servers); + test_true(1 == memcached_server_list_count(servers)); for (x= 2; x < 20; x++) { @@ -1736,14 +1793,14 @@ static test_return_t add_host_test(memcached_st *memc) snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(x == memcached_server_list_count(servers)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(x == memcached_server_list_count(servers)); } rc= memcached_server_push(memc, servers); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_server_push(memc, servers); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); @@ -1760,7 +1817,7 @@ static memcached_return_t cleanup_test_callback(memcached_st *ptr __attribute__ return MEMCACHED_SUCCESS; } -static test_return_t callback_test(memcached_st *memc) +static test_return_t callback_test(memcached_st *memc) { /* Test User Data */ { @@ -1769,9 +1826,9 @@ static test_return_t callback_test(memcached_st *memc) memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_USER_DATA, &x); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); test_ptr= (int *)memcached_callback_get(memc, MEMCACHED_CALLBACK_USER_DATA, &rc); - test_truth(*test_ptr == x); + test_true(*test_ptr == x); } /* Test Clone Callback */ @@ -1783,9 +1840,9 @@ static test_return_t callback_test(memcached_st *memc) rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, clone_cb_ptr); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc); - test_truth(temp_function == clone_cb_ptr); + test_true(temp_function == clone_cb_ptr); } /* Test Cleanup Callback */ @@ -1798,62 +1855,85 @@ static test_return_t callback_test(memcached_st *memc) rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, cleanup_cb_ptr); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); temp_function= memcached_callback_get(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION, &rc); - test_truth(temp_function == cleanup_cb_ptr); + test_true(temp_function == cleanup_cb_ptr); } return TEST_SUCCESS; } /* We don't test the behavior itself, we test the switches */ -static test_return_t 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); - test_truth(value == 1); + test_true(value == 1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY); - test_truth(value == 1); + test_true(value == 1); set= MEMCACHED_HASH_MD5; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - test_truth(value == MEMCACHED_HASH_MD5); + test_true(value == MEMCACHED_HASH_MD5); set= 0; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - test_truth(value == 0); + test_true(value == 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY); - test_truth(value == 0); + test_true(value == 0); set= MEMCACHED_HASH_DEFAULT; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - test_truth(value == MEMCACHED_HASH_DEFAULT); + test_true(value == MEMCACHED_HASH_DEFAULT); set= MEMCACHED_HASH_CRC; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, set); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - test_truth(value == MEMCACHED_HASH_CRC); + test_true(value == MEMCACHED_HASH_CRC); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE); - test_truth(value > 0); + test_true(value > 0); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); - test_truth(value > 0); + test_true(value > 0); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, value + 1); - test_truth((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); + test_true((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); + + return TEST_SUCCESS; +} + +static test_return_t MEMCACHED_BEHAVIOR_CORK_test(memcached_st *memc) +{ + memcached_return_t rc; + bool set= true; + bool value; + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOT_SUPPORTED); + + value= (bool)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_CORK); + + if (rc == MEMCACHED_SUCCESS) + { + test_true((bool)value == set); + } + else + { + test_false((bool)value == set); + } return TEST_SUCCESS; } @@ -1870,8 +1950,8 @@ static test_return_t fetch_all_results(memcached_st *memc) 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); + test_true(return_value); + test_true(rc == MEMCACHED_SUCCESS); free(return_value); } @@ -1879,10 +1959,9 @@ static test_return_t fetch_all_results(memcached_st *memc) } /* Test case provided by Cal Haldenbrand */ -static test_return_t user_supplied_bug1(memcached_st *memc) +static test_return_t user_supplied_bug1(memcached_st *memc) { unsigned int setter= 1; - unsigned int x; unsigned long long total= 0; uint32_t size= 0; @@ -1900,39 +1979,37 @@ static test_return_t user_supplied_bug1(memcached_st *memc) /* add key */ - for (x= 0 ; total < 20 * 1024576 ; x++ ) + for (uint32_t x= 0 ; total < 20 * 1024576 ; x++ ) { unsigned int j= 0; size= (uint32_t)(rand() % ( 5 * 1024 ) ) + 400; memset(randomstuff, 0, 6 * 1024); - test_truth(size < 6 * 1024); /* Being safe here */ + test_true(size < 6 * 1024); /* Being safe here */ for (j= 0 ; j < size ;j++) randomstuff[j] = (signed char) ((rand() % 26) + 97); total += size; - sprintf(key, "%d", x); + snprintf(key, sizeof(key), "%u", x); rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(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), randomstuff, strlen(randomstuff), 10, 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } return TEST_SUCCESS; } /* Test case provided by Cal Haldenbrand */ -static test_return_t user_supplied_bug2(memcached_st *memc) +static test_return_t user_supplied_bug2(memcached_st *memc) { - int errors; unsigned int setter; - unsigned int x; - unsigned long long total; + size_t total= 0; setter= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, setter); @@ -1945,10 +2022,10 @@ static test_return_t user_supplied_bug2(memcached_st *memc) getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE); getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); - for (x= 0, errors= 0, total= 0 ; total < 20 * 1024576 ; x++) + for (x= 0, errors= 0; total < 20 * 1024576 ; x++) #endif - for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++) + for (uint32_t x= 0, errors= 0; total < 24576 ; x++) { memcached_return_t rc= MEMCACHED_SUCCESS; char buffer[SMALL_STRING_LEN]; @@ -1958,7 +2035,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) memset(buffer, 0, SMALL_STRING_LEN); - snprintf(buffer, SMALL_STRING_LEN, "%u", x); + snprintf(buffer, sizeof(buffer), "%u", x); getval= memcached_get(memc, buffer, strlen(buffer), &val_len, &flags, &rc); if (rc != MEMCACHED_SUCCESS) @@ -1967,7 +2044,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) errors++; else { - test_truth(rc); + test_true(rc); } continue; @@ -1982,7 +2059,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) /* Do a large mget() over all the keys we think exist */ #define KEY_COUNT 3000 // * 1024576 -static test_return_t user_supplied_bug3(memcached_st *memc) +static test_return_t user_supplied_bug3(memcached_st *memc) { memcached_return_t rc; unsigned int setter; @@ -2003,7 +2080,7 @@ static test_return_t user_supplied_bug3(memcached_st *memc) #endif keys= calloc(KEY_COUNT, sizeof(char *)); - test_truth(keys); + test_true(keys); for (x= 0; x < KEY_COUNT; x++) { char buffer[30]; @@ -2014,9 +2091,9 @@ static test_return_t user_supplied_bug3(memcached_st *memc) } rc= memcached_mget(memc, (const char **)keys, key_lengths, KEY_COUNT); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); - test_truth(fetch_all_results(memc) == TEST_SUCCESS); + test_true(fetch_all_results(memc) == TEST_SUCCESS); for (x= 0; x < KEY_COUNT; x++) free(keys[x]); @@ -2026,7 +2103,7 @@ static test_return_t user_supplied_bug3(memcached_st *memc) } /* Make sure we behave properly if server list has no values */ -static test_return_t user_supplied_bug4(memcached_st *memc) +static test_return_t user_supplied_bug4(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; @@ -2044,39 +2121,39 @@ static test_return_t user_supplied_bug4(memcached_st *memc) /* We need to empty the server before continueing test */ rc= memcached_flush(memc, 0); - test_truth(rc == MEMCACHED_NO_SERVERS); + test_true(rc == MEMCACHED_NO_SERVERS); rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_NO_SERVERS); + test_true(rc == MEMCACHED_NO_SERVERS); while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - test_truth(return_value); + test_true(return_value); } - test_truth(!return_value); - test_truth(return_value_length == 0); - test_truth(rc == MEMCACHED_NO_SERVERS); + test_true(!return_value); + test_true(return_value_length == 0); + test_true(rc == MEMCACHED_NO_SERVERS); for (x= 0; x < 3; x++) { rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_NO_SERVERS); + test_true(rc == MEMCACHED_NO_SERVERS); } rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_NO_SERVERS); + test_true(rc == MEMCACHED_NO_SERVERS); x= 0; 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); - test_truth(return_key_length == return_value_length); - test_truth(!memcmp(return_value, return_key, return_value_length)); + test_true(return_value); + test_true(rc == MEMCACHED_SUCCESS); + test_true(return_key_length == return_value_length); + test_true(!memcmp(return_value, return_key, return_value_length)); free(return_value); x++; } @@ -2085,7 +2162,7 @@ static test_return_t user_supplied_bug4(memcached_st *memc) } #define VALUE_SIZE_BUG5 1048064 -static test_return_t user_supplied_bug5(memcached_st *memc) +static test_return_t user_supplied_bug5(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; @@ -2105,28 +2182,28 @@ static test_return_t user_supplied_bug5(memcached_st *memc) memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - test_truth(value == NULL); + test_true(value == NULL); rc= memcached_mget(memc, keys, key_length, 4); count= 0; while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; - test_truth(count == 0); + test_true(count == 0); for (x= 0; x < 4; x++) { rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } for (x= 0; x < 10; x++) { value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - test_truth(value); + test_true(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); @@ -2137,13 +2214,13 @@ static test_return_t user_supplied_bug5(memcached_st *memc) count++; free(value); } - test_truth(count == 4); + test_true(count == 4); } return TEST_SUCCESS; } -static test_return_t user_supplied_bug6(memcached_st *memc) +static test_return_t user_supplied_bug6(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; @@ -2163,44 +2240,44 @@ static test_return_t user_supplied_bug6(memcached_st *memc) memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - test_truth(value == NULL); - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(value == NULL); + test_true(rc == MEMCACHED_NOTFOUND); rc= memcached_mget(memc, keys, key_length, 4); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); count= 0; while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; - test_truth(count == 0); - test_truth(rc == MEMCACHED_END); + test_true(count == 0); + test_true(rc == MEMCACHED_END); for (x= 0; x < 4; x++) { rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } for (x= 0; x < 2; x++) { value= memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc); - test_truth(value); + test_true(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(!(memcmp(value, insert_data, value_length))); - test_truth(value_length); + test_true(rc == MEMCACHED_SUCCESS); + test_true(!(memcmp(value, insert_data, value_length))); + test_true(value_length); free(value); } } @@ -2208,7 +2285,7 @@ static test_return_t user_supplied_bug6(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused))) +static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused))) { memcached_return_t rc; memcached_st *mine; @@ -2218,14 +2295,14 @@ static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unuse 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); - test_truth(servers); + test_true(servers); mine= memcached_create(NULL); rc= memcached_server_push(mine, servers); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); - test_truth(mine); + test_true(mine); memc_clone= memcached_clone(NULL, mine); memcached_quit(mine); @@ -2239,7 +2316,7 @@ static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unuse } /* Test flag store/retrieve */ -static test_return_t user_supplied_bug7(memcached_st *memc) +static test_return_t user_supplied_bug7(memcached_st *memc) { memcached_return_t rc; const char *keys= "036790384900"; @@ -2261,13 +2338,13 @@ static test_return_t user_supplied_bug7(memcached_st *memc) rc= memcached_set(memc, keys, key_length, insert_data, VALUE_SIZE_BUG5, (time_t)0, flags); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); flags= 0; value= memcached_get(memc, keys, key_length, &value_length, &flags, &rc); - test_truth(flags == 245); - test_truth(value); + test_true(flags == 245); + test_true(value); free(value); rc= memcached_mget(memc, &keys, &key_length, 1); @@ -2275,15 +2352,15 @@ static test_return_t user_supplied_bug7(memcached_st *memc) flags= 0; value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); - test_truth(flags == 245); - test_truth(value); + test_true(flags == 245); + test_true(value); free(value); return TEST_SUCCESS; } -static test_return_t user_supplied_bug9(memcached_st *memc) +static test_return_t user_supplied_bug9(memcached_st *memc) { memcached_return_t rc; const char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"}; @@ -2308,27 +2385,27 @@ static test_return_t user_supplied_bug9(memcached_st *memc) rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } rc= memcached_mget(memc, keys, key_length, 3); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); /* We need to empty the server before continueing test */ while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { - test_truth(return_value); + test_true(return_value); free(return_value); count++; } - test_truth(count == 3); + test_true(count == 3); return TEST_SUCCESS; } /* We are testing with aggressive timeout to get failures */ -static test_return_t user_supplied_bug10(memcached_st *memc) +static test_return_t user_supplied_bug10(memcached_st *memc) { const char *key= "foo"; char *value; @@ -2355,7 +2432,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc) { rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT); if (rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_TIMEOUT) @@ -2371,7 +2448,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc) /* We are looking failures in the async protocol */ -static test_return_t user_supplied_bug11(memcached_st *memc) +static test_return_t user_supplied_bug11(memcached_st *memc) { const char *key= "foo"; char *value; @@ -2391,7 +2468,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) timeout= (int32_t)memcached_behavior_get(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); - test_truth(timeout == -1); + test_true(timeout == -1); value = (char*)malloc(value_length * sizeof(char)); @@ -2412,7 +2489,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) /* Bug found where incr was not returning MEMCACHED_NOTFOUND when object did not exist. */ -static test_return_t user_supplied_bug12(memcached_st *memc) +static test_return_t user_supplied_bug12(memcached_st *memc) { memcached_return_t rc; uint32_t flags; @@ -2422,35 +2499,35 @@ static test_return_t user_supplied_bug12(memcached_st *memc) value= memcached_get(memc, "autoincrement", strlen("autoincrement"), &value_length, &flags, &rc); - test_truth(value == NULL); - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(value == NULL); + test_true(rc == MEMCACHED_NOTFOUND); rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value); - test_truth(value == NULL); + test_true(value == NULL); /* The binary protocol will set the key if it doesn't exist */ if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1) { - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } else { - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(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); - test_truth(value); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(value); + test_true(rc == MEMCACHED_SUCCESS); free(value); rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value); - test_truth(number_value == 2); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(number_value == 2); + test_true(rc == MEMCACHED_SUCCESS); return TEST_SUCCESS; } @@ -2459,7 +2536,7 @@ static test_return_t user_supplied_bug12(memcached_st *memc) 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_t user_supplied_bug13(memcached_st *memc) +static test_return_t user_supplied_bug13(memcached_st *memc) { char key[] = "key34567890"; char *overflow; @@ -2478,12 +2555,12 @@ static test_return_t user_supplied_bug13(memcached_st *memc) for (testSize= overflowSize - 1; testSize < overflowSize + 1; testSize++) { overflow= malloc(testSize); - test_truth(overflow != NULL); + test_true(overflow != NULL); memset(overflow, 'x', testSize); rc= memcached_set(memc, key, strlen(key), overflow, testSize, 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); free(overflow); } @@ -2497,7 +2574,7 @@ static test_return_t 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_t 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); @@ -2512,7 +2589,7 @@ static test_return_t user_supplied_bug14(memcached_st *memc) size_t current_length; value = (char*)malloc(value_length); - test_truth(value); + test_true(value); for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); @@ -2522,14 +2599,14 @@ static test_return_t user_supplied_bug14(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, current_length, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); string= memcached_get(memc, key, strlen(key), &string_length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(string_length == current_length); - test_truth(!memcmp(string, value, string_length)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(string_length == current_length); + test_true(!memcmp(string, value, string_length)); free(string); } @@ -2542,7 +2619,7 @@ static test_return_t user_supplied_bug14(memcached_st *memc) /* Look for zero length value problems */ -static test_return_t user_supplied_bug15(memcached_st *memc) +static test_return_t user_supplied_bug15(memcached_st *memc) { uint32_t x; memcached_return_t rc; @@ -2557,30 +2634,30 @@ static test_return_t user_supplied_bug15(memcached_st *memc) NULL, 0, (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(value == NULL); - test_truth(length == 0); - test_truth(flags == 0); + test_true(rc == MEMCACHED_SUCCESS); + test_true(value == NULL); + test_true(length == 0); + test_true(flags == 0); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(value == NULL); - test_truth(length == 0); - test_truth(flags == 0); + test_true(rc == MEMCACHED_SUCCESS); + test_true(value == NULL); + test_true(length == 0); + test_true(flags == 0); } return TEST_SUCCESS; } /* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */ -static test_return_t user_supplied_bug16(memcached_st *memc) +static test_return_t user_supplied_bug16(memcached_st *memc) { memcached_return_t rc; const char *key= "mykey"; @@ -2592,22 +2669,22 @@ static test_return_t user_supplied_bug16(memcached_st *memc) NULL, 0, (time_t)0, UINT32_MAX); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(value == NULL); - test_truth(length == 0); - test_truth(flags == UINT32_MAX); + test_true(rc == MEMCACHED_SUCCESS); + test_true(value == NULL); + test_true(length == 0); + test_true(flags == UINT32_MAX); return TEST_SUCCESS; } #ifndef __sun /* Check the validity of chinese key*/ -static test_return_t user_supplied_bug17(memcached_st *memc) +static test_return_t user_supplied_bug17(memcached_st *memc) { memcached_return_t rc; const char *key= "豆瓣"; @@ -2620,14 +2697,14 @@ static test_return_t user_supplied_bug17(memcached_st *memc) value, strlen(value), (time_t)0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value2= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - test_truth(length==strlen(value)); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memcmp(value, value2, length)==0); + test_true(length==strlen(value)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcmp(value, value2, length)==0); free(value2); return TEST_SUCCESS; @@ -2638,22 +2715,19 @@ static test_return_t user_supplied_bug17(memcached_st *memc) From Andrei on IRC */ -static test_return_t user_supplied_bug19(memcached_st *memc) +static test_return_t user_supplied_bug19(memcached_st *not_used) { - memcached_st *m; - memcached_server_st *s; + memcached_st *memc; + const memcached_server_st *server; memcached_return_t res; - (void)memc; - - m= memcached_create(NULL); - memcached_server_add_with_weight(m, "localhost", 11311, 100); - memcached_server_add_with_weight(m, "localhost", 11312, 100); + (void)not_used; - s= memcached_server_by_key(m, "a", 1, &res); - memcached_server_free(s); + memc= memcached_create(NULL); + memcached_server_add_with_weight(memc, "localhost", 11311, 100); + memcached_server_add_with_weight(memc, "localhost", 11312, 100); - memcached_free(m); + server= memcached_server_by_key(memc, "a", 1, &res); return TEST_SUCCESS; } @@ -2671,19 +2745,19 @@ static test_return_t 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); - test_truth(status == MEMCACHED_SUCCESS); + test_true(status == MEMCACHED_SUCCESS); status = memcached_mget(memc, &key, &key_len, 1); - test_truth(status == MEMCACHED_SUCCESS); + test_true(status == MEMCACHED_SUCCESS); result= memcached_result_create(memc, &result_obj); - test_truth(result); + test_true(result); memcached_result_create(memc, &result_obj); result= memcached_fetch_result(memc, &result_obj, &status); - test_truth(result); - test_truth(status == MEMCACHED_SUCCESS); + test_true(result); + test_true(status == MEMCACHED_SUCCESS); memcached_result_free(result); @@ -2702,47 +2776,49 @@ static test_return_t user_supplied_bug18(memcached_st *trash) (void)trash; memc= memcached_create(NULL); - test_truth(memc); + test_true(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_truth(value == 1); + test_true(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_truth(value == MEMCACHED_HASH_MD5); + test_true(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. */ - test_truth(memcached_server_count(memc) == 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); + test_true(memcached_server_count(memc) == 8); + test_true(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); + test_true(server_pool[0].port == 11211); + test_true(server_pool[0].weight == 600); + test_true(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); + test_true(server_pool[2].port == 11211); + test_true(server_pool[2].weight == 200); + test_true(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); + test_true(server_pool[7].port == 11211); + test_true(server_pool[7].weight == 100); /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets * us test the boundary wraparound. */ - test_truth(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + test_true(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)); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, server_idx); - char *hostname = instance->hostname; + + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, server_idx); + + const char *hostname = memcached_server_name(instance); test_strcmp(hostname, ketama_test_cases[x].server); } @@ -2766,7 +2842,7 @@ static void fail(int unused __attribute__((unused))) } -static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) +static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) { memcached_return_t rc; unsigned int x; @@ -2776,18 +2852,18 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - test_truth(memc_clone); + test_true(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); + test_true(rc == MEMCACHED_SUCCESS); key_lengths= calloc(key_count, sizeof(size_t)); keys= calloc(key_count, sizeof(char *)); - test_truth(keys); + test_true(keys); for (x= 0; x < key_count; x++) { char buffer[30]; @@ -2801,12 +2877,12 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) alarm(5); rc= memcached_mget(memc_clone, (const char **)keys, key_lengths, key_count); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); alarm(0); signal(SIGALRM, oldalarm); - test_truth(fetch_all_results(memc) == TEST_SUCCESS); + test_true(fetch_all_results(memc) == TEST_SUCCESS); for (x= 0; x < key_count; x++) free(keys[x]); @@ -2832,11 +2908,11 @@ static test_return_t user_supplied_bug21(memcached_st *memc) /* should work as of r580 */ rc= _user_supplied_bug21(memc, 10); - test_truth(rc == TEST_SUCCESS); + test_true(rc == TEST_SUCCESS); /* should fail as of r580 */ rc= _user_supplied_bug21(memc, 1000); - test_truth(rc == TEST_SUCCESS); + test_true(rc == TEST_SUCCESS); return TEST_SUCCESS; } @@ -2844,70 +2920,74 @@ static test_return_t user_supplied_bug21(memcached_st *memc) static test_return_t auto_eject_hosts(memcached_st *trash) { (void) trash; - memcached_server_instance_st *instance; + memcached_server_instance_st instance; memcached_return_t rc; memcached_st *memc= memcached_create(NULL); - test_truth(memc); + test_true(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_truth(value == 1); + test_true(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_truth(value == MEMCACHED_HASH_MD5); + test_true(value == MEMCACHED_HASH_MD5); /* server should be removed when in delay */ rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS); - test_truth(value == 1); + test_true(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. */ - test_truth(memcached_server_count(memc) == 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); - - instance= memcached_server_instance_fetch(memc, 2); - instance->next_retry = time(NULL) + 15; + test_true(memcached_server_count(memc) == 8); + test_true(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); + test_true(server_pool[0].port == 11211); + test_true(server_pool[0].weight == 600); + test_true(strcmp(server_pool[2].hostname, "10.0.1.3") == 0); + test_true(server_pool[2].port == 11211); + test_true(server_pool[2].weight == 200); + test_true(strcmp(server_pool[7].hostname, "10.0.1.8") == 0); + test_true(server_pool[7].port == 11211); + test_true(server_pool[7].weight == 100); + + instance= memcached_server_instance_by_position(memc, 2); + ((memcached_server_write_instance_st)instance)->next_retry = time(NULL) + 15; memc->next_distribution_rebuild= time(NULL) - 1; - for (int x= 0; x < 99; x++) + /* + This would not work if there were only two hosts. + */ + for (size_t x= 0; x < 99; x++) { + memcached_autoeject(memc); uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); - test_truth(server_idx != 2); + test_true(server_idx != 2); } /* and re-added when it's back. */ - instance->next_retry = time(NULL) - 1; + ((memcached_server_write_instance_st)instance)->next_retry = time(NULL) - 1; memc->next_distribution_rebuild= time(NULL) - 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution); - for (int x= 0; x < 99; x++) + for (size_t x= 0; x < 99; x++) { uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); // We re-use instance from above. instance= - memcached_server_instance_fetch(memc, server_idx); - char *hostname = instance->hostname; - test_truth(strcmp(hostname, ketama_test_cases[x].server) == 0); + memcached_server_instance_by_position(memc, server_idx); + const char *hostname = memcached_server_name(instance); + test_true(strcmp(hostname, ketama_test_cases[x].server) == 0); } memcached_server_list_free(server_pool); @@ -2922,23 +3002,23 @@ static test_return_t output_ketama_weighted_keys(memcached_st *trash) memcached_return_t rc; memcached_st *memc= memcached_create(NULL); - test_truth(memc); + test_true(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_truth(value == 1); + test_true(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_truth(value == MEMCACHED_HASH_MD5); + test_true(value == MEMCACHED_HASH_MD5); - test_truth(memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY) == MEMCACHED_SUCCESS); + test_true(memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_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"); @@ -2974,97 +3054,97 @@ static test_return_t output_ketama_weighted_keys(memcached_st *trash) } -static test_return_t 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); - test_truth(result.options.is_allocated == false); - test_truth(memcached_is_initialized(&result) == true); - test_truth(result_ptr); - test_truth(result_ptr == &result); + test_true(result.options.is_allocated == false); + test_true(memcached_is_initialized(&result) == true); + test_true(result_ptr); + test_true(result_ptr == &result); memcached_result_free(&result); - test_truth(result.options.is_allocated == false); - test_truth(memcached_is_initialized(&result) == false); + test_true(result.options.is_allocated == false); + test_true(memcached_is_initialized(&result) == false); return TEST_SUCCESS; } -static test_return_t result_alloc(memcached_st *memc) +static test_return_t result_alloc(memcached_st *memc) { memcached_result_st *result_ptr; 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); + test_true(result_ptr); + test_true(result_ptr->options.is_allocated == true); + test_true(memcached_is_initialized(result_ptr) == true); memcached_result_free(result_ptr); return TEST_SUCCESS; } -static test_return_t 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); - test_truth(string.options.is_initialized == true); - test_truth(string_ptr); + test_true(string.options.is_initialized == true); + test_true(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_true(memcached_is_allocated(string_ptr) == false); + test_true(memcached_is_allocated(&string) == false); + test_true(&string == string_ptr); - test_truth(string.options.is_initialized == true); - test_truth(memcached_is_initialized(&string) == true); + test_true(string.options.is_initialized == true); + test_true(memcached_is_initialized(&string) == true); memcached_string_free(&string); - test_truth(memcached_is_initialized(&string) == false); + test_true(memcached_is_initialized(&string) == false); return TEST_SUCCESS; } -static test_return_t 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); - test_truth(string); - test_truth(memcached_is_allocated(string) == true); - test_truth(memcached_is_initialized(string) == true); + test_true(string); + test_true(memcached_is_allocated(string) == true); + test_true(memcached_is_initialized(string) == true); memcached_string_free(string); return TEST_SUCCESS; } -static test_return_t 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); - test_truth(string); - test_truth(memcached_is_allocated(string) == true); - test_truth(memcached_is_initialized(string) == true); + test_true(string); + test_true(memcached_is_allocated(string) == true); + test_true(memcached_is_initialized(string) == true); memcached_string_free(string); return TEST_SUCCESS; } -static test_return_t 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); - test_truth(string == NULL); + test_true(string == NULL); return TEST_SUCCESS; } -static test_return_t string_alloc_append(memcached_st *memc) +static test_return_t string_alloc_append(memcached_st *memc) { unsigned int x; char buffer[SMALL_STRING_LEN]; @@ -3074,23 +3154,23 @@ static test_return_t string_alloc_append(memcached_st *memc) memset(buffer, 6, SMALL_STRING_LEN); string= memcached_string_create(memc, NULL, 100); - test_truth(string); - test_truth(memcached_is_allocated(string) == true); - test_truth(memcached_is_initialized(string) == true); + test_true(string); + test_true(memcached_is_allocated(string) == true); + test_true(memcached_is_initialized(string) == true); for (x= 0; x < 1024; x++) { memcached_return_t rc; rc= memcached_string_append(string, buffer, SMALL_STRING_LEN); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } - test_truth(memcached_is_allocated(string) == true); + test_true(memcached_is_allocated(string) == true); memcached_string_free(string); return TEST_SUCCESS; } -static test_return_t string_alloc_append_toobig(memcached_st *memc) +static test_return_t string_alloc_append_toobig(memcached_st *memc) { memcached_return_t rc; unsigned int x; @@ -3101,37 +3181,36 @@ static test_return_t string_alloc_append_toobig(memcached_st *memc) memset(buffer, 6, SMALL_STRING_LEN); string= memcached_string_create(memc, NULL, 100); - test_truth(string); - test_truth(memcached_is_allocated(string) == true); - test_truth(memcached_is_initialized(string) == true); + test_true(string); + test_true(memcached_is_allocated(string) == true); + test_true(memcached_is_initialized(string) == true); for (x= 0; x < 1024; x++) { rc= memcached_string_append(string, buffer, SMALL_STRING_LEN); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } rc= memcached_string_append(string, buffer, SIZE_MAX); - test_truth(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); - test_truth(memcached_is_allocated(string) == true); + test_true(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); + test_true(memcached_is_allocated(string) == true); memcached_string_free(string); return TEST_SUCCESS; } -static test_return_t cleanup_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t cleanup_pairs(memcached_st *memc __attribute__((unused))) { pairs_free(global_pairs); return TEST_SUCCESS; } -static test_return_t 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); global_count= GLOBAL_COUNT; - for (x= 0; x < global_count; x++) + for (size_t x= 0; x < global_count; x++) { global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length; @@ -3140,13 +3219,12 @@ static test_return_t generate_pairs(memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t 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); global_count= GLOBAL2_COUNT; - for (x= 0; x < global_count; x++) + for (size_t x= 0; x < global_count; x++) { global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length; @@ -3155,14 +3233,14 @@ static test_return_t generate_large_pairs(memcached_st *memc __attribute__((unu return TEST_SUCCESS; } -static test_return_t generate_data(memcached_st *memc) +static test_return_t generate_data(memcached_st *memc) { execute_set(memc, global_pairs, global_count); return TEST_SUCCESS; } -static test_return_t 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_t rc; @@ -3171,22 +3249,25 @@ static test_return_t generate_data_with_stats(memcached_st *memc) //TODO: hosts used size stats stat_p= memcached_stat(memc, NULL, &rc); - test_truth(stat_p); + test_true(stat_p); for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++) { /* This test was changes so that "make test" would work properlly */ #ifdef DEBUG - printf("\nserver %u|%s|%u bytes: %llu\n", host_index, (memc->hosts)[host_index].hostname, (memc->hosts)[host_index].port, (unsigned long long)(stat_p + host_index)->bytes); + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, host_index); + + printf("\nserver %u|%s|%u bytes: %llu\n", host_index, instance->hostname, instance->port, (unsigned long long)(stat_p + host_index)->bytes); #endif - test_truth((unsigned long long)(stat_p + host_index)->bytes); + test_true((unsigned long long)(stat_p + host_index)->bytes); } memcached_stat_free(NULL, stat_p); return TEST_SUCCESS; } -static test_return_t generate_buffer_data(memcached_st *memc) +static test_return_t generate_buffer_data(memcached_st *memc) { size_t latch= 0; @@ -3197,14 +3278,13 @@ static test_return_t generate_buffer_data(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t get_read_count(memcached_st *memc) +static test_return_t get_read_count(memcached_st *memc) { - unsigned int x; memcached_return_t rc; memcached_st *memc_clone; memc_clone= memcached_clone(NULL, memc); - test_truth(memc_clone); + test_true(memc_clone); memcached_server_add_with_weight(memc_clone, "localhost", 6666, 0); @@ -3214,7 +3294,7 @@ static test_return_t get_read_count(memcached_st *memc) uint32_t flags; uint32_t count; - for (x= count= 0; x < global_count; x++) + for (size_t x= count= 0; x < global_count; x++) { return_value= memcached_get(memc_clone, global_keys[x], global_keys_length[x], &return_value_length, &flags, &rc); @@ -3232,9 +3312,8 @@ static test_return_t get_read_count(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t get_read(memcached_st *memc) +static test_return_t get_read(memcached_st *memc) { - unsigned int x; memcached_return_t rc; { @@ -3242,13 +3321,13 @@ static test_return_t get_read(memcached_st *memc) size_t return_value_length; uint32_t flags; - for (x= 0; x < global_count; x++) + for (size_t x= 0; x < global_count; x++) { return_value= memcached_get(memc, global_keys[x], global_keys_length[x], &return_value_length, &flags, &rc); /* - test_truth(return_value); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(return_value); + test_true(rc == MEMCACHED_SUCCESS); */ if (rc == MEMCACHED_SUCCESS && return_value) free(return_value); @@ -3258,23 +3337,23 @@ static test_return_t get_read(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t mget_read(memcached_st *memc) +static test_return_t mget_read(memcached_st *memc) { memcached_return_t rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(fetch_all_results(memc) == TEST_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); + test_true(fetch_all_results(memc) == TEST_SUCCESS); return TEST_SUCCESS; } -static test_return_t mget_read_result(memcached_st *memc) +static test_return_t mget_read_result(memcached_st *memc) { memcached_return_t rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); /* Turn this into a help function */ { memcached_result_st results_obj; @@ -3284,8 +3363,8 @@ static test_return_t mget_read_result(memcached_st *memc) while ((results= memcached_fetch_result(memc, &results_obj, &rc))) { - test_truth(results); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(results); + test_true(rc == MEMCACHED_SUCCESS); } memcached_result_free(&results_obj); @@ -3294,14 +3373,14 @@ static test_return_t mget_read_result(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t mget_read_function(memcached_st *memc) +static test_return_t mget_read_function(memcached_st *memc) { memcached_return_t rc; - unsigned int counter; + size_t counter; memcached_execute_fn callbacks[1]; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); callbacks[0]= &callback_counter; counter= 0; @@ -3310,11 +3389,9 @@ static test_return_t mget_read_function(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t delete_generate(memcached_st *memc) +static test_return_t delete_generate(memcached_st *memc) { - unsigned int x; - - for (x= 0; x < global_count; x++) + for (size_t x= 0; x < global_count; x++) { (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); } @@ -3322,15 +3399,14 @@ static test_return_t delete_generate(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t delete_buffer_generate(memcached_st *memc) +static test_return_t delete_buffer_generate(memcached_st *memc) { - size_t latch= 0; - unsigned int x; + uint64_t latch= 0; latch= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, latch); - for (x= 0; x < global_count; x++) + for (size_t x= 0; x < global_count; x++) { (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); } @@ -3338,65 +3414,97 @@ static test_return_t delete_buffer_generate(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t add_host_test1(memcached_st *memc) +static test_return_t add_host_test1(memcached_st *memc) { - unsigned int x; 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); - test_truth(servers); - test_truth(1 == memcached_server_list_count(servers)); + test_true(servers); + test_true(1 == memcached_server_list_count(servers)); - for (x= 2; x < 20; x++) + for (size_t x= 2; x < 20; x++) { char buffer[SMALL_STRING_LEN]; - snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); + snprintf(buffer, SMALL_STRING_LEN, "%zu.example.com", 400+x); servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(x == memcached_server_list_count(servers)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(x == memcached_server_list_count(servers)); } rc= memcached_server_push(memc, servers); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_server_push(memc, servers); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); return TEST_SUCCESS; } -static test_return_t pre_nonblock(memcached_st *memc) +static test_return_t pre_nonblock(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); return TEST_SUCCESS; } +static test_return_t pre_cork(memcached_st *memc) +{ + memcached_return_t rc; + bool set= true; + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set); + +#ifdef __APPLE__ + return TEST_SKIPPED; +#endif + + if (rc == MEMCACHED_SUCCESS) + return TEST_SUCCESS; + + return TEST_SKIPPED; +} + +static test_return_t pre_cork_and_nonblock(memcached_st *memc) +{ + test_return_t rc; + + rc= pre_cork(memc); + +#ifdef __APPLE__ + return TEST_SKIPPED; +#endif + + if (rc != TEST_SUCCESS) + return rc; + + return pre_nonblock(memc); +} + static test_return_t pre_nonblock_binary(memcached_st *memc) { memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; - memcached_server_instance_st *instance; + memcached_server_instance_st instance; memc_clone= memcached_clone(NULL, memc); - test_truth(memc_clone); + test_true(memc_clone); // The memcached_version needs to be done on a clone, because the server // will not toggle protocol on an connection. memcached_version(memc_clone); - instance= memcached_server_instance_fetch(memc_clone, 0); + instance= memcached_server_instance_by_position(memc_clone, 0); if (instance->major_version >= 1 && instance->minor_version > 2) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); } else { @@ -3482,10 +3590,10 @@ static test_return_t pre_behavior_ketama(memcached_st *memc) uint64_t value; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA); - test_truth(value == 1); + test_true(value == 1); return TEST_SUCCESS; } @@ -3496,16 +3604,16 @@ static test_return_t pre_behavior_ketama_weighted(memcached_st *memc) uint64_t value; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_truth(value == 1); + test_true(value == 1); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_truth(value == MEMCACHED_HASH_MD5); + test_true(value == MEMCACHED_HASH_MD5); return TEST_SUCCESS; } @@ -3517,20 +3625,21 @@ static test_return_t pre_binary(memcached_st *memc) { memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); + memcached_server_instance_st instance; memc_clone= memcached_clone(NULL, memc); - test_truth(memc_clone); + test_true(memc_clone); // The memcached_version needs to be done on a clone, because the server // will not toggle protocol on an connection. memcached_version(memc_clone); + instance= memcached_server_instance_by_position(memc_clone, 0); + if (instance->major_version >= 1 && instance->minor_version > 2) { rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); } memcached_free(memc_clone); @@ -3538,6 +3647,31 @@ static test_return_t pre_binary(memcached_st *memc) return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; } +static test_return_t pre_sasl(memcached_st *memc) +{ + memcached_return_t rc= MEMCACHED_FAILURE; + +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT + const char *server= getenv("LIBMEMCACHED_TEST_SASL_SERVER"); + const char *user= getenv("LIBMEMCACHED_TEST_SASL_USERNAME"); + const char *pass= getenv("LIBMEMCACHED_TEST_SASL_PASSWORD"); + + if (server != NULL && user != NULL && pass != NULL) + { + memcached_server_st *servers= memcached_servers_parse(server); + test_true(servers != NULL); + memcached_servers_reset(memc); + test_true(memcached_server_push(memc, servers) == MEMCACHED_SUCCESS); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); + rc= memcached_set_sasl_auth_data(memc, user, pass); + test_true(rc == MEMCACHED_SUCCESS); + } +#else + (void)memc; +#endif + + return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; +} static test_return_t pre_replication(memcached_st *memc) { @@ -3554,8 +3688,8 @@ static test_return_t pre_replication(memcached_st *memc) memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, memcached_server_count(memc) - 1); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memcached_server_count(memc) - 1); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memcached_server_count(memc) - 1); return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; } @@ -3575,8 +3709,9 @@ static test_return_t pre_replication_noblock(memcached_st *memc) } -static void my_free(memcached_st *ptr __attribute__((unused)), void *mem) +static void my_free(const memcached_st *ptr __attribute__((unused)), void *mem, void *context) { + (void) context; #ifdef HARD_MALLOC_TESTS void *real_ptr= (mem == NULL) ? mem : (void*)((caddr_t)mem - 8); free(real_ptr); @@ -3586,8 +3721,9 @@ static void my_free(memcached_st *ptr __attribute__((unused)), void *mem) } -static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t size) +static void *my_malloc(const memcached_st *ptr __attribute__((unused)), const size_t size, void *context) { + (void)context; #ifdef HARD_MALLOC_TESTS void *ret= malloc(size + 8); if (ret != NULL) @@ -3607,8 +3743,9 @@ static void *my_malloc(memcached_st *ptr __attribute__((unused)), const size_t s } -static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, const size_t size) +static void *my_realloc(const memcached_st *ptr __attribute__((unused)), void *mem, const size_t size, void *context) { + (void)context; #ifdef HARD_MALLOC_TESTS void *real_ptr= (mem == NULL) ? NULL : (void*)((caddr_t)mem - 8); void *nmem= realloc(real_ptr, size + 8); @@ -3626,8 +3763,9 @@ static void *my_realloc(memcached_st *ptr __attribute__((unused)), void *mem, co } -static void *my_calloc(memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size) +static void *my_calloc(const memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size, void *context) { + (void)context; #ifdef HARD_MALLOC_TESTS void *mem= my_malloc(ptr, nelem * size); if (mem) @@ -3650,30 +3788,30 @@ static test_return_t set_prefix(memcached_st *memc) /* Make sure be default none exists */ value= memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); - test_truth(rc == MEMCACHED_FAILURE); + test_true(rc == MEMCACHED_FAILURE); /* Test a clean set */ rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, (void *)key); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); - test_truth(memcmp(value, key, 4) == 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(memcmp(value, key, 4) == 0); + test_true(rc == MEMCACHED_SUCCESS); /* Test that we can turn it off */ rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); - test_truth(rc == MEMCACHED_FAILURE); + test_true(rc == MEMCACHED_FAILURE); /* Now setup for main test */ rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, (void *)key); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memcmp(value, key, 4) == 0); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memcmp(value, key, 4) == 0); /* Set to Zero, and then Set to something too large */ { @@ -3681,31 +3819,31 @@ static test_return_t set_prefix(memcached_st *memc) memset(long_key, 0, 255); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); - test_truth(rc == MEMCACHED_FAILURE); - test_truth(value == NULL); + test_true(rc == MEMCACHED_FAILURE); + test_true(value == NULL); /* Test a long key for failure */ /* TODO, extend test to determine based on setting, what result should be */ strcpy(long_key, "Thisismorethentheallottednumberofcharacters"); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); - //test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); - test_truth(rc == MEMCACHED_SUCCESS); + //test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(rc == MEMCACHED_SUCCESS); /* Now test a key with spaces (which will fail from long key, since bad key is not set) */ strcpy(long_key, "This is more then the allotted number of characters"); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); /* Test for a bad prefix, but with a short key */ rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); strcpy(long_key, "dog cat"); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); - test_truth(rc == MEMCACHED_BAD_KEY_PROVIDED); + test_true(rc == MEMCACHED_BAD_KEY_PROVIDED); } return TEST_SUCCESS; @@ -3724,10 +3862,10 @@ static test_return_t deprecated_set_memory_alloc(memcached_st *memc) memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, cb_ptr); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(test_ptr == cb_ptr); + test_true(rc == MEMCACHED_SUCCESS); + test_true(test_ptr == cb_ptr); } { @@ -3737,10 +3875,10 @@ static test_return_t deprecated_set_memory_alloc(memcached_st *memc) memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, cb_ptr); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(test_ptr == cb_ptr); + test_true(rc == MEMCACHED_SUCCESS); + test_true(test_ptr == cb_ptr); } { @@ -3750,10 +3888,10 @@ static test_return_t deprecated_set_memory_alloc(memcached_st *memc) memcached_return_t rc; rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, cb_ptr); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); test_ptr= memcached_callback_get(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(test_ptr == cb_ptr); + test_true(rc == MEMCACHED_SUCCESS); + test_true(test_ptr == cb_ptr); } return TEST_SUCCESS; @@ -3765,11 +3903,11 @@ static test_return_t set_memory_alloc(memcached_st *memc) { memcached_return_t rc; rc= memcached_set_memory_allocators(memc, NULL, my_free, - my_realloc, my_calloc); - test_truth(rc == MEMCACHED_FAILURE); + my_realloc, my_calloc, NULL); + test_true(rc == MEMCACHED_FAILURE); rc= memcached_set_memory_allocators(memc, my_malloc, my_free, - my_realloc, my_calloc); + my_realloc, my_calloc, NULL); memcached_malloc_fn mem_malloc; memcached_free_fn mem_free; @@ -3778,10 +3916,10 @@ static test_return_t set_memory_alloc(memcached_st *memc) memcached_get_memory_allocators(memc, &mem_malloc, &mem_free, &mem_realloc, &mem_calloc); - test_truth(mem_malloc == my_malloc); - test_truth(mem_realloc == my_realloc); - test_truth(mem_calloc == my_calloc); - test_truth(mem_free == my_free); + test_true(mem_malloc == my_malloc); + test_true(mem_realloc == my_realloc); + test_true(mem_calloc == my_calloc); + test_true(mem_free == my_free); return TEST_SUCCESS; } @@ -3796,7 +3934,7 @@ static test_return_t enable_consistent_crc(memcached_st *memc) return rc; value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); - test_truth(value == MEMCACHED_DISTRIBUTION_CONSISTENT); + test_true(value == MEMCACHED_DISTRIBUTION_CONSISTENT); hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); @@ -3816,7 +3954,7 @@ static test_return_t enable_consistent_hsieh(memcached_st *memc) return rc; value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); - test_truth(value == MEMCACHED_DISTRIBUTION_CONSISTENT); + test_true(value == MEMCACHED_DISTRIBUTION_CONSISTENT); hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); @@ -3831,8 +3969,8 @@ static test_return_t enable_cas(memcached_st *memc) { unsigned int set= 1; - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); memcached_version(memc); @@ -3847,11 +3985,12 @@ static test_return_t enable_cas(memcached_st *memc) return TEST_SKIPPED; } -static test_return_t check_for_1_2_3(memcached_st *memc) +static test_return_t check_for_1_2_3(memcached_st *memc) { memcached_version(memc); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); + + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); if ((instance->major_version >= 1 && (instance->minor_version == 2 && instance->micro_version >= 4)) || instance->minor_version > 2) @@ -3860,7 +3999,7 @@ static test_return_t check_for_1_2_3(memcached_st *memc) return TEST_SKIPPED; } -static test_return_t pre_unix_socket(memcached_st *memc) +static test_return_t pre_unix_socket(memcached_st *memc) { memcached_return_t rc; struct stat buf; @@ -3875,7 +4014,7 @@ static test_return_t pre_unix_socket(memcached_st *memc) return ( rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_FAILURE ); } -static test_return_t pre_nodelay(memcached_st *memc) +static test_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); @@ -3883,7 +4022,7 @@ static test_return_t pre_nodelay(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t pre_settimer(memcached_st *memc) +static test_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); @@ -3891,7 +4030,7 @@ static test_return_t pre_settimer(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t poll_timeout(memcached_st *memc) +static test_return_t poll_timeout(memcached_st *memc) { size_t timeout; @@ -3901,7 +4040,7 @@ static test_return_t poll_timeout(memcached_st *memc) timeout= (size_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); - test_truth(timeout == 100); + test_true(timeout == 100); return TEST_SUCCESS; } @@ -3910,21 +4049,21 @@ static test_return_t noreply_test(memcached_st *memc) { memcached_return_t ret; ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); - test_truth(ret == MEMCACHED_SUCCESS); + test_true(ret == MEMCACHED_SUCCESS); ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); - test_truth(ret == MEMCACHED_SUCCESS); + test_true(ret == MEMCACHED_SUCCESS); ret= memcached_behavior_set(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); + test_true(ret == MEMCACHED_SUCCESS); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NOREPLY) == 1); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS) == 1); + test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS) == 1); for (int count=0; count < 5; ++count) { - for (int x=0; x < 100; ++x) + for (size_t x= 0; x < 100; ++x) { char key[10]; - size_t len= (size_t)sprintf(key, "%d", x); + size_t len= (size_t)sprintf(key, "%zu", x); switch (count) { case 0: @@ -3943,10 +4082,10 @@ static test_return_t noreply_test(memcached_st *memc) ret= memcached_prepend(memc, key, len, key, len, 0, 0); break; default: - test_truth(count); + test_true(count); break; } - test_truth(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); + test_true(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); } /* @@ -3955,40 +4094,45 @@ static test_return_t noreply_test(memcached_st *memc) ** way it is supposed to do!!!! */ int no_msg=0; - for (uint32_t x=0; x < memcached_server_count(memc); ++x) - no_msg+=(int)(memc->hosts[x].cursor_active); + for (uint32_t x= 0; x < memcached_server_count(memc); ++x) + { + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, x); + no_msg+=(int)(instance->cursor_active); + } - test_truth(no_msg == 0); - test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_true(no_msg == 0); + test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); /* ** Now validate that all items was set properly! */ - for (int x=0; x < 100; ++x) + for (size_t x= 0; x < 100; ++x) { char key[10]; - size_t len= (size_t)sprintf(key, "%d", x); + + size_t len= (size_t)sprintf(key, "%zu", x); size_t length; uint32_t flags; char* value=memcached_get(memc, key, strlen(key), &length, &flags, &ret); - test_truth(ret == MEMCACHED_SUCCESS && value != NULL); + test_true(ret == MEMCACHED_SUCCESS && value != NULL); switch (count) { case 0: /* FALLTHROUGH */ case 1: /* FALLTHROUGH */ case 2: - test_truth(strncmp(value, key, len) == 0); - test_truth(len == length); + test_true(strncmp(value, key, len) == 0); + test_true(len == length); break; case 3: - test_truth(length == len * 2); + test_true(length == len * 2); break; case 4: - test_truth(length == len * 3); + test_true(length == len * 3); break; default: - test_truth(count); + test_true(count); break; } free(value); @@ -4005,28 +4149,28 @@ static test_return_t noreply_test(memcached_st *memc) memcached_result_st results_obj; memcached_result_st *results; ret= memcached_mget(memc, keys, lengths, 1); - test_truth(ret == MEMCACHED_SUCCESS); + test_true(ret == MEMCACHED_SUCCESS); results= memcached_result_create(memc, &results_obj); - test_truth(results); + test_true(results); results= memcached_fetch_result(memc, &results_obj, &ret); - test_truth(results); - test_truth(ret == MEMCACHED_SUCCESS); + test_true(results); + test_true(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); - test_truth(ret == MEMCACHED_SUCCESS); + test_true(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); - test_truth(ret == MEMCACHED_SUCCESS); - test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_true(ret == MEMCACHED_SUCCESS); + test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); char* value=memcached_get(memc, keys[0], lengths[0], &length, &flags, &ret); - test_truth(ret == MEMCACHED_SUCCESS && value != NULL); + test_true(ret == MEMCACHED_SUCCESS && value != NULL); free(value); return TEST_SUCCESS; @@ -4039,12 +4183,12 @@ static test_return_t analyzer_test(memcached_st *memc) memcached_analysis_st *report; memc_stat= memcached_stat(memc, NULL, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(memc_stat); + test_true(rc == MEMCACHED_SUCCESS); + test_true(memc_stat); report= memcached_analyze(memc, memc_stat, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(report); + test_true(rc == MEMCACHED_SUCCESS); + test_true(report); free(report); memcached_stat_free(NULL, memc_stat); @@ -4053,12 +4197,12 @@ static test_return_t analyzer_test(memcached_st *memc) } /* Count the objects */ -static memcached_return_t callback_dump_counter(memcached_st *ptr __attribute__((unused)), - const char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), - void *context) +static memcached_return_t callback_dump_counter(const memcached_st *ptr __attribute__((unused)), + const char *key __attribute__((unused)), + size_t key_length __attribute__((unused)), + void *context) { - uint32_t *counter= (uint32_t *)context; + size_t *counter= (size_t *)context; *counter= *counter + 1; @@ -4068,7 +4212,7 @@ static memcached_return_t callback_dump_counter(memcached_st *ptr __attribute__( static test_return_t dump_test(memcached_st *memc) { memcached_return_t rc; - uint32_t counter= 0; + size_t counter= 0; memcached_dump_fn callbacks[1]; test_return_t main_rc; @@ -4080,13 +4224,13 @@ static test_return_t dump_test(memcached_st *memc) main_rc= set_test3(memc); - test_truth (main_rc == TEST_SUCCESS); + test_true (main_rc == TEST_SUCCESS); rc= memcached_dump(memc, callbacks, (void *)&counter, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); /* We may have more then 32 if our previous flush has not completed */ - test_truth(counter >= 32); + test_true(counter >= 32); return TEST_SUCCESS; } @@ -4107,18 +4251,19 @@ static void* connection_release(void *arg) static test_return_t connection_pool_test(memcached_st *memc) { memcached_pool_st* pool= memcached_pool_create(memc, 5, 10); - test_truth(pool != NULL); + test_true(pool != NULL); memcached_st* mmc[10]; memcached_return_t rc; - for (int x= 0; x < 10; ++x) { + for (size_t x= 0; x < 10; ++x) + { mmc[x]= memcached_pool_pop(pool, false, &rc); - test_truth(mmc[x] != NULL); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(mmc[x] != NULL); + test_true(rc == MEMCACHED_SUCCESS); } - test_truth(memcached_pool_pop(pool, false, &rc) == NULL); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(memcached_pool_pop(pool, false, &rc) == NULL); + test_true(rc == MEMCACHED_SUCCESS); pthread_t tid; struct { @@ -4127,26 +4272,29 @@ static test_return_t 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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); pthread_join(tid, NULL); - test_truth(mmc[9] == item.mmc); + test_true(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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); - for (unsigned int x= 0; x < 10; ++x) { + for (size_t x= 0; x < 10; ++x) + { uint64_t number_value; rc= memcached_increment(mmc[x], key, keylen, 1, &number_value); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(number_value == (x+1)); + test_true(rc == MEMCACHED_SUCCESS); + test_true(number_value == (x+1)); } // Release them.. - for (int x= 0; x < 10; ++x) - test_truth(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); + for (size_t x= 0; x < 10; ++x) + { + test_true(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); + } /* verify that I can set behaviors on the pool when I don't have all @@ -4154,24 +4302,24 @@ static test_return_t connection_pool_test(memcached_st *memc) * when I push the item into the pool */ mmc[0]= memcached_pool_pop(pool, false, &rc); - test_truth(mmc[0] != NULL); + test_true(mmc[0] != NULL); rc= memcached_pool_behavior_set(pool, MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK, 9999); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); mmc[1]= memcached_pool_pop(pool, false, &rc); - test_truth(mmc[1] != NULL); + test_true(mmc[1] != NULL); - 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); + test_true(memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + test_true(memcached_pool_push(pool, mmc[1]) == MEMCACHED_SUCCESS); + test_true(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_true(memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + test_true(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); - test_truth(memcached_pool_destroy(pool) == memc); + test_true(memcached_pool_destroy(pool) == memc); return TEST_SUCCESS; } #endif @@ -4183,7 +4331,7 @@ static test_return_t replication_set_test(memcached_st *memc) memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); rc= memcached_set(memc, "bubba", 5, "0", 1, 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); /* ** We are using the quiet commands to store the replicas, so we need @@ -4213,8 +4361,8 @@ static test_return_t replication_set_test(memcached_st *memc) uint32_t flags; char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(val != NULL); + test_true(rc == MEMCACHED_SUCCESS); + test_true(val != NULL); free(val); } @@ -4235,7 +4383,10 @@ static test_return_t replication_get_test(memcached_st *memc) for (uint32_t host= 0; host < memcached_server_count(memc); ++host) { memcached_st *memc_clone= memcached_clone(NULL, memc); - memc_clone->hosts[host].port= 0; + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc_clone, host); + + ((memcached_server_write_instance_st)instance)->port= 0; for (int x= 'a'; x <= 'z'; ++x) { @@ -4244,8 +4395,8 @@ static test_return_t replication_get_test(memcached_st *memc) uint32_t flags; char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(val != NULL); + test_true(rc == MEMCACHED_SUCCESS); + test_true(val != NULL); free(val); } @@ -4264,10 +4415,10 @@ static test_return_t replication_mget_test(memcached_st *memc) const char *keys[]= { "bubba", "key1", "key2", "key3" }; size_t len[]= { 5, 4, 4, 4 }; - for (int x=0; x< 4; ++x) + for (size_t x= 0; x< 4; ++x) { rc= memcached_set(memc, keys[x], len[x], "0", 1, 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } /* @@ -4294,24 +4445,26 @@ static test_return_t replication_mget_test(memcached_st *memc) for (uint32_t host= 0; host < memc_clone->number_of_hosts; host++) { memcached_st *new_clone= memcached_clone(NULL, memc); - new_clone->hosts[host].port= 0; + memcached_server_instance_st instance= + memcached_server_instance_by_position(new_clone, host); + ((memcached_server_write_instance_st)instance)->port= 0; for (int x= 'a'; x <= 'z'; ++x) { - const char key[2]= { [0]= (const char)x }; + char key[2]= { [0]= (char)x, [1]= 0 }; rc= memcached_mget_by_key(new_clone, key, 1, keys, len, 4); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(new_clone, &result_obj); - test_truth(results); + test_true(results); int hits= 0; while ((results= memcached_fetch_result(new_clone, &result_obj, &rc)) != NULL) { hits++; } - test_truth(hits == 4); + test_true(hits == 4); memcached_result_free(&result_obj); } @@ -4337,26 +4490,27 @@ static test_return_t replication_randomize_mget_test(memcached_st *memc) for (int x=0; x< 7; ++x) { rc= memcached_set(memc, keys[x], len[x], "1", 1, 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } memcached_quit(memc); - for (int x=0; x< 7; ++x) { + for (size_t 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); + test_true(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); - test_truth(results); + test_true(results); int hits= 0; while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) { ++hits; } - test_truth(hits == 7); + test_true(hits == 7); memcached_result_free(&result_obj); } memcached_free(memc_clone); @@ -4375,10 +4529,10 @@ static test_return_t replication_delete_test(memcached_st *memc) const char *keys[]= { "bubba", "key1", "key2", "key3" }; size_t len[]= { 5, 4, 4, 4 }; - for (int x=0; x< 4; ++x) + for (size_t x= 0; x< 4; ++x) { rc= memcached_delete_by_key(memc, keys[0], len[0], keys[x], len[x], 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } /* @@ -4389,7 +4543,10 @@ static test_return_t replication_delete_test(memcached_st *memc) uint32_t hash= memcached_generate_hash(memc, keys[0], len[0]); for (uint32_t x= 0; x < (repl + 1); ++x) { - memc_clone->hosts[hash].port= 0; + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc_clone, x); + + ((memcached_server_write_instance_st)instance)->port= 0; if (++hash == memc_clone->number_of_hosts) hash= 0; } @@ -4397,22 +4554,22 @@ static test_return_t replication_delete_test(memcached_st *memc) memcached_result_st result_obj; for (uint32_t host= 0; host < memc_clone->number_of_hosts; ++host) { - for (int x= 'a'; x <= 'z'; ++x) + for (size_t 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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); - test_truth(results); + test_true(results); int hits= 0; while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) { ++hits; } - test_truth(hits == 4); + test_true(hits == 4); memcached_result_free(&result_obj); } } @@ -4421,376 +4578,6 @@ static test_return_t replication_delete_test(memcached_st *memc) return TEST_SUCCESS; } -static void increment_request_id(uint16_t *id) -{ - (*id)++; - if ((*id & UDP_REQUEST_ID_THREAD_MASK) != 0) - *id= 0; -} - -static uint16_t *get_udp_request_ids(memcached_st *memc) -{ - uint16_t *ids= malloc(sizeof(uint16_t) * memcached_server_count(memc)); - assert(ids != NULL); - unsigned int x; - - for (x= 0; x < memcached_server_count(memc); x++) - ids[x]= get_udp_datagram_request_id((struct udp_datagram_header_st *) memc->hosts[x].write_buffer); - - return 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; - uint16_t *cur_req_ids = get_udp_request_ids(memc); - - for (x= 0; x < memcached_server_count(memc); 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); - - return TEST_SUCCESS; -} - -/* -** 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 test_return_t init_udp(memcached_st *memc) -{ - memcached_version(memc); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); - - /* For the time being, only support udp test for >= 1.2.6 && < 1.3 */ - if (instance->major_version != 1 || instance->minor_version != 2 - || instance->micro_version < 6) - return TEST_SKIPPED; - - uint32_t num_hosts= memcached_server_count(memc); - unsigned int x= 0; - memcached_server_st servers[num_hosts]; - memcpy(servers, memc->hosts, sizeof(memcached_server_st) * num_hosts); - for (x= 0; x < num_hosts; x++) - memcached_server_free(&memc->hosts[x]); - - memc->number_of_hosts= 0; - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1); - for (x= 0; x < num_hosts; x++) - { - test_truth(memcached_server_add_udp(memc, servers[x].hostname, servers[x].port) == MEMCACHED_SUCCESS); - test_truth(memc->hosts[x].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } - - return TEST_SUCCESS; -} - -static test_return_t binary_init_udp(memcached_st *memc) -{ - test_return_t test_rc; - test_rc= pre_binary(memc); - - if (test_rc != TEST_SUCCESS) - return test_rc; - - return init_udp(memc); -} - -/* Make sure that I cant add a tcp server to a udp client */ -static test_return_t add_tcp_server_udp_client_test(memcached_st *memc) -{ - (void)memc; -#if 0 - memcached_server_st server; - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); - memcached_server_clone(&server, &memc->hosts[0]); - test_truth(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); - test_truth(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); -#endif - return TEST_SUCCESS; -} - -/* Make sure that I cant add a udp server to a tcp client */ -static test_return_t add_udp_server_tcp_client_test(memcached_st *memc) -{ - (void)memc; -#if 0 - memcached_server_st server; - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, 0); - memcached_server_clone(&server, &memc->hosts[0]); - test_truth(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); - - memcached_st tcp_client; - memcached_create(&tcp_client); - test_truth(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); -#endif - - return TEST_SUCCESS; -} - -static test_return_t set_udp_behavior_test(memcached_st *memc) -{ - - memcached_quit(memc); - 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(memcached_server_count(memc) == 0); - - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0); - test_truth(! (memc->flags.use_udp)); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0); - test_truth(! (memc->flags.no_reply)); - - return TEST_SUCCESS; -} - -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_t rc; - const char *key= "foo"; - const char *value= "when we sanitize"; - uint16_t *expected_ids= get_udp_request_ids(memc); - unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, server_key); - size_t init_offset= instance->write_buffer_offset; - - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - 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 - */ - if (rc == MEMCACHED_SUCCESS || - instance->write_buffer_offset < init_offset) - increment_request_id(&expected_ids[server_key]); - - if (rc == MEMCACHED_SUCCESS) - { - test_truth(instance->write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } - else - { - test_truth(instance->write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - test_truth(instance->write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); - } - test_truth(post_udp_op_check(memc, expected_ids) == TEST_SUCCESS); - } - return TEST_SUCCESS; -} - -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_t udp_set_too_big_test(memcached_st *memc) -{ - 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); - test_truth(rc == MEMCACHED_WRITE_FAILURE); - return post_udp_op_check(memc,expected_ids); -} - -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_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)); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, server_key); - size_t init_offset= instance->write_buffer_offset; - - rc= memcached_delete(memc, key, strlen(key), 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - - if (rc == MEMCACHED_SUCCESS || instance->write_buffer_offset < init_offset) - increment_request_id(&expected_ids[server_key]); - if (rc == MEMCACHED_SUCCESS) - { - test_truth(instance->write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } - else - { - test_truth(instance->write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - test_truth(instance->write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); - } - test_truth(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); - } - return TEST_SUCCESS; -} - -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_t udp_verbosity_test(memcached_st *memc) -{ - memcached_return_t rc; - uint16_t *expected_ids= get_udp_request_ids(memc); - unsigned int x; - for (x= 0; x < memcached_server_count(memc); x++) - increment_request_id(&expected_ids[x]); - - rc= memcached_verbosity(memc,3); - test_truth(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc,expected_ids); -} - -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_t udp_flush_test(memcached_st *memc) -{ - memcached_return_t rc; - uint16_t *expected_ids= get_udp_request_ids(memc); - unsigned int x; - for (x= 0; x < memcached_server_count(memc);x++) - increment_request_id(&expected_ids[x]); - - rc= memcached_flush(memc,0); - test_truth(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc,expected_ids); -} - -static test_return_t udp_incr_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "incr"; - const char *value= "1"; - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - - 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); - test_truth(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_decr_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "decr"; - const char *value= "1"; - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - - 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); - test_truth(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc, expected_ids); -} - - -static test_return_t udp_stat_test(memcached_st *memc) -{ - memcached_stat_st * rv= NULL; - memcached_return_t rc; - char args[]= ""; - uint16_t *expected_ids = get_udp_request_ids(memc); - rv = memcached_stat(memc, args, &rc); - free(rv); - test_truth(rc == MEMCACHED_NOT_SUPPORTED); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_version_test(memcached_st *memc) -{ - memcached_return_t rc; - uint16_t *expected_ids = get_udp_request_ids(memc); - rc = memcached_version(memc); - test_truth(rc == MEMCACHED_NOT_SUPPORTED); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_get_test(memcached_st *memc) -{ - 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); - test_truth(rc == MEMCACHED_NOT_SUPPORTED); - test_truth(val == NULL); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_mixed_io_test(memcached_st *memc) -{ - test_st current_op; - test_st mixed_io_ops [] ={ - {"udp_set_test", 0, - (test_callback_fn)udp_set_test}, - {"udp_set_too_big_test", 0, - (test_callback_fn)udp_set_too_big_test}, - {"udp_delete_test", 0, - (test_callback_fn)udp_delete_test}, - {"udp_verbosity_test", 0, - (test_callback_fn)udp_verbosity_test}, - {"udp_quit_test", 0, - (test_callback_fn)udp_quit_test}, - {"udp_flush_test", 0, - (test_callback_fn)udp_flush_test}, - {"udp_incr_test", 0, - (test_callback_fn)udp_incr_test}, - {"udp_decr_test", 0, - (test_callback_fn)udp_decr_test}, - {"udp_version_test", 0, - (test_callback_fn)udp_version_test} - }; - unsigned int x= 0; - for (x= 0; x < 500; x++) - { - current_op= mixed_io_ops[random() % 9]; - test_truth(current_op.test_fn(memc) == TEST_SUCCESS); - } - return TEST_SUCCESS; -} - #if 0 static test_return_t hash_sanity_test (memcached_st *memc) { @@ -4821,8 +4608,25 @@ static test_return_t hsieh_avaibility_test (memcached_st *memc) expected_rc= MEMCACHED_SUCCESS; #endif memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, - (uint64_t)MEMCACHED_HASH_HSIEH); - test_truth(rc == expected_rc); + (uint64_t)MEMCACHED_HASH_HSIEH); + test_true(rc == expected_rc); + + return TEST_SUCCESS; +} + +static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused))) +{ + uint32_t x; + const char **ptr; + + for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) + { + uint32_t hash_val; + + hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_DEFAULT); + test_true(one_at_a_time_values[x] == hash_val); + } + return TEST_SUCCESS; } @@ -4836,7 +4640,7 @@ static test_return_t md5_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MD5); - test_truth(md5_values[x] == hash_val); + test_true(md5_values[x] == hash_val); } return TEST_SUCCESS; @@ -4852,7 +4656,7 @@ static test_return_t crc_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_CRC); - test_truth(crc_values[x] == hash_val); + test_true(crc_values[x] == hash_val); } return TEST_SUCCESS; @@ -4868,7 +4672,7 @@ static test_return_t fnv1_64_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64); - test_truth(fnv1_64_values[x] == hash_val); + test_true(fnv1_64_values[x] == hash_val); } return TEST_SUCCESS; @@ -4884,7 +4688,7 @@ static test_return_t fnv1a_64_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_64); - test_truth(fnv1a_64_values[x] == hash_val); + test_true(fnv1a_64_values[x] == hash_val); } return TEST_SUCCESS; @@ -4901,7 +4705,7 @@ static test_return_t fnv1_32_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_32); - test_truth(fnv1_32_values[x] == hash_val); + test_true(fnv1_32_values[x] == hash_val); } return TEST_SUCCESS; @@ -4917,7 +4721,7 @@ static test_return_t fnv1a_32_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_32); - test_truth(fnv1a_32_values[x] == hash_val); + test_true(fnv1a_32_values[x] == hash_val); } return TEST_SUCCESS; @@ -4933,7 +4737,7 @@ static test_return_t hsieh_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_HSIEH); - test_truth(hsieh_values[x] == hash_val); + test_true(hsieh_values[x] == hash_val); } return TEST_SUCCESS; @@ -4952,7 +4756,7 @@ static test_return_t murmur_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MURMUR); - test_truth(murmur_values[x] == hash_val); + test_true(murmur_values[x] == hash_val); } return TEST_SUCCESS; @@ -4970,7 +4774,88 @@ static test_return_t jenkins_run (memcached_st *memc __attribute__((unused))) uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_JENKINS); - test_truth(jenkins_values[x] == hash_val); + test_true(jenkins_values[x] == hash_val); + } + + return TEST_SUCCESS; +} + +static uint32_t hash_md5_test_function(const char *string, size_t string_length, void *context) +{ + (void)context; + return libhashkit_md5(string, string_length); +} + +static uint32_t hash_crc_test_function(const char *string, size_t string_length, void *context) +{ + (void)context; + return libhashkit_crc32(string, string_length); +} + +static test_return_t memcached_get_hashkit_test (memcached_st *memc) +{ + uint32_t x; + const char **ptr; + const hashkit_st *kit; + hashkit_st new_kit; + hashkit_return_t hash_rc; + + uint32_t md5_hosts[]= {4U, 1U, 0U, 1U, 4U, 2U, 0U, 3U, 0U, 0U, 3U, 1U, 0U, 0U, 1U, 3U, 0U, 0U, 0U, 3U, 1U, 0U, 4U, 4U, 3U}; + uint32_t crc_hosts[]= {2U, 4U, 1U, 0U, 2U, 4U, 4U, 4U, 1U, 2U, 3U, 4U, 3U, 4U, 1U, 3U, 3U, 2U, 0U, 0U, 0U, 1U, 2U, 4U, 0U}; + + kit= memcached_get_hashkit(memc); + + hashkit_clone(&new_kit, kit); + hash_rc= hashkit_set_custom_function(&new_kit, hash_md5_test_function, NULL); + test_true(hash_rc == HASHKIT_SUCCESS); + + memcached_set_hashkit(memc, &new_kit); + + /* + Verify Setting the hash. + */ + for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) + { + uint32_t hash_val; + + hash_val= hashkit_digest(kit, *ptr, strlen(*ptr)); + test_true(md5_values[x] == hash_val); + } + + + /* + Now check memcached_st. + */ + for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) + { + uint32_t hash_val; + + hash_val= memcached_generate_hash(memc, *ptr, strlen(*ptr)); + test_true(md5_hosts[x] == hash_val); + } + + hash_rc= hashkit_set_custom_function(&new_kit, hash_crc_test_function, NULL); + test_true(hash_rc == HASHKIT_SUCCESS); + + memcached_set_hashkit(memc, &new_kit); + + /* + Verify Setting the hash. + */ + for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) + { + uint32_t hash_val; + + hash_val= hashkit_digest(kit, *ptr, strlen(*ptr)); + test_true(crc_values[x] == hash_val); + } + + for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) + { + uint32_t hash_val; + + hash_val= memcached_generate_hash(memc, *ptr, strlen(*ptr)); + test_true(crc_hosts[x] == hash_val); } return TEST_SUCCESS; @@ -4988,45 +4873,45 @@ static test_return_t ketama_compatibility_libmemcached(memcached_st *trash) (void)trash; memc= memcached_create(NULL); - test_truth(memc); + test_true(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_truth(value == 1); + test_true(value == 1); - test_truth(memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) == MEMCACHED_SUCCESS); - test_truth(memcached_behavior_get_distribution(memc) == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA); + test_true(memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA) == MEMCACHED_SUCCESS); + test_true(memcached_behavior_get_distribution(memc) == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA); 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. */ - test_truth(memcached_server_count(memc) == 8); + test_true(memcached_server_count(memc) == 8); test_strcmp(server_pool[0].hostname, "10.0.1.1"); - test_truth(server_pool[0].port == 11211); - test_truth(server_pool[0].weight == 600); + test_true(server_pool[0].port == 11211); + test_true(server_pool[0].weight == 600); test_strcmp(server_pool[2].hostname, "10.0.1.3"); - test_truth(server_pool[2].port == 11211); - test_truth(server_pool[2].weight == 200); + test_true(server_pool[2].port == 11211); + test_true(server_pool[2].weight == 200); test_strcmp(server_pool[7].hostname, "10.0.1.8"); - test_truth(server_pool[7].port == 11211); - test_truth(server_pool[7].weight == 100); + test_true(server_pool[7].port == 11211); + test_true(server_pool[7].weight == 100); /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets * us test the boundary wraparound. */ - test_truth(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + test_true(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)); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, server_idx); - char *hostname = instance->hostname; + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, server_idx); + const char *hostname = memcached_server_name(instance); test_strcmp(hostname, ketama_test_cases[x].server); } @@ -5048,44 +4933,47 @@ static test_return_t ketama_compatibility_spymemcached(memcached_st *trash) (void)trash; memc= memcached_create(NULL); - test_truth(memc); + test_true(memc); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_truth(value == 1); + test_true(value == 1); - test_truth(memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY) == MEMCACHED_SUCCESS); - test_truth(memcached_behavior_get_distribution(memc) == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY); + test_true(memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY) == MEMCACHED_SUCCESS); + test_true(memcached_behavior_get_distribution(memc) == MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_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. */ - test_truth(memcached_server_count(memc) == 8); + test_true(memcached_server_count(memc) == 8); test_strcmp(server_pool[0].hostname, "10.0.1.1"); - test_truth(server_pool[0].port == 11211); - test_truth(server_pool[0].weight == 600); + test_true(server_pool[0].port == 11211); + test_true(server_pool[0].weight == 600); test_strcmp(server_pool[2].hostname, "10.0.1.3"); - test_truth(server_pool[2].port == 11211); - test_truth(server_pool[2].weight == 200); + test_true(server_pool[2].port == 11211); + test_true(server_pool[2].weight == 200); test_strcmp(server_pool[7].hostname, "10.0.1.8"); - test_truth(server_pool[7].port == 11211); - test_truth(server_pool[7].weight == 100); + test_true(server_pool[7].port == 11211); + test_true(server_pool[7].weight == 100); /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets * us test the boundary wraparound. */ - test_truth(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index); + test_true(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)); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc, server_idx); - char *hostname = instance->hostname; + uint32_t server_idx= memcached_generate_hash(memc, ketama_test_cases_spy[x].key, strlen(ketama_test_cases_spy[x].key)); + + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, server_idx); + + const char *hostname= memcached_server_name(instance); + test_strcmp(hostname, ketama_test_cases_spy[x].server); } @@ -5108,13 +4996,13 @@ static test_return_t regression_bug_434484(memcached_st *memc) size_t keylen= strlen(key); ret= memcached_append(memc, key, keylen, key, keylen, 0, 0); - test_truth(ret == MEMCACHED_NOTSTORED); + test_true(ret == MEMCACHED_NOTSTORED); size_t size= 2048 * 1024; void *data= calloc(1, size); - test_truth(data != NULL); + test_true(data != NULL); ret= memcached_set(memc, key, keylen, data, size, 0, 0); - test_truth(ret == MEMCACHED_E2BIG); + test_true(ret == MEMCACHED_E2BIG); free(data); return TEST_SUCCESS; @@ -5129,7 +5017,7 @@ static test_return_t regression_bug_434843(memcached_st *memc) return test_rc; memcached_return_t rc; - unsigned int counter= 0; + size_t counter= 0; memcached_execute_fn callbacks[1]= { [0]= &callback_counter }; /* @@ -5144,45 +5032,51 @@ static test_return_t regression_bug_434843(memcached_st *memc) 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) + for (size_t x= 0; x < max_keys; ++x) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); keys[x]= strdup(k); - test_truth(keys[x] != NULL); + test_true(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) + for (size_t y= 0; y < 2; y++) { rc= memcached_mget(memc, (const char**)keys, key_length, max_keys); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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*/ - test_truth(counter == 0); char blob[1024]= { 0 }; - for (int x= 0; x < (int)max_keys; ++x) + + test_true(counter == 0); + + for (size_t x= 0; x < max_keys; ++x) { rc= memcached_add(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } } else { /* Verify that we received all of the key/value pairs */ - test_truth(counter == (unsigned int)max_keys); + test_true(counter == max_keys); } } /* Release allocated resources */ for (size_t x= 0; x < max_keys; ++x) + { free(keys[x]); + } free(keys); free(key_length); @@ -5195,7 +5089,7 @@ 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); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); return regression_bug_434843(memc); } @@ -5204,23 +5098,23 @@ static test_return_t regression_bug_421108(memcached_st *memc) { memcached_return_t rc; memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); char *bytes= memcached_stat_get_value(memc, memc_stat, "bytes", &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(bytes != NULL); + test_true(rc == MEMCACHED_SUCCESS); + test_true(bytes != NULL); char *bytes_read= memcached_stat_get_value(memc, memc_stat, "bytes_read", &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(bytes_read != NULL); + test_true(rc == MEMCACHED_SUCCESS); + test_true(bytes_read != NULL); char *bytes_written= memcached_stat_get_value(memc, memc_stat, "bytes_written", &rc); - test_truth(rc == MEMCACHED_SUCCESS); - test_truth(bytes_written != NULL); + test_true(rc == MEMCACHED_SUCCESS); + test_true(bytes_written != NULL); - test_truth(strcmp(bytes, bytes_read) != 0); - test_truth(strcmp(bytes, bytes_written) != 0); + test_true(strcmp(bytes, bytes_read) != 0); + test_true(strcmp(bytes, bytes_written) != 0); /* Release allocated resources */ free(bytes); @@ -5246,7 +5140,7 @@ static test_return_t regression_bug_442914(memcached_st *memc) { memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1); uint32_t number_of_hosts= memcached_server_count(memc); @@ -5255,21 +5149,23 @@ static test_return_t regression_bug_442914(memcached_st *memc) char k[250]; size_t len; - for (int x= 0; x < 250; ++x) + for (uint32_t x= 0; x < 250; ++x) { len= (size_t)snprintf(k, sizeof(k), "%0250u", x); rc= memcached_delete(memc, k, len, 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } - len= (size_t)snprintf(k, sizeof(k), "%037u", 251); + (void)snprintf(k, sizeof(k), "%037u", 251U); + len= strlen(k); + rc= memcached_delete(memc, k, len, 0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); rc= memcached_delete(memc, k, len, 0); - test_truth(rc == MEMCACHED_NOTFOUND); + test_true(rc == MEMCACHED_NOTFOUND); memc->number_of_hosts= number_of_hosts; @@ -5278,8 +5174,8 @@ static test_return_t regression_bug_442914(memcached_st *memc) static test_return_t regression_bug_447342(memcached_st *memc) { - memcached_server_instance_st *instance_one; - memcached_server_instance_st *instance_two; + memcached_server_instance_st instance_one; + memcached_server_instance_st instance_two; if (memcached_server_count(memc) < 3 || pre_replication(memc) != MEMCACHED_SUCCESS) return TEST_SKIPPED; @@ -5287,20 +5183,21 @@ static test_return_t regression_bug_447342(memcached_st *memc) memcached_return_t rc; rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(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 (uint64_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < max_keys; ++x) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%"PRIu64, x); + + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); keys[x]= strdup(k); - test_truth(keys[x] != NULL); + test_true(keys[x] != NULL); rc= memcached_set(memc, k, key_length[x], k, key_length[x], 0, 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } /* @@ -5322,13 +5219,13 @@ static test_return_t regression_bug_447342(memcached_st *memc) * into the servers */ rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); - unsigned int counter= 0; + size_t 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 */ - test_truth(counter == (unsigned int)max_keys); + test_true(counter == max_keys); memcached_quit(memc); /* @@ -5337,24 +5234,24 @@ static test_return_t regression_bug_447342(memcached_st *memc) * This is to verify correct behavior in the library. Fake that two servers * are dead.. */ - instance_one= memcached_server_instance_fetch(memc, 0); - instance_two= memcached_server_instance_fetch(memc, 2); + instance_one= memcached_server_instance_by_position(memc, 0); + instance_two= memcached_server_instance_by_position(memc, 2); in_port_t port0= instance_one->port; in_port_t port2= instance_two->port; - instance_one->port= 0; - instance_two->port= 0; + ((memcached_server_write_instance_st)instance_one)->port= 0; + ((memcached_server_write_instance_st)instance_two)->port= 0; rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); counter= 0; rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - test_truth(counter == (unsigned int)max_keys); + test_true(counter == (unsigned int)max_keys); /* restore the memc handle */ - instance_one->port= port0; - instance_two->port= port2; + ((memcached_server_write_instance_st)instance_one)->port= port0; + ((memcached_server_write_instance_st)instance_two)->port= port2; memcached_quit(memc); @@ -5364,21 +5261,21 @@ static test_return_t regression_bug_447342(memcached_st *memc) if (x & 1) { rc= memcached_delete(memc, keys[x], key_length[x], 0); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); } } memcached_quit(memc); - instance_one->port= 0; - instance_two->port= 0; + ((memcached_server_write_instance_st)instance_one)->port= 0; + ((memcached_server_write_instance_st)instance_two)->port= 0; /* now retry the command, this time we should have cache misses */ rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); counter= 0; rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - test_truth(counter == (unsigned int)(max_keys >> 1)); + test_true(counter == (unsigned int)(max_keys >> 1)); /* Release allocated resources */ for (size_t x= 0; x < max_keys; ++x) @@ -5389,8 +5286,8 @@ static test_return_t regression_bug_447342(memcached_st *memc) free(key_length); /* restore the memc handle */ - instance_one->port= port0; - instance_two->port= port2; + ((memcached_server_write_instance_st)instance_one)->port= port0; + ((memcached_server_write_instance_st)instance_two)->port= port2; return TEST_SUCCESS; } @@ -5398,11 +5295,11 @@ static test_return_t regression_bug_447342(memcached_st *memc) static test_return_t regression_bug_463297(memcached_st *memc) { memcached_st *memc_clone= memcached_clone(NULL, memc); - test_truth(memc_clone != NULL); - test_truth(memcached_version(memc_clone) == MEMCACHED_SUCCESS); + test_true(memc_clone != NULL); + test_true(memcached_version(memc_clone) == MEMCACHED_SUCCESS); - memcached_server_instance_st *instance= - memcached_server_instance_fetch(memc_clone, 0); + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc_clone, 0); if (instance->major_version > 1 || (instance->major_version == 1 && @@ -5410,16 +5307,16 @@ static test_return_t regression_bug_463297(memcached_st *memc) { /* Binary protocol doesn't support deferred delete */ memcached_st *bin_clone= memcached_clone(NULL, memc); - test_truth(bin_clone != NULL); - test_truth(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS); - test_truth(memcached_delete(bin_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); + test_true(bin_clone != NULL); + test_true(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS); + test_true(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 */ - test_truth(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); + test_true(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); @@ -5427,28 +5324,28 @@ static test_return_t regression_bug_463297(memcached_st *memc) /* 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 */ - test_truth(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); /* And buffered mode should be disabled and we should get protocol error */ - test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS); + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS); rc= memcached_delete(memc, "foo", 3, 1); - test_truth(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); /* Same goes for noreply... */ - test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS); + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS); rc= memcached_delete(memc, "foo", 3, 1); - test_truth(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); /* but a normal request should go through (and be buffered) */ - test_truth((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED); - test_truth(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED); + test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); - test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS); + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS); /* unbuffered noreply should be success */ - test_truth(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS); + test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS); /* unbuffered with reply should be not found... */ - test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS); - test_truth(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND); + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS); + test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND); } memcached_free(memc_clone); @@ -5460,10 +5357,10 @@ static test_return_t regression_bug_463297(memcached_st *memc) * 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) +static test_return_t test_get_last_disconnect(memcached_st *memc) { memcached_return_t rc; - memcached_server_st *disconnected_server; + memcached_server_instance_st disconnected_server; /* With the working set of server */ const char *key= "marmotte"; @@ -5472,10 +5369,10 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); disconnected_server = memcached_server_get_last_disconnect(memc); - test_truth(disconnected_server == NULL); + test_true(disconnected_server == NULL); /* With a non existing server */ memcached_st *mine; @@ -5484,22 +5381,22 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) const char *server_list= "localhost:9"; servers= memcached_servers_parse(server_list); - test_truth(servers); + test_true(servers); mine= memcached_create(NULL); rc= memcached_server_push(mine, servers); - test_truth(rc == MEMCACHED_SUCCESS); + test_true(rc == MEMCACHED_SUCCESS); memcached_server_list_free(servers); - test_truth(mine); + test_true(mine); rc= memcached_set(mine, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc != MEMCACHED_SUCCESS); + test_true(rc != MEMCACHED_SUCCESS); disconnected_server = memcached_server_get_last_disconnect(mine); - test_truth(disconnected_server != NULL); - test_truth(disconnected_server->port == 9); - test_truth(strncmp(disconnected_server->hostname,"localhost",9) == 0); + test_true(disconnected_server != NULL); + test_true(memcached_server_port(disconnected_server)== 9); + test_true(strncmp(memcached_server_name(disconnected_server),"localhost",9) == 0); memcached_quit(mine); memcached_free(mine); @@ -5514,7 +5411,7 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) static test_return_t wrong_failure_counter_test(memcached_st *memc) { memcached_return_t rc; - memcached_server_instance_st *instance; + memcached_server_instance_st instance; /* Set value to force connection to the server */ const char *key= "marmotte"; @@ -5532,15 +5429,15 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_truth(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - instance= memcached_server_instance_fetch(memc, 0); + instance= memcached_server_instance_by_position(memc, 0); /* The test is to see that the memcached_quit doesn't increase the * the server failure conter, so let's ensure that it is zero * before sending quit */ - instance->server_failure_counter= 0; + ((memcached_server_write_instance_st)instance)->server_failure_counter= 0; memcached_quit(memc); @@ -5548,7 +5445,7 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc) * Please note that this isn't bullet proof, because an error could * occur... */ - test_truth(instance->server_failure_counter == 0); + test_true(instance->server_failure_counter == 0); /* restore the instance */ memc->number_of_hosts= number_of_hosts; @@ -5556,30 +5453,118 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc) return TEST_SUCCESS; } -test_st udp_setup_server_tests[] ={ - {"set_udp_behavior_test", 0, (test_callback_fn)set_udp_behavior_test}, - {"add_tcp_server_udp_client_test", 0, (test_callback_fn)add_tcp_server_udp_client_test}, - {"add_udp_server_tcp_client_test", 0, (test_callback_fn)add_udp_server_tcp_client_test}, - {0, 0, 0} -}; -test_st upd_io_tests[] ={ - {"udp_set_test", 0, (test_callback_fn)udp_set_test}, - {"udp_buffered_set_test", 0, (test_callback_fn)udp_buffered_set_test}, - {"udp_set_too_big_test", 0, (test_callback_fn)udp_set_too_big_test}, - {"udp_delete_test", 0, (test_callback_fn)udp_delete_test}, - {"udp_buffered_delete_test", 0, (test_callback_fn)udp_buffered_delete_test}, - {"udp_verbosity_test", 0, (test_callback_fn)udp_verbosity_test}, - {"udp_quit_test", 0, (test_callback_fn)udp_quit_test}, - {"udp_flush_test", 0, (test_callback_fn)udp_flush_test}, - {"udp_incr_test", 0, (test_callback_fn)udp_incr_test}, - {"udp_decr_test", 0, (test_callback_fn)udp_decr_test}, - {"udp_stat_test", 0, (test_callback_fn)udp_stat_test}, - {"udp_version_test", 0, (test_callback_fn)udp_version_test}, - {"udp_get_test", 0, (test_callback_fn)udp_get_test}, - {"udp_mixed_io_test", 0, (test_callback_fn)udp_mixed_io_test}, - {0, 0, 0} -}; + + +/* + * Test that ensures mget_execute does not end into recursive calls that finally fails + */ +static test_return_t regression_bug_490486(memcached_st *memc) +{ + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 1); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, 1000); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, 1); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 3600); + + /* + * 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; + size_t max_keys= 20480; + + + char **keys= calloc(max_keys, sizeof(char*)); + size_t *key_length=calloc(max_keys, sizeof(size_t)); + + /* First add all of the items.. */ + char blob[1024]= { 0 }; + memcached_return rc; + for (size_t x= 0; x < max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); + keys[x]= strdup(k); + assert(keys[x] != NULL); + rc= memcached_set(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + + /* Try to get all of them with a large multiget */ + size_t counter= 0; + memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + rc= memcached_mget_execute(memc, (const char**)keys, key_length, + (size_t)max_keys, callbacks, &counter, 1); + + assert(rc == MEMCACHED_SUCCESS); + char* the_value= NULL; + char the_key[MEMCACHED_MAX_KEY]; + size_t the_key_length; + size_t the_value_length; + uint32_t the_flags; + + do { + the_value= memcached_fetch(memc, the_key, &the_key_length, &the_value_length, &the_flags, &rc); + + if ((the_value!= NULL) && (rc == MEMCACHED_SUCCESS)) + { + ++counter; + free(the_value); + } + + } while ( (the_value!= NULL) && (rc == MEMCACHED_SUCCESS)); + + + assert(rc == MEMCACHED_END); + + /* Verify that we got all of the items */ + assert(counter == max_keys); + + /* Release all 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; +} + +/* + * Test that the sasl authentication works. We cannot use the default + * pool of servers, because that would require that all servers we want + * to test supports SASL authentication, and that they use the default + * creds. + */ +static test_return_t sasl_auth_test(memcached_st *memc) +{ + memcached_return_t rc; + + rc= memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_SUCCESS); + test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_SUCCESS); + test_true((rc= memcached_destroy_sasl_auth_data(memc)) == MEMCACHED_SUCCESS); + test_true((rc= memcached_destroy_sasl_auth_data(memc)) == MEMCACHED_FAILURE); + test_true((rc= memcached_destroy_sasl_auth_data(NULL)) == MEMCACHED_FAILURE); + memcached_quit(memc); + + rc= memcached_set_sasl_auth_data(memc, + getenv("LIBMEMCACHED_TEST_SASL_USERNAME"), + getenv("LIBMEMCACHED_TEST_SASL_SERVER")); + test_true(rc == MEMCACHED_SUCCESS); + + rc= memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_AUTH_FAILURE); + test_true(memcached_destroy_sasl_auth_data(memc) == MEMCACHED_SUCCESS); + + memcached_quit(memc); + return TEST_SUCCESS; +} /* Clean the server before beginning testing */ test_st tests[] ={ @@ -5590,6 +5575,7 @@ test_st tests[] ={ {"server_unsort", 0, (test_callback_fn)server_unsort_test}, {"server_sort", 0, (test_callback_fn)server_sort_test}, {"server_sort2", 0, (test_callback_fn)server_sort2_test}, + {"memcached_server_remove", 0, (test_callback_fn)memcached_server_remove_test}, {"clone_test", 0, (test_callback_fn)clone_test }, {"connection_test", 0, (test_callback_fn)connection_test}, {"callback_test", 0, (test_callback_fn)callback_test}, @@ -5643,6 +5629,7 @@ test_st tests[] ={ test_st behavior_tests[] ={ {"behavior_test", 0, (test_callback_fn)behavior_test}, + {"MEMCACHED_BEHAVIOR_CORK", 0, (test_callback_fn)MEMCACHED_BEHAVIOR_CORK_test}, {0, 0, 0} }; @@ -5734,8 +5721,16 @@ test_st regression_tests[]= { {"lp:442914", 1, (test_callback_fn)regression_bug_442914 }, {"lp:447342", 1, (test_callback_fn)regression_bug_447342 }, {"lp:463297", 1, (test_callback_fn)regression_bug_463297 }, + {"lp:490486", 1, (test_callback_fn)regression_bug_490486 }, + {0, 0, (test_callback_fn)0} +}; + +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT +test_st sasl_auth_tests[]= { + {"sasl_auth", 1, (test_callback_fn)sasl_auth_test }, {0, 0, (test_callback_fn)0} }; +#endif test_st ketama_compatibility[]= { {"libmemcached", 1, (test_callback_fn)ketama_compatibility_libmemcached }, @@ -5797,6 +5792,7 @@ test_st ketama_auto_eject_hosts[] ={ }; test_st hash_tests[] ={ + {"one_at_a_time_run", 0, (test_callback_fn)one_at_a_time_run }, {"md5", 0, (test_callback_fn)md5_run }, {"crc", 0, (test_callback_fn)crc_run }, {"fnv1_64", 0, (test_callback_fn)fnv1_64_run }, @@ -5806,6 +5802,7 @@ test_st hash_tests[] ={ {"hsieh", 0, (test_callback_fn)hsieh_run }, {"murmur", 0, (test_callback_fn)murmur_run }, {"jenkis", 0, (test_callback_fn)jenkins_run }, + {"memcached_get_hashkit", 0, (test_callback_fn)memcached_get_hashkit_test }, {0, 0, (test_callback_fn)0} }; @@ -5814,9 +5811,6 @@ collection_st collection[] ={ {"hash_sanity", 0, 0, hash_sanity}, #endif {"hsieh_availability", 0, 0, hsieh_availability}, - {"udp_setup", (test_callback_fn)init_udp, 0, udp_setup_server_tests}, - {"udp_io", (test_callback_fn)init_udp, 0, upd_io_tests}, - {"udp_binary_io", (test_callback_fn)binary_init_udp, 0, upd_io_tests}, {"block", 0, 0, tests}, {"binary", (test_callback_fn)pre_binary, 0, tests}, {"nonblock", (test_callback_fn)pre_nonblock, 0, tests}, @@ -5843,6 +5837,8 @@ collection_st collection[] ={ #endif {"memory_allocators", (test_callback_fn)set_memory_alloc, 0, tests}, {"prefix", (test_callback_fn)set_prefix, 0, tests}, + {"sasl_auth", (test_callback_fn)pre_sasl, 0, sasl_auth_tests }, + {"sasl", (test_callback_fn)pre_sasl, 0, tests }, {"version_1_2_3", (test_callback_fn)check_for_1_2_3, 0, version_1_2_3}, {"string", 0, 0, string_tests}, {"result", 0, 0, result_tests}, @@ -5857,6 +5853,9 @@ collection_st collection[] ={ {"generate_murmur", (test_callback_fn)pre_murmur, 0, generate_tests}, {"generate_jenkins", (test_callback_fn)pre_jenkins, 0, generate_tests}, {"generate_nonblock", (test_callback_fn)pre_nonblock, 0, generate_tests}, + // Too slow + {"generate_corked", (test_callback_fn)pre_cork, 0, generate_tests}, + {"generate_corked_and_nonblock", (test_callback_fn)pre_cork_and_nonblock, 0, generate_tests}, {"consistent_not", 0, 0, consistent_tests}, {"consistent_ketama", (test_callback_fn)pre_behavior_ketama, 0, consistent_tests}, {"consistent_ketama_weighted", (test_callback_fn)pre_behavior_ketama_weighted, 0, consistent_weighted_tests},