X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffunction.c;h=2bc0192b3f0cf39f510eefcb729ae4b2852e2ce2;hb=5c6d7ae6344412f19fec578a328904c7c1700880;hp=7dea597483f55ab8a9375f2ecfa58d91c53ff65f;hpb=fd5128ba25070702e208e0f26961d6eb7dd76e5e;p=awesomized%2Flibmemcached diff --git a/tests/function.c b/tests/function.c index 7dea5974..2bc0192b 100644 --- a/tests/function.c +++ b/tests/function.c @@ -1,6 +1,7 @@ /* Sample test application. */ + #include "libmemcached/common.h" #include @@ -10,6 +11,7 @@ #include #include #include +#include #include #include #include "server.h" @@ -37,20 +39,20 @@ static uint32_t global_count; static pairs_st *global_pairs; -static char *global_keys[GLOBAL_COUNT]; +static const char *global_keys[GLOBAL_COUNT]; static size_t global_keys_length[GLOBAL_COUNT]; -static test_return init_test(memcached_st *not_used __attribute__((unused))) +static test_return_t init_test(memcached_st *not_used __attribute__((unused))) { memcached_st memc; (void)memcached_create(&memc); memcached_free(&memc); - return 0; + return TEST_SUCCESS; } -static test_return server_list_null_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unused))) { memcached_server_st *server_list; memcached_return rc; @@ -64,7 +66,7 @@ static test_return server_list_null_test(memcached_st *ptr __attribute__((unuse server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, &rc); assert(server_list == NULL); - return 0; + return TEST_SUCCESS; } #define TEST_PORT_COUNT 7 @@ -80,7 +82,7 @@ static memcached_return server_display_function(memcached_st *ptr __attribute__ return MEMCACHED_SUCCESS; } -static test_return server_sort_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused))) { uint32_t x; uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ @@ -94,7 +96,7 @@ static test_return server_sort_test(memcached_st *ptr __attribute__((unused))) for (x= 0; x < TEST_PORT_COUNT; x++) { - test_ports[x]= random() % 64000; + test_ports[x]= (uint32_t)random() % 64000; rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); assert(local_memc->number_of_hosts == x + 1); assert(local_memc->hosts[0].count == x+1); @@ -107,10 +109,10 @@ static test_return server_sort_test(memcached_st *ptr __attribute__((unused))) memcached_free(local_memc); - return 0; + return TEST_SUCCESS; } -static test_return server_sort2_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))) { uint32_t bigger= 0; /* Prime the value for the assert in server_display_function */ memcached_return rc; @@ -137,7 +139,7 @@ static test_return server_sort2_test(memcached_st *ptr __attribute__((unused))) memcached_free(local_memc); - return 0; + return TEST_SUCCESS; } static memcached_return server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context) @@ -151,7 +153,7 @@ static memcached_return server_display_unsort_function(memcached_st *ptr __attr return MEMCACHED_SUCCESS; } -static test_return server_unsort_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused))) { uint32_t x; uint32_t counter= 0; /* Prime the value for the assert in server_display_function */ @@ -165,7 +167,7 @@ static test_return server_unsort_test(memcached_st *ptr __attribute__((unused)) for (x= 0; x < TEST_PORT_COUNT; x++) { - test_ports[x]= random() % 64000; + test_ports[x]= (uint32_t)(random() % 64000); rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); assert(local_memc->number_of_hosts == x+1); assert(local_memc->hosts[0].count == x+1); @@ -183,173 +185,189 @@ static test_return server_unsort_test(memcached_st *ptr __attribute__((unused)) memcached_free(local_memc); - return 0; + return TEST_SUCCESS; } -static test_return allocation_test(memcached_st *not_used __attribute__((unused))) +static test_return_t allocation_test(memcached_st *not_used __attribute__((unused))) { memcached_st *memc; memc= memcached_create(NULL); assert(memc); memcached_free(memc); - return 0; + return TEST_SUCCESS; } -static test_return clone_test(memcached_st *memc) +static test_return_t clone_test(memcached_st *memc) { /* All null? */ { - memcached_st *clone; - clone= memcached_clone(NULL, NULL); - assert(clone); - memcached_free(clone); + memcached_st *memc_clone; + memc_clone= memcached_clone(NULL, NULL); + assert(memc_clone); + memcached_free(memc_clone); } /* Can we init from null? */ { - memcached_st *clone; - clone= memcached_clone(NULL, memc); - assert(clone); - - assert(clone->call_free == memc->call_free); - assert(clone->call_malloc == memc->call_malloc); - assert(clone->call_realloc == memc->call_realloc); - assert(clone->call_calloc == memc->call_calloc); - assert(clone->connect_timeout == memc->connect_timeout); - assert(clone->delete_trigger == memc->delete_trigger); - assert(clone->distribution == memc->distribution); - assert(clone->flags == memc->flags); - assert(clone->get_key_failure == memc->get_key_failure); - assert(clone->hash == memc->hash); - assert(clone->hash_continuum == memc->hash_continuum); - assert(clone->io_bytes_watermark == memc->io_bytes_watermark); - assert(clone->io_msg_watermark == memc->io_msg_watermark); - assert(clone->io_key_prefetch == memc->io_key_prefetch); - assert(clone->on_cleanup == memc->on_cleanup); - assert(clone->on_clone == memc->on_clone); - assert(clone->poll_timeout == memc->poll_timeout); - assert(clone->rcv_timeout == memc->rcv_timeout); - assert(clone->recv_size == memc->recv_size); - assert(clone->retry_timeout == memc->retry_timeout); - assert(clone->send_size == memc->send_size); - assert(clone->server_failure_limit == memc->server_failure_limit); - assert(clone->snd_timeout == memc->snd_timeout); - assert(clone->user_data == memc->user_data); - assert(clone->number_of_replicas == memc->number_of_replicas); - - memcached_free(clone); + memcached_st *memc_clone; + memc_clone= memcached_clone(NULL, memc); + assert(memc_clone); + + assert(memc_clone->call_free == memc->call_free); + assert(memc_clone->call_malloc == memc->call_malloc); + assert(memc_clone->call_realloc == memc->call_realloc); + assert(memc_clone->call_calloc == memc->call_calloc); + assert(memc_clone->connect_timeout == memc->connect_timeout); + assert(memc_clone->delete_trigger == memc->delete_trigger); + assert(memc_clone->distribution == memc->distribution); + assert(memc_clone->flags == memc->flags); + assert(memc_clone->get_key_failure == memc->get_key_failure); + assert(memc_clone->hash == memc->hash); + assert(memc_clone->hash_continuum == memc->hash_continuum); + assert(memc_clone->io_bytes_watermark == memc->io_bytes_watermark); + assert(memc_clone->io_msg_watermark == memc->io_msg_watermark); + assert(memc_clone->io_key_prefetch == memc->io_key_prefetch); + assert(memc_clone->on_cleanup == memc->on_cleanup); + assert(memc_clone->on_clone == memc->on_clone); + assert(memc_clone->poll_timeout == memc->poll_timeout); + assert(memc_clone->rcv_timeout == memc->rcv_timeout); + assert(memc_clone->recv_size == memc->recv_size); + assert(memc_clone->retry_timeout == memc->retry_timeout); + assert(memc_clone->send_size == memc->send_size); + assert(memc_clone->server_failure_limit == memc->server_failure_limit); + assert(memc_clone->snd_timeout == memc->snd_timeout); + assert(memc_clone->user_data == memc->user_data); + + memcached_free(memc_clone); } /* Can we init from struct? */ { memcached_st declared_clone; - memcached_st *clone; + memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); - clone= memcached_clone(&declared_clone, NULL); - assert(clone); - memcached_free(clone); + memc_clone= memcached_clone(&declared_clone, NULL); + assert(memc_clone); + memcached_free(memc_clone); } /* Can we init from struct? */ { memcached_st declared_clone; - memcached_st *clone; + memcached_st *memc_clone; memset(&declared_clone, 0 , sizeof(memcached_st)); - clone= memcached_clone(&declared_clone, memc); - assert(clone); - memcached_free(clone); + memc_clone= memcached_clone(&declared_clone, memc); + assert(memc_clone); + memcached_free(memc_clone); } - return 0; + return TEST_SUCCESS; } -static test_return userdata_test(memcached_st *memc) +static test_return_t userdata_test(memcached_st *memc) { - void* foo; + void* foo= NULL; assert(memcached_set_user_data(memc, foo) == NULL); assert(memcached_get_user_data(memc) == foo); assert(memcached_set_user_data(memc, NULL) == foo); - + return TEST_SUCCESS; } -static test_return connection_test(memcached_st *memc) +static test_return_t connection_test(memcached_st *memc) { memcached_return rc; rc= memcached_server_add_with_weight(memc, "localhost", 0, 0); assert(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return error_test(memcached_st *memc) +static test_return_t error_test(memcached_st *memc) { memcached_return rc; - + uint32_t values[] = { 851992627U, 2337886783U, 3196981036U, 4001849190U, + 982370485U, 1263635348U, 4242906218U, 3829656100U, + 1891735253U, 334139633U, 2257084983U, 3088286104U, + 13199785U, 2542027183U, 1097051614U, 199566778U, + 2748246961U, 2465192557U, 1664094137U, 2405439045U, + 1842224848U, 692413798U, 3479807801U, 919913813U, + 4269430871U, 610793021U, 527273862U, 1437122909U, + 2300930706U, 2943759320U, 674306647U, 2400528935U, + 54481931U, 4186304426U, 1741088401U, 2979625118U, + 4159057246U, 3425930182U}; + + // You have updated the memcache_error messages but not updated docs/tests. + assert(MEMCACHED_MAXIMUM_RETURN == 38); for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++) { - printf("Error %d -> %s\n", rc, memcached_strerror(memc, rc)); + uint32_t hash_val; + const char *msg= memcached_strerror(memc, rc); + hash_val= memcached_generate_hash_value(msg, strlen(msg), + MEMCACHED_HASH_JENKINS); + assert(values[rc] == hash_val); } - return 0; + return TEST_SUCCESS; } -static test_return set_test(memcached_st *memc) +static test_return_t set_test(memcached_st *memc) { memcached_return rc; - char *key= "foo"; - char *value= "when we sanitize"; + const char *key= "foo"; + const char *value= "when we sanitize"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - return 0; + return TEST_SUCCESS; } -static test_return append_test(memcached_st *memc) +static test_return_t append_test(memcached_st *memc) { memcached_return rc; - char *key= "fig"; - char *value= "we"; + const char *key= "fig"; + const char *in_value= "we"; + char *out_value= NULL; size_t value_length; uint32_t flags; rc= memcached_flush(memc, 0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), + rc= memcached_set(memc, key, strlen(key), + in_value, strlen(in_value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_append(memc, key, strlen(key), + rc= memcached_append(memc, key, strlen(key), " the", strlen(" the"), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_append(memc, key, strlen(key), + rc= memcached_append(memc, key, strlen(key), " people", strlen(" people"), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - value= memcached_get(memc, key, strlen(key), + out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert(!memcmp(value, "we the people", strlen("we the people"))); + assert(!memcmp(out_value, "we the people", strlen("we the people"))); assert(strlen("we the people") == value_length); assert(rc == MEMCACHED_SUCCESS); - free(value); + free(out_value); - return 0; + return TEST_SUCCESS; } -static test_return append_binary_test(memcached_st *memc) +static test_return_t append_binary_test(memcached_st *memc) { memcached_return rc; - char *key= "numbers"; + const char *key= "numbers"; unsigned int *store_ptr; unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 }; char *value; @@ -360,16 +378,16 @@ static test_return append_binary_test(memcached_st *memc) rc= memcached_flush(memc, 0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_set(memc, - key, strlen(key), + rc= memcached_set(memc, + key, strlen(key), NULL, 0, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); for (x= 0; store_list[x] ; x++) { - rc= memcached_append(memc, - key, strlen(key), + rc= memcached_append(memc, + key, strlen(key), (char *)&store_list[x], sizeof(unsigned int), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); @@ -389,15 +407,15 @@ static test_return append_binary_test(memcached_st *memc) } free(value); - return 0; + return TEST_SUCCESS; } -static test_return cas2_test(memcached_st *memc) +static test_return_t cas2_test(memcached_st *memc) { memcached_return rc; - char *keys[]= {"fudge", "son", "food"}; + const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; - char *value= "we the people"; + const char *value= "we the people"; size_t value_length= strlen("we the people"); unsigned int x; memcached_result_st results_obj; @@ -411,7 +429,7 @@ static test_return cas2_test(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS); @@ -425,7 +443,7 @@ static test_return cas2_test(memcached_st *memc) assert(results); assert(results->cas); assert(rc == MEMCACHED_SUCCESS); - WATCHPOINT_ASSERT(memcached_result_cas(results)); + assert(memcached_result_cas(results)); assert(!memcmp(value, "we the people", strlen("we the people"))); assert(strlen("we the people") == value_length); @@ -433,16 +451,16 @@ static test_return cas2_test(memcached_st *memc) memcached_result_free(&results_obj); - return 0; + return TEST_SUCCESS; } -static test_return cas_test(memcached_st *memc) +static test_return_t cas_test(memcached_st *memc) { memcached_return rc; const char *key= "fun"; size_t key_length= strlen(key); const char *value= "we the people"; - char* keys[2] = { (char*)key, NULL }; + const char* keys[2] = { key, NULL }; size_t keylengths[2] = { strlen(key), 0 }; size_t value_length= strlen(value); const char *value2= "change the value"; @@ -457,7 +475,7 @@ static test_return cas_test(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); @@ -469,7 +487,7 @@ static test_return cas_test(memcached_st *memc) results= memcached_fetch_result(memc, &results_obj, &rc); assert(results); assert(rc == MEMCACHED_SUCCESS); - WATCHPOINT_ASSERT(memcached_result_cas(results)); + assert(memcached_result_cas(results)); assert(!memcmp(value, memcached_result_value(results), value_length)); assert(strlen(memcached_result_value(results)) == value_length); assert(rc == MEMCACHED_SUCCESS); @@ -480,7 +498,7 @@ static test_return cas_test(memcached_st *memc) assert(rc == MEMCACHED_END); assert(results == NULL); #endif - + rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); assert(rc == MEMCACHED_SUCCESS); @@ -493,64 +511,65 @@ static test_return cas_test(memcached_st *memc) memcached_result_free(&results_obj); - return 0; + return TEST_SUCCESS; } -static test_return prepend_test(memcached_st *memc) +static test_return_t prepend_test(memcached_st *memc) { memcached_return rc; - char *key= "fig"; - char *value= "people"; + const char *key= "fig"; + const char *value= "people"; + char *out_value= NULL; size_t value_length; uint32_t flags; rc= memcached_flush(memc, 0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_prepend(memc, key, strlen(key), + rc= memcached_prepend(memc, key, strlen(key), "the ", strlen("the "), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_prepend(memc, key, strlen(key), + rc= memcached_prepend(memc, key, strlen(key), "we ", strlen("we "), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - value= memcached_get(memc, key, strlen(key), + out_value= memcached_get(memc, key, strlen(key), &value_length, &flags, &rc); - assert(!memcmp(value, "we the people", strlen("we the people"))); + assert(!memcmp(out_value, "we the people", strlen("we the people"))); assert(strlen("we the people") == value_length); assert(rc == MEMCACHED_SUCCESS); - free(value); + free(out_value); - return 0; + return TEST_SUCCESS; } -/* +/* Set the value, then quit to make sure it is flushed. Come back in and test that add fails. */ -static test_return add_test(memcached_st *memc) +static test_return_t add_test(memcached_st *memc) { memcached_return rc; - char *key= "foo"; - char *value= "when we sanitize"; + const char *key= "foo"; + const char *value= "when we sanitize"; unsigned long long setting_value; setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); - rc= memcached_add(memc, key, strlen(key), + rc= memcached_add(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); @@ -560,7 +579,7 @@ static test_return add_test(memcached_st *memc) else assert(rc == MEMCACHED_NOTSTORED || rc == MEMCACHED_DATA_EXISTS); - return 0; + return TEST_SUCCESS; } /* @@ -570,47 +589,50 @@ static test_return add_test(memcached_st *memc) ** because the connects starts to time out (the test doesn't do much ** anyway, so just loop 10 iterations) */ -static test_return add_wrapper(memcached_st *memc) +static test_return_t add_wrapper(memcached_st *memc) { unsigned int x; unsigned int max= 10000; #ifdef __sun max= 10; #endif +#ifdef __APPLE__ + max= 10; +#endif for (x= 0; x < max; x++) add_test(memc); - return 0; + return TEST_SUCCESS; } -static test_return replace_test(memcached_st *memc) +static test_return_t replace_test(memcached_st *memc) { memcached_return rc; - char *key= "foo"; - char *value= "when we sanitize"; - char *original= "first we insert some data"; + const char *key= "foo"; + const char *value= "when we sanitize"; + const char *original= "first we insert some data"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), original, strlen(original), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - rc= memcached_replace(memc, key, strlen(key), + rc= memcached_replace(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return delete_test(memcached_st *memc) +static test_return_t delete_test(memcached_st *memc) { memcached_return rc; - char *key= "foo"; - char *value= "when we sanitize"; + const char *key= "foo"; + const char *value= "when we sanitize"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -618,21 +640,21 @@ static test_return delete_test(memcached_st *memc) rc= memcached_delete(memc, key, strlen(key), (time_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - return 0; + return TEST_SUCCESS; } -static test_return flush_test(memcached_st *memc) +static test_return_t flush_test(memcached_st *memc) { memcached_return rc; rc= memcached_flush(memc, 0); assert(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static memcached_return server_function(memcached_st *ptr __attribute__((unused)), - memcached_server_st *server __attribute__((unused)), +static memcached_return server_function(memcached_st *ptr __attribute__((unused)), + memcached_server_st *server __attribute__((unused)), void *context __attribute__((unused))) { /* Do Nothing */ @@ -640,63 +662,63 @@ static memcached_return server_function(memcached_st *ptr __attribute__((unused return MEMCACHED_SUCCESS; } -static test_return memcached_server_cursor_test(memcached_st *memc) +static test_return_t memcached_server_cursor_test(memcached_st *memc) { - char *context= "foo bad"; + char context[8]; + strcpy(context, "foo bad"); memcached_server_function callbacks[1]; callbacks[0]= server_function; memcached_server_cursor(memc, callbacks, context, 1); - - return 0; + return TEST_SUCCESS; } -static test_return bad_key_test(memcached_st *memc) +static test_return_t bad_key_test(memcached_st *memc) { memcached_return rc; - char *key= "foo bad"; + const char *key= "foo bad"; char *string; size_t string_length; uint32_t flags; - memcached_st *clone; + memcached_st *memc_clone; unsigned int set= 1; size_t max_keylen= 0xffff; - clone= memcached_clone(NULL, memc); - assert(clone); + memc_clone= memcached_clone(NULL, memc); + assert(memc_clone); - rc= memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); + rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); assert(rc == MEMCACHED_SUCCESS); /* All keys are valid in the binary protocol (except for length) */ - if (memcached_behavior_get(clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 0) + if (memcached_behavior_get(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 0) { - string= memcached_get(clone, key, strlen(key), + string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); assert(string_length == 0); assert(!string); set= 0; - rc= memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); + rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); assert(rc == MEMCACHED_SUCCESS); - string= memcached_get(clone, key, strlen(key), + string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); assert(rc == MEMCACHED_NOTFOUND); assert(string_length == 0); assert(!string); /* Test multi key for bad keys */ - char *keys[] = { "GoodKey", "Bad Key", "NotMine" }; + const char *keys[] = { "GoodKey", "Bad Key", "NotMine" }; size_t key_lengths[] = { 7, 7, 7 }; set= 1; - rc= memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); + rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); assert(rc == MEMCACHED_SUCCESS); - rc= memcached_mget(clone, keys, key_lengths, 3); + rc= memcached_mget(memc_clone, keys, key_lengths, 3); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); - rc= memcached_mget_by_key(clone, "foo daddy", 9, keys, key_lengths, 1); + rc= memcached_mget_by_key(memc_clone, "foo daddy", 9, keys, key_lengths, 1); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); max_keylen= 250; @@ -705,20 +727,20 @@ static test_return bad_key_test(memcached_st *memc) memcached server is updated to allow max size length of the keys in the binary protocol */ - rc= memcached_callback_set(clone, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); + rc= memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); assert(rc == MEMCACHED_SUCCESS); char *longkey= malloc(max_keylen + 1); - if (longkey != NULL) + if (longkey != NULL) { memset(longkey, 'a', max_keylen + 1); - string= memcached_get(clone, longkey, max_keylen, + string= memcached_get(memc_clone, longkey, max_keylen, &string_length, &flags, &rc); assert(rc == MEMCACHED_NOTFOUND); assert(string_length == 0); assert(!string); - string= memcached_get(clone, longkey, max_keylen + 1, + string= memcached_get(memc_clone, longkey, max_keylen + 1, &string_length, &flags, &rc); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); assert(string_length == 0); @@ -730,33 +752,33 @@ static test_return bad_key_test(memcached_st *memc) /* Make sure zero length keys are marked as bad */ set= 1; - rc= memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); + rc= memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_VERIFY_KEY, set); assert(rc == MEMCACHED_SUCCESS); - string= memcached_get(clone, key, 0, + string= memcached_get(memc_clone, key, 0, &string_length, &flags, &rc); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); assert(string_length == 0); assert(!string); - memcached_free(clone); + memcached_free(memc_clone); - return 0; + return TEST_SUCCESS; } #define READ_THROUGH_VALUE "set for me" static memcached_return read_through_trigger(memcached_st *memc __attribute__((unused)), - char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), + char *key __attribute__((unused)), + size_t key_length __attribute__((unused)), memcached_result_st *result) { - + return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE)); } -static test_return read_through(memcached_st *memc) +static test_return_t read_through(memcached_st *memc) { memcached_return rc; - char *key= "foo"; + const char *key= "foo"; char *string; size_t string_length; uint32_t flags; @@ -789,11 +811,11 @@ static test_return read_through(memcached_st *memc) assert(!strcmp(READ_THROUGH_VALUE, string)); free(string); - return 0; + return TEST_SUCCESS; } -static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused)), - const char *key, +static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused)), + const char *key, size_t key_length __attribute__((unused))) { assert(key); @@ -801,7 +823,7 @@ static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused) return MEMCACHED_SUCCESS; } -static test_return delete_through(memcached_st *memc) +static test_return_t delete_through(memcached_st *memc) { memcached_trigger_delete_key callback; memcached_return rc; @@ -811,13 +833,13 @@ static test_return delete_through(memcached_st *memc) rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback); assert(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return get_test(memcached_st *memc) +static test_return_t get_test(memcached_st *memc) { memcached_return rc; - char *key= "foo"; + const char *key= "foo"; char *string; size_t string_length; uint32_t flags; @@ -832,19 +854,19 @@ static test_return get_test(memcached_st *memc) assert(string_length == 0); assert(!string); - return 0; + return TEST_SUCCESS; } -static test_return get_test2(memcached_st *memc) +static test_return_t get_test2(memcached_st *memc) { memcached_return rc; - char *key= "foo"; - char *value= "when we sanitize"; + const char *key= "foo"; + const char *value= "when we sanitize"; char *string; size_t string_length; uint32_t flags; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -859,29 +881,29 @@ static test_return get_test2(memcached_st *memc) free(string); - return 0; + return TEST_SUCCESS; } -static test_return set_test2(memcached_st *memc) +static test_return_t set_test2(memcached_st *memc) { memcached_return rc; - char *key= "foo"; - char *value= "train in the brain"; + const char *key= "foo"; + const char *value= "train in the brain"; size_t value_length= strlen(value); unsigned int x; for (x= 0; x < 10; x++) { - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } - return 0; + return TEST_SUCCESS; } -static test_return set_test3(memcached_st *memc) +static test_return_t set_test3(memcached_st *memc) { memcached_return rc; char *value; @@ -901,7 +923,7 @@ static test_return set_test3(memcached_st *memc) sprintf(key, "foo%u", x); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -909,13 +931,13 @@ static test_return set_test3(memcached_st *memc) free(value); - return 0; + return TEST_SUCCESS; } -static test_return get_test3(memcached_st *memc) +static test_return_t get_test3(memcached_st *memc) { memcached_return rc; - char *key= "foo"; + const char *key= "foo"; char *value; size_t value_length= 8191; char *string; @@ -929,7 +951,7 @@ static test_return get_test3(memcached_st *memc) for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -945,13 +967,13 @@ static test_return get_test3(memcached_st *memc) free(string); free(value); - return 0; + return TEST_SUCCESS; } -static test_return get_test4(memcached_st *memc) +static test_return_t get_test4(memcached_st *memc) { memcached_return rc; - char *key= "foo"; + const char *key= "foo"; char *value; size_t value_length= 8191; char *string; @@ -965,7 +987,7 @@ static test_return get_test4(memcached_st *memc) for (x= 0; x < value_length; x++) value[x] = (char) (x % 127); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, value_length, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -984,7 +1006,7 @@ static test_return get_test4(memcached_st *memc) free(value); - return 0; + return TEST_SUCCESS; } /* @@ -992,18 +1014,18 @@ static test_return get_test4(memcached_st *memc) * dereference a NIL-pointer if you issue a multi-get and don't read out all * responses before you execute a storage command. */ -static test_return get_test5(memcached_st *memc) +static test_return_t get_test5(memcached_st *memc) { /* ** Request the same key twice, to ensure that we hash to the same server ** (so that we have multiple response values queued up) ;-) */ - char *keys[]= { "key", "key" }; + const char *keys[]= { "key", "key" }; size_t lengths[]= { 3, 3 }; uint32_t flags; size_t rlen; - memcached_return rc= memcached_set(memc, keys[0], lengths[0], + memcached_return rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); assert(rc == MEMCACHED_SUCCESS); rc= memcached_mget(memc, keys, lengths, 2); @@ -1032,26 +1054,90 @@ static test_return get_test5(memcached_st *memc) return TEST_SUCCESS; } +static test_return_t mget_end(memcached_st *memc) +{ + const char *keys[]= { "foo", "foo2" }; + size_t lengths[]= { 3, 4 }; + const char *values[]= { "fjord", "41" }; + + memcached_return rc; + + // Set foo and foo2 + for (int i= 0; i < 2; i++) + { + rc= memcached_set(memc, keys[i], lengths[i], values[i], strlen(values[i]), + (time_t)0, (uint32_t)0); + assert(rc == MEMCACHED_SUCCESS); + } + + char *string; + size_t string_length; + uint32_t flags; + + // retrieve both via mget + rc= memcached_mget(memc, keys, lengths, 2); + assert(rc == MEMCACHED_SUCCESS); + + char key[MEMCACHED_MAX_KEY]; + size_t key_length; + + // this should get both + for (int i = 0; i < 2; i++) + { + string= memcached_fetch(memc, key, &key_length, &string_length, + &flags, &rc); + assert(rc == MEMCACHED_SUCCESS); + int val = 0; + if (key_length == 4) + val= 1; + assert(string_length == strlen(values[val])); + assert(strncmp(values[val], string, string_length) == 0); + free(string); + } + + // this should indicate end + string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); + assert(rc == MEMCACHED_END); + + // now get just one + rc= memcached_mget(memc, keys, lengths, 1); + assert(rc == MEMCACHED_SUCCESS); + + string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); + assert(key_length == lengths[0]); + assert(strncmp(keys[0], key, key_length) == 0); + assert(string_length == strlen(values[0])); + assert(strncmp(values[0], string, string_length) == 0); + assert(rc == MEMCACHED_SUCCESS); + free(string); + + // this should indicate end + string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); + assert(rc == MEMCACHED_END); + + return TEST_SUCCESS; +} + /* Do not copy the style of this code, I just access hosts to testthis function */ -static test_return stats_servername_test(memcached_st *memc) +static test_return_t stats_servername_test(memcached_st *memc) { memcached_return rc; - memcached_stat_st stat; - rc= memcached_stat_servername(&stat, NULL, - memc->hosts[0].hostname, + memcached_stat_st memc_stat; + rc= memcached_stat_servername(&memc_stat, NULL, + memc->hosts[0].hostname, memc->hosts[0].port); - return 0; + return TEST_SUCCESS; } -static test_return increment_test(memcached_st *memc) +static test_return_t increment_test(memcached_st *memc) { uint64_t new_number; memcached_return rc; - char *key= "number"; - char *value= "0"; + const char *key= "number"; + const char *value= "0"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -1066,16 +1152,16 @@ static test_return increment_test(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); assert(new_number == 2); - return 0; + return TEST_SUCCESS; } -static test_return increment_with_initial_test(memcached_st *memc) +static test_return_t increment_with_initial_test(memcached_st *memc) { if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; memcached_return rc; - char *key= "number"; + const char *key= "number"; uint64_t initial= 0; rc= memcached_increment_with_initial(memc, key, strlen(key), @@ -1088,17 +1174,17 @@ static test_return increment_with_initial_test(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); assert(new_number == (initial + 1)); } - return 0; + return TEST_SUCCESS; } -static test_return decrement_test(memcached_st *memc) +static test_return_t decrement_test(memcached_st *memc) { uint64_t new_number; memcached_return rc; - char *key= "number"; - char *value= "3"; + const char *key= "number"; + const char *value= "3"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -1113,16 +1199,16 @@ static test_return decrement_test(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); assert(new_number == 1); - return 0; + return TEST_SUCCESS; } -static test_return decrement_with_initial_test(memcached_st *memc) +static test_return_t decrement_with_initial_test(memcached_st *memc) { if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) { uint64_t new_number; memcached_return rc; - char *key= "number"; + const char *key= "number"; uint64_t initial= 3; rc= memcached_decrement_with_initial(memc, key, strlen(key), @@ -1135,33 +1221,33 @@ static test_return decrement_with_initial_test(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); assert(new_number == (initial - 1)); } - return 0; + return TEST_SUCCESS; } -static test_return quit_test(memcached_st *memc) +static test_return_t quit_test(memcached_st *memc) { memcached_return rc; - char *key= "fudge"; - char *value= "sanford and sun"; + const char *key= "fudge"; + const char *value= "sanford and sun"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)10, (uint32_t)3); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); memcached_quit(memc); - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - return 0; + return TEST_SUCCESS; } -static test_return mget_result_test(memcached_st *memc) +static test_return_t mget_result_test(memcached_st *memc) { memcached_return rc; - char *keys[]= {"fudge", "son", "food"}; + const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1190,7 +1276,7 @@ static test_return mget_result_test(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -1205,20 +1291,20 @@ static test_return mget_result_test(memcached_st *memc) assert(&results_obj == results); assert(rc == MEMCACHED_SUCCESS); assert(memcached_result_key_length(results) == memcached_result_length(results)); - assert(!memcmp(memcached_result_key_value(results), - memcached_result_value(results), + assert(!memcmp(memcached_result_key_value(results), + memcached_result_value(results), memcached_result_length(results))); } memcached_result_free(&results_obj); - return 0; + return TEST_SUCCESS; } -static test_return mget_result_alloc_test(memcached_st *memc) +static test_return_t mget_result_alloc_test(memcached_st *memc) { memcached_return rc; - char *keys[]= {"fudge", "son", "food"}; + const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; @@ -1240,7 +1326,7 @@ static test_return mget_result_alloc_test(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -1255,19 +1341,19 @@ static test_return mget_result_alloc_test(memcached_st *memc) assert(results); assert(rc == MEMCACHED_SUCCESS); assert(memcached_result_key_length(results) == memcached_result_length(results)); - assert(!memcmp(memcached_result_key_value(results), - memcached_result_value(results), + assert(!memcmp(memcached_result_key_value(results), + memcached_result_value(results), memcached_result_length(results))); memcached_result_free(results); x++; } - return 0; + return TEST_SUCCESS; } /* Count the results */ -static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)), - memcached_result_st *result __attribute__((unused)), +static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)), + memcached_result_st *result __attribute__((unused)), void *context) { unsigned int *counter= (unsigned int *)context; @@ -1277,10 +1363,10 @@ static memcached_return callback_counter(memcached_st *ptr __attribute__((unused return MEMCACHED_SUCCESS; } -static test_return mget_result_function(memcached_st *memc) +static test_return_t mget_result_function(memcached_st *memc) { memcached_return rc; - char *keys[]= {"fudge", "son", "food"}; + const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; unsigned int counter; @@ -1290,7 +1376,7 @@ static test_return mget_result_function(memcached_st *memc) rc= memcached_flush(memc, 0); for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -1301,17 +1387,17 @@ static test_return mget_result_function(memcached_st *memc) callbacks[0]= &callback_counter; counter= 0; - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); assert(counter == 3); - return 0; + return TEST_SUCCESS; } -static test_return mget_test(memcached_st *memc) +static test_return_t mget_test(memcached_st *memc) { memcached_return rc; - char *keys[]= {"fudge", "son", "food"}; + const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; uint32_t flags; @@ -1328,7 +1414,7 @@ static test_return mget_test(memcached_st *memc) rc= memcached_mget(memc, keys, key_length, 3); assert(rc == MEMCACHED_SUCCESS); - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { assert(return_value); @@ -1339,7 +1425,7 @@ static test_return mget_test(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -1349,7 +1435,7 @@ static test_return mget_test(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); x= 0; - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { assert(return_value); @@ -1360,17 +1446,81 @@ static test_return mget_test(memcached_st *memc) x++; } - return 0; + return TEST_SUCCESS; +} + +static test_return_t mget_execute(memcached_st *memc) +{ + bool binary= false; + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) + binary= true; + + /* + * I only want to hit _one_ server so I know the number of requests I'm + * sending in the pipeline. + */ + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + + int max_keys= binary ? 20480 : 1; + + + char **keys= calloc((size_t)max_keys, sizeof(char*)); + size_t *key_length=calloc((size_t)max_keys, sizeof(size_t)); + + /* First add all of the items.. */ + char blob[1024] = {0}; + memcached_return rc; + for (int x= 0; x < max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + keys[x]= strdup(k); + assert(keys[x] != NULL); + rc= memcached_add(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 */ + unsigned int 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); + + if (binary) + { + assert(rc == MEMCACHED_SUCCESS); + + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + assert(rc == MEMCACHED_END); + + /* Verify that we got all of the items */ + assert(counter == (unsigned int)max_keys); + } + else + { + assert(rc == MEMCACHED_NOT_SUPPORTED); + assert(counter == 0); + } + + /* Release all allocated resources */ + for (int x= 0; x < max_keys; ++x) + free(keys[x]); + free(keys); + free(key_length); + + memc->number_of_hosts= number_of_hosts; + return TEST_SUCCESS; } -static test_return get_stats_keys(memcached_st *memc) +static test_return_t get_stats_keys(memcached_st *memc) { char **list; char **ptr; - memcached_stat_st stat; + memcached_stat_st memc_stat; memcached_return rc; - list= memcached_stat_get_keys(memc, &stat, &rc); + list= memcached_stat_get_keys(memc, &memc_stat, &rc); assert(rc == MEMCACHED_SUCCESS); for (ptr= list; *ptr; ptr++) assert(*ptr); @@ -1378,10 +1528,10 @@ static test_return get_stats_keys(memcached_st *memc) free(list); - return 0; + return TEST_SUCCESS; } -static test_return version_string_test(memcached_st *memc __attribute__((unused))) +static test_return_t version_string_test(memcached_st *memc __attribute__((unused))) { const char *version_string; @@ -1389,38 +1539,38 @@ static test_return version_string_test(memcached_st *memc __attribute__((unused assert(!strcmp(version_string, LIBMEMCACHED_VERSION_STRING)); - return 0; + return TEST_SUCCESS; } -static test_return get_stats(memcached_st *memc) +static test_return_t get_stats(memcached_st *memc) { unsigned int x; char **list; char **ptr; memcached_return rc; - memcached_stat_st *stat; + memcached_stat_st *memc_stat; - stat= memcached_stat(memc, NULL, &rc); + memc_stat= memcached_stat(memc, NULL, &rc); assert(rc == MEMCACHED_SUCCESS); assert(rc == MEMCACHED_SUCCESS); - assert(stat); + assert(memc_stat); for (x= 0; x < memcached_server_count(memc); x++) { - list= memcached_stat_get_keys(memc, stat+x, &rc); + list= memcached_stat_get_keys(memc, memc_stat+x, &rc); assert(rc == MEMCACHED_SUCCESS); for (ptr= list; *ptr; ptr++); free(list); } - memcached_stat_free(NULL, stat); + memcached_stat_free(NULL, memc_stat); - return 0; + return TEST_SUCCESS; } -static test_return add_host_test(memcached_st *memc) +static test_return_t add_host_test(memcached_st *memc) { unsigned int x; memcached_server_st *servers; @@ -1436,7 +1586,7 @@ static test_return add_host_test(memcached_st *memc) char buffer[SMALL_STRING_LEN]; snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); - servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, + servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); assert(rc == MEMCACHED_SUCCESS); assert(x == memcached_server_list_count(servers)); @@ -1449,10 +1599,10 @@ static test_return add_host_test(memcached_st *memc) memcached_server_list_free(servers); - return 0; + return TEST_SUCCESS; } -static memcached_return clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *clone __attribute__((unused))) +static memcached_return clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused))) { return MEMCACHED_SUCCESS; } @@ -1462,7 +1612,7 @@ static memcached_return cleanup_test_callback(memcached_st *ptr __attribute__(( return MEMCACHED_SUCCESS; } -static test_return callback_test(memcached_st *memc) +static test_return_t callback_test(memcached_st *memc) { /* Test User Data */ { @@ -1505,11 +1655,11 @@ static test_return callback_test(memcached_st *memc) assert(temp_function == cleanup_cb_ptr); } - return 0; + return TEST_SUCCESS; } /* We don't test the behavior itself, we test the switches */ -static test_return behavior_test(memcached_st *memc) +static test_return_t behavior_test(memcached_st *memc) { uint64_t value; uint32_t set= 1; @@ -1556,11 +1706,31 @@ static test_return behavior_test(memcached_st *memc) value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, value + 1); assert((value + 1) == memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS)); - return 0; + return TEST_SUCCESS; +} + +static test_return_t fetch_all_results(memcached_st *memc) +{ + memcached_return rc= MEMCACHED_SUCCESS; + char return_key[MEMCACHED_MAX_KEY]; + size_t return_key_length; + char *return_value; + size_t return_value_length; + uint32_t flags; + + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + &return_value_length, &flags, &rc))) + { + assert(return_value); + assert(rc == MEMCACHED_SUCCESS); + free(return_value); + } + + return ((rc == MEMCACHED_END) || (rc == MEMCACHED_SUCCESS)) ? TEST_SUCCESS : TEST_FAILURE; } /* Test case provided by Cal Haldenbrand */ -static test_return user_supplied_bug1(memcached_st *memc) +static test_return_t user_supplied_bug1(memcached_st *memc) { unsigned int setter= 1; unsigned int x; @@ -1568,7 +1738,7 @@ static test_return user_supplied_bug1(memcached_st *memc) unsigned long long total= 0; uint32_t size= 0; char key[10]; - char randomstuff[6 * 1024]; + char randomstuff[6 * 1024]; memcached_return rc; memset(randomstuff, 0, 6 * 1024); @@ -1585,30 +1755,30 @@ static test_return user_supplied_bug1(memcached_st *memc) { unsigned int j= 0; - size= (rand() % ( 5 * 1024 ) ) + 400; + size= (uint32_t)(rand() % ( 5 * 1024 ) ) + 400; memset(randomstuff, 0, 6 * 1024); assert(size < 6 * 1024); /* Being safe here */ - for (j= 0 ; j < size ;j++) - randomstuff[j] = (char) (rand() % 26) + 97; + for (j= 0 ; j < size ;j++) + randomstuff[j] = (signed char) ((rand() % 26) + 97); total += size; sprintf(key, "%d", x); - rc = memcached_set(memc, key, strlen(key), + rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); /* If we fail, lets try again */ if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_BUFFERED) - rc = memcached_set(memc, key, strlen(key), + rc = memcached_set(memc, key, strlen(key), randomstuff, strlen(randomstuff), 10, 0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } - return 0; + return TEST_SUCCESS; } /* Test case provided by Cal Haldenbrand */ -static test_return user_supplied_bug2(memcached_st *memc) +static test_return_t user_supplied_bug2(memcached_st *memc) { int errors; unsigned int setter; @@ -1641,15 +1811,14 @@ static test_return user_supplied_bug2(memcached_st *memc) snprintf(buffer, SMALL_STRING_LEN, "%u", x); getval= memcached_get(memc, buffer, strlen(buffer), - &val_len, &flags, &rc); - if (rc != MEMCACHED_SUCCESS) + &val_len, &flags, &rc); + if (rc != MEMCACHED_SUCCESS) { if (rc == MEMCACHED_NOTFOUND) errors++; else { - WATCHPOINT_ERROR(rc); - assert(0); + assert(rc); } continue; @@ -1659,12 +1828,12 @@ static test_return user_supplied_bug2(memcached_st *memc) free(getval); } - return 0; + return TEST_SUCCESS; } /* Do a large mget() over all the keys we think exist */ #define KEY_COUNT 3000 // * 1024576 -static test_return user_supplied_bug3(memcached_st *memc) +static test_return_t user_supplied_bug3(memcached_st *memc) { memcached_return rc; unsigned int setter; @@ -1684,9 +1853,8 @@ static test_return user_supplied_bug3(memcached_st *memc) getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); #endif - keys= (char **)malloc(sizeof(char *) * KEY_COUNT); + keys= calloc(KEY_COUNT, sizeof(char *)); assert(keys); - memset(keys, 0, (sizeof(char *) * KEY_COUNT)); for (x= 0; x < KEY_COUNT; x++) { char buffer[30]; @@ -1696,38 +1864,23 @@ static test_return user_supplied_bug3(memcached_st *memc) key_lengths[x]= strlen(keys[x]); } - rc= memcached_mget(memc, keys, key_lengths, KEY_COUNT); + rc= memcached_mget(memc, (const char **)keys, key_lengths, KEY_COUNT); assert(rc == MEMCACHED_SUCCESS); - /* Turn this into a help function */ - { - char return_key[MEMCACHED_MAX_KEY]; - size_t return_key_length; - char *return_value; - size_t return_value_length; - uint32_t flags; - - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, - &return_value_length, &flags, &rc))) - { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - free(return_value); - } - } + assert(fetch_all_results(memc) == TEST_SUCCESS); for (x= 0; x < KEY_COUNT; x++) free(keys[x]); free(keys); - return 0; + return TEST_SUCCESS; } /* Make sure we behave properly if server list has no values */ -static test_return user_supplied_bug4(memcached_st *memc) +static test_return_t user_supplied_bug4(memcached_st *memc) { memcached_return rc; - char *keys[]= {"fudge", "son", "food"}; + const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; unsigned int x; uint32_t flags; @@ -1751,7 +1904,7 @@ static test_return user_supplied_bug4(memcached_st *memc) rc= memcached_mget(memc, keys, key_length, 3); assert(rc == MEMCACHED_NO_SERVERS); - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { assert(return_value); @@ -1762,7 +1915,7 @@ static test_return user_supplied_bug4(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_NO_SERVERS); @@ -1772,7 +1925,7 @@ static test_return user_supplied_bug4(memcached_st *memc) assert(rc == MEMCACHED_NO_SERVERS); x= 0; - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { assert(return_value); @@ -1783,14 +1936,14 @@ static test_return user_supplied_bug4(memcached_st *memc) x++; } - return 0; + return TEST_SUCCESS; } #define VALUE_SIZE_BUG5 1048064 -static test_return user_supplied_bug5(memcached_st *memc) +static test_return_t user_supplied_bug5(memcached_st *memc) { memcached_return rc; - char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; + const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; char return_key[MEMCACHED_MAX_KEY]; size_t return_key_length; @@ -1802,23 +1955,23 @@ static test_return user_supplied_bug5(memcached_st *memc) char insert_data[VALUE_SIZE_BUG5]; for (x= 0; x < VALUE_SIZE_BUG5; x++) - insert_data[x]= rand(); + insert_data[x]= (signed char)rand(); memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(value == NULL); rc= memcached_mget(memc, keys, key_length, 4); count= 0; - while ((value= memcached_fetch(memc, return_key, &return_key_length, + while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; assert(count == 0); for (x= 0; x < 4; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); @@ -1827,13 +1980,13 @@ static test_return user_supplied_bug5(memcached_st *memc) for (x= 0; x < 10; x++) { value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(value); free(value); rc= memcached_mget(memc, keys, key_length, 4); count= 0; - while ((value= memcached_fetch(memc, return_key, &return_key_length, + while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) { count++; @@ -1842,13 +1995,13 @@ static test_return user_supplied_bug5(memcached_st *memc) assert(count == 4); } - return 0; + return TEST_SUCCESS; } -static test_return user_supplied_bug6(memcached_st *memc) +static test_return_t user_supplied_bug6(memcached_st *memc) { memcached_return rc; - char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; + const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; char return_key[MEMCACHED_MAX_KEY]; size_t return_key_length; @@ -1860,18 +2013,18 @@ static test_return user_supplied_bug6(memcached_st *memc) char insert_data[VALUE_SIZE_BUG5]; for (x= 0; x < VALUE_SIZE_BUG5; x++) - insert_data[x]= rand(); + insert_data[x]= (signed char)rand(); memcached_flush(memc, 0); value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(value == NULL); assert(rc == MEMCACHED_NOTFOUND); rc= memcached_mget(memc, keys, key_length, 4); assert(rc == MEMCACHED_SUCCESS); count= 0; - while ((value= memcached_fetch(memc, return_key, &return_key_length, + while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) count++; assert(count == 0); @@ -1879,7 +2032,7 @@ static test_return user_supplied_bug6(memcached_st *memc) for (x= 0; x < 4; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS); @@ -1888,7 +2041,7 @@ static test_return user_supplied_bug6(memcached_st *memc) for (x= 0; x < 2; x++) { value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(value); free(value); @@ -1898,7 +2051,7 @@ static test_return user_supplied_bug6(memcached_st *memc) /* We test for purge of partial complete fetches */ for (count= 3; count; count--) { - value= memcached_fetch(memc, return_key, &return_key_length, + value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); assert(rc == MEMCACHED_SUCCESS); assert(!(memcmp(value, insert_data, value_length))); @@ -1907,17 +2060,17 @@ static test_return user_supplied_bug6(memcached_st *memc) } } - return 0; + return TEST_SUCCESS; } -static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused))) +static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused))) { memcached_return rc; memcached_st *mine; - memcached_st *clone; + memcached_st *memc_clone; memcached_server_st *servers; - 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"; + const char *server_list= "memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214"; servers= memcached_servers_parse(server_list); assert(servers); @@ -1928,24 +2081,24 @@ static test_return user_supplied_bug8(memcached_st *memc __attribute__((unused) memcached_server_list_free(servers); assert(mine); - clone= memcached_clone(NULL, mine); + memc_clone= memcached_clone(NULL, mine); memcached_quit(mine); - memcached_quit(clone); + memcached_quit(memc_clone); memcached_free(mine); - memcached_free(clone); + memcached_free(memc_clone); - return 0; + return TEST_SUCCESS; } /* Test flag store/retrieve */ -static test_return user_supplied_bug7(memcached_st *memc) +static test_return_t user_supplied_bug7(memcached_st *memc) { memcached_return rc; - char *keys= "036790384900"; - size_t key_length= strlen("036790384900"); + const char *keys= "036790384900"; + size_t key_length= strlen(keys); char return_key[MEMCACHED_MAX_KEY]; size_t return_key_length; char *value; @@ -1955,19 +2108,19 @@ static test_return user_supplied_bug7(memcached_st *memc) char insert_data[VALUE_SIZE_BUG5]; for (x= 0; x < VALUE_SIZE_BUG5; x++) - insert_data[x]= rand(); + insert_data[x]= (signed char)rand(); memcached_flush(memc, 0); flags= 245; - rc= memcached_set(memc, keys, key_length, + rc= memcached_set(memc, keys, key_length, insert_data, VALUE_SIZE_BUG5, (time_t)0, flags); assert(rc == MEMCACHED_SUCCESS); flags= 0; value= memcached_get(memc, keys, key_length, - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(flags == 245); assert(value); free(value); @@ -1975,20 +2128,20 @@ static test_return user_supplied_bug7(memcached_st *memc) rc= memcached_mget(memc, &keys, &key_length, 1); flags= 0; - value= memcached_fetch(memc, return_key, &return_key_length, + value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); assert(flags == 245); assert(value); free(value); - return 0; + return TEST_SUCCESS; } -static test_return user_supplied_bug9(memcached_st *memc) +static test_return_t user_supplied_bug9(memcached_st *memc) { memcached_return rc; - char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"}; + const char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"}; size_t key_length[3]; unsigned int x; uint32_t flags; @@ -2007,7 +2160,7 @@ static test_return user_supplied_bug9(memcached_st *memc) for (x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], + rc= memcached_set(memc, keys[x], key_length[x], keys[x], key_length[x], (time_t)50, (uint32_t)9); assert(rc == MEMCACHED_SUCCESS); @@ -2017,7 +2170,7 @@ static test_return user_supplied_bug9(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); /* We need to empty the server before continueing test */ - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc)) != NULL) { assert(return_value); @@ -2026,17 +2179,17 @@ static test_return user_supplied_bug9(memcached_st *memc) } assert(count == 3); - return 0; + return TEST_SUCCESS; } /* We are testing with aggressive timeout to get failures */ -static test_return user_supplied_bug10(memcached_st *memc) +static test_return_t user_supplied_bug10(memcached_st *memc) { - char *key= "foo"; + const char *key= "foo"; char *value; size_t value_length= 512; unsigned int x; - int key_len= 3; + size_t key_len= 3; memcached_return rc; unsigned int set= 1; memcached_st *mclone= memcached_clone(NULL, memc); @@ -2045,7 +2198,8 @@ static test_return user_supplied_bug10(memcached_st *memc) memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, set); memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); timeout= 2; - memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout); + memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, + (uint64_t)timeout); value = (char*)malloc(value_length * sizeof(char)); @@ -2056,7 +2210,7 @@ static test_return user_supplied_bug10(memcached_st *memc) { rc= memcached_set(mclone, key, key_len,value, value_length, 0, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT); if (rc == MEMCACHED_WRITE_FAILURE || rc == MEMCACHED_TIMEOUT) @@ -2066,19 +2220,19 @@ static test_return user_supplied_bug10(memcached_st *memc) free(value); memcached_free(mclone); - return 0; + return TEST_SUCCESS; } /* We are looking failures in the async protocol */ -static test_return user_supplied_bug11(memcached_st *memc) +static test_return_t user_supplied_bug11(memcached_st *memc) { - char *key= "foo"; + const char *key= "foo"; char *value; size_t value_length= 512; unsigned int x; - int key_len= 3; + size_t key_len= 3; memcached_return rc; unsigned int set= 1; int32_t timeout; @@ -2087,7 +2241,8 @@ static test_return user_supplied_bug11(memcached_st *memc) memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, set); memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); timeout= -1; - memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout); + memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, + (size_t)timeout); timeout= (int32_t)memcached_behavior_get(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); @@ -2106,13 +2261,13 @@ static test_return user_supplied_bug11(memcached_st *memc) free(value); memcached_free(mclone); - return 0; + return TEST_SUCCESS; } /* Bug found where incr was not returning MEMCACHED_NOTFOUND when object did not exist. */ -static test_return user_supplied_bug12(memcached_st *memc) +static test_return_t user_supplied_bug12(memcached_st *memc) { memcached_return rc; uint32_t flags; @@ -2121,7 +2276,7 @@ static test_return user_supplied_bug12(memcached_st *memc) uint64_t number_value; value= memcached_get(memc, "autoincrement", strlen("autoincrement"), - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(value == NULL); assert(rc == MEMCACHED_NOTFOUND); @@ -2130,7 +2285,7 @@ static test_return user_supplied_bug12(memcached_st *memc) assert(value == NULL); /* The binary protocol will set the key if it doesn't exist */ - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1) + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1) assert(rc == MEMCACHED_SUCCESS); else assert(rc == MEMCACHED_NOTFOUND); @@ -2138,7 +2293,7 @@ static test_return user_supplied_bug12(memcached_st *memc) rc= memcached_set(memc, "autoincrement", strlen("autoincrement"), "1", 1, 0, 0); value= memcached_get(memc, "autoincrement", strlen("autoincrement"), - &value_length, &flags, &rc); + &value_length, &flags, &rc); assert(value); assert(rc == MEMCACHED_SUCCESS); free(value); @@ -2148,14 +2303,14 @@ static test_return user_supplied_bug12(memcached_st *memc) assert(number_value == 2); assert(rc == MEMCACHED_SUCCESS); - return 0; + return TEST_SUCCESS; } /* Bug found where command total one more than MEMCACHED_MAX_BUFFER set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169 */ -static test_return user_supplied_bug13(memcached_st *memc) +static test_return_t user_supplied_bug13(memcached_st *memc) { char key[] = "key34567890"; char *overflow; @@ -2183,7 +2338,7 @@ static test_return user_supplied_bug13(memcached_st *memc) free(overflow); } - return 0; + return TEST_SUCCESS; } @@ -2193,12 +2348,12 @@ static test_return user_supplied_bug13(memcached_st *memc) set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169 */ -static test_return user_supplied_bug14(memcached_st *memc) +static test_return_t user_supplied_bug14(memcached_st *memc) { - int setter= 1; + size_t setter= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter); memcached_return rc; - char *key= "foo"; + const char *key= "foo"; char *value; size_t value_length= 18000; char *string; @@ -2215,7 +2370,7 @@ static test_return user_supplied_bug14(memcached_st *memc) for (current_length= 0; current_length < value_length; current_length++) { - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), value, current_length, (time_t)0, (uint32_t)0); assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); @@ -2232,24 +2387,24 @@ static test_return user_supplied_bug14(memcached_st *memc) free(value); - return 0; + return TEST_SUCCESS; } /* Look for zero length value problems */ -static test_return user_supplied_bug15(memcached_st *memc) +static test_return_t user_supplied_bug15(memcached_st *memc) { uint32_t x; memcached_return rc; - char *key= "mykey"; + const char *key= "mykey"; char *value; size_t length; uint32_t flags; for (x= 0; x < 2; x++) { - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), NULL, 0, (time_t)0, (uint32_t)0); @@ -2272,19 +2427,19 @@ static test_return user_supplied_bug15(memcached_st *memc) assert(flags == 0); } - return 0; + return TEST_SUCCESS; } /* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */ -static test_return user_supplied_bug16(memcached_st *memc) +static test_return_t user_supplied_bug16(memcached_st *memc) { memcached_return rc; - char *key= "mykey"; + const char *key= "mykey"; char *value; size_t length; uint32_t flags; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, key, strlen(key), NULL, 0, (time_t)0, UINT32_MAX); @@ -2298,15 +2453,16 @@ static test_return user_supplied_bug16(memcached_st *memc) assert(length == 0); assert(flags == UINT32_MAX); - return 0; + return TEST_SUCCESS; } +#ifndef __sun /* Check the validity of chinese key*/ -static test_return user_supplied_bug17(memcached_st *memc) +static test_return_t user_supplied_bug17(memcached_st *memc) { memcached_return rc; - char *key= "豆瓣"; - char *value="我们在炎热抑郁的夏天无法停止豆瓣"; + const char *key= "豆瓣"; + const char *value="我们在炎热抑郁的夏天无法停止豆瓣"; char *value2; size_t length; uint32_t flags; @@ -2325,14 +2481,15 @@ static test_return user_supplied_bug17(memcached_st *memc) assert(memcmp(value, value2, length)==0); free(value2); - return 0; + return TEST_SUCCESS; } +#endif /* From Andrei on IRC */ -static test_return user_supplied_bug19(memcached_st *memc) +static test_return_t user_supplied_bug19(memcached_st *memc) { memcached_st *m; memcached_server_st *s; @@ -2349,17 +2506,17 @@ static test_return user_supplied_bug19(memcached_st *memc) memcached_free(m); - return 0; + return TEST_SUCCESS; } /* CAS test from Andei */ -static test_return user_supplied_bug20(memcached_st *memc) +static test_return_t user_supplied_bug20(memcached_st *memc) { memcached_return status; memcached_result_st *result, result_obj; - char *key = "abc"; + const char *key = "abc"; size_t key_len = strlen("abc"); - char *value = "foobar"; + const char *value = "foobar"; size_t value_len = strlen(value); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, 1); @@ -2381,14 +2538,14 @@ static test_return user_supplied_bug20(memcached_st *memc) memcached_result_free(result); - return 0; + return TEST_SUCCESS; } #include "ketama_test_cases.h" -static test_return user_supplied_bug18(memcached_st *trash) +static test_return_t user_supplied_bug18(memcached_st *trash) { memcached_return rc; - int value; + uint64_t value; int x; memcached_server_st *server_pool; memcached_st *memc; @@ -2397,7 +2554,7 @@ static test_return user_supplied_bug18(memcached_st *trash) memc= memcached_create(NULL); assert(memc); - + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); assert(rc == MEMCACHED_SUCCESS); @@ -2412,7 +2569,7 @@ static test_return user_supplied_bug18(memcached_st *trash) server_pool = memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); memcached_server_push(memc, server_pool); - + /* verify that the server list was parsed okay. */ assert(memc->number_of_hosts == 8); assert(strcmp(server_pool[0].hostname, "10.0.1.1") == 0); @@ -2441,10 +2598,96 @@ static test_return user_supplied_bug18(memcached_st *trash) memcached_server_list_free(server_pool); memcached_free(memc); - return 0; + return TEST_SUCCESS; +} + +/* Large mget() of missing keys with binary proto + * + * If many binary quiet commands (such as getq's in an mget) fill the output + * buffer and the server chooses not to respond, memcached_flush hangs. See + * http://lists.tangent.org/pipermail/libmemcached/2009-August/000918.html + */ + +/* sighandler_t function that always asserts false */ +static void fail(int unused __attribute__((unused))) +{ + assert(0); +} + + +static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) +{ + memcached_return rc; + unsigned int x; + char **keys; + size_t* key_lengths; + void (*oldalarm)(int); + memcached_st *memc_clone; + + memc_clone= memcached_clone(NULL, memc); + assert(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); + assert(rc == MEMCACHED_SUCCESS); + + key_lengths= calloc(key_count, sizeof(size_t)); + keys= calloc(key_count, sizeof(char *)); + assert(keys); + for (x= 0; x < key_count; x++) + { + char buffer[30]; + + snprintf(buffer, 30, "%u", x); + keys[x]= strdup(buffer); + key_lengths[x]= strlen(keys[x]); + } + + oldalarm= signal(SIGALRM, fail); + alarm(5); + + rc= memcached_mget(memc_clone, (const char **)keys, key_lengths, key_count); + assert(rc == MEMCACHED_SUCCESS); + + alarm(0); + signal(SIGALRM, oldalarm); + + assert(fetch_all_results(memc) == TEST_SUCCESS); + + for (x= 0; x < key_count; x++) + free(keys[x]); + free(keys); + free(key_lengths); + + memcached_free(memc_clone); + + return TEST_SUCCESS; +} + +static memcached_return pre_binary(memcached_st *memc); + +static test_return_t user_supplied_bug21(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + test_return_t rc; + + /* should work as of r580 */ + rc= _user_supplied_bug21(memc, 10); + assert(rc == TEST_SUCCESS); + + /* should fail as of r580 */ + rc= _user_supplied_bug21(memc, 1000); + assert(rc == TEST_SUCCESS); + + return TEST_SUCCESS; } -static test_return auto_eject_hosts(memcached_st *trash) +static test_return_t auto_eject_hosts(memcached_st *trash) { (void) trash; @@ -2513,7 +2756,7 @@ static test_return auto_eject_hosts(memcached_st *trash) return TEST_SUCCESS; } -static test_return result_static(memcached_st *memc) +static test_return_t result_static(memcached_st *memc) { memcached_result_st result; memcached_result_st *result_ptr; @@ -2523,10 +2766,10 @@ static test_return result_static(memcached_st *memc) assert(result_ptr); memcached_result_free(&result); - return 0; + return TEST_SUCCESS; } -static test_return result_alloc(memcached_st *memc) +static test_return_t result_alloc(memcached_st *memc) { memcached_result_st *result; @@ -2534,10 +2777,10 @@ static test_return result_alloc(memcached_st *memc) assert(result); memcached_result_free(result); - return 0; + return TEST_SUCCESS; } -static test_return string_static_null(memcached_st *memc) +static test_return_t string_static_null(memcached_st *memc) { memcached_string_st string; memcached_string_st *string_ptr; @@ -2547,10 +2790,10 @@ static test_return string_static_null(memcached_st *memc) assert(string_ptr); memcached_string_free(&string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_null(memcached_st *memc) +static test_return_t string_alloc_null(memcached_st *memc) { memcached_string_st *string; @@ -2558,10 +2801,10 @@ static test_return string_alloc_null(memcached_st *memc) assert(string); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_with_size(memcached_st *memc) +static test_return_t string_alloc_with_size(memcached_st *memc) { memcached_string_st *string; @@ -2569,20 +2812,20 @@ static test_return string_alloc_with_size(memcached_st *memc) assert(string); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_with_size_toobig(memcached_st *memc) +static test_return_t string_alloc_with_size_toobig(memcached_st *memc) { memcached_string_st *string; string= memcached_string_create(memc, NULL, SIZE_MAX); assert(string == NULL); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_append(memcached_st *memc) +static test_return_t string_alloc_append(memcached_st *memc) { unsigned int x; char buffer[SMALL_STRING_LEN]; @@ -2602,10 +2845,10 @@ static test_return string_alloc_append(memcached_st *memc) } memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return string_alloc_append_toobig(memcached_st *memc) +static test_return_t string_alloc_append_toobig(memcached_st *memc) { memcached_return rc; unsigned int x; @@ -2627,17 +2870,17 @@ static test_return string_alloc_append_toobig(memcached_st *memc) assert(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE); memcached_string_free(string); - return 0; + return TEST_SUCCESS; } -static test_return cleanup_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t cleanup_pairs(memcached_st *memc __attribute__((unused))) { pairs_free(global_pairs); - return 0; + return TEST_SUCCESS; } -static test_return generate_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t generate_pairs(memcached_st *memc __attribute__((unused))) { unsigned long long x; global_pairs= pairs_generate(GLOBAL_COUNT, 400); @@ -2645,14 +2888,14 @@ static test_return generate_pairs(memcached_st *memc __attribute__((unused))) for (x= 0; x < global_count; x++) { - global_keys[x]= global_pairs[x].key; + global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length; } - return 0; + return TEST_SUCCESS; } -static test_return generate_large_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t generate_large_pairs(memcached_st *memc __attribute__((unused))) { unsigned long long x; global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10); @@ -2660,21 +2903,21 @@ static test_return generate_large_pairs(memcached_st *memc __attribute__((unuse for (x= 0; x < global_count; x++) { - global_keys[x]= global_pairs[x].key; + global_keys[x]= global_pairs[x].key; global_keys_length[x]= global_pairs[x].key_length; } - return 0; + return TEST_SUCCESS; } -static test_return generate_data(memcached_st *memc) +static test_return_t generate_data(memcached_st *memc) { execute_set(memc, global_pairs, global_count); - return 0; + return TEST_SUCCESS; } -static test_return generate_data_with_stats(memcached_st *memc) +static test_return_t generate_data_with_stats(memcached_st *memc) { memcached_stat_st *stat_p; memcached_return rc; @@ -2696,29 +2939,29 @@ static test_return generate_data_with_stats(memcached_st *memc) memcached_stat_free(NULL, stat_p); - return 0; + return TEST_SUCCESS; } -static test_return generate_buffer_data(memcached_st *memc) +static test_return_t generate_buffer_data(memcached_st *memc) { - int latch= 0; + size_t latch= 0; latch= 1; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, latch); generate_data(memc); - return 0; + return TEST_SUCCESS; } -static test_return get_read_count(memcached_st *memc) +static test_return_t get_read_count(memcached_st *memc) { unsigned int x; memcached_return rc; - memcached_st *clone; + memcached_st *memc_clone; - clone= memcached_clone(NULL, memc); - assert(clone); + memc_clone= memcached_clone(NULL, memc); + assert(memc_clone); - memcached_server_add_with_weight(clone, "localhost", 6666, 0); + memcached_server_add_with_weight(memc_clone, "localhost", 6666, 0); { char *return_value; @@ -2728,7 +2971,7 @@ static test_return get_read_count(memcached_st *memc) for (x= count= 0; x < global_count; x++) { - return_value= memcached_get(clone, global_keys[x], global_keys_length[x], + return_value= memcached_get(memc_clone, global_keys[x], global_keys_length[x], &return_value_length, &flags, &rc); if (rc == MEMCACHED_SUCCESS) { @@ -2737,15 +2980,14 @@ static test_return get_read_count(memcached_st *memc) free(return_value); } } - fprintf(stderr, "\t%u -> %u", global_count, count); } - memcached_free(clone); + memcached_free(memc_clone); - return 0; + return TEST_SUCCESS; } -static test_return get_read(memcached_st *memc) +static test_return_t get_read(memcached_st *memc) { unsigned int x; memcached_return rc; @@ -2768,36 +3010,21 @@ static test_return get_read(memcached_st *memc) } } - return 0; + return TEST_SUCCESS; } -static test_return mget_read(memcached_st *memc) +static test_return_t mget_read(memcached_st *memc) { memcached_return rc; rc= memcached_mget(memc, global_keys, global_keys_length, global_count); assert(rc == MEMCACHED_SUCCESS); - /* Turn this into a help function */ - { - char return_key[MEMCACHED_MAX_KEY]; - size_t return_key_length; - char *return_value; - size_t return_value_length; - uint32_t flags; - - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, - &return_value_length, &flags, &rc))) - { - assert(return_value); - assert(rc == MEMCACHED_SUCCESS); - free(return_value); - } - } + assert(fetch_all_results(memc) == TEST_SUCCESS); - return 0; + return TEST_SUCCESS; } -static test_return mget_read_result(memcached_st *memc) +static test_return_t mget_read_result(memcached_st *memc) { memcached_return rc; @@ -2819,10 +3046,10 @@ static test_return mget_read_result(memcached_st *memc) memcached_result_free(&results_obj); } - return 0; + return TEST_SUCCESS; } -static test_return mget_read_function(memcached_st *memc) +static test_return_t mget_read_function(memcached_st *memc) { memcached_return rc; unsigned int counter; @@ -2833,12 +3060,12 @@ static test_return mget_read_function(memcached_st *memc) callbacks[0]= &callback_counter; counter= 0; - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); - return 0; + return TEST_SUCCESS; } -static test_return delete_generate(memcached_st *memc) +static test_return_t delete_generate(memcached_st *memc) { unsigned int x; @@ -2847,12 +3074,12 @@ static test_return delete_generate(memcached_st *memc) (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); } - return 0; + return TEST_SUCCESS; } -static test_return delete_buffer_generate(memcached_st *memc) +static test_return_t delete_buffer_generate(memcached_st *memc) { - int latch= 0; + size_t latch= 0; unsigned int x; latch= 1; @@ -2863,10 +3090,10 @@ static test_return delete_buffer_generate(memcached_st *memc) (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); } - return 0; + return TEST_SUCCESS; } -static test_return add_host_test1(memcached_st *memc) +static test_return_t add_host_test1(memcached_st *memc) { unsigned int x; memcached_return rc; @@ -2882,7 +3109,7 @@ static test_return add_host_test1(memcached_st *memc) char buffer[SMALL_STRING_LEN]; snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x); - servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, + servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); assert(rc == MEMCACHED_SUCCESS); assert(x == memcached_server_list_count(servers)); @@ -2895,7 +3122,7 @@ static test_return add_host_test1(memcached_st *memc) memcached_server_list_free(servers); - return 0; + return TEST_SUCCESS; } static memcached_return pre_nonblock(memcached_st *memc) @@ -2908,15 +3135,15 @@ static memcached_return pre_nonblock(memcached_st *memc) static memcached_return pre_nonblock_binary(memcached_st *memc) { memcached_return rc= MEMCACHED_FAILURE; - memcached_st *clone; + memcached_st *memc_clone; - clone= memcached_clone(NULL, memc); - assert(clone); + memc_clone= memcached_clone(NULL, memc); + assert(memc_clone); // The memcached_version needs to be done on a clone, because the server // will not toggle protocol on an connection. - memcached_version(clone); + memcached_version(memc_clone); - if (clone->hosts[0].major_version >= 1 && clone->hosts[0].minor_version > 2) + if (memc_clone->hosts[0].major_version >= 1 && memc_clone->hosts[0].minor_version > 2) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); @@ -2924,7 +3151,7 @@ static memcached_return pre_nonblock_binary(memcached_st *memc) assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); } - memcached_free(clone); + memcached_free(memc_clone); return rc; } @@ -3032,39 +3259,50 @@ static memcached_return pre_behavior_ketama_weighted(memcached_st *memc) static memcached_return pre_binary(memcached_st *memc) { memcached_return rc= MEMCACHED_FAILURE; - memcached_st *clone; + memcached_st *memc_clone; - clone= memcached_clone(NULL, memc); - assert(clone); + memc_clone= memcached_clone(NULL, memc); + assert(memc_clone); // The memcached_version needs to be done on a clone, because the server // will not toggle protocol on an connection. - memcached_version(clone); + memcached_version(memc_clone); - if (clone->hosts[0].major_version >= 1 && clone->hosts[0].minor_version > 2) + if (memc_clone->hosts[0].major_version >= 1 && memc_clone->hosts[0].minor_version > 2) { rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); assert(rc == MEMCACHED_SUCCESS); assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); } - memcached_free(clone); + memcached_free(memc_clone); + return rc; } static memcached_return pre_replication(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return MEMCACHED_FAILURE; + + /* + * Make sure that we store the item on all servers + * (master + replicas == number of servers) + */ + memcached_return rc; + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, + memc->number_of_hosts - 1); + assert(rc == MEMCACHED_SUCCESS); + assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memc->number_of_hosts - 1); + + return rc; +} + +static memcached_return pre_replication_noblock(memcached_st *memc) { memcached_return rc= MEMCACHED_FAILURE; - if (pre_binary(memc) == MEMCACHED_SUCCESS) - { - /* - * Make sure that we store the item on all servers - * (master + replicas == number of servers) - */ - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, - memc->number_of_hosts - 1); - assert(rc == MEMCACHED_SUCCESS); - assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memc->number_of_hosts - 1); - } + if (pre_replication(memc) == MEMCACHED_SUCCESS && + pre_nonblock(memc) == MEMCACHED_SUCCESS) + rc= MEMCACHED_SUCCESS; return rc; } @@ -3128,7 +3366,9 @@ static memcached_return set_prefix(memcached_st *memc) /* Set to Zero, and then Set to something too large */ { - char *long_key; + char long_key[255]; + memset(long_key, 0, 255); + rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); assert(rc == MEMCACHED_SUCCESS); @@ -3138,13 +3378,13 @@ static memcached_return set_prefix(memcached_st *memc) /* Test a long key for failure */ /* TODO, extend test to determine based on setting, what result should be */ - long_key= "Thisismorethentheallottednumberofcharacters"; + strcpy(long_key, "Thisismorethentheallottednumberofcharacters"); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); //assert(rc == MEMCACHED_BAD_KEY_PROVIDED); assert(rc == MEMCACHED_SUCCESS); /* Now test a key with spaces (which will fail from long key, since bad key is not set) */ - long_key= "This is more then the allotted number of characters"; + strcpy(long_key, "This is more then the allotted number of characters"); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); @@ -3152,7 +3392,7 @@ static memcached_return set_prefix(memcached_st *memc) rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, 1); assert(rc == MEMCACHED_SUCCESS); - long_key= "dog cat"; + strcpy(long_key, "dog cat"); rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); assert(rc == MEMCACHED_BAD_KEY_PROVIDED); } @@ -3166,7 +3406,7 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) void *test_ptr= NULL; void *cb_ptr= NULL; { - memcached_malloc_function malloc_cb= + memcached_malloc_function malloc_cb= (memcached_malloc_function)my_malloc; cb_ptr= *(void **)&malloc_cb; memcached_return rc; @@ -3179,7 +3419,7 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } { - memcached_realloc_function realloc_cb= + memcached_realloc_function realloc_cb= (memcached_realloc_function)my_realloc; cb_ptr= *(void **)&realloc_cb; memcached_return rc; @@ -3192,7 +3432,7 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) } { - memcached_free_function free_cb= + memcached_free_function free_cb= (memcached_free_function)my_free; cb_ptr= *(void **)&free_cb; memcached_return rc; @@ -3210,19 +3450,19 @@ static memcached_return deprecated_set_memory_alloc(memcached_st *memc) static memcached_return set_memory_alloc(memcached_st *memc) { memcached_return rc; - rc= memcached_set_memory_allocators(memc, NULL, my_free, + rc= memcached_set_memory_allocators(memc, NULL, my_free, my_realloc, my_calloc); assert(rc == MEMCACHED_FAILURE); - rc= memcached_set_memory_allocators(memc, my_malloc, my_free, + rc= memcached_set_memory_allocators(memc, my_malloc, my_free, my_realloc, my_calloc); - + memcached_malloc_function mem_malloc; memcached_free_function mem_free; memcached_realloc_function mem_realloc; memcached_calloc_function mem_calloc; - memcached_get_memory_allocators(memc, &mem_malloc, &mem_free, - &mem_realloc, &mem_calloc); + memcached_get_memory_allocators(memc, &mem_malloc, &mem_free, + &mem_realloc, &mem_calloc); assert(mem_malloc == my_malloc); assert(mem_realloc == my_realloc); @@ -3256,7 +3496,7 @@ static memcached_return enable_cas(memcached_st *memc) memcached_version(memc); - if ((memc->hosts[0].major_version >= 1 && (memc->hosts[0].minor_version == 2 && memc->hosts[0].micro_version >= 4)) + if ((memc->hosts[0].major_version >= 1 && (memc->hosts[0].minor_version == 2 && memc->hosts[0].micro_version >= 4)) || memc->hosts[0].minor_version > 2) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); @@ -3313,20 +3553,20 @@ static memcached_return pre_settimer(memcached_st *memc) static memcached_return poll_timeout(memcached_st *memc) { - int32_t timeout; + size_t timeout; timeout= 100; memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout); - timeout= (int32_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); + timeout= (size_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); assert(timeout == 100); return MEMCACHED_SUCCESS; } -static test_return noreply_test(memcached_st *memc) +static test_return_t noreply_test(memcached_st *memc) { memcached_return ret; ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); @@ -3344,7 +3584,7 @@ static test_return noreply_test(memcached_st *memc) for (int x=0; x < 100; ++x) { char key[10]; - size_t len= sprintf(key, "%d", x); + size_t len= (size_t)sprintf(key, "%d", x); switch (count) { case 0: @@ -3362,6 +3602,9 @@ static test_return noreply_test(memcached_st *memc) case 4: ret=memcached_prepend(memc, key, len, key, len, 0, 0); break; + default: + assert(count); + break; } assert(ret == MEMCACHED_SUCCESS || ret == MEMCACHED_BUFFERED); } @@ -3373,7 +3616,7 @@ static test_return noreply_test(memcached_st *memc) */ int no_msg=0; for (uint32_t x=0; x < memc->number_of_hosts; ++x) - no_msg+=memc->hosts[x].cursor_active; + no_msg+=(int)(memc->hosts[x].cursor_active); assert(no_msg == 0); assert(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); @@ -3384,7 +3627,7 @@ static test_return noreply_test(memcached_st *memc) for (int x=0; x < 100; ++x) { char key[10]; - size_t len= sprintf(key, "%d", x); + size_t len= (size_t)sprintf(key, "%d", x); size_t length; uint32_t flags; char* value=memcached_get(memc, key, strlen(key), @@ -3404,6 +3647,9 @@ static test_return noreply_test(memcached_st *memc) case 4: assert(length == len * 3); break; + default: + assert(count); + break; } free(value); } @@ -3412,7 +3658,7 @@ static test_return noreply_test(memcached_st *memc) /* Try setting an illegal cas value (should not return an error to * the caller (because we don't expect a return message from the server) */ - char* keys[]= {"0"}; + const char* keys[]= {"0"}; size_t lengths[]= {1}; size_t length; uint32_t flags; @@ -3446,30 +3692,30 @@ static test_return noreply_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return analyzer_test(memcached_st *memc) +static test_return_t analyzer_test(memcached_st *memc) { memcached_return rc; - memcached_stat_st *stat; + memcached_stat_st *memc_stat; memcached_analysis_st *report; - stat= memcached_stat(memc, NULL, &rc); + memc_stat= memcached_stat(memc, NULL, &rc); assert(rc == MEMCACHED_SUCCESS); - assert(stat); + assert(memc_stat); - report= memcached_analyze(memc, stat, &rc); + report= memcached_analyze(memc, memc_stat, &rc); assert(rc == MEMCACHED_SUCCESS); assert(report); free(report); - memcached_stat_free(NULL, stat); + memcached_stat_free(NULL, memc_stat); return TEST_SUCCESS; } /* Count the objects */ -static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((unused)), - const char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), +static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((unused)), + const char *key __attribute__((unused)), + size_t key_length __attribute__((unused)), void *context) { uint32_t *counter= (uint32_t *)context; @@ -3479,12 +3725,12 @@ static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((u return MEMCACHED_SUCCESS; } -static test_return dump_test(memcached_st *memc) +static test_return_t dump_test(memcached_st *memc) { memcached_return rc; uint32_t counter= 0; memcached_dump_func callbacks[1]; - test_return main_rc; + test_return_t main_rc; callbacks[0]= &callback_dump_counter; @@ -3517,7 +3763,7 @@ static void* connection_release(void *arg) { return arg; } -static test_return connection_pool_test(memcached_st *memc) +static test_return_t connection_pool_test(memcached_st *memc) { memcached_pool_st* pool= memcached_pool_create(memc, 5, 10); assert(pool != NULL); @@ -3561,20 +3807,58 @@ static test_return connection_pool_test(memcached_st *memc) for (int x= 0; x < 10; ++x) assert(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); + + /* verify that I can set behaviors on the pool when I don't have all + * of the connections in the pool. It should however be enabled + * when I push the item into the pool + */ + mmc[0]= memcached_pool_pop(pool, false, &rc); + assert(mmc[0] != NULL); + + rc= memcached_pool_behavior_set(pool, MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK, 9999); + assert(rc == MEMCACHED_SUCCESS); + + mmc[1]= memcached_pool_pop(pool, false, &rc); + assert(mmc[1] != NULL); + + assert(memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + assert(memcached_pool_push(pool, mmc[1]) == MEMCACHED_SUCCESS); + assert(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); + + mmc[0]= memcached_pool_pop(pool, false, &rc); + assert(memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); + assert(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); + + assert(memcached_pool_destroy(pool) == memc); return TEST_SUCCESS; } #endif -static test_return replication_set_test(memcached_st *memc) +static test_return_t replication_set_test(memcached_st *memc) { memcached_return rc; - memcached_st *clone= memcached_clone(NULL, memc); - memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); + memcached_st *memc_clone= memcached_clone(NULL, memc); + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); rc= memcached_set(memc, "bubba", 5, "0", 1, 0, 0); assert(rc == MEMCACHED_SUCCESS); + /* + ** We are using the quiet commands to store the replicas, so we need + ** to ensure that all of them are processed before we can continue. + ** In the test we go directly from storing the object to trying to + ** receive the object from all of the different servers, so we + ** could end up in a race condition (the memcached server hasn't yet + ** processed the quiet command from the replication set when it process + ** the request from the other client (created by the clone)). As a + ** workaround for that we call memcached_quit to send the quit command + ** to the server and wait for the response ;-) If you use the test code + ** as an example for your own code, please note that you shouldn't need + ** to do this ;-) + */ + memcached_quit(memc); + /* ** "bubba" should now be stored on all of our servers. We don't have an ** easy to use API to address each individual server, so I'll just iterate @@ -3586,19 +3870,19 @@ static test_return replication_set_test(memcached_st *memc) char key[2]= { [0]= (char)x }; size_t len; uint32_t flags; - char *val= memcached_get_by_key(clone, key, 1, "bubba", 5, + char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); assert(rc == MEMCACHED_SUCCESS); assert(val != NULL); free(val); } - memcached_free(clone); + memcached_free(memc_clone); return TEST_SUCCESS; } -static test_return replication_get_test(memcached_st *memc) +static test_return_t replication_get_test(memcached_st *memc) { memcached_return rc; @@ -3607,35 +3891,36 @@ static test_return replication_get_test(memcached_st *memc) * within the library, and this is not a supported interface. * This is to verify correct behavior in the library */ - for (int host= 0; host < memc->number_of_hosts; ++host) { - memcached_st *clone= memcached_clone(NULL, memc); - clone->hosts[host].port= 0; + for (uint32_t host= 0; host < memc->number_of_hosts; ++host) + { + memcached_st *memc_clone= memcached_clone(NULL, memc); + memc_clone->hosts[host].port= 0; for (int x= 'a'; x <= 'z'; ++x) { char key[2]= { [0]= (char)x }; size_t len; uint32_t flags; - char *val= memcached_get_by_key(clone, key, 1, "bubba", 5, + char *val= memcached_get_by_key(memc_clone, key, 1, "bubba", 5, &len, &flags, &rc); assert(rc == MEMCACHED_SUCCESS); assert(val != NULL); free(val); } - memcached_free(clone); + memcached_free(memc_clone); } return TEST_SUCCESS; } -static test_return replication_mget_test(memcached_st *memc) +static test_return_t replication_mget_test(memcached_st *memc) { memcached_return rc; - memcached_st *clone= memcached_clone(NULL, memc); - memcached_behavior_set(clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); + memcached_st *memc_clone= memcached_clone(NULL, memc); + memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0); - char *keys[]= { "bubba", "key1", "key2", "key3" }; + const char *keys[]= { "bubba", "key1", "key2", "key3" }; size_t len[]= { 5, 4, 4, 4 }; for (int x=0; x< 4; ++x) @@ -3644,29 +3929,44 @@ static test_return replication_mget_test(memcached_st *memc) assert(rc == MEMCACHED_SUCCESS); } + /* + ** We are using the quiet commands to store the replicas, so we need + ** to ensure that all of them are processed before we can continue. + ** In the test we go directly from storing the object to trying to + ** receive the object from all of the different servers, so we + ** could end up in a race condition (the memcached server hasn't yet + ** processed the quiet command from the replication set when it process + ** the request from the other client (created by the clone)). As a + ** workaround for that we call memcached_quit to send the quit command + ** to the server and wait for the response ;-) If you use the test code + ** as an example for your own code, please note that you shouldn't need + ** to do this ;-) + */ + memcached_quit(memc); + /* * Don't do the following in your code. I am abusing the internal details * within the library, and this is not a supported interface. * This is to verify correct behavior in the library */ memcached_result_st result_obj; - for (int host= 0; host < clone->number_of_hosts; ++host) + for (uint32_t host= 0; host < memc_clone->number_of_hosts; host++) { - memcached_st *clone= memcached_clone(NULL, memc); - clone->hosts[host].port= 0; + memcached_st *new_clone= memcached_clone(NULL, memc); + new_clone->hosts[host].port= 0; for (int x= 'a'; x <= 'z'; ++x) { - char key[2]= { [0]= (char)x }; + const char key[2]= { [0]= (const char)x }; - rc= memcached_mget_by_key(clone, key, 1, keys, len, 4); + rc= memcached_mget_by_key(new_clone, key, 1, keys, len, 4); assert(rc == MEMCACHED_SUCCESS); - memcached_result_st *results= memcached_result_create(clone, &result_obj); + memcached_result_st *results= memcached_result_create(new_clone, &result_obj); assert(results); int hits= 0; - while ((results= memcached_fetch_result(clone, &result_obj, &rc)) != NULL) + while ((results= memcached_fetch_result(new_clone, &result_obj, &rc)) != NULL) { hits++; } @@ -3674,22 +3974,24 @@ static test_return replication_mget_test(memcached_st *memc) memcached_result_free(&result_obj); } - memcached_free(clone); + memcached_free(new_clone); } + memcached_free(memc_clone); + return TEST_SUCCESS; } -static test_return replication_delete_test(memcached_st *memc) +static test_return_t replication_delete_test(memcached_st *memc) { memcached_return rc; - memcached_st *clone= memcached_clone(NULL, memc); + memcached_st *memc_clone= memcached_clone(NULL, memc); /* Delete the items from all of the servers except 1 */ uint64_t repl= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, --repl); - char *keys[]= { "bubba", "key1", "key2", "key3" }; + const char *keys[]= { "bubba", "key1", "key2", "key3" }; size_t len[]= { 5, 4, 4, 4 }; for (int x=0; x< 4; ++x) @@ -3703,28 +4005,29 @@ static test_return replication_delete_test(memcached_st *memc) * within the library, and this is not a supported interface. * This is to verify correct behavior in the library */ - int hash= memcached_generate_hash(memc, keys[0], len[0]); - for (int x= 0; x < (repl + 1); ++x) { - clone->hosts[hash].port= 0; - if (++hash == clone->number_of_hosts) + 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; + if (++hash == memc_clone->number_of_hosts) hash= 0; } memcached_result_st result_obj; - for (int host= 0; host < clone->number_of_hosts; ++host) + for (uint32_t host= 0; host < memc_clone->number_of_hosts; ++host) { for (int x= 'a'; x <= 'z'; ++x) { - char key[2]= { [0]= (char)x }; + const char key[2]= { [0]= (const char)x }; - rc= memcached_mget_by_key(clone, key, 1, keys, len, 4); + rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 4); assert(rc == MEMCACHED_SUCCESS); - memcached_result_st *results= memcached_result_create(clone, &result_obj); + memcached_result_st *results= memcached_result_create(memc_clone, &result_obj); assert(results); int hits= 0; - while ((results= memcached_fetch_result(clone, &result_obj, &rc)) != NULL) + while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL) { ++hits; } @@ -3732,7 +4035,7 @@ static test_return replication_delete_test(memcached_st *memc) memcached_result_free(&result_obj); } } - memcached_free(clone); + memcached_free(memc_clone); return TEST_SUCCESS; } @@ -3756,7 +4059,7 @@ static uint16_t *get_udp_request_ids(memcached_st *memc) return ids; } -static test_return post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ids) +static test_return_t post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ids) { unsigned int x; memcached_server_st *cur_server = memc->hosts; @@ -3810,7 +4113,7 @@ static memcached_return binary_init_udp(memcached_st *memc) } /* Make sure that I cant add a tcp server to a udp client */ -static test_return add_tcp_server_udp_client_test(memcached_st *memc) +static test_return_t add_tcp_server_udp_client_test(memcached_st *memc) { memcached_server_st server; memcached_server_clone(&server, &memc->hosts[0]); @@ -3820,7 +4123,7 @@ static test_return add_tcp_server_udp_client_test(memcached_st *memc) } /* Make sure that I cant add a udp server to a tcp client */ -static test_return add_udp_server_tcp_client_test(memcached_st *memc) +static test_return_t add_udp_server_tcp_client_test(memcached_st *memc) { memcached_server_st server; memcached_server_clone(&server, &memc->hosts[0]); @@ -3832,7 +4135,7 @@ static test_return add_udp_server_tcp_client_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return set_udp_behavior_test(memcached_st *memc) +static test_return_t set_udp_behavior_test(memcached_st *memc) { memcached_quit(memc); @@ -3841,7 +4144,7 @@ static test_return set_udp_behavior_test(memcached_st *memc) assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS); assert(memc->flags & MEM_USE_UDP); assert(memc->flags & MEM_NOREPLY);; - + assert(memc->number_of_hosts == 0); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0); @@ -3851,15 +4154,15 @@ static test_return set_udp_behavior_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return udp_set_test(memcached_st *memc) +static test_return_t udp_set_test(memcached_st *memc) { unsigned int x= 0; unsigned int num_iters= 1025; //request id rolls over at 1024 for (x= 0; x < num_iters;x++) { memcached_return rc; - char *key= "foo"; - char *value= "when we sanitize"; + 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)); size_t init_offset= memc->hosts[server_key].write_buffer_offset; @@ -3874,11 +4177,11 @@ static test_return udp_set_test(memcached_st *memc) if (rc == MEMCACHED_SUCCESS || memc->hosts[server_key].write_buffer_offset < init_offset) increment_request_id(&expected_ids[server_key]); - + if (rc == MEMCACHED_SUCCESS) { assert(memc->hosts[server_key].write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } + } else { assert(memc->hosts[server_key].write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); @@ -3889,16 +4192,16 @@ static test_return udp_set_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return udp_buffered_set_test(memcached_st *memc) +static test_return_t udp_buffered_set_test(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); return udp_set_test(memc); } -static test_return udp_set_too_big_test(memcached_st *memc) +static test_return_t udp_set_too_big_test(memcached_st *memc) { memcached_return rc; - char *key= "bar"; + 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), @@ -3908,14 +4211,14 @@ static test_return udp_set_too_big_test(memcached_st *memc) return post_udp_op_check(memc,expected_ids); } -static test_return udp_delete_test(memcached_st *memc) +static test_return_t udp_delete_test(memcached_st *memc) { unsigned int x= 0; unsigned int num_iters= 1025; //request id rolls over at 1024 for (x= 0; x < num_iters;x++) { memcached_return rc; - char *key= "foo"; + const char *key= "foo"; uint16_t *expected_ids=get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); size_t init_offset= memc->hosts[server_key].write_buffer_offset; @@ -3935,13 +4238,13 @@ static test_return udp_delete_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return udp_buffered_delete_test(memcached_st *memc) +static test_return_t udp_buffered_delete_test(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); return udp_delete_test(memc); } -static test_return udp_verbosity_test(memcached_st *memc) +static test_return_t udp_verbosity_test(memcached_st *memc) { memcached_return rc; uint16_t *expected_ids= get_udp_request_ids(memc); @@ -3954,19 +4257,19 @@ static test_return udp_verbosity_test(memcached_st *memc) return post_udp_op_check(memc,expected_ids); } -static test_return udp_quit_test(memcached_st *memc) +static test_return_t udp_quit_test(memcached_st *memc) { uint16_t *expected_ids= get_udp_request_ids(memc); memcached_quit(memc); return post_udp_op_check(memc, expected_ids); } -static test_return udp_flush_test(memcached_st *memc) +static test_return_t udp_flush_test(memcached_st *memc) { memcached_return rc; uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int x; - for (x= 0; x < memc->number_of_hosts;x++) + for (x= 0; x < memc->number_of_hosts;x++) increment_request_id(&expected_ids[x]); rc= memcached_flush(memc,0); @@ -3974,15 +4277,15 @@ static test_return udp_flush_test(memcached_st *memc) return post_udp_op_check(memc,expected_ids); } -static test_return udp_incr_test(memcached_st *memc) +static test_return_t udp_incr_test(memcached_st *memc) { memcached_return rc; - char *key= "incr"; - char *value= "1"; - rc= memcached_set(memc, key, strlen(key), + const char *key= "incr"; + const char *value= "1"; + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - + assert(rc == MEMCACHED_SUCCESS); uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); @@ -3993,15 +4296,15 @@ static test_return udp_incr_test(memcached_st *memc) return post_udp_op_check(memc, expected_ids); } -static test_return udp_decr_test(memcached_st *memc) +static test_return_t udp_decr_test(memcached_st *memc) { memcached_return rc; - char *key= "decr"; - char *value= "1"; - rc= memcached_set(memc, key, strlen(key), + const char *key= "decr"; + const char *value= "1"; + rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - + assert(rc == MEMCACHED_SUCCESS); uint16_t *expected_ids= get_udp_request_ids(memc); unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); @@ -4013,7 +4316,7 @@ static test_return udp_decr_test(memcached_st *memc) } -static test_return udp_stat_test(memcached_st *memc) +static test_return_t udp_stat_test(memcached_st *memc) { memcached_stat_st * rv= NULL; memcached_return rc; @@ -4025,7 +4328,7 @@ static test_return udp_stat_test(memcached_st *memc) return post_udp_op_check(memc, expected_ids); } -static test_return udp_version_test(memcached_st *memc) +static test_return_t udp_version_test(memcached_st *memc) { memcached_return rc; uint16_t *expected_ids = get_udp_request_ids(memc); @@ -4034,10 +4337,10 @@ static test_return udp_version_test(memcached_st *memc) return post_udp_op_check(memc, expected_ids); } -static test_return udp_get_test(memcached_st *memc) +static test_return_t udp_get_test(memcached_st *memc) { memcached_return rc; - char *key= "foo"; + 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); @@ -4046,7 +4349,7 @@ static test_return udp_get_test(memcached_st *memc) return post_udp_op_check(memc, expected_ids); } -static test_return udp_mixed_io_test(memcached_st *memc) +static test_return_t udp_mixed_io_test(memcached_st *memc) { test_st current_op; test_st mixed_io_ops [] ={ @@ -4069,7 +4372,7 @@ static test_return udp_mixed_io_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return hsieh_avaibility_test (memcached_st *memc) +static test_return_t hsieh_avaibility_test (memcached_st *memc) { memcached_return expected_rc= MEMCACHED_FAILURE; #ifdef HAVE_HSIEH_HASH @@ -4081,7 +4384,7 @@ static test_return hsieh_avaibility_test (memcached_st *memc) return TEST_SUCCESS; } -static char *list[]= +static const char *list[]= { "apple", "beat", @@ -4111,20 +4414,22 @@ static char *list[]= NULL }; -static test_return md5_run (memcached_st *memc __attribute__((unused))) +static test_return_t md5_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 3195025439, 2556848621, 3724893440, 3332385401, 245758794, 2550894432, - 121710495, 3053817768, 1250994555, 1862072655, 2631955953, 2951528551, - 1451250070, 2820856945, 2060845566, 3646985608, 2138080750, 217675895, - 2230934345, 1234361223, 3968582726, 2455685270, 1293568479, 199067604, - 2042482093 }; + const char **ptr; + uint32_t values[]= { 3195025439U, 2556848621U, 3724893440U, 3332385401U, + 245758794U, 2550894432U, 121710495U, 3053817768U, + 1250994555U, 1862072655U, 2631955953U, 2951528551U, + 1451250070U, 2820856945U, 2060845566U, 3646985608U, + 2138080750U, 217675895U, 2230934345U, 1234361223U, + 3968582726U, 2455685270U, 1293568479U, 199067604U, + 2042482093U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_MD5); assert(values[x] == hash_val); @@ -4133,17 +4438,18 @@ static test_return md5_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return crc_run (memcached_st *memc __attribute__((unused))) +static test_return_t crc_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 10542, 22009, 14526, 19510, 19432, 10199, 20634, 9369, 11511, 10362, - 7893, 31289, 11313, 9354, 7621, 30628, 15218, 25967, 2695, 9380, - 17300, 28156, 9192, 20484, 16925 }; + const char **ptr; + uint32_t values[]= { 10542U, 22009U, 14526U, 19510U, 19432U, 10199U, 20634U, + 9369U, 11511U, 10362U, 7893U, 31289U, 11313U, 9354U, + 7621U, 30628U, 15218U, 25967U, 2695U, 9380U, + 17300U, 28156U, 9192U, 20484U, 16925U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_CRC); assert(values[x] == hash_val); @@ -4152,19 +4458,21 @@ static test_return crc_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1_64_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1_64_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 473199127, 4148981457, 3971873300, 3257986707, 1722477987, 2991193800, - 4147007314, 3633179701, 1805162104, 3503289120, 3395702895, 3325073042, - 2345265314, 3340346032, 2722964135, 1173398992, 2815549194, 2562818319, - 224996066, 2680194749, 3035305390, 246890365, 2395624193, 4145193337, - 1801941682 }; + const char **ptr; + uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U, + 1722477987U, 2991193800U, 4147007314U, 3633179701U, + 1805162104U, 3503289120U, 3395702895U, 3325073042U, + 2345265314U, 3340346032U, 2722964135U, 1173398992U, + 2815549194U, 2562818319U, 224996066U, 2680194749U, + 3035305390U, 246890365U, 2395624193U, 4145193337U, + 1801941682U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64); assert(values[x] == hash_val); @@ -4173,19 +4481,21 @@ static test_return fnv1_64_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1a_64_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 1488911807, 2500855813, 1510099634, 1390325195, 3647689787, 3241528582, - 1669328060, 2604311949, 734810122, 1516407546, 560948863, 1767346780, - 561034892, 4156330026, 3716417003, 3475297030, 1518272172, 227211583, - 3938128828, 126112909, 3043416448, 3131561933, 1328739897, 2455664041, - 2272238452 }; + const char **ptr; + uint32_t values[]= { 1488911807U, 2500855813U, 1510099634U, 1390325195U, + 3647689787U, 3241528582U, 1669328060U, 2604311949U, + 734810122U, 1516407546U, 560948863U, 1767346780U, + 561034892U, 4156330026U, 3716417003U, 3475297030U, + 1518272172U, 227211583U, 3938128828U, 126112909U, + 3043416448U, 3131561933U, 1328739897U, 2455664041U, + 2272238452U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_64); assert(values[x] == hash_val); @@ -4194,19 +4504,22 @@ static test_return fnv1a_64_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1_32_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1_32_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 67176023, 1190179409, 2043204404, 3221866419, 2567703427, 3787535528, 4147287986, - 3500475733, 344481048, 3865235296, 2181839183, 119581266, 510234242, 4248244304, - 1362796839, 103389328, 1449620010, 182962511, 3554262370, 3206747549, 1551306158, - 4127558461, 1889140833, 2774173721, 1180552018 }; + const char **ptr; + uint32_t values[]= { 67176023U, 1190179409U, 2043204404U, 3221866419U, + 2567703427U, 3787535528U, 4147287986U, 3500475733U, + 344481048U, 3865235296U, 2181839183U, 119581266U, + 510234242U, 4248244304U, 1362796839U, 103389328U, + 1449620010U, 182962511U, 3554262370U, 3206747549U, + 1551306158U, 4127558461U, 1889140833U, 2774173721U, + 1180552018U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_32); assert(values[x] == hash_val); @@ -4215,18 +4528,21 @@ static test_return fnv1_32_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1a_32_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 280767167, 2421315013, 3072375666, 855001899, 459261019, 3521085446, 18738364, - 1625305005, 2162232970, 777243802, 3323728671, 132336572, 3654473228, 260679466, - 1169454059, 2698319462, 1062177260, 235516991, 2218399068, 405302637, 1128467232, - 3579622413, 2138539289, 96429129, 2877453236 }; + const char **ptr; + uint32_t values[]= { 280767167U, 2421315013U, 3072375666U, 855001899U, + 459261019U, 3521085446U, 18738364U, 1625305005U, + 2162232970U, 777243802U, 3323728671U, 132336572U, + 3654473228U, 260679466U, 1169454059U, 2698319462U, + 1062177260U, 235516991U, 2218399068U, 405302637U, + 1128467232U, 3579622413U, 2138539289U, 96429129U, + 2877453236U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1A_32); assert(values[x] == hash_val); @@ -4235,10 +4551,10 @@ static test_return fnv1a_32_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return hsieh_run (memcached_st *memc __attribute__((unused))) +static test_return_t hsieh_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; + const char **ptr; #ifdef HAVE_HSIEH_HASH uint32_t values[]= { 3738850110, 3636226060, 3821074029, 3489929160, 3485772682, 80540287, 1805464076, 1895033657, 409795758, 979934958, 3634096985, 1284445480, @@ -4251,7 +4567,7 @@ static test_return hsieh_run (memcached_st *memc __attribute__((unused))) for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_HSIEH); assert(values[x] == hash_val); @@ -4260,19 +4576,21 @@ static test_return hsieh_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return murmur_run (memcached_st *memc __attribute__((unused))) +static test_return_t murmur_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 473199127, 4148981457, 3971873300, 3257986707, 1722477987, 2991193800, - 4147007314, 3633179701, 1805162104, 3503289120, 3395702895, 3325073042, - 2345265314, 3340346032, 2722964135, 1173398992, 2815549194, 2562818319, - 224996066, 2680194749, 3035305390, 246890365, 2395624193, 4145193337, - 1801941682 }; + const char **ptr; + uint32_t values[]= { 473199127U, 4148981457U, 3971873300U, 3257986707U, + 1722477987U, 2991193800U, 4147007314U, 3633179701U, + 1805162104U, 3503289120U, 3395702895U, 3325073042U, + 2345265314U, 3340346032U, 2722964135U, 1173398992U, + 2815549194U, 2562818319U, 224996066U, 2680194749U, + 3035305390U, 246890365U, 2395624193U, 4145193337U, + 1801941682U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_FNV1_64); assert(values[x] == hash_val); @@ -4281,20 +4599,22 @@ static test_return murmur_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return jenkins_run (memcached_st *memc __attribute__((unused))) +static test_return_t jenkins_run (memcached_st *memc __attribute__((unused))) { uint32_t x; - char **ptr; - uint32_t values[]= { 1442444624, 4253821186, 1885058256, 2120131735, 3261968576, 3515188778, - 4232909173, 4288625128, 1812047395, 3689182164, 2502979932, 1214050606, - 2415988847, 1494268927, 1025545760, 3920481083, 4153263658, 3824871822, - 3072759809, 798622255, 3065432577, 1453328165, 2691550971, 3408888387, - 2629893356 }; + const char **ptr; + uint32_t values[]= { 1442444624U, 4253821186U, 1885058256U, 2120131735U, + 3261968576U, 3515188778U, 4232909173U, 4288625128U, + 1812047395U, 3689182164U, 2502979932U, 1214050606U, + 2415988847U, 1494268927U, 1025545760U, 3920481083U, + 4153263658U, 3824871822U, 3072759809U, 798622255U, + 3065432577U, 1453328165U, 2691550971U, 3408888387U, + 2629893356U }; for (ptr= list, x= 0; *ptr; ptr++, x++) { - uint32_t hash_val; + uint32_t hash_val; hash_val= memcached_generate_hash_value(*ptr, strlen(*ptr), MEMCACHED_HASH_JENKINS); assert(values[x] == hash_val); @@ -4303,6 +4623,385 @@ static test_return jenkins_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } +static test_return_t regression_bug_434484(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + memcached_return ret; + const char *key= "regression_bug_434484"; + size_t keylen= strlen(key); + + ret= memcached_append(memc, key, keylen, key, keylen, 0, 0); + assert(ret == MEMCACHED_NOTSTORED); + + size_t size= 2048 * 1024; + void *data= calloc(1, size); + assert(data != NULL); + ret= memcached_set(memc, key, keylen, data, size, 0, 0); + assert(ret == MEMCACHED_E2BIG); + free(data); + + return TEST_SUCCESS; +} + +static test_return_t regression_bug_434843(memcached_st *memc) +{ + if (pre_binary(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + memcached_return rc; + unsigned int counter= 0; + memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + + /* + * I only want to hit only _one_ server so I know the number of requests I'm + * sending in the pipleine to the server. Let's try to do a multiget of + * 1024 (that should satisfy most users don't you think?). Future versions + * will include a mget_execute function call if you need a higher number. + */ + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + const size_t max_keys= 1024; + char **keys= calloc(max_keys, sizeof(char*)); + size_t *key_length=calloc(max_keys, sizeof(size_t)); + + for (int x= 0; x < (int)max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + keys[x]= strdup(k); + assert(keys[x] != NULL); + } + + /* + * Run two times.. the first time we should have 100% cache miss, + * and the second time we should have 100% cache hits + */ + for (int y= 0; y < 2; ++y) + { + rc= memcached_mget(memc, (const char**)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + if (y == 0) + { + /* The first iteration should give me a 100% cache miss. verify that*/ + assert(counter == 0); + char blob[1024]= { 0 }; + for (int x= 0; x < (int)max_keys; ++x) + { + rc= memcached_add(memc, keys[x], key_length[x], + blob, sizeof(blob), 0, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + } + else + { + /* Verify that we received all of the key/value pairs */ + assert(counter == (unsigned int)max_keys); + } + } + + /* Release allocated resources */ + for (size_t x= 0; x < max_keys; ++x) + free(keys[x]); + free(keys); + free(key_length); + + memc->number_of_hosts= number_of_hosts; + return TEST_SUCCESS; +} + +static test_return_t regression_bug_434843_buffered(memcached_st *memc) +{ + memcached_return rc; + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); + assert(rc == MEMCACHED_SUCCESS); + + return regression_bug_434843(memc); +} + +static test_return_t regression_bug_421108(memcached_st *memc) +{ + memcached_return rc; + memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); + assert(rc == MEMCACHED_SUCCESS); + + char *bytes= memcached_stat_get_value(memc, memc_stat, "bytes", &rc); + assert(rc == MEMCACHED_SUCCESS); + assert(bytes != NULL); + char *bytes_read= memcached_stat_get_value(memc, memc_stat, + "bytes_read", &rc); + assert(rc == MEMCACHED_SUCCESS); + assert(bytes_read != NULL); + + char *bytes_written= memcached_stat_get_value(memc, memc_stat, + "bytes_written", &rc); + assert(rc == MEMCACHED_SUCCESS); + assert(bytes_written != NULL); + + assert(strcmp(bytes, bytes_read) != 0); + assert(strcmp(bytes, bytes_written) != 0); + + /* Release allocated resources */ + free(bytes); + free(bytes_read); + free(bytes_written); + memcached_stat_free(NULL, memc_stat); + return TEST_SUCCESS; +} + +/* + * The test case isn't obvious so I should probably document why + * it works the way it does. Bug 442914 was caused by a bug + * in the logic in memcached_purge (it did not handle the case + * where the number of bytes sent was equal to the watermark). + * In this test case, create messages so that we hit that case + * and then disable noreply mode and issue a new command to + * verify that it isn't stuck. If we change the format for the + * delete command or the watermarks, we need to update this + * test.... + */ +static test_return_t regression_bug_442914(memcached_st *memc) +{ + memcached_return rc; + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1); + assert(rc == MEMCACHED_SUCCESS); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1); + + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + + char k[250]; + size_t len; + + for (int x= 0; x < 250; ++x) + { + len= (size_t)snprintf(k, sizeof(k), "%0250u", x); + rc= memcached_delete(memc, k, len, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + + len= (size_t)snprintf(k, sizeof(k), "%037u", 251); + rc= memcached_delete(memc, k, len, 0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0); + assert(rc == MEMCACHED_SUCCESS); + rc= memcached_delete(memc, k, len, 0); + assert(rc == MEMCACHED_NOTFOUND); + + memc->number_of_hosts= number_of_hosts; + + return TEST_SUCCESS; +} + +static test_return_t regression_bug_447342(memcached_st *memc) +{ + if (memc->number_of_hosts < 3 || pre_replication(memc) != MEMCACHED_SUCCESS) + return TEST_SKIPPED; + + memcached_return rc; + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2); + assert(rc == MEMCACHED_SUCCESS); + + const size_t max_keys= 100; + char **keys= calloc(max_keys, sizeof(char*)); + size_t *key_length=calloc(max_keys, sizeof(size_t)); + + for (int x= 0; x < (int)max_keys; ++x) + { + char k[251]; + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); + keys[x]= strdup(k); + assert(keys[x] != NULL); + rc= memcached_set(memc, k, key_length[x], k, key_length[x], 0, 0); + assert(rc == MEMCACHED_SUCCESS); + } + + /* + ** We are using the quiet commands to store the replicas, so we need + ** to ensure that all of them are processed before we can continue. + ** In the test we go directly from storing the object to trying to + ** receive the object from all of the different servers, so we + ** could end up in a race condition (the memcached server hasn't yet + ** processed the quiet command from the replication set when it process + ** the request from the other client (created by the clone)). As a + ** workaround for that we call memcached_quit to send the quit command + ** to the server and wait for the response ;-) If you use the test code + ** as an example for your own code, please note that you shouldn't need + ** to do this ;-) + */ + memcached_quit(memc); + + /* Verify that all messages are stored, and we didn't stuff too much + * into the servers + */ + rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + + unsigned int counter= 0; + memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + /* Verify that we received all of the key/value pairs */ + assert(counter == (unsigned int)max_keys); + + memcached_quit(memc); + /* + * Don't do the following in your code. I am abusing the internal details + * within the library, and this is not a supported interface. + * This is to verify correct behavior in the library. Fake that two servers + * are dead.. + */ + unsigned int port0= memc->hosts[0].port; + unsigned int port2= memc->hosts[2].port; + memc->hosts[0].port= 0; + memc->hosts[2].port= 0; + + rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + + counter= 0; + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + assert(counter == (unsigned int)max_keys); + + /* restore the memc handle */ + memc->hosts[0].port= port0; + memc->hosts[2].port= port2; + + memcached_quit(memc); + + /* Remove half of the objects */ + for (int x= 0; x < (int)max_keys; ++x) + if (x & 1) + { + rc= memcached_delete(memc, keys[x], key_length[x], 0); + assert(rc == MEMCACHED_SUCCESS); + } + + memcached_quit(memc); + memc->hosts[0].port= 0; + memc->hosts[2].port= 0; + + /* now retry the command, this time we should have cache misses */ + rc= memcached_mget(memc, (const char* const *)keys, key_length, max_keys); + assert(rc == MEMCACHED_SUCCESS); + + counter= 0; + rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); + assert(counter == (unsigned int)(max_keys >> 1)); + + /* Release allocated resources */ + for (size_t x= 0; x < max_keys; ++x) + free(keys[x]); + free(keys); + free(key_length); + + /* restore the memc handle */ + memc->hosts[0].port= port0; + memc->hosts[2].port= port2; + return TEST_SUCCESS; +} + +/* Test memcached_server_get_last_disconnect + * For a working server set, shall be NULL + * For a set of non existing server, shall not be NULL + */ +static test_return_t test_get_last_disconnect(memcached_st *memc) +{ + memcached_return rc; + memcached_server_st *disconnected_server; + + /* With the working set of server */ + const char *key= "marmotte"; + const char *value= "milka"; + + rc= memcached_set(memc, key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + disconnected_server = memcached_server_get_last_disconnect(memc); + assert(disconnected_server == NULL); + + /* With a non existing server */ + memcached_st *mine; + memcached_server_st *servers; + + const char *server_list= "localhost:9"; + + servers= memcached_servers_parse(server_list); + assert(servers); + mine= memcached_create(NULL); + rc= memcached_server_push(mine, servers); + assert(rc == MEMCACHED_SUCCESS); + memcached_server_list_free(servers); + assert(mine); + + rc= memcached_set(mine, key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + assert(rc != MEMCACHED_SUCCESS); + + disconnected_server = memcached_server_get_last_disconnect(mine); + assert(disconnected_server != NULL); + assert(disconnected_server->port == 9); + assert(strncmp(disconnected_server->hostname,"localhost",9) == 0); + + memcached_quit(mine); + memcached_free(mine); + + return TEST_SUCCESS; +} + +/* + * This test ensures that the failure counter isn't incremented during + * normal termination of the memcached instance. + */ +static test_return_t wrong_failure_counter_test(memcached_st *memc) +{ + memcached_return rc; + + /* Set value to force connection to the server */ + const char *key= "marmotte"; + const char *value= "milka"; + + /* + * Please note that I'm abusing the internal structures in libmemcached + * in a non-portable way and you shouldn't be doing this. I'm only + * doing this in order to verify that the library works the way it should + */ + uint32_t number_of_hosts= memc->number_of_hosts; + memc->number_of_hosts= 1; + + /* Ensure that we are connected to the server by setting a value */ + rc= memcached_set(memc, key, strlen(key), + value, strlen(value), + (time_t)0, (uint32_t)0); + assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + + + /* The test is to see that the memcached_quit doesn't increase the + * the server failure conter, so let's ensure that it is zero + * before sending quit + */ + memc->hosts[0].server_failure_counter= 0; + + memcached_quit(memc); + + /* Verify that it memcached_quit didn't increment the failure counter + * Please note that this isn't bullet proof, because an error could + * occur... + */ + assert(memc->hosts[0].server_failure_counter == 0); + + /* restore the instance */ + memc->number_of_hosts= number_of_hosts; + + return TEST_SUCCESS; +} + test_st udp_setup_server_tests[] ={ {"set_udp_behavior_test", 0, set_udp_behavior_test}, {"add_tcp_server_udp_client_test", 0, add_tcp_server_udp_client_test}, @@ -4365,6 +5064,8 @@ test_st tests[] ={ {"mget_result", 1, mget_result_test }, {"mget_result_alloc", 1, mget_result_alloc_test }, {"mget_result_function", 1, mget_result_function }, + {"mget_execute", 1, mget_execute }, + {"mget_end", 0, mget_end }, {"get_stats", 0, get_stats }, {"add_host_test", 0, add_host_test }, {"add_host_test_1", 0, add_host_test1 }, @@ -4381,6 +5082,7 @@ test_st tests[] ={ #ifdef HAVE_LIBMEMCACHEDUTIL {"connectionpool", 1, connection_pool_test }, #endif + {"test_get_last_disconnect", 1, test_get_last_disconnect}, {0, 0, 0} }; @@ -4432,8 +5134,8 @@ test_st user_tests[] ={ {"user_supplied_bug15", 1, user_supplied_bug15 }, {"user_supplied_bug16", 1, user_supplied_bug16 }, #ifndef __sun - /* - ** It seems to be something weird with the character sets.. + /* + ** It seems to be something weird with the character sets.. ** value_fetch is unable to parse the value line (iscntrl "fails"), so I ** guess I need to find out how this is supposed to work.. Perhaps I need ** to run the test in a specific locale (I tried zh_CN.UTF-8 without success, @@ -4444,6 +5146,8 @@ test_st user_tests[] ={ {"user_supplied_bug18", 1, user_supplied_bug18 }, {"user_supplied_bug19", 1, user_supplied_bug19 }, {"user_supplied_bug20", 1, user_supplied_bug20 }, + {"user_supplied_bug21", 1, user_supplied_bug21 }, + {"wrong_failure_counter_test", 1, wrong_failure_counter_test}, {0, 0, 0} }; @@ -4455,6 +5159,22 @@ test_st replication_tests[]= { {0, 0, 0} }; +/* + * The following test suite is used to verify that we don't introduce + * regression bugs. If you want more information about the bug / test, + * you should look in the bug report at + * http://bugs.launchpad.net/libmemcached + */ +test_st regression_tests[]= { + {"lp:434484", 1, regression_bug_434484 }, + {"lp:434843", 1, regression_bug_434843 }, + {"lp:434843 buffered", 1, regression_bug_434843_buffered }, + {"lp:421108", 1, regression_bug_421108 }, + {"lp:442914", 1, regression_bug_442914 }, + {"lp:447342", 1, regression_bug_447342 }, + {0, 0, 0} +}; + test_st generate_tests[] ={ {"generate_pairs", 1, generate_pairs }, {"generate_data", 1, generate_data }, @@ -4562,6 +5282,8 @@ collection_st collection[] ={ {"consistent_ketama_weighted", pre_behavior_ketama_weighted, 0, consistent_weighted_tests}, {"test_hashes", 0, 0, hash_tests}, {"replication", pre_replication, 0, replication_tests}, + {"replication_noblock", pre_replication_noblock, 0, replication_tests}, + {"regression", 0, 0, regression_tests}, {0, 0, 0, 0} }; @@ -4575,8 +5297,7 @@ void *world_create(void) { server_startup_st *construct; - construct= (server_startup_st *)malloc(sizeof(server_startup_st)); - memset(construct, 0, sizeof(server_startup_st)); + construct= calloc(sizeof(server_startup_st), 1); construct->count= SERVERS_TO_CREATE; construct->udp= 0; server_startup(construct);