X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_functions.c;h=48b254dbfcf921de08f853e0af9cd2d303e04961;hb=6c2bd52dfa24287c856b0b679270b7f7681333a5;hp=61bfc33daefb5eed7cc6bd08e9d64a462058be11;hpb=93723c9e5e41d8d9c41f610623060b28b4ec8ae3;p=awesomized%2Flibmemcached diff --git a/tests/mem_functions.c b/tests/mem_functions.c index 61bfc33d..48b254db 100644 --- a/tests/mem_functions.c +++ b/tests/mem_functions.c @@ -10,10 +10,11 @@ Sample test application. */ -#include "libmemcached/common.h" +#include "config.h" #include #include +#include #include #include #include @@ -22,20 +23,18 @@ #include #include #include + +#include "libmemcached/common.h" + #include "server.h" #include "clients/generator.h" #include "clients/execute.h" -#ifndef INT64_MAX -#define INT64_MAX LONG_MAX -#endif -#ifndef INT32_MAX -#define INT32_MAX INT_MAX -#endif - +#define SMALL_STRING_LEN 1024 #include "test.h" + #ifdef HAVE_LIBMEMCACHEDUTIL #include #include "libmemcached/memcached_util.h" @@ -52,9 +51,14 @@ static pairs_st *global_pairs; static const char *global_keys[GLOBAL_COUNT]; static size_t global_keys_length[GLOBAL_COUNT]; -static test_return_t init_test(memcached_st *not_used __attribute__((unused))) +// Prototype +static test_return_t pre_binary(memcached_st *memc); + + +static test_return_t init_test(memcached_st *not_used) { memcached_st memc; + (void)not_used; (void)memcached_create(&memc); memcached_free(&memc); @@ -62,10 +66,11 @@ static test_return_t init_test(memcached_st *not_used __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_list_null_test(memcached_st *ptr) { memcached_server_st *server_list; memcached_return_t rc; + (void)ptr; server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, NULL); test_true(server_list == NULL); @@ -82,25 +87,45 @@ static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unus #define TEST_PORT_COUNT 7 in_port_t test_ports[TEST_PORT_COUNT]; -static memcached_return_t server_display_function(const memcached_st *ptr __attribute__((unused)), +static memcached_return_t server_display_function(const memcached_st *ptr, const memcached_server_st *server, void *context) { /* Do Nothing */ size_t bigger= *((size_t *)(context)); + (void)ptr; assert(bigger <= memcached_server_port(server)); *((size_t *)(context))= memcached_server_port(server); return MEMCACHED_SUCCESS; } -static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused))) +static memcached_return_t dump_server_information(const memcached_st *ptr, + const memcached_server_st *instance, + void *context) +{ + /* Do Nothing */ + FILE *stream= (FILE *)context; + (void)ptr; + + fprintf(stream, "Memcached Server: %s %u Version %u.%u.%u\n", + memcached_server_name(instance), + memcached_server_port(instance), + instance->major_version, + instance->minor_version, + instance->micro_version); + + return MEMCACHED_SUCCESS; +} + +static test_return_t server_sort_test(memcached_st *ptr) { size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ memcached_return_t rc; memcached_server_fn callbacks[1]; memcached_st *local_memc; + (void)ptr; local_memc= memcached_create(NULL); test_true(local_memc); @@ -126,13 +151,14 @@ static test_return_t server_sort_test(memcached_st *ptr __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_sort2_test(memcached_st *ptr) { size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ memcached_return_t rc; memcached_server_fn callbacks[1]; memcached_st *local_memc; memcached_server_instance_st instance; + (void)ptr; local_memc= memcached_create(NULL); test_true(local_memc); @@ -162,11 +188,13 @@ static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused)) return TEST_SUCCESS; } -static memcached_return_t server_print_callback(const memcached_st *ptr __attribute__((unused)), +static memcached_return_t server_print_callback(const memcached_st *ptr, const memcached_server_st *server, - void *context __attribute__((unused))) + void *context) { (void)server; // Just in case we aren't printing. + (void)ptr; + (void)context; #if 0 fprintf(stderr, "%s(%d)", memcached_server_name(server), memcached_server_port(server)); @@ -175,7 +203,7 @@ static memcached_return_t server_print_callback(const memcached_st *ptr __attrib return MEMCACHED_SUCCESS; } -static test_return_t memcached_server_remove_test(memcached_st *ptr __attribute__((unused))) +static test_return_t memcached_server_remove_test(memcached_st *ptr) { memcached_return_t rc; memcached_st local_memc; @@ -184,12 +212,14 @@ static test_return_t memcached_server_remove_test(memcached_st *ptr __attribute_ memcached_server_fn callbacks[1]; const char *server_string= "localhost:4444, localhost:4445, localhost:4446, localhost:4447, localhost, memcache1.memcache.bk.sapo.pt:11211, memcache1.memcache.bk.sapo.pt:11212, memcache1.memcache.bk.sapo.pt:11213, memcache1.memcache.bk.sapo.pt:11214, memcache2.memcache.bk.sapo.pt:11211, memcache2.memcache.bk.sapo.pt:11212, memcache2.memcache.bk.sapo.pt:11213, memcache2.memcache.bk.sapo.pt:11214"; + (void)ptr; memc= memcached_create(&local_memc); servers= memcached_servers_parse(server_string); rc= memcached_server_push(memc, servers); + memcached_server_list_free(servers); callbacks[0]= server_print_callback; memcached_server_cursor(memc, callbacks, NULL, 1); @@ -199,12 +229,13 @@ static test_return_t memcached_server_remove_test(memcached_st *ptr __attribute_ return TEST_SUCCESS; } -static memcached_return_t server_display_unsort_function(const memcached_st *ptr __attribute__((unused)), +static memcached_return_t server_display_unsort_function(const memcached_st *ptr, const memcached_server_st *server, void *context) { /* Do Nothing */ uint32_t x= *((uint32_t *)(context)); + (void)ptr; assert(test_ports[x] == server->port); *((uint32_t *)(context))= ++x; @@ -212,13 +243,14 @@ static memcached_return_t server_display_unsort_function(const memcached_st *ptr return MEMCACHED_SUCCESS; } -static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused))) +static test_return_t server_unsort_test(memcached_st *ptr) { size_t counter= 0; /* Prime the value for the test_true in server_display_function */ size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ memcached_return_t rc; memcached_server_fn callbacks[1]; memcached_st *local_memc; + (void)ptr; local_memc= memcached_create(NULL); test_true(local_memc); @@ -248,8 +280,9 @@ static test_return_t server_unsort_test(memcached_st *ptr __attribute__((unused) return TEST_SUCCESS; } -static test_return_t allocation_test(memcached_st *not_used __attribute__((unused))) +static test_return_t allocation_test(memcached_st *not_used) { + (void)not_used; memcached_st *memc; memc= memcached_create(NULL); test_true(memc); @@ -376,10 +409,11 @@ static test_return_t error_test(memcached_st *memc) 4269430871U, 610793021U, 527273862U, 1437122909U, 2300930706U, 2943759320U, 674306647U, 2400528935U, 54481931U, 4186304426U, 1741088401U, 2979625118U, - 4159057246U, 3425930182U, 2593724503U, 1868899624U}; + 4159057246U, 3425930182U, 2593724503U, 1868899624U, + 1769812374U, 2302537950U, 1110330676U }; // You have updated the memcache_error messages but not updated docs/tests. - test_true(MEMCACHED_MAXIMUM_RETURN == 40); + test_true(MEMCACHED_MAXIMUM_RETURN == 43); for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++) { uint32_t hash_val; @@ -676,7 +710,6 @@ static test_return_t add_test(memcached_st *memc) */ static test_return_t add_wrapper(memcached_st *memc) { - unsigned int x; unsigned int max= 10000; #ifdef __sun max= 10; @@ -685,7 +718,7 @@ static test_return_t add_wrapper(memcached_st *memc) max= 10; #endif - for (x= 0; x < max; x++) + for (uint32_t x= 0; x < max; x++) add_test(memc); return TEST_SUCCESS; @@ -738,10 +771,11 @@ static test_return_t flush_test(memcached_st *memc) return TEST_SUCCESS; } -static memcached_return_t server_function(const memcached_st *ptr __attribute__((unused)), - const memcached_server_st *server __attribute__((unused)), - void *context __attribute__((unused))) +static memcached_return_t server_function(const memcached_st *ptr, + const memcached_server_st *server, + void *context) { + (void)ptr; (void)server; (void)context; /* Do Nothing */ return MEMCACHED_SUCCESS; @@ -855,12 +889,12 @@ static test_return_t bad_key_test(memcached_st *memc) } #define READ_THROUGH_VALUE "set for me" -static memcached_return_t read_through_trigger(memcached_st *memc __attribute__((unused)), - char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), +static memcached_return_t read_through_trigger(memcached_st *memc, + char *key, + size_t key_length, memcached_result_st *result) { - + (void)memc;(void)key;(void)key_length; return memcached_result_set_value(result, READ_THROUGH_VALUE, strlen(READ_THROUGH_VALUE)); } @@ -903,10 +937,11 @@ static test_return_t read_through(memcached_st *memc) return TEST_SUCCESS; } -static memcached_return_t delete_trigger(memcached_st *ptr __attribute__((unused)), +static memcached_return_t delete_trigger(memcached_st *ptr, const char *key, - size_t key_length __attribute__((unused))) + size_t key_length) { + (void)ptr;(void)key_length; assert(key); return MEMCACHED_SUCCESS; @@ -1010,7 +1045,7 @@ static test_return_t set_test3(memcached_st *memc) { char key[16]; - sprintf(key, "foo%u", x); + snprintf(key, sizeof(key), "foo%u", x); rc= memcached_set(memc, key, strlen(key), value, value_length, @@ -1215,6 +1250,10 @@ static test_return_t stats_servername_test(memcached_st *memc) memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT + if (memcached_get_sasl_callbacks(memc) != NULL) + return TEST_SKIPPED; +#endif rc= memcached_stat_servername(&memc_stat, NULL, memcached_server_name(instance), memcached_server_port(instance)); @@ -1550,10 +1589,11 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) } /* Count the results */ -static memcached_return_t callback_counter(const memcached_st *ptr __attribute__((unused)), - memcached_result_st *result __attribute__((unused)), +static memcached_return_t callback_counter(const memcached_st *ptr, + memcached_result_st *result, void *context) { + (void)ptr; (void)result; size_t *counter= (size_t *)context; *counter= *counter + 1; @@ -1661,7 +1701,7 @@ static test_return_t mget_execute(memcached_st *memc) uint32_t number_of_hosts= memc->number_of_hosts; memc->number_of_hosts= 1; - size_t max_keys= binary ? 20480 : 1; + size_t max_keys= 20480; char **keys= calloc(max_keys, sizeof(char*)); @@ -1670,11 +1710,12 @@ static test_return_t mget_execute(memcached_st *memc) /* First add all of the items.. */ char blob[1024] = {0}; memcached_return_t rc; + for (size_t x= 0; x < max_keys; ++x) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); keys[x]= strdup(k); test_true(keys[x] != NULL); rc= memcached_add(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); @@ -1687,21 +1728,23 @@ static test_return_t mget_execute(memcached_st *memc) rc= memcached_mget_execute(memc, (const char**)keys, key_length, max_keys, callbacks, &counter, 1); - if (binary) + if (rc == MEMCACHED_SUCCESS) { - test_true(rc == MEMCACHED_SUCCESS); - + test_true(binary); rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1); test_true(rc == MEMCACHED_END); /* Verify that we got all of the items */ test_true(counter == max_keys); } - else + else if (rc == MEMCACHED_NOT_SUPPORTED) { - test_true(rc == MEMCACHED_NOT_SUPPORTED); test_true(counter == 0); } + else + { + test_fail("note: this test functions differently when in binary mode"); + } /* Release all allocated resources */ for (size_t x= 0; x < max_keys; ++x) @@ -1715,6 +1758,51 @@ static test_return_t mget_execute(memcached_st *memc) return TEST_SUCCESS; } +#define REGRESSION_BINARY_VS_BLOCK_COUNT 20480 + +static test_return_t key_setup(memcached_st *memc) +{ + (void)memc; + + if (pre_binary(memc) != TEST_SUCCESS) + return TEST_SKIPPED; + + global_pairs= pairs_generate(REGRESSION_BINARY_VS_BLOCK_COUNT, 0); + + return TEST_SUCCESS; +} + +static test_return_t key_teardown(memcached_st *memc) +{ + (void)memc; + pairs_free(global_pairs); + + return TEST_SUCCESS; +} + +static test_return_t block_add_regression(memcached_st *memc) +{ + /* First add all of the items.. */ + for (size_t x= 0; x < REGRESSION_BINARY_VS_BLOCK_COUNT; ++x) + { + memcached_return_t rc; + char blob[1024] = {0}; + + rc= memcached_add_by_key(memc, "bob", 3, global_pairs[x].key, global_pairs[x].key_length, blob, sizeof(blob), 0, 0); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + } + + return TEST_SUCCESS; +} + +static test_return_t binary_add_regression(memcached_st *memc) +{ + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); + test_return_t rc= block_add_regression(memc); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 0); + return rc; +} + static test_return_t get_stats_keys(memcached_st *memc) { char **stat_list; @@ -1732,9 +1820,10 @@ static test_return_t get_stats_keys(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t version_string_test(memcached_st *memc __attribute__((unused))) +static test_return_t version_string_test(memcached_st *memc) { const char *version_string; + (void)memc; version_string= memcached_lib_version(); @@ -1802,13 +1891,15 @@ static test_return_t add_host_test(memcached_st *memc) return TEST_SUCCESS; } -static memcached_return_t clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused))) +static memcached_return_t clone_test_callback(memcached_st *parent, memcached_st *memc_clone) { + (void)parent;(void)memc_clone; return MEMCACHED_SUCCESS; } -static memcached_return_t cleanup_test_callback(memcached_st *ptr __attribute__((unused))) +static memcached_return_t cleanup_test_callback(memcached_st *ptr) { + (void)ptr; return MEMCACHED_SUCCESS; } @@ -1933,7 +2024,55 @@ static test_return_t MEMCACHED_BEHAVIOR_CORK_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t fetch_all_results(memcached_st *memc) + +static test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test(memcached_st *memc) +{ + memcached_return_t rc; + bool set= true; + bool value; + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_KEEPALIVE, set); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOT_SUPPORTED); + + value= (bool)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_KEEPALIVE); + + if (rc == MEMCACHED_SUCCESS) + { + test_true((bool)value == set); + } + else + { + test_false((bool)value == set); + } + + return TEST_SUCCESS; +} + + +static test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test(memcached_st *memc) +{ + memcached_return_t rc; + bool set= true; + bool value; + + rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_KEEPIDLE, set); + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOT_SUPPORTED); + + value= (bool)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_KEEPIDLE); + + if (rc == MEMCACHED_SUCCESS) + { + test_true((bool)value == set); + } + else + { + test_false((bool)value == set); + } + + return TEST_SUCCESS; +} + +static test_return_t fetch_all_results(memcached_st *memc, size_t *keys_returned) { memcached_return_t rc= MEMCACHED_SUCCESS; char return_key[MEMCACHED_MAX_KEY]; @@ -1942,15 +2081,20 @@ static test_return_t fetch_all_results(memcached_st *memc) size_t return_value_length; uint32_t flags; + *keys_returned= 0; + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, &return_value_length, &flags, &rc))) { test_true(return_value); test_true(rc == MEMCACHED_SUCCESS); free(return_value); + *keys_returned= *keys_returned +1; } - return ((rc == MEMCACHED_END) || (rc == MEMCACHED_SUCCESS)) ? TEST_SUCCESS : TEST_FAILURE; + test_true_got(rc == MEMCACHED_END || rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc)); + + return TEST_SUCCESS; } /* Test case provided by Cal Haldenbrand */ @@ -2088,7 +2232,8 @@ static test_return_t user_supplied_bug3(memcached_st *memc) rc= memcached_mget(memc, (const char **)keys, key_lengths, KEY_COUNT); test_true(rc == MEMCACHED_SUCCESS); - test_true(fetch_all_results(memc) == TEST_SUCCESS); + size_t keys_returned; + test_true(fetch_all_results(memc, &keys_returned) == TEST_SUCCESS); for (x= 0; x < KEY_COUNT; x++) free(keys[x]); @@ -2280,7 +2425,7 @@ static test_return_t user_supplied_bug6(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused))) +static test_return_t user_supplied_bug8(memcached_st *memc) { memcached_return_t rc; memcached_st *mine; @@ -2289,6 +2434,7 @@ static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused memcached_server_st *servers; 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"; + (void)memc; servers= memcached_servers_parse(server_list); test_true(servers); @@ -2677,7 +2823,7 @@ static test_return_t user_supplied_bug16(memcached_st *memc) return TEST_SUCCESS; } -#ifndef __sun +#if !defined(__sun) && !defined(__OpenBSD__) /* Check the validity of chinese key*/ static test_return_t user_supplied_bug17(memcached_st *memc) { @@ -2724,6 +2870,8 @@ static test_return_t user_supplied_bug19(memcached_st *not_used) server= memcached_server_by_key(memc, "a", 1, &res); + memcached_free(memc); + return TEST_SUCCESS; } @@ -2831,14 +2979,20 @@ static test_return_t user_supplied_bug18(memcached_st *trash) */ /* sighandler_t function that always asserts false */ -static void fail(int unused __attribute__((unused))) +static void fail(int unused) { + (void)unused; assert(0); } static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) { +#ifdef WIN32 + (void)memc; + (void)key_count; + return TEST_SKIPPED; +#else memcached_return_t rc; unsigned int x; char **keys; @@ -2877,7 +3031,8 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) alarm(0); signal(SIGALRM, oldalarm); - test_true(fetch_all_results(memc) == TEST_SUCCESS); + size_t keys_returned; + test_true(fetch_all_results(memc, &keys_returned) == TEST_SUCCESS); for (x= 0; x < key_count; x++) free(keys[x]); @@ -2887,10 +3042,9 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) memcached_free(memc_clone); return TEST_SUCCESS; +#endif } -static test_return_t pre_binary(memcached_st *memc); - static test_return_t user_supplied_bug21(memcached_st *memc) { test_return_t test_rc; @@ -2966,7 +3120,7 @@ static test_return_t auto_eject_hosts(memcached_st *trash) for (size_t x= 0; x < 99; x++) { memcached_autoeject(memc); - uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); + uint32_t server_idx= memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); test_true(server_idx != 2); } @@ -3033,12 +3187,14 @@ static test_return_t output_ketama_weighted_keys(memcached_st *trash) for (int x= 0; x < 10000; x++) { char key[10]; - sprintf(key, "%d", x); + snprintf(key, sizeof(key), "%d", x); uint32_t server_idx = memcached_generate_hash(memc, key, strlen(key)); char *hostname = memc->hosts[server_idx].hostname; in_port_t port = memc->hosts[server_idx].port; fprintf(fp, "key %s is on host /%s:%u\n", key, hostname, port); + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, host_index); } fclose(fp); #endif @@ -3193,15 +3349,17 @@ static test_return_t string_alloc_append_toobig(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t cleanup_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t cleanup_pairs(memcached_st *memc) { + (void)memc; pairs_free(global_pairs); return TEST_SUCCESS; } -static test_return_t generate_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t generate_pairs(memcached_st *memc) { + (void)memc; global_pairs= pairs_generate(GLOBAL_COUNT, 400); global_count= GLOBAL_COUNT; @@ -3214,8 +3372,9 @@ static test_return_t generate_pairs(memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t generate_large_pairs(memcached_st *memc __attribute__((unused))) +static test_return_t generate_large_pairs(memcached_st *memc) { + (void)memc; global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10); global_count= GLOBAL2_COUNT; @@ -3230,7 +3389,9 @@ static test_return_t generate_large_pairs(memcached_st *memc __attribute__((unus static test_return_t generate_data(memcached_st *memc) { - execute_set(memc, global_pairs, global_count); + unsigned int check_execute= execute_set(memc, global_pairs, global_count); + + test_true(check_execute == global_count); return TEST_SUCCESS; } @@ -3240,7 +3401,9 @@ static test_return_t generate_data_with_stats(memcached_st *memc) memcached_stat_st *stat_p; memcached_return_t rc; uint32_t host_index= 0; - execute_set(memc, global_pairs, global_count); + unsigned int check_execute= execute_set(memc, global_pairs, global_count); + + test_true(check_execute == global_count); //TODO: hosts used size stats stat_p= memcached_stat(memc, NULL, &rc); @@ -3336,9 +3499,22 @@ static test_return_t mget_read(memcached_st *memc) { memcached_return_t rc; + if (! libmemcached_util_version_check(memc, 1, 4, 4)) + return TEST_SKIPPED; + rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - test_true(rc == MEMCACHED_SUCCESS); - test_true(fetch_all_results(memc) == TEST_SUCCESS); + + test_true_got(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc)); + + // Go fetch the keys and test to see if all of them were returned + { + size_t keys_returned; + test_true(fetch_all_results(memc, &keys_returned) == TEST_SUCCESS); + char buffer[30]; + snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)keys_returned); + test_true_got(global_count == keys_returned, buffer); + } + return TEST_SUCCESS; } @@ -3347,8 +3523,13 @@ static test_return_t mget_read_result(memcached_st *memc) { memcached_return_t rc; + if (! libmemcached_util_version_check(memc, 1, 4, 4)) + return TEST_SKIPPED; + rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - test_true(rc == MEMCACHED_SUCCESS); + + test_true_got(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc)); + /* Turn this into a help function */ { memcached_result_st results_obj; @@ -3374,8 +3555,12 @@ static test_return_t mget_read_function(memcached_st *memc) size_t counter; memcached_execute_fn callbacks[1]; + if (! libmemcached_util_version_check(memc, 1, 4, 4)) + return TEST_SKIPPED; + rc= memcached_mget(memc, global_keys, global_keys_length, global_count); - test_true(rc == MEMCACHED_SUCCESS); + + test_true_got(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc)); callbacks[0]= &callback_counter; counter= 0; @@ -3423,7 +3608,7 @@ static test_return_t add_host_test1(memcached_st *memc) { char buffer[SMALL_STRING_LEN]; - snprintf(buffer, SMALL_STRING_LEN, "%zu.example.com", 400+x); + snprintf(buffer, SMALL_STRING_LEN, "%lu.example.com", (unsigned long)(400 +x)); servers= memcached_server_list_append_with_weight(servers, buffer, 401, 0, &rc); test_true(rc == MEMCACHED_SUCCESS); @@ -3467,7 +3652,7 @@ static test_return_t pre_cork(memcached_st *memc) static test_return_t pre_cork_and_nonblock(memcached_st *memc) { test_return_t rc; - + rc= pre_cork(memc); #ifdef __APPLE__ @@ -3484,7 +3669,6 @@ static test_return_t pre_nonblock_binary(memcached_st *memc) { memcached_return_t rc= MEMCACHED_FAILURE; memcached_st *memc_clone; - memcached_server_instance_st instance; memc_clone= memcached_clone(NULL, memc); test_true(memc_clone); @@ -3492,9 +3676,7 @@ static test_return_t pre_nonblock_binary(memcached_st *memc) // will not toggle protocol on an connection. memcached_version(memc_clone); - instance= memcached_server_instance_by_position(memc_clone, 0); - - if (instance->major_version >= 1 && instance->minor_version > 2) + if (libmemcached_util_version_check(memc_clone, 1, 4, 4)) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); @@ -3619,29 +3801,42 @@ static test_return_t pre_behavior_ketama_weighted(memcached_st *memc) static test_return_t pre_binary(memcached_st *memc) { memcached_return_t rc= MEMCACHED_FAILURE; - memcached_st *memc_clone; - memcached_server_instance_st instance; - - memc_clone= memcached_clone(NULL, memc); - test_true(memc_clone); - // The memcached_version needs to be done on a clone, because the server - // will not toggle protocol on an connection. - memcached_version(memc_clone); - instance= memcached_server_instance_by_position(memc_clone, 0); - - if (instance->major_version >= 1 && instance->minor_version > 2) + if (libmemcached_util_version_check(memc, 1, 4, 4)) { rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); test_true(rc == MEMCACHED_SUCCESS); test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); } - memcached_free(memc_clone); - return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; } +static test_return_t pre_sasl(memcached_st *memc) +{ + memcached_return_t rc= MEMCACHED_FAILURE; + +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT + const char *server= getenv("LIBMEMCACHED_TEST_SASL_SERVER"); + const char *user= getenv("LIBMEMCACHED_TEST_SASL_USERNAME"); + const char *pass= getenv("LIBMEMCACHED_TEST_SASL_PASSWORD"); + + if (server != NULL && user != NULL && pass != NULL) + { + memcached_server_st *servers= memcached_servers_parse(server); + test_true(servers != NULL); + memcached_servers_reset(memc); + test_true(memcached_server_push(memc, servers) == MEMCACHED_SUCCESS); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); + rc= memcached_set_sasl_auth_data(memc, user, pass); + test_true(rc == MEMCACHED_SUCCESS); + } +#else + (void)memc; +#endif + + return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; +} static test_return_t pre_replication(memcached_st *memc) { @@ -3679,9 +3874,10 @@ static test_return_t pre_replication_noblock(memcached_st *memc) } -static void my_free(const memcached_st *ptr __attribute__((unused)), void *mem, void *context) +static void my_free(const memcached_st *ptr, void *mem, void *context) { - (void) context; + (void)context; + (void)ptr; #ifdef HARD_MALLOC_TESTS void *real_ptr= (mem == NULL) ? mem : (void*)((caddr_t)mem - 8); free(real_ptr); @@ -3691,9 +3887,10 @@ static void my_free(const memcached_st *ptr __attribute__((unused)), void *mem, } -static void *my_malloc(const memcached_st *ptr __attribute__((unused)), const size_t size, void *context) +static void *my_malloc(const memcached_st *ptr, const size_t size, void *context) { (void)context; + (void)ptr; #ifdef HARD_MALLOC_TESTS void *ret= malloc(size + 8); if (ret != NULL) @@ -3713,7 +3910,7 @@ static void *my_malloc(const memcached_st *ptr __attribute__((unused)), const si } -static void *my_realloc(const memcached_st *ptr __attribute__((unused)), void *mem, const size_t size, void *context) +static void *my_realloc(const memcached_st *ptr, void *mem, const size_t size, void *context) { (void)context; #ifdef HARD_MALLOC_TESTS @@ -3728,12 +3925,13 @@ static void *my_realloc(const memcached_st *ptr __attribute__((unused)), void *m return ret; #else + (void)ptr; return realloc(mem, size); #endif } -static void *my_calloc(const memcached_st *ptr __attribute__((unused)), size_t nelem, const size_t size, void *context) +static void *my_calloc(const memcached_st *ptr, size_t nelem, const size_t size, void *context) { (void)context; #ifdef HARD_MALLOC_TESTS @@ -3745,6 +3943,7 @@ static void *my_calloc(const memcached_st *ptr __attribute__((unused)), size_t n return mem; #else + (void)ptr; return calloc(nelem, size); #endif } @@ -3939,13 +4138,7 @@ static test_return_t enable_cas(memcached_st *memc) { unsigned int set= 1; - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); - - memcached_version(memc); - - if ((instance->major_version >= 1 && (instance->minor_version == 2 && instance->micro_version >= 4)) - || instance->minor_version > 2) + if (libmemcached_util_version_check(memc, 1, 2, 4)) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); @@ -3964,7 +4157,9 @@ static test_return_t check_for_1_2_3(memcached_st *memc) if ((instance->major_version >= 1 && (instance->minor_version == 2 && instance->micro_version >= 4)) || instance->minor_version > 2) + { return TEST_SUCCESS; + } return TEST_SKIPPED; } @@ -4033,7 +4228,11 @@ static test_return_t noreply_test(memcached_st *memc) for (size_t x= 0; x < 100; ++x) { char key[10]; - size_t len= (size_t)sprintf(key, "%zu", x); + int check_length= (size_t)snprintf(key, sizeof(key), "%lu", (unsigned long)x); + test_false((size_t)check_length >= sizeof(key) || check_length < 0); + + size_t len= (size_t)check_length; + switch (count) { case 0: @@ -4081,7 +4280,11 @@ static test_return_t noreply_test(memcached_st *memc) { char key[10]; - size_t len= (size_t)sprintf(key, "%zu", x); + int check_length= (size_t)snprintf(key, sizeof(key), "%lu", (unsigned long)x); + + test_false((size_t)check_length >= sizeof(key) || check_length < 0); + + size_t len= (size_t)check_length; size_t length; uint32_t flags; char* value=memcached_get(memc, key, strlen(key), @@ -4167,11 +4370,12 @@ static test_return_t analyzer_test(memcached_st *memc) } /* Count the objects */ -static memcached_return_t callback_dump_counter(const memcached_st *ptr __attribute__((unused)), - const char *key __attribute__((unused)), - size_t key_length __attribute__((unused)), +static memcached_return_t callback_dump_counter(const memcached_st *ptr, + const char *key, + size_t key_length, void *context) { + (void)ptr; (void)key; (void)key_length; size_t *counter= (size_t *)context; *counter= *counter + 1; @@ -4218,14 +4422,15 @@ static void* connection_release(void *arg) return arg; } +#define POOL_SIZE 10 static test_return_t connection_pool_test(memcached_st *memc) { - memcached_pool_st* pool= memcached_pool_create(memc, 5, 10); + memcached_pool_st* pool= memcached_pool_create(memc, 5, POOL_SIZE); test_true(pool != NULL); - memcached_st* mmc[10]; + memcached_st *mmc[POOL_SIZE]; memcached_return_t rc; - for (size_t x= 0; x < 10; ++x) + for (size_t x= 0; x < POOL_SIZE; ++x) { mmc[x]= memcached_pool_pop(pool, false, &rc); test_true(mmc[x] != NULL); @@ -4252,7 +4457,7 @@ static test_return_t connection_pool_test(memcached_st *memc) rc= memcached_set(mmc[0], key, keylen, "0", 1, 0, 0); test_true(rc == MEMCACHED_SUCCESS); - for (size_t x= 0; x < 10; ++x) + for (size_t x= 0; x < POOL_SIZE; ++x) { uint64_t number_value; rc= memcached_increment(mmc[x], key, keylen, 1, &number_value); @@ -4261,7 +4466,7 @@ static test_return_t connection_pool_test(memcached_st *memc) } // Release them.. - for (size_t x= 0; x < 10; ++x) + for (size_t x= 0; x < POOL_SIZE; ++x) { test_true(memcached_pool_push(pool, mmc[x]) == MEMCACHED_SUCCESS); } @@ -4288,8 +4493,78 @@ static test_return_t connection_pool_test(memcached_st *memc) test_true(memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK) == 9999); test_true(memcached_pool_push(pool, mmc[0]) == MEMCACHED_SUCCESS); - test_true(memcached_pool_destroy(pool) == memc); + + return TEST_SUCCESS; +} + +static test_return_t util_version_test(memcached_st *memc) +{ + bool if_successful; + + if_successful= libmemcached_util_version_check(memc, 0, 0, 0); + test_true(if_successful == true); + + if_successful= libmemcached_util_version_check(memc, 9, 9, 9); + + // We expect failure + if (if_successful) + { + fprintf(stderr, "\n----------------------------------------------------------------------\n"); + fprintf(stderr, "\nDumping Server Information\n\n"); + memcached_server_fn callbacks[1]; + + callbacks[0]= dump_server_information; + memcached_server_cursor(memc, callbacks, (void *)stderr, 1); + fprintf(stderr, "\n----------------------------------------------------------------------\n"); + } + test_true(if_successful == false); + + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); + + memcached_version(memc); + + // We only use one binary when we test, so this should be just fine. + if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, instance->micro_version); + test_true(if_successful == true); + + if (instance->micro_version > 0) + if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, (uint8_t)(instance->micro_version -1)); + else if (instance->minor_version > 0) + if_successful= libmemcached_util_version_check(memc, instance->major_version, (uint8_t)(instance->minor_version - 1), instance->micro_version); + else if (instance->major_version > 0) + if_successful= libmemcached_util_version_check(memc, (uint8_t)(instance->major_version -1), instance->minor_version, instance->micro_version); + + test_true(if_successful == true); + + if (instance->micro_version > 0) + if_successful= libmemcached_util_version_check(memc, instance->major_version, instance->minor_version, (uint8_t)(instance->micro_version +1)); + else if (instance->minor_version > 0) + if_successful= libmemcached_util_version_check(memc, instance->major_version, (uint8_t)(instance->minor_version +1), instance->micro_version); + else if (instance->major_version > 0) + if_successful= libmemcached_util_version_check(memc, (uint8_t)(instance->major_version +1), instance->minor_version, instance->micro_version); + + test_true(if_successful == false); + + return TEST_SUCCESS; +} + +static test_return_t ping_test(memcached_st *memc) +{ + memcached_return_t rc; + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); + + // Test both the version that returns a code, and the one that does not. + test_true(libmemcached_util_ping(memcached_server_name(instance), + memcached_server_port(instance), NULL)); + + test_true(libmemcached_util_ping(memcached_server_name(instance), + memcached_server_port(instance), &rc)); + + test_true(rc == MEMCACHED_SUCCESS); + return TEST_SUCCESS; } #endif @@ -4457,7 +4732,7 @@ static test_return_t replication_randomize_mget_test(memcached_st *memc) const char *keys[]= { "key1", "key2", "key3", "key4", "key5", "key6", "key7" }; size_t len[]= { 4, 4, 4, 4, 4, 4, 4 }; - for (int x=0; x< 7; ++x) + for (size_t x= 0; x< 7; ++x) { rc= memcached_set(memc, keys[x], len[x], "1", 1, 0, 0); test_true(rc == MEMCACHED_SUCCESS); @@ -4548,420 +4823,30 @@ static test_return_t replication_delete_test(memcached_st *memc) return TEST_SUCCESS; } -static void increment_request_id(uint16_t *id) -{ - (*id)++; - if ((*id & UDP_REQUEST_ID_THREAD_MASK) != 0) - *id= 0; -} - -static uint16_t *get_udp_request_ids(memcached_st *memc) +#if 0 +static test_return_t hash_sanity_test (memcached_st *memc) { - uint16_t *ids= malloc(sizeof(uint16_t) * memcached_server_count(memc)); - assert(ids != NULL); - - for (uint32_t x= 0; x < memcached_server_count(memc); x++) - { - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, x); + (void)memc; - ids[x]= get_udp_datagram_request_id((struct udp_datagram_header_st *) ((memcached_server_instance_st )instance)->write_buffer); - } + assert(MEMCACHED_HASH_DEFAULT == MEMCACHED_HASH_DEFAULT); + assert(MEMCACHED_HASH_MD5 == MEMCACHED_HASH_MD5); + assert(MEMCACHED_HASH_CRC == MEMCACHED_HASH_CRC); + assert(MEMCACHED_HASH_FNV1_64 == MEMCACHED_HASH_FNV1_64); + assert(MEMCACHED_HASH_FNV1A_64 == MEMCACHED_HASH_FNV1A_64); + assert(MEMCACHED_HASH_FNV1_32 == MEMCACHED_HASH_FNV1_32); + assert(MEMCACHED_HASH_FNV1A_32 == MEMCACHED_HASH_FNV1A_32); +#ifdef HAVE_HSIEH_HASH + assert(MEMCACHED_HASH_HSIEH == MEMCACHED_HASH_HSIEH); +#endif + assert(MEMCACHED_HASH_MURMUR == MEMCACHED_HASH_MURMUR); + assert(MEMCACHED_HASH_JENKINS == MEMCACHED_HASH_JENKINS); + assert(MEMCACHED_HASH_MAX == MEMCACHED_HASH_MAX); - return ids; + return TEST_SUCCESS; } +#endif -static test_return_t post_udp_op_check(memcached_st *memc, uint16_t *expected_req_ids) -{ - (void)memc; - (void)expected_req_ids; -#if 0 - memcached_server_st *cur_server = memcached_server_list(memc); - uint16_t *cur_req_ids = get_udp_request_ids(memc); - - for (size_t x= 0; x < memcached_server_count(memc); x++) - { - test_true(cur_server[x].cursor_active == 0); - test_true(cur_req_ids[x] == expected_req_ids[x]); - } - free(expected_req_ids); - free(cur_req_ids); - -#endif - return TEST_SUCCESS; -} - -/* -** There is a little bit of a hack here, instead of removing -** the servers, I just set num host to 0 and them add then new udp servers -**/ -static test_return_t init_udp(memcached_st *memc) -{ - memcached_version(memc); -#if 0 - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); - - /* For the time being, only support udp test for >= 1.2.6 && < 1.3 */ - if (instance->major_version != 1 || instance->minor_version != 2 - || instance->micro_version < 6) - return TEST_SKIPPED; - - uint32_t num_hosts= memcached_server_count(memc); - memcached_server_st servers[num_hosts]; - memcpy(servers, memcached_server_list(memc), sizeof(memcached_server_st) * num_hosts); - for (uint32_t x= 0; x < num_hosts; x++) - { - memcached_server_instance_st set_instance= - memcached_server_instance_by_position(memc, x); - - memcached_server_free(((memcached_server_write_instance_st)set_instance)); - } - - memc->number_of_hosts= 0; - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1); - for (uint32_t x= 0; x < num_hosts; x++) - { - memcached_server_instance_st set_instance= - memcached_server_instance_by_position(memc, x); - - test_true(memcached_server_add_udp(memc, servers[x].hostname, servers[x].port) == MEMCACHED_SUCCESS); - test_true(set_instance->write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } -#endif - - return TEST_SKIPPED; -} - -static test_return_t binary_init_udp(memcached_st *memc) -{ - test_return_t test_rc; - test_rc= pre_binary(memc); - - if (test_rc != TEST_SUCCESS) - return test_rc; - - return init_udp(memc); -} - -/* Make sure that I cant add a tcp server to a udp client */ -static test_return_t add_tcp_server_udp_client_test(memcached_st *memc) -{ - (void)memc; -#if 0 - memcached_server_st server; - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); - memcached_server_clone(&server, &memc->hosts[0]); - test_true(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); - test_true(memcached_server_add(memc, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); -#endif - return TEST_SUCCESS; -} - -/* Make sure that I cant add a udp server to a tcp client */ -static test_return_t add_udp_server_tcp_client_test(memcached_st *memc) -{ - (void)memc; -#if 0 - memcached_server_st server; - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); - memcached_server_clone(&server, &memc->hosts[0]); - test_true(memcached_server_remove(&(memc->hosts[0])) == MEMCACHED_SUCCESS); - - memcached_st tcp_client; - memcached_create(&tcp_client); - test_true(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL); -#endif - - return TEST_SUCCESS; -} - -static test_return_t set_udp_behavior_test(memcached_st *memc) -{ - - memcached_quit(memc); - memc->number_of_hosts= 0; - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution); - test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS); - test_true(memc->flags.use_udp); - test_true(memc->flags.no_reply); - - test_true(memcached_server_count(memc) == 0); - - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0); - test_true(! (memc->flags.use_udp)); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0); - test_true(! (memc->flags.no_reply)); - - return TEST_SUCCESS; -} - -static test_return_t udp_set_test(memcached_st *memc) -{ - unsigned int num_iters= 1025; //request id rolls over at 1024 - - for (size_t x= 0; x < num_iters;x++) - { - memcached_return_t rc; - const char *key= "foo"; - const char *value= "when we sanitize"; - uint16_t *expected_ids= get_udp_request_ids(memc); - unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, server_key); - size_t init_offset= instance->write_buffer_offset; - - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - /** NB, the check below assumes that if new write_ptr is less than - * the original write_ptr that we have flushed. For large payloads, this - * maybe an invalid assumption, but for the small payload we have it is OK - */ - if (rc == MEMCACHED_SUCCESS || - instance->write_buffer_offset < init_offset) - increment_request_id(&expected_ids[server_key]); - - if (rc == MEMCACHED_SUCCESS) - { - test_true(instance->write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } - else - { - test_true(instance->write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - test_true(instance->write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); - } - test_true(post_udp_op_check(memc, expected_ids) == TEST_SUCCESS); - } - return TEST_SUCCESS; -} - -static test_return_t udp_buffered_set_test(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); - return udp_set_test(memc); -} - -static test_return_t udp_set_too_big_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "bar"; - char value[MAX_UDP_DATAGRAM_LENGTH]; - uint16_t *expected_ids= get_udp_request_ids(memc); - rc= memcached_set(memc, key, strlen(key), - value, MAX_UDP_DATAGRAM_LENGTH, - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_WRITE_FAILURE); - - return post_udp_op_check(memc,expected_ids); -} - -static test_return_t udp_delete_test(memcached_st *memc) -{ - unsigned int num_iters= 1025; //request id rolls over at 1024 - - for (size_t x= 0; x < num_iters;x++) - { - memcached_return_t rc; - const char *key= "foo"; - uint16_t *expected_ids=get_udp_request_ids(memc); - unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, server_key); - size_t init_offset= instance->write_buffer_offset; - - rc= memcached_delete(memc, key, strlen(key), 0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); - - if (rc == MEMCACHED_SUCCESS || instance->write_buffer_offset < init_offset) - increment_request_id(&expected_ids[server_key]); - if (rc == MEMCACHED_SUCCESS) - { - test_true(instance->write_buffer_offset == UDP_DATAGRAM_HEADER_LENGTH); - } - else - { - test_true(instance->write_buffer_offset != UDP_DATAGRAM_HEADER_LENGTH); - test_true(instance->write_buffer_offset <= MAX_UDP_DATAGRAM_LENGTH); - } - test_true(post_udp_op_check(memc,expected_ids) == TEST_SUCCESS); - } - return TEST_SUCCESS; -} - -static test_return_t udp_buffered_delete_test(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); - return udp_delete_test(memc); -} - -static test_return_t udp_verbosity_test(memcached_st *memc) -{ - memcached_return_t rc; - uint16_t *expected_ids= get_udp_request_ids(memc); - - for (size_t x= 0; x < memcached_server_count(memc); x++) - { - increment_request_id(&expected_ids[x]); - } - - rc= memcached_verbosity(memc,3); - test_true(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc,expected_ids); -} - -static test_return_t udp_quit_test(memcached_st *memc) -{ - uint16_t *expected_ids= get_udp_request_ids(memc); - memcached_quit(memc); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_flush_test(memcached_st *memc) -{ - memcached_return_t rc; - uint16_t *expected_ids= get_udp_request_ids(memc); - - for (size_t x= 0; x < memcached_server_count(memc); x++) - { - increment_request_id(&expected_ids[x]); - } - - rc= memcached_flush(memc,0); - test_true(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc,expected_ids); -} - -static test_return_t udp_incr_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "incr"; - const char *value= "1"; - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - - test_true(rc == MEMCACHED_SUCCESS); - uint16_t *expected_ids= get_udp_request_ids(memc); - unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); - increment_request_id(&expected_ids[server_key]); - uint64_t newvalue; - rc= memcached_increment(memc, key, strlen(key), 1, &newvalue); - test_true(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_decr_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "decr"; - const char *value= "1"; - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - - test_true(rc == MEMCACHED_SUCCESS); - uint16_t *expected_ids= get_udp_request_ids(memc); - unsigned int server_key= memcached_generate_hash(memc, key, strlen(key)); - increment_request_id(&expected_ids[server_key]); - uint64_t newvalue; - rc= memcached_decrement(memc, key, strlen(key), 1, &newvalue); - test_true(rc == MEMCACHED_SUCCESS); - return post_udp_op_check(memc, expected_ids); -} - - -static test_return_t udp_stat_test(memcached_st *memc) -{ - memcached_stat_st * rv= NULL; - memcached_return_t rc; - char args[]= ""; - uint16_t *expected_ids = get_udp_request_ids(memc); - rv = memcached_stat(memc, args, &rc); - free(rv); - test_true(rc == MEMCACHED_NOT_SUPPORTED); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_version_test(memcached_st *memc) -{ - memcached_return_t rc; - uint16_t *expected_ids = get_udp_request_ids(memc); - rc = memcached_version(memc); - test_true(rc == MEMCACHED_NOT_SUPPORTED); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_get_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "foo"; - size_t vlen; - uint16_t *expected_ids = get_udp_request_ids(memc); - char *val= memcached_get(memc, key, strlen(key), &vlen, (uint32_t)0, &rc); - test_true(rc == MEMCACHED_NOT_SUPPORTED); - test_true(val == NULL); - return post_udp_op_check(memc, expected_ids); -} - -static test_return_t udp_mixed_io_test(memcached_st *memc) -{ - test_st current_op; - test_st mixed_io_ops [] ={ - {"udp_set_test", 0, - (test_callback_fn)udp_set_test}, - {"udp_set_too_big_test", 0, - (test_callback_fn)udp_set_too_big_test}, - {"udp_delete_test", 0, - (test_callback_fn)udp_delete_test}, - {"udp_verbosity_test", 0, - (test_callback_fn)udp_verbosity_test}, - {"udp_quit_test", 0, - (test_callback_fn)udp_quit_test}, - {"udp_flush_test", 0, - (test_callback_fn)udp_flush_test}, - {"udp_incr_test", 0, - (test_callback_fn)udp_incr_test}, - {"udp_decr_test", 0, - (test_callback_fn)udp_decr_test}, - {"udp_version_test", 0, - (test_callback_fn)udp_version_test} - }; - for (size_t x= 0; x < 500; x++) - { - current_op= mixed_io_ops[random() % 9]; - test_true(current_op.test_fn(memc) == TEST_SUCCESS); - } - return TEST_SUCCESS; -} - -#if 0 -static test_return_t hash_sanity_test (memcached_st *memc) -{ - (void)memc; - - assert(MEMCACHED_HASH_DEFAULT == MEMCACHED_HASH_DEFAULT); - assert(MEMCACHED_HASH_MD5 == MEMCACHED_HASH_MD5); - assert(MEMCACHED_HASH_CRC == MEMCACHED_HASH_CRC); - assert(MEMCACHED_HASH_FNV1_64 == MEMCACHED_HASH_FNV1_64); - assert(MEMCACHED_HASH_FNV1A_64 == MEMCACHED_HASH_FNV1A_64); - assert(MEMCACHED_HASH_FNV1_32 == MEMCACHED_HASH_FNV1_32); - assert(MEMCACHED_HASH_FNV1A_32 == MEMCACHED_HASH_FNV1A_32); -#ifdef HAVE_HSIEH_HASH - assert(MEMCACHED_HASH_HSIEH == MEMCACHED_HASH_HSIEH); -#endif - assert(MEMCACHED_HASH_MURMUR == MEMCACHED_HASH_MURMUR); - assert(MEMCACHED_HASH_JENKINS == MEMCACHED_HASH_JENKINS); - assert(MEMCACHED_HASH_MAX == MEMCACHED_HASH_MAX); - - return TEST_SUCCESS; -} -#endif - -static test_return_t hsieh_avaibility_test (memcached_st *memc) +static test_return_t hsieh_avaibility_test (memcached_st *memc) { memcached_return_t expected_rc= MEMCACHED_FAILURE; #ifdef HAVE_HSIEH_HASH @@ -4974,10 +4859,11 @@ static test_return_t hsieh_avaibility_test (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused))) +static test_return_t one_at_a_time_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4990,10 +4876,11 @@ static test_return_t one_at_a_time_run (memcached_st *memc __attribute__((unused return TEST_SUCCESS; } -static test_return_t md5_run (memcached_st *memc __attribute__((unused))) +static test_return_t md5_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5006,10 +4893,11 @@ static test_return_t md5_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t crc_run (memcached_st *memc __attribute__((unused))) +static test_return_t crc_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5022,10 +4910,11 @@ static test_return_t crc_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t fnv1_64_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1_64_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5038,10 +4927,11 @@ static test_return_t fnv1_64_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t fnv1a_64_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1a_64_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5054,11 +4944,11 @@ static test_return_t fnv1a_64_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t fnv1_32_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1_32_run (memcached_st *memc) { uint32_t x; const char **ptr; - + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5071,10 +4961,11 @@ static test_return_t fnv1_32_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t fnv1a_32_run (memcached_st *memc __attribute__((unused))) +static test_return_t fnv1a_32_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5087,10 +4978,11 @@ static test_return_t fnv1a_32_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t hsieh_run (memcached_st *memc __attribute__((unused))) +static test_return_t hsieh_run (memcached_st *memc) { uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5103,13 +4995,14 @@ static test_return_t hsieh_run (memcached_st *memc __attribute__((unused))) return TEST_SUCCESS; } -static test_return_t murmur_run (memcached_st *memc __attribute__((unused))) +static test_return_t murmur_run (memcached_st *memc) { -#ifdef __sparc +#ifdef WORDS_BIGENDIAN return TEST_SKIPPED; #else uint32_t x; const char **ptr; + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5123,11 +5016,11 @@ static test_return_t murmur_run (memcached_st *memc __attribute__((unused))) #endif } -static test_return_t jenkins_run (memcached_st *memc __attribute__((unused))) +static test_return_t jenkins_run (memcached_st *memc) { uint32_t x; const char **ptr; - + (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -5156,7 +5049,8 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) { uint32_t x; const char **ptr; - hashkit_st *kit; + const hashkit_st *kit; + hashkit_st new_kit; hashkit_return_t hash_rc; uint32_t md5_hosts[]= {4U, 1U, 0U, 1U, 4U, 2U, 0U, 3U, 0U, 0U, 3U, 1U, 0U, 0U, 1U, 3U, 0U, 0U, 0U, 3U, 1U, 0U, 4U, 4U, 3U}; @@ -5164,9 +5058,12 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) kit= memcached_get_hashkit(memc); - hash_rc= hashkit_set_custom_function(kit, hash_md5_test_function, NULL); + hashkit_clone(&new_kit, kit); + hash_rc= hashkit_set_custom_function(&new_kit, hash_md5_test_function, NULL); test_true(hash_rc == HASHKIT_SUCCESS); + memcached_set_hashkit(memc, &new_kit); + /* Verify Setting the hash. */ @@ -5178,7 +5075,7 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) test_true(md5_values[x] == hash_val); } - + /* Now check memcached_st. */ @@ -5190,9 +5087,11 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) test_true(md5_hosts[x] == hash_val); } - hash_rc= hashkit_set_custom_function(kit, hash_crc_test_function, NULL); + hash_rc= hashkit_set_custom_function(&new_kit, hash_crc_test_function, NULL); test_true(hash_rc == HASHKIT_SUCCESS); + memcached_set_hashkit(memc, &new_kit); + /* Verify Setting the hash. */ @@ -5215,6 +5114,120 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) return TEST_SUCCESS; } +/* + Test case adapted from John Gorman + + We are testing the error condition when we connect to a server via memcached_get() + but find that the server is not available. +*/ +static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *memc) +{ + (void)memc; + memcached_st *tl_memc_h; + memcached_server_st *servers; + + const char *key= "MemcachedLives"; + size_t len; + uint32_t flags; + memcached_return rc; + char *value; + + // Create a handle. + tl_memc_h= memcached_create(NULL); + servers= memcached_servers_parse("localhost:9898,localhost:9899"); // This server should not exist + memcached_server_push(tl_memc_h, servers); + memcached_server_list_free(servers); + + // See if memcached is reachable. + value= memcached_get(tl_memc_h, key, strlen(key), &len, &flags, &rc); + + test_false(value); + test_true(len == 0); + test_false(rc == MEMCACHED_SUCCESS); + + memcached_free(tl_memc_h); + + return TEST_SUCCESS; +} + +/* + We connect to a server which exists, but search for a key that does not exist. +*/ +static test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc) +{ + const char *key= "MemcachedKeyNotEXIST"; + size_t len; + uint32_t flags; + memcached_return rc; + char *value; + + // See if memcached is reachable. + value= memcached_get(memc, key, strlen(key), &len, &flags, &rc); + + test_false(value); + test_true(len == 0); + test_true(rc == MEMCACHED_NOTFOUND); + + return TEST_SUCCESS; +} + +/* + Test case adapted from John Gorman + + We are testing the error condition when we connect to a server via memcached_get_by_key() + but find that the server is not available. +*/ +static test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *memc) +{ + (void)memc; + memcached_st *tl_memc_h; + memcached_server_st *servers; + + const char *key= "MemcachedLives"; + size_t len; + uint32_t flags; + memcached_return rc; + char *value; + + // Create a handle. + tl_memc_h= memcached_create(NULL); + servers= memcached_servers_parse("localhost:9898,localhost:9899"); // This server should not exist + memcached_server_push(tl_memc_h, servers); + memcached_server_list_free(servers); + + // See if memcached is reachable. + value= memcached_get_by_key(tl_memc_h, key, strlen(key), key, strlen(key), &len, &flags, &rc); + + test_false(value); + test_true(len == 0); + test_false(rc == MEMCACHED_SUCCESS); + + memcached_free(tl_memc_h); + + return TEST_SUCCESS; +} + +/* + We connect to a server which exists, but search for a key that does not exist. +*/ +static test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc) +{ + const char *key= "MemcachedKeyNotEXIST"; + size_t len; + uint32_t flags; + memcached_return rc; + char *value; + + // See if memcached is reachable. + value= memcached_get_by_key(memc, key, strlen(key), key, strlen(key), &len, &flags, &rc); + + test_false(value); + test_true(len == 0); + test_true(rc == MEMCACHED_NOTFOUND); + + return TEST_SUCCESS; +} + static test_return_t ketama_compatibility_libmemcached(memcached_st *trash) { @@ -5390,7 +5403,7 @@ static test_return_t regression_bug_434843(memcached_st *memc) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); keys[x]= strdup(k); test_true(keys[x] != NULL); } @@ -5531,7 +5544,7 @@ static test_return_t regression_bug_447342(memcached_st *memc) memcached_server_instance_st instance_one; memcached_server_instance_st instance_two; - if (memcached_server_count(memc) < 3 || pre_replication(memc) != MEMCACHED_SUCCESS) + if (memcached_server_count(memc) < 3 || pre_replication(memc) != TEST_SUCCESS) return TEST_SKIPPED; memcached_return_t rc; @@ -5547,7 +5560,7 @@ static test_return_t regression_bug_447342(memcached_st *memc) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); keys[x]= strdup(k); test_true(keys[x] != NULL); rc= memcached_set(memc, k, key_length[x], k, key_length[x], 0, 0); @@ -5659,47 +5672,47 @@ static test_return_t regression_bug_463297(memcached_st *memc) (instance->major_version == 1 && instance->minor_version > 2)) { - /* Binary protocol doesn't support deferred delete */ - memcached_st *bin_clone= memcached_clone(NULL, memc); - test_true(bin_clone != NULL); - test_true(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS); - test_true(memcached_delete(bin_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); - memcached_free(bin_clone); + /* Binary protocol doesn't support deferred delete */ + memcached_st *bin_clone= memcached_clone(NULL, memc); + test_true(bin_clone != NULL); + test_true(memcached_behavior_set(bin_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1) == MEMCACHED_SUCCESS); + test_true(memcached_delete(bin_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); + memcached_free(bin_clone); - memcached_quit(memc_clone); + memcached_quit(memc_clone); - /* If we know the server version, deferred delete should fail - * with invalid arguments */ - test_true(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); + /* If we know the server version, deferred delete should fail + * with invalid arguments */ + test_true(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS); - /* If we don't know the server version, we should get a protocol error */ - memcached_return_t rc= memcached_delete(memc, "foo", 3, 1); + /* If we don't know the server version, we should get a protocol error */ + memcached_return_t rc= memcached_delete(memc, "foo", 3, 1); - /* but there is a bug in some of the memcached servers (1.4) that treats - * the counter as noreply so it doesn't send the proper error message - */ - test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + /* but there is a bug in some of the memcached servers (1.4) that treats + * the counter as noreply so it doesn't send the proper error message + */ + test_true_got(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR || rc == MEMCACHED_INVALID_ARGUMENTS, memcached_strerror(NULL, rc)); - /* And buffered mode should be disabled and we should get protocol error */ - test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS); - rc= memcached_delete(memc, "foo", 3, 1); - test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + /* And buffered mode should be disabled and we should get protocol error */ + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1) == MEMCACHED_SUCCESS); + rc= memcached_delete(memc, "foo", 3, 1); + test_true_got(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR || rc == MEMCACHED_INVALID_ARGUMENTS, memcached_strerror(NULL, rc)); - /* Same goes for noreply... */ - test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS); - rc= memcached_delete(memc, "foo", 3, 1); - test_true(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR); + /* Same goes for noreply... */ + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1) == MEMCACHED_SUCCESS); + rc= memcached_delete(memc, "foo", 3, 1); + test_true_got(rc == MEMCACHED_PROTOCOL_ERROR || rc == MEMCACHED_NOTFOUND || rc == MEMCACHED_CLIENT_ERROR || rc == MEMCACHED_INVALID_ARGUMENTS, memcached_strerror(NULL, rc)); - /* but a normal request should go through (and be buffered) */ - test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED); - test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); + /* but a normal request should go through (and be buffered) */ + test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_BUFFERED); + test_true(memcached_flush_buffers(memc) == MEMCACHED_SUCCESS); - test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS); - /* unbuffered noreply should be success */ - test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS); - /* unbuffered with reply should be not found... */ - test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS); - test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND); + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 0) == MEMCACHED_SUCCESS); + /* unbuffered noreply should be success */ + test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_SUCCESS); + /* unbuffered with reply should be not found... */ + test_true(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0) == MEMCACHED_SUCCESS); + test_true(memcached_delete(memc, "foo", 3, 0) == MEMCACHED_NOTFOUND); } memcached_free(memc_clone); @@ -5720,6 +5733,7 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) const char *key= "marmotte"; const char *value= "milka"; + memcached_reset_last_disconnected_server(memc); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); @@ -5747,7 +5761,12 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) (time_t)0, (uint32_t)0); test_true(rc != MEMCACHED_SUCCESS); - disconnected_server = memcached_server_get_last_disconnect(mine); + disconnected_server= memcached_server_get_last_disconnect(mine); + if (disconnected_server == NULL) + { + fprintf(stderr, "RC %s\n", memcached_strerror(mine, rc)); + abort(); + } test_true(disconnected_server != NULL); test_true(memcached_server_port(disconnected_server)== 9); test_true(strncmp(memcached_server_name(disconnected_server),"localhost",9) == 0); @@ -5758,6 +5777,100 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) return TEST_SUCCESS; } +static test_return_t test_verbosity(memcached_st *memc) +{ + memcached_verbosity(memc, 3); + + return TEST_SUCCESS; +} + +static test_return_t test_server_failure(memcached_st *memc) +{ + memcached_st *local_memc; + memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); + + local_memc= memcached_create(NULL); + + memcached_server_add(local_memc, memcached_server_name(instance), memcached_server_port(instance)); + memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, 2); + + uint32_t server_count= memcached_server_count(local_memc); + + test_true(server_count == 1); + + // Disable the server + instance= memcached_server_instance_by_position(local_memc, 0); + ((memcached_server_write_instance_st)instance)->server_failure_counter= 2; + + memcached_return_t rc; + rc= memcached_set(local_memc, "foo", strlen("foo"), + NULL, 0, + (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_SERVER_MARKED_DEAD); + + ((memcached_server_write_instance_st)instance)->server_failure_counter= 0; + rc= memcached_set(local_memc, "foo", strlen("foo"), + NULL, 0, + (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_SUCCESS); + + + memcached_free(local_memc); + + return TEST_SUCCESS; +} + +static test_return_t test_cull_servers(memcached_st *memc) +{ + uint32_t count = memcached_server_count(memc); + + // Do not do this in your code, it is not supported. + memc->servers[1].state.is_dead= true; + memc->state.is_time_for_rebuild= true; + + uint32_t new_count= memcached_server_count(memc); + test_true(count == new_count); + +#if 0 + test_true(count == new_count + 1 ); +#endif + + return TEST_SUCCESS; +} + + +static memcached_return_t stat_printer(memcached_server_instance_st server, + const char *key, size_t key_length, + const char *value, size_t value_length, + void *context) +{ + (void)server; + (void)context; + (void)key; + (void)key_length; + (void)value; + (void)value_length; + + return MEMCACHED_SUCCESS; +} + +static test_return_t memcached_stat_execute_test(memcached_st *memc) +{ + memcached_return_t rc= memcached_stat_execute(memc, NULL, stat_printer, NULL); + test_true(rc == MEMCACHED_SUCCESS); + + rc= memcached_stat_execute(memc, "slabs", stat_printer, NULL); + test_true(rc == MEMCACHED_SUCCESS); + + rc= memcached_stat_execute(memc, "items", stat_printer, NULL); + test_true(rc == MEMCACHED_SUCCESS); + + rc= memcached_stat_execute(memc, "sizes", stat_printer, NULL); + test_true(rc == MEMCACHED_SUCCESS); + + return TEST_SUCCESS; +} + /* * This test ensures that the failure counter isn't incremented during * normal termination of the memcached instance. @@ -5821,6 +5934,10 @@ static test_return_t regression_bug_490486(memcached_st *memc) memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, 1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 3600); +#ifdef __APPLE__ + return TEST_SKIPPED; // My MAC can't handle this test +#endif + /* * I only want to hit _one_ server so I know the number of requests I'm * sending in the pipeline. @@ -5834,47 +5951,70 @@ static test_return_t regression_bug_490486(memcached_st *memc) size_t *key_length=calloc(max_keys, sizeof(size_t)); /* First add all of the items.. */ + bool slept= false; char blob[1024]= { 0 }; memcached_return rc; for (size_t x= 0; x < max_keys; ++x) { char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%zu", x); + key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); keys[x]= strdup(k); assert(keys[x] != NULL); rc= memcached_set(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); - assert(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); +#ifdef __APPLE__ + if (rc == MEMCACHED_SERVER_MARKED_DEAD) + { + break; // We are out of business + } +#endif + test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED || rc == MEMCACHED_TIMEOUT); // MEMCACHED_TIMEOUT <-- only observed on OSX + + if (rc == MEMCACHED_TIMEOUT && slept == false) + { + x++; + sleep(1);// We will try to sleep + slept= true; + } + else if (rc == MEMCACHED_TIMEOUT && slept == true) + { + // We failed to send everything. + break; + } } - /* Try to get all of them with a large multiget */ - size_t counter= 0; - memcached_execute_function callbacks[1]= { [0]= &callback_counter }; - rc= memcached_mget_execute(memc, (const char**)keys, key_length, - (size_t)max_keys, callbacks, &counter, 1); + if (rc != MEMCACHED_SERVER_MARKED_DEAD) + { - assert(rc == MEMCACHED_SUCCESS); - char* the_value= NULL; - char the_key[MEMCACHED_MAX_KEY]; - size_t the_key_length; - size_t the_value_length; - uint32_t the_flags; + /* Try to get all of them with a large multiget */ + size_t counter= 0; + memcached_execute_function callbacks[1]= { [0]= &callback_counter }; + rc= memcached_mget_execute(memc, (const char**)keys, key_length, + (size_t)max_keys, callbacks, &counter, 1); - do { - the_value= memcached_fetch(memc, the_key, &the_key_length, &the_value_length, &the_flags, &rc); + assert(rc == MEMCACHED_SUCCESS); + char* the_value= NULL; + char the_key[MEMCACHED_MAX_KEY]; + size_t the_key_length; + size_t the_value_length; + uint32_t the_flags; - if ((the_value!= NULL) && (rc == MEMCACHED_SUCCESS)) - { - ++counter; - free(the_value); - } + do { + the_value= memcached_fetch(memc, the_key, &the_key_length, &the_value_length, &the_flags, &rc); + + if ((the_value!= NULL) && (rc == MEMCACHED_SUCCESS)) + { + ++counter; + free(the_value); + } - } while ( (the_value!= NULL) && (rc == MEMCACHED_SUCCESS)); + } while ( (the_value!= NULL) && (rc == MEMCACHED_SUCCESS)); - assert(rc == MEMCACHED_END); + assert(rc == MEMCACHED_END); - /* Verify that we got all of the items */ - assert(counter == max_keys); + /* Verify that we got all of the items */ + assert(counter == max_keys); + } /* Release all allocated resources */ for (size_t x= 0; x < max_keys; ++x) @@ -5889,36 +6029,181 @@ static test_return_t regression_bug_490486(memcached_st *memc) return TEST_SUCCESS; } +static test_return_t regression_bug_583031(memcached_st *unused) +{ + (void)unused; + memcached_st *memc= memcached_create(NULL); + assert(memc); + memcached_server_add(memc, "10.2.3.4", 11211); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 1000); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 1000); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, 1000); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, 3); -test_st udp_setup_server_tests[] ={ - {"set_udp_behavior_test", 0, (test_callback_fn)set_udp_behavior_test}, - {"add_tcp_server_udp_client_test", 0, (test_callback_fn)add_tcp_server_udp_client_test}, - {"add_udp_server_tcp_client_test", 0, (test_callback_fn)add_udp_server_tcp_client_test}, - {0, 0, 0} -}; + memcached_return_t rc; + size_t length; + uint32_t flags; -test_st upd_io_tests[] ={ - {"udp_set_test", 0, (test_callback_fn)udp_set_test}, - {"udp_buffered_set_test", 0, (test_callback_fn)udp_buffered_set_test}, - {"udp_set_too_big_test", 0, (test_callback_fn)udp_set_too_big_test}, - {"udp_delete_test", 0, (test_callback_fn)udp_delete_test}, - {"udp_buffered_delete_test", 0, (test_callback_fn)udp_buffered_delete_test}, - {"udp_verbosity_test", 0, (test_callback_fn)udp_verbosity_test}, - {"udp_quit_test", 0, (test_callback_fn)udp_quit_test}, - {"udp_flush_test", 0, (test_callback_fn)udp_flush_test}, - {"udp_incr_test", 0, (test_callback_fn)udp_incr_test}, - {"udp_decr_test", 0, (test_callback_fn)udp_decr_test}, - {"udp_stat_test", 0, (test_callback_fn)udp_stat_test}, - {"udp_version_test", 0, (test_callback_fn)udp_version_test}, - {"udp_get_test", 0, (test_callback_fn)udp_get_test}, - {"udp_mixed_io_test", 0, (test_callback_fn)udp_mixed_io_test}, - {0, 0, 0} -}; + (void)memcached_get(memc, "dsf", 3, &length, &flags, &rc); + + test_true_got(rc == MEMCACHED_TIMEOUT, memcached_strerror(NULL, rc)); + + memcached_free(memc); + + return TEST_SUCCESS; +} + +static void memcached_die(memcached_st* mc, memcached_return error, const char* what, uint32_t it) +{ + fprintf(stderr, "Iteration #%u: ", it); + + if(error == MEMCACHED_ERRNO) + { + fprintf(stderr, "system error %d from %s: %s\n", + errno, what, strerror(errno)); + } + else + { + fprintf(stderr, "error %d from %s: %s\n", error, what, + memcached_strerror(mc, error)); + } +} + +#define TEST_CONSTANT_CREATION 200 + +static test_return_t regression_bug_(memcached_st *memc) +{ + const char *remote_server; + (void)memc; + + if (! (remote_server= getenv("LIBMEMCACHED_REMOTE_SERVER"))) + { + return TEST_SKIPPED; + } + + for (uint32_t x= 0; x < TEST_CONSTANT_CREATION; x++) + { + memcached_st* mc= memcached_create(NULL); + memcached_return rc; + + rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); + if (rc != MEMCACHED_SUCCESS) + { + memcached_die(mc, rc, "memcached_behavior_set", x); + } + + rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, 1); + if (rc != MEMCACHED_SUCCESS) + { + memcached_die(mc, rc, "memcached_behavior_set", x); + } + + rc= memcached_server_add(mc, remote_server, 0); + if (rc != MEMCACHED_SUCCESS) + { + memcached_die(mc, rc, "memcached_server_add", x); + } + + const char *set_key= "akey"; + const size_t set_key_len= strlen(set_key); + const char *set_value= "a value"; + const size_t set_value_len= strlen(set_value); + + if (rc == MEMCACHED_SUCCESS) + { + if (x > 0) + { + size_t get_value_len; + char *get_value; + uint32_t get_value_flags; + + get_value= memcached_get(mc, set_key, set_key_len, &get_value_len, + &get_value_flags, &rc); + if (rc != MEMCACHED_SUCCESS) + { + memcached_die(mc, rc, "memcached_get", x); + } + else + { + + if (x != 0 && + (get_value_len != set_value_len + || 0!=strncmp(get_value, set_value, get_value_len))) + { + fprintf(stderr, "Values don't match?\n"); + rc= MEMCACHED_FAILURE; + } + free(get_value); + } + } + + rc= memcached_set(mc, + set_key, set_key_len, + set_value, set_value_len, + 0, /* time */ + 0 /* flags */ + ); + if (rc != MEMCACHED_SUCCESS) + { + memcached_die(mc, rc, "memcached_set", x); + } + } + + memcached_quit(mc); + memcached_free(mc); + + if (rc != MEMCACHED_SUCCESS) + { + break; + } + } + + return TEST_SUCCESS; +} + +/* + * Test that the sasl authentication works. We cannot use the default + * pool of servers, because that would require that all servers we want + * to test supports SASL authentication, and that they use the default + * creds. + */ +static test_return_t sasl_auth_test(memcached_st *memc) +{ +#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT + memcached_return_t rc; + + rc= memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_SUCCESS); + test_true((rc= memcached_delete(memc, "foo", 3, 0)) == MEMCACHED_SUCCESS); + test_true((rc= memcached_destroy_sasl_auth_data(memc)) == MEMCACHED_SUCCESS); + test_true((rc= memcached_destroy_sasl_auth_data(memc)) == MEMCACHED_FAILURE); + test_true((rc= memcached_destroy_sasl_auth_data(NULL)) == MEMCACHED_FAILURE); + memcached_quit(memc); + + rc= memcached_set_sasl_auth_data(memc, + getenv("LIBMEMCACHED_TEST_SASL_USERNAME"), + getenv("LIBMEMCACHED_TEST_SASL_SERVER")); + test_true(rc == MEMCACHED_SUCCESS); + + rc= memcached_set(memc, "foo", 3, "bar", 3, (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_AUTH_FAILURE); + test_true(memcached_destroy_sasl_auth_data(memc) == MEMCACHED_SUCCESS); + + memcached_quit(memc); + return TEST_SUCCESS; +#else + (void)memc; + return TEST_FAILURE; +#endif +} /* Clean the server before beginning testing */ test_st tests[] ={ + {"util_version", 1, (test_callback_fn)util_version_test }, {"flush", 0, (test_callback_fn)flush_test }, {"init", 0, (test_callback_fn)init_test }, {"allocation", 0, (test_callback_fn)allocation_test }, @@ -5973,14 +6258,27 @@ test_st tests[] ={ {"analyzer", 1, (test_callback_fn)analyzer_test}, #ifdef HAVE_LIBMEMCACHEDUTIL {"connectionpool", 1, (test_callback_fn)connection_pool_test }, + {"ping", 1, (test_callback_fn)ping_test }, #endif {"test_get_last_disconnect", 1, (test_callback_fn)test_get_last_disconnect}, + {"verbosity", 1, (test_callback_fn)test_verbosity}, + {"test_server_failure", 1, (test_callback_fn)test_server_failure}, + {"cull_servers", 1, (test_callback_fn)test_cull_servers}, + {"memcached_stat_execute", 1, (test_callback_fn)memcached_stat_execute_test}, {0, 0, 0} }; test_st behavior_tests[] ={ {"behavior_test", 0, (test_callback_fn)behavior_test}, {"MEMCACHED_BEHAVIOR_CORK", 0, (test_callback_fn)MEMCACHED_BEHAVIOR_CORK_test}, + {"MEMCACHED_BEHAVIOR_TCP_KEEPALIVE", 0, (test_callback_fn)MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test}, + {"MEMCACHED_BEHAVIOR_TCP_KEEPIDLE", 0, (test_callback_fn)MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test}, + {0, 0, 0} +}; + +test_st regression_binary_vs_block[] ={ + {"block add", 1, (test_callback_fn)block_add_regression}, + {"binary add", 1, (test_callback_fn)binary_add_regression}, {0, 0, 0} }; @@ -6031,7 +6329,7 @@ test_st user_tests[] ={ {"user_supplied_bug14", 1, (test_callback_fn)user_supplied_bug14 }, {"user_supplied_bug15", 1, (test_callback_fn)user_supplied_bug15 }, {"user_supplied_bug16", 1, (test_callback_fn)user_supplied_bug16 }, -#ifndef __sun +#if !defined(__sun) && !defined(__OpenBSD__) /* ** It seems to be something weird with the character sets.. ** value_fetch is unable to parse the value line (iscntrl "fails"), so I @@ -6067,12 +6365,19 @@ test_st replication_tests[]= { test_st regression_tests[]= { {"lp:434484", 1, (test_callback_fn)regression_bug_434484 }, {"lp:434843", 1, (test_callback_fn)regression_bug_434843 }, - {"lp:434843 buffered", 1, (test_callback_fn)regression_bug_434843_buffered }, + {"lp:434843-buffered", 1, (test_callback_fn)regression_bug_434843_buffered }, {"lp:421108", 1, (test_callback_fn)regression_bug_421108 }, {"lp:442914", 1, (test_callback_fn)regression_bug_442914 }, {"lp:447342", 1, (test_callback_fn)regression_bug_447342 }, {"lp:463297", 1, (test_callback_fn)regression_bug_463297 }, {"lp:490486", 1, (test_callback_fn)regression_bug_490486 }, + {"lp:583031", 1, (test_callback_fn)regression_bug_583031 }, + {"lp:?", 1, (test_callback_fn)regression_bug_ }, + {0, 0, (test_callback_fn)0} +}; + +test_st sasl_auth_tests[]= { + {"sasl_auth", 1, (test_callback_fn)sasl_auth_test }, {0, 0, (test_callback_fn)0} }; @@ -6150,14 +6455,19 @@ test_st hash_tests[] ={ {0, 0, (test_callback_fn)0} }; +test_st error_conditions[] ={ + {"memcached_get_MEMCACHED_ERRNO", 0, (test_callback_fn)memcached_get_MEMCACHED_ERRNO }, + {"memcached_get_MEMCACHED_NOTFOUND", 0, (test_callback_fn)memcached_get_MEMCACHED_NOTFOUND }, + {"memcached_get_by_key_MEMCACHED_ERRNO", 0, (test_callback_fn)memcached_get_by_key_MEMCACHED_ERRNO }, + {"memcached_get_by_key_MEMCACHED_NOTFOUND", 0, (test_callback_fn)memcached_get_by_key_MEMCACHED_NOTFOUND }, + {0, 0, (test_callback_fn)0} +}; + collection_st collection[] ={ #if 0 {"hash_sanity", 0, 0, hash_sanity}, #endif {"hsieh_availability", 0, 0, hsieh_availability}, - {"udp_setup", (test_callback_fn)init_udp, 0, udp_setup_server_tests}, - {"udp_io", (test_callback_fn)init_udp, 0, upd_io_tests}, - {"udp_binary_io", (test_callback_fn)binary_init_udp, 0, upd_io_tests}, {"block", 0, 0, tests}, {"binary", (test_callback_fn)pre_binary, 0, tests}, {"nonblock", (test_callback_fn)pre_nonblock, 0, tests}, @@ -6184,6 +6494,8 @@ collection_st collection[] ={ #endif {"memory_allocators", (test_callback_fn)set_memory_alloc, 0, tests}, {"prefix", (test_callback_fn)set_prefix, 0, tests}, + {"sasl_auth", (test_callback_fn)pre_sasl, 0, sasl_auth_tests }, + {"sasl", (test_callback_fn)pre_sasl, 0, tests }, {"version_1_2_3", (test_callback_fn)check_for_1_2_3, 0, version_1_2_3}, {"string", 0, 0, string_tests}, {"result", 0, 0, result_tests}, @@ -6210,6 +6522,8 @@ collection_st collection[] ={ {"replication_noblock", (test_callback_fn)pre_replication_noblock, 0, replication_tests}, {"regression", 0, 0, regression_tests}, {"behaviors", 0, 0, behavior_tests}, + {"regression_binary_vs_block", (test_callback_fn)key_setup, (test_callback_fn)key_teardown, regression_binary_vs_block}, + {"error_conditions", 0, 0, error_conditions}, {0, 0, 0, 0} };