X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fmem_functions.cc;h=9750d44d2062f4ac2371fb1d1e60863e2845d4bb;hb=fbdf9f2089a2653c8ea8150af22852ebc61ce42d;hp=a4d424f0b66f44bf1dd0c0bcac9b70b850cfb7c3;hpb=e83783bf806a23af0cb813bc61224580a3b743c8;p=m6w6%2Flibmemcached diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index a4d424f0..9750d44d 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -38,6 +38,10 @@ #include #include +#if defined(HAVE_LIBUUID) && HAVE_LIBUUID +#include +#endif + /* Test cases */ @@ -48,7 +52,8 @@ #include -#include +#include + #include #include #include @@ -64,66 +69,44 @@ #include #include "clients/generator.h" -#include "clients/execute.h" #define SMALL_STRING_LEN 1024 #include -#include "tests/basic.h" -#include "tests/debug.h" -#include "tests/deprecated.h" -#include "tests/error_conditions.h" -#include "tests/exist.h" -#include "tests/ketama.h" -#include "tests/namespace.h" -#include "tests/parser.h" -#include "tests/touch.h" -#include "tests/callbacks.h" -#include "tests/pool.h" -#include "tests/print.h" -#include "tests/replication.h" -#include "tests/server_add.h" -#include "tests/virtual_buckets.h" - using namespace libtest; #include #include "tests/hash_results.h" -#define GLOBAL_COUNT 10000 -#define GLOBAL2_COUNT 100 -#define SERVERS_TO_CREATE 5 -static uint32_t global_count= GLOBAL2_COUNT; +#include "tests/libmemcached-1.0/callback_counter.h" +#include "tests/libmemcached-1.0/fetch_all_results.h" +#include "tests/libmemcached-1.0/mem_functions.h" +#include "tests/libmemcached-1.0/setup_and_teardowns.h" +#include "tests/print.h" +#include "tests/debug.h" -static pairs_st *global_pairs; -static const char *global_keys[GLOBAL_COUNT]; -static size_t global_keys_length[GLOBAL_COUNT]; +#define UUID_STRING_MAXLENGTH 36 -/** - @note This should be testing to see if the server really supports the binary protocol. -*/ -static test_return_t pre_binary(memcached_st *memc) -{ - test_skip(true, libmemcached_util_version_check(memc, 1, 4, 4)); - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, true)); +#include "tests/keys.hpp" - return TEST_SUCCESS; -} +#include "libmemcached/instance.h" -static bool return_value_based_on_buffering(memcached_st *memc) +static memcached_st * create_single_instance_memcached(const memcached_st *original_memc, const char *options) { - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS)) + /* + If no options are given, copy over at least the binary flag. + */ + char options_buffer[1024]= { 0 }; + if (options == NULL) { - return MEMCACHED_BUFFERED; + if (memcached_is_binary(original_memc)) + { + snprintf(options_buffer, sizeof(options_buffer), "--BINARY"); + } } - return MEMCACHED_SUCCESS; -} - -static memcached_st * create_single_instance_memcached(const memcached_st *original_memc, const char *options) -{ /* * I only want to hit _one_ server so I know the number of requests I'm * sending in the pipeline. @@ -132,16 +115,32 @@ static memcached_st * create_single_instance_memcached(const memcached_st *origi char server_string[1024]; int server_string_length; - if (options) + if (instance->type == MEMCACHED_CONNECTION_UNIX_SOCKET) { - server_string_length= snprintf(server_string, sizeof(server_string), "--server=%s:%d %s", - memcached_server_name(instance), int(memcached_server_port(instance)), - options); + if (options) + { + server_string_length= snprintf(server_string, sizeof(server_string), "--SOCKET=\"%s\" %s", + memcached_server_name(instance), options); + } + else + { + server_string_length= snprintf(server_string, sizeof(server_string), "--SOCKET=\"%s\"", + memcached_server_name(instance)); + } } else { - server_string_length= snprintf(server_string, sizeof(server_string), "--server=%s:%d", - memcached_server_name(instance), int(memcached_server_port(instance))); + if (options) + { + server_string_length= snprintf(server_string, sizeof(server_string), "--server=%s:%d %s", + memcached_server_name(instance), int(memcached_server_port(instance)), + options); + } + else + { + server_string_length= snprintf(server_string, sizeof(server_string), "--server=%s:%d", + memcached_server_name(instance), int(memcached_server_port(instance))); + } } if (server_string_length <= 0) @@ -149,10 +148,10 @@ static memcached_st * create_single_instance_memcached(const memcached_st *origi return NULL; } - char buffer[1024]; - if (memcached_failed(libmemcached_check_configuration(server_string, server_string_length, buffer, sizeof(buffer)))) + char errror_buffer[1024]; + if (memcached_failed(libmemcached_check_configuration(server_string, server_string_length, errror_buffer, sizeof(errror_buffer)))) { - Error << "Failed to parse " << server_string_length; + Error << "Failed to parse (" << server_string << ") " << errror_buffer; return NULL; } @@ -160,7 +159,7 @@ static memcached_st * create_single_instance_memcached(const memcached_st *origi } -static test_return_t init_test(memcached_st *not_used) +test_return_t init_test(memcached_st *not_used) { memcached_st memc; (void)not_used; @@ -175,20 +174,20 @@ static test_return_t init_test(memcached_st *not_used) in_port_t test_ports[TEST_PORT_COUNT]; static memcached_return_t server_display_function(const memcached_st *ptr, - const memcached_server_st *server, + memcached_server_instance_st server, void *context) { /* Do Nothing */ size_t bigger= *((size_t *)(context)); (void)ptr; - assert(bigger <= memcached_server_port(server)); + fatal_assert(bigger <= memcached_server_port(server)); *((size_t *)(context))= memcached_server_port(server); return MEMCACHED_SUCCESS; } static memcached_return_t dump_server_information(const memcached_st *ptr, - const memcached_server_st *instance, + memcached_server_instance_st instance, void *context) { /* Do Nothing */ @@ -205,7 +204,7 @@ static memcached_return_t dump_server_information(const memcached_st *ptr, return MEMCACHED_SUCCESS; } -static test_return_t server_sort_test(memcached_st *ptr) +test_return_t server_sort_test(memcached_st *ptr) { size_t bigger= 0; /* Prime the value for the test_true in server_display_function */ @@ -238,7 +237,7 @@ static test_return_t server_sort_test(memcached_st *ptr) return TEST_SUCCESS; } -static test_return_t server_sort2_test(memcached_st *ptr) +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_server_fn callbacks[1]; @@ -274,7 +273,7 @@ static test_return_t server_sort2_test(memcached_st *ptr) return TEST_SUCCESS; } -static test_return_t memcached_server_remove_test(memcached_st*) +test_return_t memcached_server_remove_test(memcached_st*) { const char *server_string= "--server=localhost:4444 --server=localhost:4445 --server=localhost:4446 --server=localhost:4447 --server=localhost --server=memcache1.memcache.bk.sapo.pt:11211 --server=memcache1.memcache.bk.sapo.pt:11212 --server=memcache1.memcache.bk.sapo.pt:11213 --server=memcache1.memcache.bk.sapo.pt:11214 --server=memcache2.memcache.bk.sapo.pt:11211 --server=memcache2.memcache.bk.sapo.pt:11212 --server=memcache2.memcache.bk.sapo.pt:11213 --server=memcache2.memcache.bk.sapo.pt:11214"; char buffer[BUFSIZ]; @@ -294,7 +293,7 @@ static test_return_t memcached_server_remove_test(memcached_st*) } static memcached_return_t server_display_unsort_function(const memcached_st*, - const memcached_server_st *server, + memcached_server_instance_st server, void *context) { /* Do Nothing */ @@ -311,7 +310,7 @@ static memcached_return_t server_display_unsort_function(const memcached_st*, return MEMCACHED_SUCCESS; } -static test_return_t server_unsort_test(memcached_st *ptr) +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 */ @@ -347,7 +346,7 @@ static test_return_t server_unsort_test(memcached_st *ptr) return TEST_SUCCESS; } -static test_return_t allocation_test(memcached_st *not_used) +test_return_t allocation_test(memcached_st *not_used) { (void)not_used; memcached_st *memc; @@ -358,7 +357,7 @@ static test_return_t allocation_test(memcached_st *not_used) return TEST_SUCCESS; } -static test_return_t clone_test(memcached_st *memc) +test_return_t clone_test(memcached_st *memc) { /* All null? */ { @@ -394,7 +393,7 @@ static test_return_t clone_test(memcached_st *memc) test_true(memc_clone->ketama.weighted == memc->ketama.weighted); test_true(memc_clone->flags.binary_protocol == memc->flags.binary_protocol); test_true(memc_clone->flags.hash_with_namespace == memc->flags.hash_with_namespace); - test_true(memc_clone->flags.no_reply == memc->flags.no_reply); + test_true(memc_clone->flags.reply == memc->flags.reply); test_true(memc_clone->flags.use_udp == memc->flags.use_udp); test_true(memc_clone->flags.auto_eject_hosts == memc->flags.auto_eject_hosts); test_true(memc_clone->flags.randomize_replica_read == memc->flags.randomize_replica_read); @@ -441,7 +440,7 @@ static test_return_t clone_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t userdata_test(memcached_st *memc) +test_return_t userdata_test(memcached_st *memc) { void* foo= NULL; test_false(memcached_set_user_data(memc, foo)); @@ -451,7 +450,7 @@ static test_return_t userdata_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t connection_test(memcached_st *memc) +test_return_t connection_test(memcached_st *memc) { test_compare(MEMCACHED_SUCCESS, memcached_server_add_with_weight(memc, "localhost", 0, 0)); @@ -459,18 +458,18 @@ static test_return_t connection_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t libmemcached_string_behavior_test(memcached_st *) +test_return_t libmemcached_string_behavior_test(memcached_st *) { for (int x= MEMCACHED_BEHAVIOR_NO_BLOCK; x < int(MEMCACHED_BEHAVIOR_MAX); ++x) { test_true(libmemcached_string_behavior(memcached_behavior_t(x))); } - test_compare(36, int(MEMCACHED_BEHAVIOR_MAX)); + test_compare(37, int(MEMCACHED_BEHAVIOR_MAX)); return TEST_SUCCESS; } -static test_return_t libmemcached_string_distribution_test(memcached_st *) +test_return_t libmemcached_string_distribution_test(memcached_st *) { for (int x= MEMCACHED_DISTRIBUTION_MODULA; x < int(MEMCACHED_DISTRIBUTION_CONSISTENT_MAX); ++x) { @@ -481,11 +480,11 @@ static test_return_t libmemcached_string_distribution_test(memcached_st *) return TEST_SUCCESS; } -static test_return_t memcached_return_t_TEST(memcached_st *memc) +test_return_t memcached_return_t_TEST(memcached_st *memc) { uint32_t values[] = { 851992627U, 2337886783U, 4109241422U, 4001849190U, 982370485U, 1263635348U, 4242906218U, 3829656100U, - 1891735253U, 334139633U, 2257084983U, 3088286104U, + 1891735253U, 334139633U, 2257084983U, 3351789013U, 13199785U, 2542027183U, 1097051614U, 199566778U, 2748246961U, 2465192557U, 1664094137U, 2405439045U, 1842224848U, 692413798U, 3479807801U, 919913813U, @@ -516,46 +515,48 @@ static test_return_t memcached_return_t_TEST(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t set_test(memcached_st *memc) +test_return_t set_test(memcached_st *memc) { memcached_return_t rc= memcached_set(memc, test_literal_param("foo"), test_literal_param("when we sanitize"), time_t(0), (uint32_t)0); - test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_strerror(NULL, rc)); + test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); return TEST_SUCCESS; } -static test_return_t append_test(memcached_st *memc) +test_return_t append_test(memcached_st *memc) { memcached_return_t rc; - 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); - test_compare(MEMCACHED_SUCCESS, rc); - - rc= memcached_set(memc, key, strlen(key), - in_value, strlen(in_value), - (time_t)0, (uint32_t)0); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_flush(memc, 0)); - rc= memcached_append(memc, key, strlen(key), - " the", strlen(" the"), - (time_t)0, (uint32_t)0); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param(__func__), + in_value, strlen(in_value), + time_t(0), uint32_t(0))); - rc= memcached_append(memc, key, strlen(key), - " people", strlen(" people"), - (time_t)0, (uint32_t)0); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_append(memc, + test_literal_param(__func__), + " the", strlen(" the"), + time_t(0), uint32_t(0))); - out_value= memcached_get(memc, key, strlen(key), - &value_length, &flags, &rc); + test_compare(MEMCACHED_SUCCESS, + memcached_append(memc, + test_literal_param(__func__), + " people", strlen(" people"), + time_t(0), uint32_t(0))); + + char *out_value= memcached_get(memc, + test_literal_param(__func__), + &value_length, &flags, &rc); test_memcmp(out_value, "we the people", strlen("we the people")); test_compare(strlen("we the people"), value_length); test_compare(MEMCACHED_SUCCESS, rc); @@ -564,42 +565,42 @@ static test_return_t append_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t append_binary_test(memcached_st *memc) +test_return_t append_binary_test(memcached_st *memc) { - memcached_return_t rc; - const char *key= "numbers"; uint32_t store_list[] = { 23, 56, 499, 98, 32847, 0 }; - uint32_t *value; - size_t value_length; - uint32_t flags; - uint32_t x; - rc= memcached_flush(memc, 0); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_flush(memc, 0)); - rc= memcached_set(memc, - key, strlen(key), - NULL, 0, - (time_t)0, (uint32_t)0); - test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param(__func__), + NULL, 0, + time_t(0), uint32_t(0))); - for (x= 0; store_list[x] ; x++) + size_t count= 0; + for (uint32_t x= 0; store_list[x] ; x++) { - rc= memcached_append(memc, - key, strlen(key), + test_compare(MEMCACHED_SUCCESS, + memcached_append(memc, + test_literal_param(__func__), (char *)&store_list[x], sizeof(uint32_t), - (time_t)0, (uint32_t)0); - test_compare(MEMCACHED_SUCCESS, rc); + time_t(0), uint32_t(0))); + count++; } - value= (uint32_t *)memcached_get(memc, key, strlen(key), - &value_length, &flags, &rc); - test_compare(value_length, sizeof(uint32_t) * x); + size_t value_length; + uint32_t flags; + memcached_return_t rc; + uint32_t *value= (uint32_t *)memcached_get(memc, + test_literal_param(__func__), + &value_length, &flags, &rc); + test_compare(value_length, sizeof(uint32_t) * count); test_compare(MEMCACHED_SUCCESS, rc); - for (uint32_t counter= x, *ptr= value; counter; counter--) + for (uint32_t counter= count, *ptr= value; counter; counter--) { - test_compare(*ptr, store_list[x - counter]); + test_compare(*ptr, store_list[count - counter]); ptr++; } free(value); @@ -607,36 +608,90 @@ static test_return_t append_binary_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t cas2_test(memcached_st *memc) +test_return_t memcached_mget_mixed_memcached_get_TEST(memcached_st *memc) +{ + keys_st keys(200); + + for (libtest::vchar_ptr_t::iterator iter= keys.begin(); + iter != keys.end(); + iter++) + { + test_compare_hint(MEMCACHED_SUCCESS, + memcached_set(memc, + (*iter), 36, + NULL, 0, + time_t(0), uint32_t(0)), + memcached_last_error_message(memc)); + } + + for (ptrdiff_t loop= 0; loop < 20; loop++) + { + if (random() %2) + { + test_compare(MEMCACHED_SUCCESS, + memcached_mget(memc, keys.keys_ptr(), keys.lengths_ptr(), keys.size())); + + memcached_result_st *results= memcached_result_create(memc, NULL); + test_true(results); + + size_t result_count= 0; + memcached_return_t rc; + while (memcached_fetch_result(memc, results, &rc)) + { + result_count++; + } + test_true(keys.size() >= result_count); + } + else + { + int which_key= random() %keys.size(); + size_t value_length; + uint32_t flags; + memcached_return_t rc; + char *out_value= memcached_get(memc, keys.key_at(which_key), keys.length_at(which_key), + &value_length, &flags, &rc); + if (rc == MEMCACHED_NOTFOUND) + { } // It is possible that the value has been purged. + else + { + test_compare(MEMCACHED_SUCCESS, rc); + } + test_null(out_value); + test_zero(value_length); + test_zero(flags); + } + } + + return TEST_SUCCESS; +} + +test_return_t cas2_test(memcached_st *memc) { - memcached_return_t rc; const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; const char *value= "we the people"; size_t value_length= strlen("we the people"); - memcached_result_st results_obj; - memcached_result_st *results; - unsigned int set= 1; test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0)); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, true)); for (uint32_t x= 0; x < 3; x++) { - rc= memcached_set(memc, keys[x], key_length[x], - keys[x], key_length[x], - (time_t)50, (uint32_t)9); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, keys[x], key_length[x], + keys[x], key_length[x], + time_t(50), uint32_t(9))); } test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 3)); - results= memcached_result_create(memc, &results_obj); + memcached_result_st *results= memcached_result_create(memc, NULL); test_true(results); - results= memcached_fetch_result(memc, &results_obj, &rc); + memcached_return_t rc; + results= memcached_fetch_result(memc, results, &rc); test_true(results); test_true(results->item_cas); test_compare(MEMCACHED_SUCCESS, rc); @@ -646,38 +701,32 @@ static test_return_t cas2_test(memcached_st *memc) test_compare(strlen("we the people"), value_length); test_compare(MEMCACHED_SUCCESS, rc); - memcached_result_free(&results_obj); + memcached_result_free(results); return TEST_SUCCESS; } -static test_return_t cas_test(memcached_st *memc) +test_return_t cas_test(memcached_st *memc) { - const char *key= "fun"; - size_t key_length= strlen(key); - const char *value= "we the people"; - 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"; - size_t value2_length= strlen(value2); + const char* keys[2] = { __func__, NULL }; + size_t keylengths[2] = { strlen(__func__), 0 }; memcached_result_st results_obj; - memcached_result_st *results; test_compare(MEMCACHED_SUCCESS, memcached_flush(memc, 0)); test_skip(true, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, true)); test_compare(MEMCACHED_SUCCESS, - memcached_set(memc, key, strlen(key), - value, strlen(value), + memcached_set(memc, + test_literal_param(__func__), + test_literal_param("we the people"), (time_t)0, (uint32_t)0)); test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, keylengths, 1)); - results= memcached_result_create(memc, &results_obj); + memcached_result_st *results= memcached_result_create(memc, &results_obj); test_true(results); memcached_return_t rc; @@ -685,10 +734,11 @@ static test_return_t cas_test(memcached_st *memc) test_true(results); test_compare(MEMCACHED_SUCCESS, rc); test_true(memcached_result_cas(results)); - test_memcmp(value, memcached_result_value(results), value_length); - test_compare(strlen(memcached_result_value(results)), value_length); - test_compare(MEMCACHED_SUCCESS, rc); - uint64_t cas = memcached_result_cas(results); + test_memcmp("we the people", memcached_result_value(results), test_literal_param_size("we the people")); + test_compare(test_literal_param_size("we the people"), + strlen(memcached_result_value(results))); + + uint64_t cas= memcached_result_cas(results); #if 0 results= memcached_fetch_result(memc, &results_obj, &rc); @@ -696,22 +746,29 @@ static test_return_t cas_test(memcached_st *memc) test_true(results == NULL); #endif - rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_cas(memc, + test_literal_param(__func__), + test_literal_param("change the value"), + 0, 0, cas)); /* * The item will have a new cas value, so try to set it again with the old * value. This should fail! */ - rc= memcached_cas(memc, key, key_length, value2, value2_length, 0, 0, cas); - test_compare(MEMCACHED_DATA_EXISTS, rc); + test_compare(MEMCACHED_DATA_EXISTS, + memcached_cas(memc, + test_literal_param(__func__), + test_literal_param("change the value"), + 0, 0, cas)); memcached_result_free(&results_obj); return TEST_SUCCESS; } -static test_return_t prepend_test(memcached_st *memc) + +test_return_t prepend_test(memcached_st *memc) { const char *key= "fig"; const char *value= "people"; @@ -751,33 +808,51 @@ static test_return_t prepend_test(memcached_st *memc) Set the value, then quit to make sure it is flushed. Come back in and test that add fails. */ -static test_return_t add_test(memcached_st *memc) +test_return_t memcached_add_SUCCESS_TEST(memcached_st *memc) { memcached_return_t rc; - const char *key= "foo"; - const char *value= "when we sanitize"; - unsigned long long setting_value; + test_null(memcached_get(memc, test_literal_param(__func__), NULL, NULL, &rc)); + test_compare(MEMCACHED_NOTFOUND, rc); - setting_value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK); + test_compare(MEMCACHED_SUCCESS, + memcached_add(memc, + test_literal_param(__func__), + test_literal_param("try something else"), + time_t(0), uint32_t(0))); + + return TEST_SUCCESS; +} + +/* + Set the value, then quit to make sure it is flushed. + Come back in and test that add fails. +*/ +test_return_t add_test(memcached_st *memc) +{ + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param(__func__), + test_literal_param("when we sanitize"), + time_t(0), uint32_t(0))); - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); memcached_quit(memc); - rc= memcached_add(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - /* Too many broken OS'es have broken loopback in async, so we can't be sure of the result */ - if (setting_value) - { - test_true(rc == MEMCACHED_NOTSTORED or rc == MEMCACHED_STORED); - } - else - { - test_true(rc == MEMCACHED_NOTSTORED or rc == MEMCACHED_DATA_EXISTS); - } + size_t value_length; + uint32_t flags; + memcached_return_t rc; + char *check_value= memcached_get(memc, + test_literal_param(__func__), + &value_length, &flags, &rc); + test_memcmp(check_value, "when we sanitize", strlen("when we sanitize")); + test_compare(test_literal_param_size("when we sanitize"), value_length); + test_compare(MEMCACHED_SUCCESS, rc); + free(check_value); + + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) ? MEMCACHED_DATA_EXISTS : MEMCACHED_NOTSTORED, + memcached_add(memc, + test_literal_param(__func__), + test_literal_param("try something else"), + time_t(0), uint32_t(0))); return TEST_SUCCESS; } @@ -789,7 +864,7 @@ static test_return_t add_test(memcached_st *memc) ** because the connects starts to time out (the test doesn't do much ** anyway, so just loop 10 iterations) */ -static test_return_t add_wrapper(memcached_st *memc) +test_return_t add_wrapper(memcached_st *memc) { unsigned int max= 10000; #ifdef __sun @@ -800,32 +875,31 @@ static test_return_t add_wrapper(memcached_st *memc) #endif for (uint32_t x= 0; x < max; x++) + { add_test(memc); + } return TEST_SUCCESS; } -static test_return_t replace_test(memcached_st *memc) +test_return_t replace_test(memcached_st *memc) { - memcached_return_t rc; - const char *key= "foo"; - const char *value= "when we sanitize"; - const char *original= "first we insert some data"; - - rc= memcached_set(memc, key, strlen(key), - original, strlen(original), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param(__func__), + test_literal_param("when we sanitize"), + time_t(0), uint32_t(0))); test_compare(MEMCACHED_SUCCESS, - memcached_replace(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0)); + memcached_replace(memc, + test_literal_param(__func__), + test_literal_param("first we insert some data"), + time_t(0), uint32_t(0))); return TEST_SUCCESS; } -static test_return_t delete_test(memcached_st *memc) +test_return_t delete_test(memcached_st *memc) { test_compare(return_value_based_on_buffering(memc), memcached_set(memc, @@ -833,17 +907,15 @@ static test_return_t delete_test(memcached_st *memc) test_literal_param("when we sanitize"), time_t(0), uint32_t(0))); - memcached_return_t rc= memcached_delete(memc, - test_literal_param(__func__), - time_t(0)); - test_compare_hint(MEMCACHED_SUCCESS, - rc, - memcached_last_error_message(memc)); + test_compare(return_value_based_on_buffering(memc), + memcached_delete(memc, + test_literal_param(__func__), + time_t(0))); return TEST_SUCCESS; } -static test_return_t flush_test(memcached_st *memc) +test_return_t flush_test(memcached_st *memc) { uint64_t query_id= memcached_query_id(memc); test_compare(MEMCACHED_SUCCESS, @@ -853,17 +925,15 @@ static test_return_t flush_test(memcached_st *memc) return TEST_SUCCESS; } -static memcached_return_t server_function(const memcached_st *ptr, - const memcached_server_st *server, - void *context) +static memcached_return_t server_function(const memcached_st *, + memcached_server_instance_st, + void *) { - (void)ptr; (void)server; (void)context; /* Do Nothing */ - return MEMCACHED_SUCCESS; } -static test_return_t memcached_server_cursor_test(memcached_st *memc) +test_return_t memcached_server_cursor_test(memcached_st *memc) { char context[10]; strncpy(context, "foo bad", sizeof(context)); @@ -874,12 +944,11 @@ static test_return_t memcached_server_cursor_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t bad_key_test(memcached_st *memc) +test_return_t bad_key_test(memcached_st *memc) { memcached_return_t rc; const char *key= "foo bad"; uint32_t flags; - memcached_st *memc_clone; uint64_t query_id= memcached_query_id(memc); @@ -888,7 +957,7 @@ static test_return_t bad_key_test(memcached_st *memc) test_compare(query_id, memcached_query_id(memc)); // We should not increase the query_id for memcached_behavior_get() - memc_clone= memcached_clone(NULL, memc); + memcached_st *memc_clone= memcached_clone(NULL, memc); test_true(memc_clone); query_id= memcached_query_id(memc_clone); @@ -897,7 +966,7 @@ static test_return_t bad_key_test(memcached_st *memc) test_compare(query_id, memcached_query_id(memc_clone)); // We should not increase the query_id for memcached_behavior_set() /* All keys are valid in the binary protocol (except for length) */ - if (not memcached_behavior_get(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)) + if (memcached_behavior_get(memc_clone, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == false) { uint64_t before_query_id= memcached_query_id(memc_clone); { @@ -937,7 +1006,8 @@ static test_return_t bad_key_test(memcached_st *memc) test_compare(query_id +1, memcached_query_id(memc_clone)); query_id= memcached_query_id(memc_clone); - test_compare(MEMCACHED_BAD_KEY_PROVIDED, + // Grouping keys are not required to follow normal key behaviors + test_compare(MEMCACHED_SUCCESS, memcached_mget_by_key(memc_clone, "foo daddy", 9, keys, key_lengths, 1)); test_compare(query_id +1, memcached_query_id(memc_clone)); @@ -948,9 +1018,9 @@ static test_return_t bad_key_test(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_NAMESPACE, NULL)); - std::vector longkey; + libtest::vchar_t longkey; { - std::vector::iterator it= longkey.begin(); + libtest::vchar_t::iterator it= longkey.begin(); longkey.insert(it, MEMCACHED_MAX_KEY, 'a'); } @@ -986,12 +1056,11 @@ 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, - char *key, - size_t key_length, +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)); } @@ -999,35 +1068,36 @@ static memcached_return_t read_through_trigger(memcached_st *memc, #pragma GCC diagnostic ignored "-Wstrict-aliasing" #endif -static test_return_t read_through(memcached_st *memc) +test_return_t read_through(memcached_st *memc) { - memcached_return_t rc; - const char *key= "foo"; - char *string; - size_t string_length; - uint32_t flags; memcached_trigger_key_fn cb= (memcached_trigger_key_fn)read_through_trigger; - string= memcached_get(memc, key, strlen(key), - &string_length, &flags, &rc); + size_t string_length; + uint32_t flags; + memcached_return_t rc; + char *string= memcached_get(memc, + test_literal_param(__func__), + &string_length, &flags, &rc); test_compare(MEMCACHED_NOTFOUND, rc); test_false(string_length); test_false(string); - rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, *(void **)&cb); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_GET_FAILURE, *(void **)&cb)); - string= memcached_get(memc, key, strlen(key), + string= memcached_get(memc, + test_literal_param(__func__), &string_length, &flags, &rc); test_compare(MEMCACHED_SUCCESS, rc); - test_compare(string_length, sizeof(READ_THROUGH_VALUE) -1); - test_true(string[sizeof(READ_THROUGH_VALUE) -1] == 0); + test_compare(sizeof(READ_THROUGH_VALUE) -1, string_length); + test_compare(0, string[sizeof(READ_THROUGH_VALUE) -1]); test_strcmp(READ_THROUGH_VALUE, string); free(string); - string= memcached_get(memc, key, strlen(key), + string= memcached_get(memc, + test_literal_param(__func__), &string_length, &flags, &rc); test_compare(MEMCACHED_SUCCESS, rc); @@ -1040,80 +1110,25 @@ static test_return_t read_through(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t get_test(memcached_st *memc) -{ - memcached_return_t rc; - const char *key= "foo"; - char *string; - size_t string_length; - uint32_t flags; - - uint64_t query_id= memcached_query_id(memc); - rc= memcached_delete(memc, key, strlen(key), (time_t)0); - test_true_got(rc == MEMCACHED_BUFFERED || rc == MEMCACHED_NOTFOUND, memcached_last_error_message(memc)); - test_compare(query_id +1, memcached_query_id(memc)); - - string= memcached_get(memc, key, strlen(key), - &string_length, &flags, &rc); - - test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_strerror(NULL, rc)); - test_false(string_length); - test_false(string); - - return TEST_SUCCESS; -} - -static test_return_t get_test2(memcached_st *memc) -{ - const char *key= "foo"; - const char *value= "when we sanitize"; - - uint64_t query_id= memcached_query_id(memc); - memcached_return_t rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - test_compare(query_id +1, memcached_query_id(memc)); - - query_id= memcached_query_id(memc); - test_true(query_id); - - uint32_t flags; - size_t string_length; - char *string= memcached_get(memc, key, strlen(key), - &string_length, &flags, &rc); - test_compare(query_id +1, memcached_query_id(memc)); - - test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); - test_compare_got(MEMCACHED_SUCCESS, memcached_last_error(memc), memcached_last_error_message(memc)); - test_true(string); - test_compare(strlen(value), string_length); - test_memcmp(string, value, string_length); - - free(string); - - return TEST_SUCCESS; -} - -static test_return_t set_test2(memcached_st *memc) +test_return_t set_test2(memcached_st *memc) { for (uint32_t x= 0; x < 10; x++) { - memcached_return_t rc= memcached_set(memc, - test_literal_param("foo"), - test_literal_param("train in the brain"), - time_t(0), uint32_t(0)); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param("foo"), + test_literal_param("train in the brain"), + time_t(0), uint32_t(0))); } return TEST_SUCCESS; } -static test_return_t set_test3(memcached_st *memc) +test_return_t set_test3(memcached_st *memc) { size_t value_length= 8191; - std::vector value; + libtest::vchar_t value; value.reserve(value_length); for (uint32_t x= 0; x < value_length; x++) { @@ -1128,139 +1143,30 @@ static test_return_t set_test3(memcached_st *memc) snprintf(key, sizeof(key), "foo%u", x); uint64_t query_id= memcached_query_id(memc); - memcached_return_t rc= memcached_set(memc, key, strlen(key), - &value[0], value.size(), - (time_t)0, (uint32_t)0); - test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_strerror(NULL, rc)); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, key, strlen(key), + &value[0], value.size(), + time_t(0), uint32_t(0))); test_compare(query_id +1, memcached_query_id(memc)); } return TEST_SUCCESS; } -static test_return_t get_test3(memcached_st *memc) +test_return_t mget_end(memcached_st *memc) { - const char *key= "foo"; - size_t value_length= 8191; + const char *keys[]= { "foo", "foo2" }; + size_t lengths[]= { 3, 4 }; + const char *values[]= { "fjord", "41" }; - std::vector value; - value.reserve(value_length); - for (uint32_t x= 0; x < value_length; x++) + // Set foo and foo2 + for (size_t x= 0; x < test_array_length(keys); x++) { - value.push_back(char(x % 127)); - } - - memcached_return_t rc; - rc= memcached_set(memc, key, strlen(key), - &value[0], value.size(), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - - size_t string_length; - uint32_t flags; - char *string= memcached_get(memc, key, strlen(key), - &string_length, &flags, &rc); - - test_compare(MEMCACHED_SUCCESS, rc); - test_true(string); - test_compare(string_length, value_length); - test_memcmp(string, &value[0], string_length); - - free(string); - - return TEST_SUCCESS; -} - -static test_return_t get_test4(memcached_st *memc) -{ - const char *key= "foo"; - size_t value_length= 8191; - - std::vector value; - value.reserve(value_length); - for (uint32_t x= 0; x < value_length; x++) - { - value.push_back(char(x % 127)); - } - - memcached_return_t rc= memcached_set(memc, key, strlen(key), - &value[0], value.size(), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - - for (uint32_t x= 0; x < 10; x++) - { - uint32_t flags; - size_t string_length; - char *string= memcached_get(memc, key, strlen(key), - &string_length, &flags, &rc); - - test_compare(MEMCACHED_SUCCESS, rc); - test_true(string); - test_compare(string_length, value_length); - test_memcmp(string, &value[0], string_length); - free(string); - } - - return TEST_SUCCESS; -} - -/* - * This test verifies that memcached_read_one_response doesn't try to - * 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_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) ;-) - */ - const char *keys[]= { "key", "key" }; - size_t lengths[]= { 3, 3 }; - uint32_t flags; - size_t rlen; - - memcached_return_t rc= memcached_set(memc, keys[0], lengths[0], - keys[0], lengths[0], 0, 0); - test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, lengths, test_array_length(keys))); - - memcached_result_st results_obj; - memcached_result_st *results= memcached_result_create(memc, &results_obj); - test_true(results); - - results= memcached_fetch_result(memc, &results_obj, &rc); - test_true(results); - - memcached_result_free(&results_obj); - - /* Don't read out the second result, but issue a set instead.. */ - test_compare(MEMCACHED_SUCCESS, memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0)); - - char *val= memcached_get_by_key(memc, keys[0], lengths[0], "yek", 3, - &rlen, &flags, &rc); - test_false(val); - test_compare(MEMCACHED_NOTFOUND, rc); - val= memcached_get(memc, keys[0], lengths[0], &rlen, &flags, &rc); - test_true(val); - test_compare(MEMCACHED_SUCCESS, rc); - free(val); - - return TEST_SUCCESS; -} - -static test_return_t mget_end(memcached_st *memc) -{ - const char *keys[]= { "foo", "foo2" }; - size_t lengths[]= { 3, 4 }; - const char *values[]= { "fjord", "41" }; - - memcached_return_t rc; - - // Set foo and foo2 - for (size_t x= 0; x < test_array_length(keys); x++) - { - test_compare(MEMCACHED_SUCCESS, memcached_set(memc, keys[x], lengths[x], values[x], strlen(values[x]), (time_t)0, (uint32_t)0)); + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + keys[x], lengths[x], + values[x], strlen(values[x]), + time_t(0), uint32_t(0))); } char *string; @@ -1268,10 +1174,14 @@ static test_return_t mget_end(memcached_st *memc) uint32_t flags; // retrieve both via mget - test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, lengths, test_array_length(keys))); + test_compare(MEMCACHED_SUCCESS, + memcached_mget(memc, + keys, lengths, + test_array_length(keys))); char key[MEMCACHED_MAX_KEY]; size_t key_length; + memcached_return_t rc; // this should get both for (size_t x= 0; x < test_array_length(keys); x++) @@ -1296,8 +1206,8 @@ static test_return_t mget_end(memcached_st *memc) test_null(string); // now get just one - rc= memcached_mget(memc, keys, lengths, 1); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_mget(memc, keys, lengths, 1)); string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); test_compare(key_length, lengths[0]); @@ -1316,7 +1226,7 @@ static test_return_t mget_end(memcached_st *memc) } /* Do not copy the style of this code, I just access hosts to testthis function */ -static test_return_t stats_servername_test(memcached_st *memc) +test_return_t stats_servername_test(memcached_st *memc) { memcached_stat_st memc_stat; memcached_server_instance_st instance= @@ -1334,7 +1244,7 @@ static test_return_t stats_servername_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t increment_test(memcached_st *memc) +test_return_t increment_test(memcached_st *memc) { uint64_t new_number; @@ -1355,7 +1265,7 @@ static test_return_t increment_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t increment_with_initial_test(memcached_st *memc) +test_return_t increment_with_initial_test(memcached_st *memc) { test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); @@ -1375,119 +1285,123 @@ static test_return_t increment_with_initial_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t decrement_test(memcached_st *memc) +test_return_t decrement_test(memcached_st *memc) { - uint64_t new_number; - memcached_return_t rc; - const char *value= "3"; - - rc= memcached_set(memc, - test_literal_param("number"), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param(__func__), + test_literal_param("3"), + time_t(0), uint32_t(0))); + + // Make sure we flush the value we just set + test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); + uint64_t new_number; test_compare(MEMCACHED_SUCCESS, memcached_decrement(memc, - test_literal_param("number"), + test_literal_param(__func__), 1, &new_number)); test_compare(uint64_t(2), new_number); test_compare(MEMCACHED_SUCCESS, memcached_decrement(memc, - test_literal_param("number"), + test_literal_param(__func__), 1, &new_number)); test_compare(uint64_t(1), new_number); return TEST_SUCCESS; } -static test_return_t decrement_with_initial_test(memcached_st *memc) +test_return_t decrement_with_initial_test(memcached_st *memc) { test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); - uint64_t new_number; uint64_t initial= 3; test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); + uint64_t new_number; test_compare(MEMCACHED_SUCCESS, memcached_decrement_with_initial(memc, - test_literal_param("number"), - 1, initial, 0, &new_number)); + test_literal_param(__func__), + 1, initial, + 0, &new_number)); test_compare(new_number, initial); test_compare(MEMCACHED_SUCCESS, memcached_decrement_with_initial(memc, - test_literal_param("number"), - 1, initial, 0, &new_number)); + test_literal_param(__func__), + 1, initial, + 0, &new_number)); test_compare(new_number, (initial - 1)); return TEST_SUCCESS; } -static test_return_t increment_by_key_test(memcached_st *memc) +test_return_t increment_by_key_test(memcached_st *memc) { - uint64_t new_number; - memcached_return_t rc; const char *master_key= "foo"; const char *key= "number"; const char *value= "0"; - rc= memcached_set_by_key(memc, master_key, strlen(master_key), - key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + value, strlen(value), + time_t(0), uint32_t(0))); + + // Make sure we flush the value we just set + test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); + uint64_t new_number; test_compare(MEMCACHED_SUCCESS, - memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number)); + memcached_increment_by_key(memc, master_key, strlen(master_key), + key, strlen(key), 1, &new_number)); test_compare(uint64_t(1), new_number); test_compare(MEMCACHED_SUCCESS, - memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number)); + memcached_increment_by_key(memc, master_key, strlen(master_key), + key, strlen(key), 1, &new_number)); test_compare(uint64_t(2), new_number); return TEST_SUCCESS; } -static test_return_t increment_with_initial_by_key_test(memcached_st *memc) +test_return_t increment_with_initial_by_key_test(memcached_st *memc) { test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); uint64_t new_number; - memcached_return_t rc; const char *master_key= "foo"; const char *key= "number"; uint64_t initial= 0; - rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), - key, strlen(key), - 1, initial, 0, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, initial, 0, &new_number)); test_compare(new_number, initial); - rc= memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), - key, strlen(key), - 1, initial, 0, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_increment_with_initial_by_key(memc, master_key, strlen(master_key), + key, strlen(key), + 1, initial, 0, &new_number)); test_compare(new_number, (initial +1)); return TEST_SUCCESS; } -static test_return_t decrement_by_key_test(memcached_st *memc) +test_return_t decrement_by_key_test(memcached_st *memc) { uint64_t new_number; - memcached_return_t rc; const char *value= "3"; - rc= memcached_set_by_key(memc, - test_literal_param("foo"), - test_literal_param("number"), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set_by_key(memc, + test_literal_param("foo"), + test_literal_param("number"), + value, strlen(value), + (time_t)0, (uint32_t)0)); test_compare(MEMCACHED_SUCCESS, memcached_decrement_by_key(memc, @@ -1506,7 +1420,7 @@ static test_return_t decrement_by_key_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) +test_return_t decrement_with_initial_by_key_test(memcached_st *memc) { test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); @@ -1529,20 +1443,17 @@ static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t binary_increment_with_prefix_test(memcached_st *orig_memc) +test_return_t binary_increment_with_prefix_test(memcached_st *memc) { - memcached_st *memc= memcached_clone(NULL, orig_memc); - - test_skip(TEST_SUCCESS, pre_binary(memc)); + test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); test_compare(MEMCACHED_SUCCESS, memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, (void *)"namespace:")); - memcached_return_t rc; - rc= memcached_set(memc, - test_literal_param("number"), - test_literal_param("0"), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param("number"), + test_literal_param("0"), + (time_t)0, (uint32_t)0)); uint64_t new_number; test_compare(MEMCACHED_SUCCESS, memcached_increment(memc, @@ -1554,40 +1465,37 @@ static test_return_t binary_increment_with_prefix_test(memcached_st *orig_memc) test_literal_param("number"), 1, &new_number)); test_compare(uint64_t(2), new_number); - memcached_free(memc); return TEST_SUCCESS; } -static test_return_t quit_test(memcached_st *memc) +test_return_t quit_test(memcached_st *memc) { - memcached_return_t rc; - const char *key= "fudge"; const char *value= "sanford and sun"; - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)10, (uint32_t)3); - test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_strerror(NULL, rc)); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param(__func__), + value, strlen(value), + time_t(10), uint32_t(3))); memcached_quit(memc); - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)50, (uint32_t)9); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, + test_literal_param(__func__), + value, strlen(value), + time_t(50), uint32_t(9))); return TEST_SUCCESS; } -static test_return_t mget_result_test(memcached_st *memc) +test_return_t mget_result_test(memcached_st *memc) { const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; memcached_result_st results_obj; - memcached_result_st *results; - - results= memcached_result_create(memc, &results_obj); + memcached_result_st *results= memcached_result_create(memc, &results_obj); test_true(results); test_true(&results_obj == results); @@ -1635,7 +1543,7 @@ static test_return_t mget_result_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t mget_result_alloc_test(memcached_st *memc) +test_return_t mget_result_alloc_test(memcached_st *memc) { const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; @@ -1684,33 +1592,22 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) return TEST_SUCCESS; } -/* Count the results */ -static memcached_return_t callback_counter(const memcached_st*, memcached_result_st*, void *context) -{ - size_t *counter= (size_t *)context; - - *counter= *counter + 1; - - return MEMCACHED_SUCCESS; -} - -static test_return_t mget_result_function(memcached_st *memc) +test_return_t mget_result_function(memcached_st *memc) { const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; size_t counter; memcached_execute_fn callbacks[1]; - /* We need to empty the server before continueing test */ - test_compare(MEMCACHED_SUCCESS, - memcached_flush(memc, 0)); for (uint32_t x= 0; x < 3; x++) { - memcached_return_t rc= memcached_set(memc, keys[x], key_length[x], - keys[x], key_length[x], - (time_t)50, (uint32_t)9); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_compare(return_value_based_on_buffering(memc), + memcached_set(memc, keys[x], key_length[x], + keys[x], key_length[x], + time_t(50), uint32_t(9))); } + test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); + memcached_quit(memc); test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 3)); @@ -1726,7 +1623,7 @@ static test_return_t mget_result_function(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t mget_test(memcached_st *memc) +test_return_t mget_test(memcached_st *memc) { const char *keys[]= {"fudge", "son", "food"}; size_t key_length[]= {5, 3, 4}; @@ -1736,10 +1633,6 @@ static test_return_t mget_test(memcached_st *memc) char *return_value; size_t return_value_length; - /* We need to empty the server before continueing test */ - test_compare(MEMCACHED_SUCCESS, - memcached_flush(memc, 0)); - test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 3)); @@ -1782,32 +1675,26 @@ static test_return_t mget_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t mget_execute(memcached_st *original_memc) +test_return_t mget_execute(memcached_st *original_memc) { test_skip(true, memcached_behavior_get(original_memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); memcached_st *memc= create_single_instance_memcached(original_memc, "--BINARY-PROTOCOL"); test_true(memc); - size_t max_keys= 20480; - - - char **keys= static_cast(calloc(max_keys, sizeof(char*))); - size_t *key_length=static_cast(calloc(max_keys, sizeof(size_t))); + keys_st keys(20480); /* First add all of the items.. */ char blob[1024] = {0}; - for (size_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { - char k[251]; - - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); - keys[x]= strdup(k); - test_true(keys[x] != NULL); uint64_t query_id= memcached_query_id(memc); - memcached_return_t rc= memcached_add(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); - test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_strerror(NULL, rc)); + memcached_return_t rc= memcached_add(memc, + keys.key_at(x), keys.length_at(x), + blob, sizeof(blob), + 0, 0); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); test_compare(query_id +1, memcached_query_id(memc)); } @@ -1815,8 +1702,9 @@ static test_return_t mget_execute(memcached_st *original_memc) size_t counter= 0; memcached_execute_fn callbacks[]= { &callback_counter }; test_compare(MEMCACHED_SUCCESS, - memcached_mget_execute(memc, (const char**)keys, key_length, - max_keys, callbacks, &counter, 1)); + memcached_mget_execute(memc, + keys.keys_ptr(), keys.lengths_ptr(), + keys.size(), callbacks, &counter, 1)); { uint64_t query_id= memcached_query_id(memc); @@ -1825,16 +1713,8 @@ static test_return_t mget_execute(memcached_st *original_memc) test_compare(query_id, memcached_query_id(memc)); /* Verify that we got all of the items */ - test_true(counter == max_keys); - } - - /* Release all allocated resources */ - for (size_t x= 0; x < max_keys; ++x) - { - free(keys[x]); + test_compare(keys.size(), counter); } - free(keys); - free(key_length); memcached_free(memc); @@ -1842,8 +1722,9 @@ static test_return_t mget_execute(memcached_st *original_memc) } #define REGRESSION_BINARY_VS_BLOCK_COUNT 20480 +static pairs_st *global_pairs= NULL; -static test_return_t key_setup(memcached_st *memc) +test_return_t key_setup(memcached_st *memc) { test_skip(TEST_SUCCESS, pre_binary(memc)); @@ -1852,37 +1733,41 @@ static test_return_t key_setup(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t key_teardown(memcached_st *memc) +test_return_t key_teardown(memcached_st *) { - (void)memc; pairs_free(global_pairs); + global_pairs= NULL; return TEST_SUCCESS; } -static test_return_t block_add_regression(memcached_st *memc) +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) + for (ptrdiff_t x= 0; x < REGRESSION_BINARY_VS_BLOCK_COUNT; ++x) { - char blob[1024] = {0}; + libtest::vchar_t blob; + libtest::vchar::make(blob, 1024); - memcached_return_t rc= memcached_add_by_key(memc, "bob", 3, global_pairs[x].key, global_pairs[x].key_length, blob, sizeof(blob), 0, 0); - test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE, memcached_strerror(NULL, rc)); + memcached_return_t rc= memcached_add_by_key(memc, + test_literal_param("bob"), + global_pairs[x].key, global_pairs[x].key_length, + &blob[0], blob.size(), + time_t(0), uint32_t(0)); + test_compare(*memc, MEMCACHED_SUCCESS); + test_compare(rc, MEMCACHED_SUCCESS); } return TEST_SUCCESS; } -static test_return_t binary_add_regression(memcached_st *memc) +test_return_t binary_add_regression(memcached_st *memc) { test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, true)); - test_return_t rc= block_add_regression(memc); - - return rc; + return block_add_regression(memc); } -static test_return_t get_stats_keys(memcached_st *memc) +test_return_t get_stats_keys(memcached_st *memc) { char **stat_list; char **ptr; @@ -1899,14 +1784,14 @@ static test_return_t get_stats_keys(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t version_string_test(memcached_st *) +test_return_t version_string_test(memcached_st *) { test_strcmp(LIBMEMCACHED_VERSION_STRING, memcached_lib_version()); return TEST_SUCCESS; } -static test_return_t get_stats(memcached_st *memc) +test_return_t get_stats(memcached_st *memc) { memcached_return_t rc; @@ -1928,7 +1813,7 @@ static test_return_t get_stats(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t add_host_test(memcached_st *memc) +test_return_t add_host_test(memcached_st *memc) { char servername[]= "0.example.com"; @@ -1955,7 +1840,7 @@ static test_return_t add_host_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t memcached_fetch_result_NOT_FOUND(memcached_st *memc) +test_return_t memcached_fetch_result_NOT_FOUND(memcached_st *memc) { memcached_return_t rc; @@ -1984,7 +1869,7 @@ static memcached_return_t cleanup_test_callback(memcached_st *) return MEMCACHED_SUCCESS; } -static test_return_t callback_test(memcached_st *memc) +test_return_t callback_test(memcached_st *memc) { /* Test User Data */ { @@ -2026,7 +1911,7 @@ static test_return_t callback_test(memcached_st *memc) } /* We don't test the behavior itself, we test the switches */ -static test_return_t behavior_test(memcached_st *memc) +test_return_t behavior_test(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 1); test_compare(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK)); @@ -2060,7 +1945,7 @@ static test_return_t behavior_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t MEMCACHED_BEHAVIOR_CORK_test(memcached_st *memc) +test_return_t MEMCACHED_BEHAVIOR_CORK_test(memcached_st *memc) { test_compare(MEMCACHED_DEPRECATED, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, true)); @@ -2075,7 +1960,7 @@ static test_return_t MEMCACHED_BEHAVIOR_CORK_test(memcached_st *memc) } -static test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test(memcached_st *memc) +test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test(memcached_st *memc) { memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_KEEPALIVE, true); test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOT_SUPPORTED); @@ -2095,7 +1980,7 @@ static test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test(memcached_st *memc) } -static test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test(memcached_st *memc) +test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test(memcached_st *memc) { memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_KEEPIDLE, true); test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_NOT_SUPPORTED); @@ -2114,244 +1999,82 @@ static test_return_t MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t fetch_all_results(memcached_st *memc, unsigned int &keys_returned, const memcached_return_t expect) +/* Make sure we behave properly if server list has no values */ +test_return_t user_supplied_bug4(memcached_st *memc) { - memcached_return_t rc; - char return_key[MEMCACHED_MAX_KEY]; - size_t return_key_length; - char *return_value; - size_t return_value_length; - uint32_t flags; + const char *keys[]= {"fudge", "son", "food"}; + size_t key_length[]= {5, 3, 4}; - keys_returned= 0; - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, - &return_value_length, &flags, &rc))) - { - test_true(return_value); - test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); - free(return_value); - keys_returned+= 1; - } + /* Here we free everything before running a bunch of mget tests */ + memcached_servers_reset(memc); + + + /* We need to empty the server before continueing test */ + test_compare(MEMCACHED_NO_SERVERS, + memcached_flush(memc, 0)); + + test_compare(MEMCACHED_NO_SERVERS, + memcached_mget(memc, keys, key_length, 3)); - if (memcached_success(expect) and memcached_success(rc)) { - return TEST_SUCCESS; + unsigned int keys_returned; + memcached_return_t rc; + test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, rc)); + test_compare(MEMCACHED_NOTFOUND, rc); + test_zero(keys_returned); } - else if (expect == rc) + + for (uint32_t x= 0; x < 3; x++) { - return TEST_SUCCESS; + test_compare(MEMCACHED_NO_SERVERS, + memcached_set(memc, keys[x], key_length[x], + keys[x], key_length[x], + (time_t)50, (uint32_t)9)); } - fprintf(stderr, "\n%s:%u %s(#%u)\n", __FILE__, __LINE__, memcached_strerror(NULL, rc), keys_returned); - - return TEST_FAILURE; -} - -/* Test case provided by Cal Haldenbrand */ -#define HALDENBRAND_KEY_COUNT 3000U // * 1024576 -#define HALDENBRAND_FLAG_KEY 99 // * 1024576 -static test_return_t user_supplied_bug1(memcached_st *memc) -{ - /* We just keep looking at the same values over and over */ - srandom(10); - - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, true)); - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, true)); + test_compare(MEMCACHED_NO_SERVERS, + memcached_mget(memc, keys, key_length, 3)); - /* add key */ - unsigned long long total= 0; - for (uint32_t x= 0 ; total < 20 * 1024576 ; x++ ) { - uint32_t size= (uint32_t)(rand() % ( 5 * 1024 ) ) + 400; - char randomstuff[6 * 1024]; - memset(randomstuff, 0, 6 * 1024); - test_true(size < 6 * 1024); /* Being safe here */ - - for (uint32_t j= 0 ; j < size ;j++) + char *return_value; + char return_key[MEMCACHED_MAX_KEY]; + memcached_return_t rc; + size_t return_key_length; + size_t return_value_length; + uint32_t flags; + uint32_t x= 0; + while ((return_value= memcached_fetch(memc, return_key, &return_key_length, + &return_value_length, &flags, &rc))) { - randomstuff[j] = (signed char) ((rand() % 26) + 97); + test_true(return_value); + test_compare(MEMCACHED_SUCCESS, rc); + test_true(return_key_length == return_value_length); + test_memcmp(return_value, return_key, return_value_length); + free(return_value); + x++; } - - total+= size; - char key[22]; - int key_length= snprintf(key, sizeof(key), "%u", x); - test_compare(MEMCACHED_SUCCESS, - memcached_set(memc, key, key_length, randomstuff, strlen(randomstuff), time_t(0), HALDENBRAND_FLAG_KEY)); } - test_true(total > HALDENBRAND_KEY_COUNT); return TEST_SUCCESS; } -/* Test case provided by Cal Haldenbrand */ -static test_return_t user_supplied_bug2(memcached_st *memc) +#define VALUE_SIZE_BUG5 1048064 +test_return_t user_supplied_bug5(memcached_st *memc) { - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, true)); - - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, true)); - -#ifdef NOT_YET - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, 20 * 1024576)); - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, 20 * 1024576)); - getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE); - getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); - - for (x= 0, errors= 0; total < 20 * 1024576 ; x++) -#endif + const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; + size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; + char *value; + size_t value_length; + uint32_t flags; + char *insert_data= new (std::nothrow) char[VALUE_SIZE_BUG5]; - size_t total_value_length= 0; - for (uint32_t x= 0, errors= 0; total_value_length < 24576 ; x++) + for (uint32_t x= 0; x < VALUE_SIZE_BUG5; x++) { - uint32_t flags= 0; - size_t val_len= 0; + insert_data[x]= (signed char)rand(); + } - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - int key_length= snprintf(key, sizeof(key), "%u", x); - - memcached_return_t rc; - char *getval= memcached_get(memc, key, key_length, &val_len, &flags, &rc); - if (memcached_failed(rc)) - { - if (rc == MEMCACHED_NOTFOUND) - { - errors++; - } - else - { - test_true(rc); - } - - continue; - } - test_compare(uint32_t(HALDENBRAND_FLAG_KEY), flags); - - total_value_length+= val_len; - errors= 0; - free(getval); - } - - return TEST_SUCCESS; -} - -/* Do a large mget() over all the keys we think exist */ -static test_return_t user_supplied_bug3(memcached_st *memc) -{ - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 1)); - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1)); - -#ifdef NOT_YET - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE, 20 * 1024576); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, 20 * 1024576); - getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE); - getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE); -#endif - - std::vector key_lengths; - key_lengths.resize(HALDENBRAND_KEY_COUNT); - std::vector keys; - keys.resize(key_lengths.size()); - for (uint32_t x= 0; x < key_lengths.size(); x++) - { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - int key_length= snprintf(key, sizeof(key), "%u", x); - test_true(key_length > 0 and key_length < MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1); - keys[x]= strdup(key); - key_lengths[x]= key_length; - } - - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, &keys[0], &key_lengths[0], key_lengths.size())); - - unsigned int keys_returned; - test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_SUCCESS)); - test_compare(HALDENBRAND_KEY_COUNT, keys_returned); - - for (std::vector::iterator iter= keys.begin(); - iter != keys.end(); - iter++) - { - free(*iter); - } - - return TEST_SUCCESS; -} - -/* Make sure we behave properly if server list has no values */ -static test_return_t user_supplied_bug4(memcached_st *memc) -{ - const char *keys[]= {"fudge", "son", "food"}; - size_t key_length[]= {5, 3, 4}; - - /* Here we free everything before running a bunch of mget tests */ - memcached_servers_reset(memc); - - - /* We need to empty the server before continueing test */ - test_compare(MEMCACHED_NO_SERVERS, - memcached_flush(memc, 0)); - - test_compare(MEMCACHED_NO_SERVERS, - memcached_mget(memc, keys, key_length, 3)); - - unsigned int keys_returned; - test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_NOTFOUND)); - test_zero(keys_returned); - - for (uint32_t x= 0; x < 3; x++) - { - test_compare(MEMCACHED_NO_SERVERS, - memcached_set(memc, keys[x], key_length[x], - keys[x], key_length[x], - (time_t)50, (uint32_t)9)); - } - - test_compare(MEMCACHED_NO_SERVERS, - memcached_mget(memc, keys, key_length, 3)); - - { - char *return_value; - char return_key[MEMCACHED_MAX_KEY]; - memcached_return_t rc; - size_t return_key_length; - size_t return_value_length; - uint32_t flags; - uint32_t x= 0; - while ((return_value= memcached_fetch(memc, return_key, &return_key_length, - &return_value_length, &flags, &rc))) - { - test_true(return_value); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(return_key_length == return_value_length); - test_memcmp(return_value, return_key, return_value_length); - free(return_value); - x++; - } - } - - return TEST_SUCCESS; -} - -#define VALUE_SIZE_BUG5 1048064 -static test_return_t user_supplied_bug5(memcached_st *memc) -{ - const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; - size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; - char *value; - size_t value_length; - uint32_t flags; - char *insert_data= new (std::nothrow) char[VALUE_SIZE_BUG5]; - - for (uint32_t x= 0; x < VALUE_SIZE_BUG5; x++) - { - insert_data[x]= (signed char)rand(); - } - - test_compare(MEMCACHED_SUCCESS, - memcached_flush(memc, 0)); + test_compare(MEMCACHED_SUCCESS, + memcached_flush(memc, 0)); memcached_return_t rc; test_null(memcached_get(memc, keys[0], key_length[0], &value_length, &flags, &rc)); @@ -2359,7 +2082,8 @@ static test_return_t user_supplied_bug5(memcached_st *memc) memcached_mget(memc, keys, key_length, 4)); unsigned int count; - test_compare(TEST_SUCCESS, fetch_all_results(memc, count, MEMCACHED_NOTFOUND)); + test_compare(TEST_SUCCESS, fetch_all_results(memc, count, rc)); + test_compare(MEMCACHED_NOTFOUND, rc); test_zero(count); for (uint32_t x= 0; x < 4; x++) @@ -2376,12 +2100,12 @@ static test_return_t user_supplied_bug5(memcached_st *memc) &value_length, &flags, &rc); test_compare(rc, MEMCACHED_SUCCESS); test_true(value); - free(value); + ::free(value); test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 4)); - test_compare(TEST_SUCCESS, fetch_all_results(memc, count, MEMCACHED_SUCCESS)); + test_compare(TEST_SUCCESS, fetch_all_results(memc, count)); test_compare(4U, count); } delete [] insert_data; @@ -2389,7 +2113,7 @@ static test_return_t user_supplied_bug5(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t user_supplied_bug6(memcached_st *memc) +test_return_t user_supplied_bug6(memcached_st *memc) { const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"}; size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")}; @@ -2458,7 +2182,7 @@ static test_return_t user_supplied_bug6(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t user_supplied_bug8(memcached_st *) +test_return_t user_supplied_bug8(memcached_st *) { memcached_return_t rc; memcached_st *mine; @@ -2489,7 +2213,7 @@ static test_return_t user_supplied_bug8(memcached_st *) } /* Test flag store/retrieve */ -static test_return_t user_supplied_bug7(memcached_st *memc) +test_return_t user_supplied_bug7(memcached_st *memc) { char *insert_data= new (std::nothrow) char[VALUE_SIZE_BUG5]; test_true(insert_data); @@ -2503,10 +2227,9 @@ static test_return_t user_supplied_bug7(memcached_st *memc) const char *keys= "036790384900"; size_t key_length= strlen(keys); - test_compare_hint(MEMCACHED_SUCCESS, memcached_set(memc, keys, key_length, - insert_data, VALUE_SIZE_BUG5, - time_t(0), 245U), - memcached_last_error_message(memc)); + test_compare(MEMCACHED_SUCCESS, memcached_set(memc, keys, key_length, + insert_data, VALUE_SIZE_BUG5, + time_t(0), 245U)); memcached_return_t rc; size_t value_length; @@ -2533,7 +2256,7 @@ static test_return_t user_supplied_bug7(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t user_supplied_bug9(memcached_st *memc) +test_return_t user_supplied_bug9(memcached_st *memc) { const char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"}; size_t key_length[3]; @@ -2576,8 +2299,10 @@ static test_return_t user_supplied_bug9(memcached_st *memc) } /* We are testing with aggressive timeout to get failures */ -static test_return_t user_supplied_bug10(memcached_st *memc) +test_return_t user_supplied_bug10(memcached_st *memc) { + test_skip(memc->servers[0].type, MEMCACHED_CONNECTION_TCP); + size_t value_length= 512; unsigned int set= 1; memcached_st *mclone= memcached_clone(NULL, memc); @@ -2586,7 +2311,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc) memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, set); memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, uint64_t(0)); - std::vector value; + libtest::vchar_t value; value.reserve(value_length); for (uint32_t x= 0; x < value_length; x++) { @@ -2618,7 +2343,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc) /* We are looking failures in the async protocol */ -static test_return_t user_supplied_bug11(memcached_st *memc) +test_return_t user_supplied_bug11(memcached_st *memc) { memcached_st *mclone= memcached_clone(NULL, memc); @@ -2629,7 +2354,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) test_compare(-1, int32_t(memcached_behavior_get(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT))); - std::vector value; + libtest::vchar_t value; value.reserve(512); for (unsigned int x= 0; x < 512; x++) { @@ -2650,7 +2375,7 @@ static test_return_t user_supplied_bug11(memcached_st *memc) /* Bug found where incr was not returning MEMCACHED_NOTFOUND when object did not exist. */ -static test_return_t user_supplied_bug12(memcached_st *memc) +test_return_t user_supplied_bug12(memcached_st *memc) { memcached_return_t rc; uint32_t flags; @@ -2694,30 +2419,27 @@ static test_return_t user_supplied_bug12(memcached_st *memc) Bug found where command total one more than MEMCACHED_MAX_BUFFER set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169 */ -static test_return_t user_supplied_bug13(memcached_st *memc) +test_return_t user_supplied_bug13(memcached_st *memc) { char key[] = "key34567890"; - memcached_return_t rc; - size_t overflowSize; char commandFirst[]= "set key34567890 0 0 "; char commandLast[] = " \r\n"; /* first line of command sent to server */ size_t commandLength; - size_t testSize; commandLength = strlen(commandFirst) + strlen(commandLast) + 4; /* 4 is number of characters in size, probably 8196 */ - overflowSize = MEMCACHED_MAX_BUFFER - commandLength; + size_t overflowSize = MEMCACHED_MAX_BUFFER - commandLength; - for (testSize= overflowSize - 1; testSize < overflowSize + 1; testSize++) + for (size_t testSize= overflowSize - 1; testSize < overflowSize + 1; testSize++) { char *overflow= new (std::nothrow) char[testSize]; test_true(overflow); memset(overflow, 'x', testSize); - rc= memcached_set(memc, key, strlen(key), - overflow, testSize, 0, 0); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, key, strlen(key), + overflow, testSize, 0, 0)); delete [] overflow; } @@ -2731,18 +2453,18 @@ static test_return_t user_supplied_bug13(memcached_st *memc) set key34567890 0 0 8169 \r\n is sent followed by buffer of size 8169, followed by 8169 */ -static test_return_t user_supplied_bug14(memcached_st *memc) +test_return_t user_supplied_bug14(memcached_st *memc) { memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, true); - std::vector value; + libtest::vchar_t value; value.reserve(18000); - for (size_t x= 0; x < 18000; x++) + for (ptrdiff_t x= 0; x < 18000; x++) { value.push_back((char) (x % 127)); } - for (size_t current_length= 0; current_length < value.size(); current_length++) + for (size_t current_length= 1; current_length < value.size(); current_length++) { memcached_return_t rc= memcached_set(memc, test_literal_param("foo"), &value[0], current_length, @@ -2756,7 +2478,9 @@ static test_return_t user_supplied_bug14(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, rc); test_compare(string_length, current_length); - test_memcmp(string, &value[0], string_length); + char buffer[1024]; + snprintf(buffer, sizeof(buffer), "%u", uint32_t(string_length)); + test_memcmp_hint(string, &value[0], string_length, buffer); free(string); } @@ -2767,7 +2491,7 @@ static test_return_t user_supplied_bug14(memcached_st *memc) /* Look for zero length value problems */ -static test_return_t user_supplied_bug15(memcached_st *memc) +test_return_t user_supplied_bug15(memcached_st *memc) { for (uint32_t x= 0; x < 2; x++) { @@ -2791,7 +2515,7 @@ static test_return_t user_supplied_bug15(memcached_st *memc) &length, &flags, &rc); test_compare(MEMCACHED_SUCCESS, rc); - test_true(value == NULL); + test_null(value); test_zero(length); test_zero(flags); } @@ -2800,7 +2524,7 @@ static test_return_t user_supplied_bug15(memcached_st *memc) } /* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */ -static test_return_t user_supplied_bug16(memcached_st *memc) +test_return_t user_supplied_bug16(memcached_st *memc) { test_compare_hint(MEMCACHED_SUCCESS, memcached_set(memc, test_literal_param("mykey"), NULL, 0, @@ -2824,7 +2548,7 @@ static test_return_t user_supplied_bug16(memcached_st *memc) #if !defined(__sun) && !defined(__OpenBSD__) /* Check the validity of chinese key*/ -static test_return_t user_supplied_bug17(memcached_st *memc) +test_return_t user_supplied_bug17(memcached_st *memc) { const char *key= "豆瓣"; const char *value="我们在炎热抑郁的夏天无法停止豆瓣"; @@ -2839,7 +2563,7 @@ static test_return_t user_supplied_bug17(memcached_st *memc) char *value2= memcached_get(memc, key, strlen(key), &length, &flags, &rc); - test_true(length==strlen(value)); + test_compare(length, strlen(value)); test_compare(MEMCACHED_SUCCESS, rc); test_memcmp(value, value2, length); free(value2); @@ -2852,13 +2576,13 @@ static test_return_t user_supplied_bug17(memcached_st *memc) From Andrei on IRC */ -static test_return_t user_supplied_bug19(memcached_st *) +test_return_t user_supplied_bug19(memcached_st *) { memcached_return_t res; memcached_st *memc= memcached(test_literal_param("--server=localhost:11311/?100 --server=localhost:11312/?100")); - const memcached_server_st *server= memcached_server_by_key(memc, "a", 1, &res); + memcached_server_instance_st server= memcached_server_by_key(memc, "a", 1, &res); test_true(server); memcached_free(memc); @@ -2867,7 +2591,7 @@ static test_return_t user_supplied_bug19(memcached_st *) } /* CAS test from Andei */ -static test_return_t user_supplied_bug20(memcached_st *memc) +test_return_t user_supplied_bug20(memcached_st *memc) { const char *key= "abc"; size_t key_len= strlen("abc"); @@ -2909,11 +2633,11 @@ static test_return_t user_supplied_bug20(memcached_st *memc) /* sighandler_t function that always asserts false */ static void fail(int) { - assert(0); + fatal_assert(0); } -static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) +test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) { #ifdef WIN32 (void)memc; @@ -2931,24 +2655,14 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) /* empty the cache to ensure misses (hence non-responses) */ test_compare(MEMCACHED_SUCCESS, memcached_flush(memc_clone, 0)); - std::vector key_lengths; - key_lengths.resize(key_count); - std::vector keys; - keys.resize(key_lengths.size()); - for (unsigned int x= 0; x < key_lengths.size(); x++) - { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - int key_length= snprintf(key, sizeof(key), "%u", x); - test_true(key_length > 0 and key_length < MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1); - keys[x]= strdup(key); - key_lengths[x]= key_length; - } + keys_st keys(key_count); oldalarm= signal(SIGALRM, fail); alarm(5); test_compare_got(MEMCACHED_SUCCESS, - memcached_mget(memc_clone, &keys[0], &key_lengths[0], key_count), memcached_last_error_message(memc_clone)); + memcached_mget(memc_clone, keys.keys_ptr(), keys.lengths_ptr(), keys.size()), + memcached_last_error_message(memc_clone)); alarm(0); signal(SIGALRM, oldalarm); @@ -2970,20 +2684,13 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) test_false(return_key[0]); test_false(return_value); - for (std::vector::iterator iter= keys.begin(); - iter != keys.end(); - iter++) - { - free(*iter); - } - memcached_free(memc_clone); return TEST_SUCCESS; #endif } -static test_return_t user_supplied_bug21(memcached_st *memc) +test_return_t user_supplied_bug21(memcached_st *memc) { test_skip(TEST_SUCCESS, pre_binary(memc)); @@ -2998,7 +2705,7 @@ static test_return_t user_supplied_bug21(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t output_ketama_weighted_keys(memcached_st *) +test_return_t output_ketama_weighted_keys(memcached_st *) { memcached_st *memc= memcached_create(NULL); test_true(memc); @@ -3055,7 +2762,7 @@ static test_return_t output_ketama_weighted_keys(memcached_st *) } -static test_return_t result_static(memcached_st *memc) +test_return_t result_static(memcached_st *memc) { memcached_result_st result; memcached_result_st *result_ptr= memcached_result_create(memc, &result); @@ -3072,510 +2779,47 @@ static test_return_t result_static(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t result_alloc(memcached_st *memc) -{ - memcached_result_st *result_ptr= memcached_result_create(memc, NULL); - test_true(result_ptr); - test_true(result_ptr->options.is_allocated); - test_true(memcached_is_initialized(result_ptr)); - memcached_result_free(result_ptr); - - return TEST_SUCCESS; -} - -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 *) -{ - global_pairs= pairs_generate(GLOBAL_COUNT, 400); - global_count= GLOBAL_COUNT; - - for (size_t x= 0; x < global_count; x++) - { - global_keys[x]= global_pairs[x].key; - global_keys_length[x]= global_pairs[x].key_length; - } - - return TEST_SUCCESS; -} - -static test_return_t generate_large_pairs(memcached_st *) -{ - global_pairs= pairs_generate(GLOBAL2_COUNT, MEMCACHED_MAX_BUFFER+10); - global_count= GLOBAL2_COUNT; - - for (size_t x= 0; x < global_count; x++) - { - global_keys[x]= global_pairs[x].key; - global_keys_length[x]= global_pairs[x].key_length; - } - - return TEST_SUCCESS; -} - -static test_return_t generate_data(memcached_st *memc) -{ - unsigned int check_execute= execute_set(memc, global_pairs, global_count); - - test_compare(global_count, check_execute); - - return TEST_SUCCESS; -} - -static test_return_t generate_data_with_stats(memcached_st *memc) -{ - unsigned int check_execute= execute_set(memc, global_pairs, global_count); - - test_compare(check_execute, global_count); - - // @todo hosts used size stats - memcached_return_t rc; - memcached_stat_st *stat_p= memcached_stat(memc, NULL, &rc); - test_true(stat_p); - - for (uint32_t host_index= 0; host_index < SERVERS_TO_CREATE; host_index++) - { - /* This test was changes so that "make test" would work properlly */ - if (DEBUG) - { - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, host_index); - - printf("\nserver %u|%s|%u bytes: %llu\n", host_index, instance->hostname, instance->port, (unsigned long long)(stat_p + host_index)->bytes); - } - test_true((unsigned long long)(stat_p + host_index)->bytes); - } - - memcached_stat_free(NULL, stat_p); - - return TEST_SUCCESS; -} -static test_return_t generate_buffer_data(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true); - generate_data(memc); - - return TEST_SUCCESS; -} - -static test_return_t get_read_count(memcached_st *memc) -{ - memcached_st *memc_clone= memcached_clone(NULL, memc); - test_true(memc_clone); - - memcached_server_add_with_weight(memc_clone, "localhost", 6666, 0); - - { - char *return_value; - size_t return_value_length; - uint32_t flags; - uint32_t count; - - for (size_t x= count= 0; x < global_count; x++) - { - memcached_return_t rc; - return_value= memcached_get(memc_clone, global_keys[x], global_keys_length[x], - &return_value_length, &flags, &rc); - if (rc == MEMCACHED_SUCCESS) - { - count++; - if (return_value) - { - free(return_value); - } - } - } - } - - memcached_free(memc_clone); - - return TEST_SUCCESS; -} - -static test_return_t get_read(memcached_st *memc) -{ - for (size_t x= 0; x < global_count; x++) - { - size_t return_value_length; - uint32_t flags; - memcached_return_t rc; - char *return_value= memcached_get(memc, global_keys[x], global_keys_length[x], - &return_value_length, &flags, &rc); - /* - test_true(return_value); - test_compare(MEMCACHED_SUCCESS, rc); - */ - if (rc == MEMCACHED_SUCCESS && return_value) - { - free(return_value); - } - } - - return TEST_SUCCESS; -} - -static test_return_t mget_read(memcached_st *memc) -{ - - test_skip(true, bool(libmemcached_util_version_check(memc, 1, 4, 4))); - - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, global_keys, global_keys_length, global_count)); - - // Go fetch the keys and test to see if all of them were returned - { - unsigned int keys_returned; - test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_SUCCESS)); - test_true(keys_returned > 0); - test_compare_warn_hint(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs"); - } - - return TEST_SUCCESS; -} - -static test_return_t mget_read_result(memcached_st *memc) -{ - - test_skip(true, bool(libmemcached_util_version_check(memc, 1, 4, 4))); - - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, global_keys, global_keys_length, global_count)); - - /* Turn this into a help function */ - { - memcached_result_st results_obj; - memcached_result_st *results= memcached_result_create(memc, &results_obj); - test_true(results); - - memcached_return_t rc; - while ((results= memcached_fetch_result(memc, &results_obj, &rc))) - { - if (rc == MEMCACHED_IN_PROGRESS) - { - continue; - } - - test_true(results); - test_compare(MEMCACHED_SUCCESS, rc); - } - test_compare(MEMCACHED_END, rc); - - memcached_result_free(&results_obj); - } - - return TEST_SUCCESS; -} - -static test_return_t mget_read_internal_result(memcached_st *memc) -{ - - test_skip(true, bool(libmemcached_util_version_check(memc, 1, 4, 4))); - - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, global_keys, global_keys_length, global_count)); - { - memcached_result_st *results= NULL; - memcached_return_t rc; - while ((results= memcached_fetch_result(memc, results, &rc))) - { - test_true(results); - test_compare(MEMCACHED_SUCCESS, rc); - } - test_compare(MEMCACHED_END, rc); - - memcached_result_free(results); - } - - return TEST_SUCCESS; -} - -static test_return_t mget_read_partial_result(memcached_st *memc) -{ - - test_skip(true, bool(libmemcached_util_version_check(memc, 1, 4, 4))); - - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, global_keys, global_keys_length, global_count)); - - // We will scan for just one key - { - memcached_result_st results_obj; - memcached_result_st *results= memcached_result_create(memc, &results_obj); - - memcached_return_t rc; - results= memcached_fetch_result(memc, results, &rc); - test_true(results); - test_compare(MEMCACHED_SUCCESS, rc); - - memcached_result_free(&results_obj); - } - - // We already have a read happening, lets start up another one. - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, global_keys, global_keys_length, global_count)); - { - memcached_result_st results_obj; - memcached_result_st *results= memcached_result_create(memc, &results_obj); - test_true(results); - test_false(memcached_is_allocated(results)); - - memcached_return_t rc; - while ((results= memcached_fetch_result(memc, &results_obj, &rc))) - { - test_true(results); - test_compare(MEMCACHED_SUCCESS, rc); - } - test_compare(MEMCACHED_END, rc); - - memcached_result_free(&results_obj); - } - - return TEST_SUCCESS; -} - -static test_return_t mget_read_function(memcached_st *memc) -{ - test_skip(true, bool(libmemcached_util_version_check(memc, 1, 4, 4))); - - test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, global_keys, global_keys_length, global_count)); - - memcached_execute_fn callbacks[]= { &callback_counter }; - size_t counter= 0; - test_compare(MEMCACHED_SUCCESS, - memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); - - return TEST_SUCCESS; -} - -static test_return_t delete_generate(memcached_st *memc) -{ - for (size_t x= 0; x < global_count; x++) - { - (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); - } - - return TEST_SUCCESS; -} - -static test_return_t delete_buffer_generate(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true); - - for (size_t x= 0; x < global_count; x++) - { - (void)memcached_delete(memc, global_keys[x], global_keys_length[x], (time_t)0); - } - - return TEST_SUCCESS; -} - -static test_return_t add_host_test1(memcached_st *memc) -{ - memcached_return_t rc; - char servername[]= "0.example.com"; - - memcached_server_st *servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); - test_true(servers); - test_compare(1U, memcached_server_list_count(servers)); - - for (uint32_t x= 2; x < 20; x++) - { - char buffer[SMALL_STRING_LEN]; - - 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_compare(MEMCACHED_SUCCESS, rc); - test_compare(x, memcached_server_list_count(servers)); - } - - test_compare(MEMCACHED_SUCCESS, memcached_server_push(memc, servers)); - test_compare(MEMCACHED_SUCCESS, memcached_server_push(memc, servers)); - - memcached_server_list_free(servers); - - return TEST_SUCCESS; -} - -static test_return_t pre_nonblock(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); - - return TEST_SUCCESS; -} - -static test_return_t pre_cork(memcached_st *memc) -{ -#ifdef __APPLE__ - return TEST_SKIPPED; -#endif - bool set= true; - if (memcached_success(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CORK, set))) - return TEST_SUCCESS; - - return TEST_SKIPPED; -} - -static test_return_t pre_cork_and_nonblock(memcached_st *memc) -{ -#ifdef __APPLE__ - return TEST_SKIPPED; -#endif - test_return_t test_rc; - if ((test_rc= pre_cork(memc)) != TEST_SUCCESS) - return test_rc; - - return pre_nonblock(memc); -} - -static test_return_t pre_nonblock_binary(memcached_st *memc) -{ - memcached_st *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); - - memcached_return_t rc= MEMCACHED_FAILURE; - if (libmemcached_util_version_check(memc_clone, 1, 4, 4)) - { - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)); - test_compare(uint64_t(1), memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); - } - else - { - memcached_free(memc_clone); - return TEST_SKIPPED; - } - - memcached_free(memc_clone); - - return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; -} - -static test_return_t pre_murmur(memcached_st *memc) -{ - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR)); - return TEST_SUCCESS; -} - -static test_return_t pre_jenkins(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_JENKINS); - - return TEST_SKIPPED; -} - - -static test_return_t pre_md5(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MD5); - - return TEST_SUCCESS; -} - -static test_return_t pre_crc(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_CRC); - - return TEST_SUCCESS; -} - -static test_return_t pre_hsieh(memcached_st *memc) -{ - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH)); - return TEST_SUCCESS; -} - -static test_return_t pre_hash_fnv1_64(memcached_st *memc) -{ - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR)); - - return TEST_SUCCESS; -} - -static test_return_t pre_hash_fnv1a_64(memcached_st *memc) -{ - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_64)); - - return TEST_SUCCESS; -} - -static test_return_t pre_hash_fnv1_32(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_32); - - return TEST_SUCCESS; -} - -static test_return_t pre_hash_fnv1a_32(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_32); - - return TEST_SUCCESS; -} - -static test_return_t pre_behavior_ketama(memcached_st *memc) +test_return_t result_alloc(memcached_st *memc) { - memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1); - test_compare(MEMCACHED_SUCCESS, rc); - - uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA); - test_compare(value, uint64_t(1)); + memcached_result_st *result_ptr= memcached_result_create(memc, NULL); + test_true(result_ptr); + test_true(result_ptr->options.is_allocated); + test_true(memcached_is_initialized(result_ptr)); + memcached_result_free(result_ptr); return TEST_SUCCESS; } -static test_return_t pre_behavior_ketama_weighted(memcached_st *memc) -{ - memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_compare(MEMCACHED_SUCCESS, rc); - uint64_t value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_compare(value, uint64_t(1)); +test_return_t add_host_test1(memcached_st *memc) +{ + memcached_return_t rc; + char servername[]= "0.example.com"; - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5)); + memcached_server_st *servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); + test_true(servers); + test_compare(1U, memcached_server_list_count(servers)); - value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_compare(MEMCACHED_HASH_MD5, memcached_hash_t(value)); + for (uint32_t x= 2; x < 20; x++) + { + char buffer[SMALL_STRING_LEN]; - return TEST_SUCCESS; -} + 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_compare(MEMCACHED_SUCCESS, rc); + test_compare(x, memcached_server_list_count(servers)); + } -static test_return_t pre_replication(memcached_st *memc) -{ - test_skip(TEST_SUCCESS, pre_binary(memc)); + test_compare(MEMCACHED_SUCCESS, memcached_server_push(memc, servers)); + test_compare(MEMCACHED_SUCCESS, memcached_server_push(memc, servers)); - /* - * Make sure that we store the item on all servers - * (master + replicas == number of servers) - */ - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, memcached_server_count(memc) - 1)); - test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS), uint64_t(memcached_server_count(memc) - 1)); + memcached_server_list_free(servers); return TEST_SUCCESS; } -static test_return_t pre_replication_noblock(memcached_st *memc) -{ - test_skip(TEST_SUCCESS, pre_replication(memc)); - - return pre_nonblock(memc); -} - - static void my_free(const memcached_st *ptr, void *mem, void *context) { (void)context; @@ -3648,7 +2892,7 @@ static void *my_calloc(const memcached_st *ptr, size_t nelem, const size_t size, #endif } -static test_return_t selection_of_namespace_tests(memcached_st *memc) +test_return_t selection_of_namespace_tests(memcached_st *memc) { memcached_return_t rc; const char *key= "mine"; @@ -3719,7 +2963,7 @@ static test_return_t selection_of_namespace_tests(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t set_namespace(memcached_st *memc) +test_return_t set_namespace(memcached_st *memc) { memcached_return_t rc; const char *key= "mine"; @@ -3742,7 +2986,7 @@ static test_return_t set_namespace(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t set_namespace_and_binary(memcached_st *memc) +test_return_t set_namespace_and_binary(memcached_st *memc) { test_return_if(pre_binary(memc)); test_return_if(set_namespace(memc)); @@ -3751,13 +2995,12 @@ static test_return_t set_namespace_and_binary(memcached_st *memc) } #ifdef MEMCACHED_ENABLE_DEPRECATED -static test_return_t deprecated_set_memory_alloc(memcached_st *memc) +test_return_t deprecated_set_memory_alloc(memcached_st *memc) { void *test_ptr= NULL; void *cb_ptr= NULL; { - memcached_malloc_fn malloc_cb= - (memcached_malloc_fn)my_malloc; + memcached_malloc_fn malloc_cb= (memcached_malloc_fn)my_malloc; cb_ptr= *(void **)&malloc_cb; memcached_return_t rc; @@ -3799,7 +3042,7 @@ static test_return_t deprecated_set_memory_alloc(memcached_st *memc) #endif -static test_return_t set_memory_alloc(memcached_st *memc) +test_return_t set_memory_alloc(memcached_st *memc) { test_compare(MEMCACHED_INVALID_ARGUMENTS, memcached_set_memory_allocators(memc, NULL, my_free, @@ -3824,56 +3067,51 @@ static test_return_t set_memory_alloc(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t enable_consistent_crc(memcached_st *memc) +test_return_t enable_consistent_crc(memcached_st *memc) { + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT)); + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION), uint64_t(MEMCACHED_DISTRIBUTION_CONSISTENT)); + test_return_t rc; - memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT; - memcached_hash_t hash; - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); if ((rc= pre_crc(memc)) != TEST_SUCCESS) + { return rc; + } - value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); - test_true(value == MEMCACHED_DISTRIBUTION_CONSISTENT); - - hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION), uint64_t(MEMCACHED_DISTRIBUTION_CONSISTENT)); - if (hash != MEMCACHED_HASH_CRC) + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH) != MEMCACHED_HASH_CRC) + { return TEST_SKIPPED; + } return TEST_SUCCESS; } -static test_return_t enable_consistent_hsieh(memcached_st *memc) +test_return_t enable_consistent_hsieh(memcached_st *memc) { test_return_t rc; - memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT; - memcached_hash_t hash; - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT); if ((rc= pre_hsieh(memc)) != TEST_SUCCESS) { return rc; } - value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION); - test_true(value == MEMCACHED_DISTRIBUTION_CONSISTENT); + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION), uint64_t(MEMCACHED_DISTRIBUTION_CONSISTENT)); - hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH); - - if (hash != MEMCACHED_HASH_HSIEH) + if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH) != MEMCACHED_HASH_HSIEH) + { return TEST_SKIPPED; - + } return TEST_SUCCESS; } -static test_return_t enable_cas(memcached_st *memc) +test_return_t enable_cas(memcached_st *memc) { - unsigned int set= 1; - if (libmemcached_util_version_check(memc, 1, 2, 4)) { - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, set); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SUPPORT_CAS, true); return TEST_SUCCESS; } @@ -3881,7 +3119,7 @@ static test_return_t enable_cas(memcached_st *memc) return TEST_SKIPPED; } -static test_return_t check_for_1_2_3(memcached_st *memc) +test_return_t check_for_1_2_3(memcached_st *memc) { memcached_version(memc); @@ -3897,38 +3135,7 @@ static test_return_t check_for_1_2_3(memcached_st *memc) return TEST_SKIPPED; } -static test_return_t pre_unix_socket(memcached_st *memc) -{ - struct stat buf; - - memcached_servers_reset(memc); - const char *socket_file= default_socket(); - - test_skip(0, stat(socket_file, &buf)); - - test_compare(MEMCACHED_SUCCESS, - memcached_server_add_unix_socket_with_weight(memc, socket_file, 0)); - - return TEST_SUCCESS; -} - -static test_return_t pre_nodelay(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 0); - - return TEST_SUCCESS; -} - -static test_return_t pre_settimer(memcached_st *memc) -{ - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000); - - return TEST_SUCCESS; -} - -static test_return_t MEMCACHED_BEHAVIOR_POLL_TIMEOUT_test(memcached_st *memc) +test_return_t MEMCACHED_BEHAVIOR_POLL_TIMEOUT_test(memcached_st *memc) { const uint64_t timeout= 100; // Not using, just checking that it sets @@ -3939,7 +3146,7 @@ static test_return_t MEMCACHED_BEHAVIOR_POLL_TIMEOUT_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t noreply_test(memcached_st *memc) +test_return_t noreply_test(memcached_st *memc) { test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, true)); @@ -3956,7 +3163,7 @@ static test_return_t noreply_test(memcached_st *memc) { for (size_t x= 0; x < 100; ++x) { - char key[10]; + char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; int check_length= (size_t)snprintf(key, sizeof(key), "%lu", (unsigned long)x); test_false((size_t)check_length >= sizeof(key) || check_length < 0); @@ -3983,7 +3190,8 @@ static test_return_t noreply_test(memcached_st *memc) test_true(count); break; } - test_true_got(ret == MEMCACHED_SUCCESS or ret == MEMCACHED_BUFFERED, memcached_strerror(NULL, ret)); + test_true_got(ret == MEMCACHED_SUCCESS or ret == MEMCACHED_BUFFERED, + memcached_strerror(NULL, ret)); } /* @@ -3991,6 +3199,7 @@ static test_return_t noreply_test(memcached_st *memc) ** API and is _ONLY_ done this way to verify that the library works the ** way it is supposed to do!!!! */ +#if 0 int no_msg=0; for (uint32_t x= 0; x < memcached_server_count(memc); ++x) { @@ -4000,6 +3209,7 @@ static test_return_t noreply_test(memcached_st *memc) } test_true(no_msg == 0); +#endif test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); /* @@ -4018,7 +3228,12 @@ static test_return_t noreply_test(memcached_st *memc) uint32_t flags; char* value=memcached_get(memc, key, strlen(key), &length, &flags, &ret); - test_true_got(ret == MEMCACHED_SUCCESS && value != NULL, memcached_strerror(NULL, ret)); + // For the moment we will just go to the next key + if (MEMCACHED_TIMEOUT == ret) + { + continue; + } + test_true(ret == MEMCACHED_SUCCESS and value != NULL); switch (count) { case 0: /* FALLTHROUGH */ @@ -4078,10 +3293,10 @@ static test_return_t noreply_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t analyzer_test(memcached_st *memc) +test_return_t analyzer_test(memcached_st *memc) { - memcached_return_t rc; memcached_analysis_st *report; + memcached_return_t rc; memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); test_compare(MEMCACHED_SUCCESS, rc); @@ -4097,25 +3312,7 @@ static test_return_t analyzer_test(memcached_st *memc) return TEST_SUCCESS; } -/* Count the objects */ - -static test_return_t dump_test(memcached_st *memc) -{ - /* No support for Binary protocol yet */ - test_skip(false, memc->flags.binary_protocol); - - test_compare(TEST_SUCCESS, set_test3(memc)); - - // confirm_key_count() call dump - size_t counter= confirm_key_count(memc); - - /* We may have more then 32 if our previous flush has not completed */ - test_true(counter >= 32); - - return TEST_SUCCESS; -} - -static test_return_t util_version_test(memcached_st *memc) +test_return_t util_version_test(memcached_st *memc) { test_compare_hint(MEMCACHED_SUCCESS, memcached_version(memc), memcached_last_error_message(memc)); test_true(libmemcached_util_version_check(memc, 0, 0, 0)); @@ -4177,8 +3374,9 @@ static test_return_t util_version_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t getpid_connection_failure_test(memcached_st *memc) +test_return_t getpid_connection_failure_test(memcached_st *memc) { + test_skip(memc->servers[0].type, MEMCACHED_CONNECTION_TCP); memcached_return_t rc; memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); @@ -4195,7 +3393,7 @@ static test_return_t getpid_connection_failure_test(memcached_st *memc) } -static test_return_t getpid_test(memcached_st *memc) +test_return_t getpid_test(memcached_st *memc) { memcached_return_t rc; memcached_server_instance_st instance= @@ -4212,27 +3410,39 @@ static test_return_t getpid_test(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t ping_test(memcached_st *memc) +static memcached_return_t ping_each_server(const memcached_st*, + memcached_server_instance_st instance, + void*) { + // Test both the version that returns a code, and the one that does not. memcached_return_t rc; - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, 0); + if (libmemcached_util_ping(memcached_server_name(instance), + memcached_server_port(instance), &rc) == false) + { + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "%s:%d %s", memcached_server_name(instance), + memcached_server_port(instance), memcached_strerror(NULL, rc)); + } - // 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)); + if (libmemcached_util_ping(memcached_server_name(instance), + memcached_server_port(instance), NULL) == false) + { + throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "%s:%d", memcached_server_name(instance), memcached_server_port(instance)); + } - test_true(libmemcached_util_ping(memcached_server_name(instance), - memcached_server_port(instance), &rc)); + return MEMCACHED_SUCCESS; +} - test_compare(MEMCACHED_SUCCESS, rc); +test_return_t libmemcached_util_ping_TEST(memcached_st *memc) +{ + memcached_server_fn callbacks[1]= { ping_each_server }; + memcached_server_cursor(memc, callbacks, NULL, 1); return TEST_SUCCESS; } #if 0 -static test_return_t hash_sanity_test (memcached_st *memc) +test_return_t hash_sanity_test (memcached_st *memc) { (void)memc; @@ -4254,7 +3464,7 @@ static test_return_t hash_sanity_test (memcached_st *memc) } #endif -static test_return_t hsieh_avaibility_test (memcached_st *memc) +test_return_t hsieh_avaibility_test (memcached_st *memc) { test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_HSIEH)); @@ -4265,7 +3475,7 @@ static test_return_t hsieh_avaibility_test (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t murmur_avaibility_test (memcached_st *memc) +test_return_t murmur_avaibility_test (memcached_st *memc) { test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_MURMUR)); @@ -4275,7 +3485,7 @@ static test_return_t murmur_avaibility_test (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t one_at_a_time_run (memcached_st *) +test_return_t one_at_a_time_run (memcached_st *) { uint32_t x; const char **ptr; @@ -4289,7 +3499,7 @@ static test_return_t one_at_a_time_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t md5_run (memcached_st *) +test_return_t md5_run (memcached_st *) { uint32_t x; const char **ptr; @@ -4303,7 +3513,7 @@ static test_return_t md5_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t crc_run (memcached_st *) +test_return_t crc_run (memcached_st *) { uint32_t x; const char **ptr; @@ -4317,7 +3527,7 @@ static test_return_t crc_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t fnv1_64_run (memcached_st *) +test_return_t fnv1_64_run (memcached_st *) { test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_FNV1_64)); @@ -4333,7 +3543,7 @@ static test_return_t fnv1_64_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t fnv1a_64_run (memcached_st *) +test_return_t fnv1a_64_run (memcached_st *) { test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_FNV1A_64)); @@ -4349,7 +3559,7 @@ static test_return_t fnv1a_64_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t fnv1_32_run (memcached_st *) +test_return_t fnv1_32_run (memcached_st *) { uint32_t x; const char **ptr; @@ -4363,7 +3573,7 @@ static test_return_t fnv1_32_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t fnv1a_32_run (memcached_st *) +test_return_t fnv1a_32_run (memcached_st *) { uint32_t x; const char **ptr; @@ -4377,7 +3587,7 @@ static test_return_t fnv1a_32_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t hsieh_run (memcached_st *) +test_return_t hsieh_run (memcached_st *) { test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_HSIEH)); @@ -4393,7 +3603,7 @@ static test_return_t hsieh_run (memcached_st *) return TEST_SUCCESS; } -static test_return_t murmur_run (memcached_st *) +test_return_t murmur_run (memcached_st *) { test_skip(true, libhashkit_has_algorithm(HASHKIT_HASH_MURMUR)); @@ -4414,7 +3624,7 @@ static test_return_t murmur_run (memcached_st *) #endif } -static test_return_t jenkins_run (memcached_st *) +test_return_t jenkins_run (memcached_st *) { uint32_t x; const char **ptr; @@ -4438,7 +3648,7 @@ static uint32_t hash_crc_test_function(const char *string, size_t string_length, return libhashkit_crc32(string, string_length); } -static test_return_t memcached_get_hashkit_test (memcached_st *) +test_return_t memcached_get_hashkit_test (memcached_st *) { uint32_t x; const char **ptr; @@ -4513,9 +3723,8 @@ static test_return_t memcached_get_hashkit_test (memcached_st *) 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 *) +test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *) { - const char *key= "MemcachedLives"; size_t len; uint32_t flags; memcached_return rc; @@ -4524,7 +3733,9 @@ static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *) memcached_st *tl_memc_h= memcached(test_literal_param("--server=localhost:9898 --server=localhost:9899")); // This server should not exist // See if memcached is reachable. - char *value= memcached_get(tl_memc_h, key, strlen(key), &len, &flags, &rc); + char *value= memcached_get(tl_memc_h, + test_literal_param(__func__), + &len, &flags, &rc); test_false(value); test_zero(len); @@ -4538,15 +3749,16 @@ static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *) /* 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) +test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc) { - const char *key= "MemcachedKeyNotEXIST"; size_t len; uint32_t flags; memcached_return rc; // See if memcached is reachable. - char *value= memcached_get(memc, key, strlen(key), &len, &flags, &rc); + char *value= memcached_get(memc, + test_literal_param(__func__), + &len, &flags, &rc); test_false(value); test_zero(len); @@ -4561,26 +3773,23 @@ static test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc) 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) +test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *) { - (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_st *tl_memc_h= memcached_create(NULL); + memcached_server_st *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); + char *value= memcached_get_by_key(tl_memc_h, + test_literal_param(__func__), // Key + test_literal_param(__func__), // Value + &len, &flags, &rc); test_false(value); test_zero(len); @@ -4594,16 +3803,17 @@ static test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *memc) /* 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) +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); + char *value= memcached_get_by_key(memc, + test_literal_param(__func__), // Key + test_literal_param(__func__), // Value + &len, &flags, &rc); test_false(value); test_zero(len); @@ -4612,27 +3822,27 @@ static test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t regression_bug_434484(memcached_st *memc) +test_return_t regression_bug_434484(memcached_st *memc) { test_skip(TEST_SUCCESS, pre_binary(memc)); - const char *key= "regression_bug_434484"; - size_t keylen= strlen(key); - - memcached_return_t ret= memcached_append(memc, key, keylen, key, keylen, 0, 0); - test_compare(MEMCACHED_NOTSTORED, ret); + test_compare(MEMCACHED_NOTSTORED, + memcached_append(memc, + test_literal_param(__func__), // Key + test_literal_param(__func__), // Value + 0, 0)); - size_t size= 2048 * 1024; - char *data= (char*)calloc(1, size); - test_true(data); + libtest::vchar_t data; + data.resize(2048 * 1024); test_compare(MEMCACHED_E2BIG, - memcached_set(memc, key, keylen, data, size, 0, 0)); - free(data); + memcached_set(memc, + test_literal_param(__func__), // Key + &data[0], data.size(), 0, 0)); return TEST_SUCCESS; } -static test_return_t regression_bug_434843(memcached_st *original_memc) +test_return_t regression_bug_434843(memcached_st *original_memc) { test_skip(TEST_SUCCESS, pre_binary(original_memc)); @@ -4648,28 +3858,19 @@ static test_return_t regression_bug_434843(memcached_st *original_memc) */ memcached_st *memc= create_single_instance_memcached(original_memc, "--BINARY-PROTOCOL"); - const size_t max_keys= 1024; - char **keys= (char**)calloc(max_keys, sizeof(char*)); - size_t *key_length= (size_t *)calloc(max_keys, sizeof(size_t)); - - for (size_t x= 0; x < max_keys; ++x) - { - char k[251]; - - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); - keys[x]= strdup(k); - test_true(keys[x]); - } + keys_st keys(1024); /* * Run two times.. the first time we should have 100% cache miss, * and the second time we should have 100% cache hits */ - for (size_t y= 0; y < 2; y++) + for (ptrdiff_t y= 0; y < 2; y++) { test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char**)keys, key_length, max_keys)); + memcached_mget(memc, keys.keys_ptr(), keys.lengths_ptr(), keys.size())); + // One the first run we should get a NOT_FOUND, but on the second some data + // should be returned. test_compare(y ? MEMCACHED_SUCCESS : MEMCACHED_NOTFOUND, memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); @@ -4680,9 +3881,10 @@ static test_return_t regression_bug_434843(memcached_st *original_memc) test_false(counter); - for (size_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { - rc= memcached_add(memc, keys[x], key_length[x], + rc= memcached_add(memc, + keys.key_at(x), keys.length_at(x), blob, sizeof(blob), 0, 0); test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); } @@ -4690,33 +3892,23 @@ static test_return_t regression_bug_434843(memcached_st *original_memc) else { /* Verify that we received all of the key/value pairs */ - test_compare(counter, max_keys); + test_compare(counter, keys.size()); } } - /* Release allocated resources */ - for (size_t x= 0; x < max_keys; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); - memcached_free(memc); return TEST_SUCCESS; } -static test_return_t regression_bug_434843_buffered(memcached_st *memc) +test_return_t regression_bug_434843_buffered(memcached_st *memc) { - memcached_return_t rc; - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, true)); return regression_bug_434843(memc); } -static test_return_t regression_bug_421108(memcached_st *memc) +test_return_t regression_bug_421108(memcached_st *memc) { memcached_return_t rc; memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc); @@ -4762,62 +3954,57 @@ static test_return_t regression_bug_421108(memcached_st *memc) * delete command or the watermarks, we need to update this * test.... */ -static test_return_t regression_bug_442914(memcached_st *memc) +test_return_t regression_bug_442914(memcached_st *original_memc) { - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1)); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1); + test_skip(original_memc->servers[0].type, MEMCACHED_CONNECTION_TCP); - uint32_t number_of_hosts= memcached_server_count(memc); - memc->number_of_hosts= 1; - - char k[250]; - size_t len; + memcached_st* memc= create_single_instance_memcached(original_memc, "--NOREPLY --TCP-NODELAY"); for (uint32_t x= 0; x < 250; ++x) { - len= (size_t)snprintf(k, sizeof(k), "%0250u", x); - memcached_return_t rc= memcached_delete(memc, k, len, 0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + char key[250]; + size_t len= (size_t)snprintf(key, sizeof(key), "%0250u", x); + memcached_return_t rc= memcached_delete(memc, key, len, 0); + char error_buffer[2048]= { 0 }; + snprintf(error_buffer, sizeof(error_buffer), "%s key: %s", memcached_last_error_message(memc), key); + test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, error_buffer); } - (void)snprintf(k, sizeof(k), "%037u", 251U); - len= strlen(k); - - memcached_return_t rc= memcached_delete(memc, k, len, 0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + // Delete, and then delete again to look for not found + { + char key[250]; + size_t len= snprintf(key, sizeof(key), "%037u", 251U); + memcached_return_t rc= memcached_delete(memc, key, len, 0); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0)); - test_compare(MEMCACHED_NOTFOUND, memcached_delete(memc, k, len, 0)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, false)); + test_compare(MEMCACHED_NOTFOUND, memcached_delete(memc, key, len, 0)); + } - memc->number_of_hosts= number_of_hosts; + memcached_free(memc); return TEST_SUCCESS; } -static test_return_t regression_bug_447342(memcached_st *memc) +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 or pre_replication(memc) != TEST_SUCCESS) + { return TEST_SKIPPED; + } test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2)); - const unsigned int max_keys= 100; - char **keys= (char**)calloc(max_keys, sizeof(char*)); - size_t *key_length= (size_t *)calloc(max_keys, sizeof(size_t)); + keys_st keys(100); - for (unsigned int x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { - char k[251]; - - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); - keys[x]= strdup(k); - test_true(keys[x]); test_compare(MEMCACHED_SUCCESS, - memcached_set(memc, k, key_length[x], k, key_length[x], 0, 0)); + memcached_set(memc, + keys.key_at(x), keys.length_at(x), // Keys + keys.key_at(x), keys.length_at(x), // Values + 0, 0)); } /* @@ -4839,7 +4026,8 @@ static test_return_t regression_bug_447342(memcached_st *memc) * into the servers */ test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); + memcached_mget(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size())); unsigned int counter= 0; memcached_execute_fn callbacks[]= { &callback_counter }; @@ -4847,7 +4035,7 @@ static test_return_t regression_bug_447342(memcached_st *memc) memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); /* Verify that we received all of the key/value pairs */ - test_compare(counter, max_keys); + test_compare(counter, keys.size()); memcached_quit(memc); /* @@ -4856,8 +4044,8 @@ static test_return_t regression_bug_447342(memcached_st *memc) * This is to verify correct behavior in the library. Fake that two servers * are dead.. */ - instance_one= memcached_server_instance_by_position(memc, 0); - instance_two= memcached_server_instance_by_position(memc, 2); + memcached_server_instance_st instance_one= memcached_server_instance_by_position(memc, 0); + memcached_server_instance_st instance_two= memcached_server_instance_by_position(memc, 2); in_port_t port0= instance_one->port; in_port_t port2= instance_two->port; @@ -4865,12 +4053,13 @@ static test_return_t regression_bug_447342(memcached_st *memc) ((memcached_server_write_instance_st)instance_two)->port= 0; test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); + memcached_mget(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size())); counter= 0; test_compare(MEMCACHED_SUCCESS, memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); - test_compare(counter, (unsigned int)max_keys); + test_compare(counter, keys.size()); /* restore the memc handle */ ((memcached_server_write_instance_st)instance_one)->port= port0; @@ -4879,12 +4068,12 @@ static test_return_t regression_bug_447342(memcached_st *memc) memcached_quit(memc); /* Remove half of the objects */ - for (size_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { if (x & 1) { test_compare(MEMCACHED_SUCCESS, - memcached_delete(memc, keys[x], key_length[x], 0)); + memcached_delete(memc, keys.key_at(x), keys.length_at(x), 0)); } } @@ -4894,20 +4083,13 @@ static test_return_t regression_bug_447342(memcached_st *memc) /* now retry the command, this time we should have cache misses */ test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); + memcached_mget(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size())); counter= 0; test_compare(MEMCACHED_SUCCESS, memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); - test_compare(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); + test_compare(counter, (unsigned int)(keys.size() >> 1)); /* restore the memc handle */ ((memcached_server_write_instance_st)instance_one)->port= port0; @@ -4916,8 +4098,12 @@ static test_return_t regression_bug_447342(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t regression_bug_463297(memcached_st *memc) +test_return_t regression_bug_463297(memcached_st *memc) { + test_compare(MEMCACHED_INVALID_ARGUMENTS, memcached_delete(memc, "foo", 3, 1)); + + // Since we blocked timed delete, this test is no longer valid. +#if 0 memcached_st *memc_clone= memcached_clone(NULL, memc); test_true(memc_clone); test_true(memcached_version(memc_clone) == MEMCACHED_SUCCESS); @@ -4973,6 +4159,8 @@ static test_return_t regression_bug_463297(memcached_st *memc) } memcached_free(memc_clone); +#endif + return TEST_SUCCESS; } @@ -4981,7 +4169,7 @@ static test_return_t regression_bug_463297(memcached_st *memc) * For a working server set, shall be NULL * For a set of non existing server, shall not be NULL */ -static test_return_t test_get_last_disconnect(memcached_st *memc) +test_return_t test_get_last_disconnect(memcached_st *memc) { memcached_return_t rc; memcached_server_instance_st disconnected_server; @@ -5030,7 +4218,7 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t test_multiple_get_last_disconnect(memcached_st *) +test_return_t test_multiple_get_last_disconnect(memcached_st *) { const char *server_string= "--server=localhost:8888 --server=localhost:8889 --server=localhost:8890 --server=localhost:8891 --server=localhost:8892"; char buffer[BUFSIZ]; @@ -5068,7 +4256,7 @@ static test_return_t test_multiple_get_last_disconnect(memcached_st *) return TEST_SUCCESS; } -static test_return_t test_verbosity(memcached_st *memc) +test_return_t test_verbosity(memcached_st *memc) { memcached_verbosity(memc, 3); @@ -5091,7 +4279,7 @@ static memcached_return_t stat_printer(memcached_server_instance_st server, return MEMCACHED_SUCCESS; } -static test_return_t memcached_stat_execute_test(memcached_st *memc) +test_return_t memcached_stat_execute_test(memcached_st *memc) { memcached_return_t rc= memcached_stat_execute(memc, NULL, stat_printer, NULL); test_compare(MEMCACHED_SUCCESS, rc); @@ -5112,31 +4300,20 @@ static test_return_t memcached_stat_execute_test(memcached_st *memc) * 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) +test_return_t wrong_failure_counter_test(memcached_st *original_memc) { - memcached_return_t rc; - memcached_server_instance_st instance; - - /* 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= memcached_server_count(memc); - memc->number_of_hosts= 1; + memcached_st* memc= create_single_instance_memcached(original_memc, NULL); /* 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); + memcached_return_t rc= memcached_set(memc, + test_literal_param(__func__), // Key + test_literal_param(__func__), // Value + time_t(0), uint32_t(0)); test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - instance= memcached_server_instance_by_position(memc, 0); + memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); + /* The test is to see that the memcached_quit doesn't increase the * the server failure conter, so let's ensure that it is zero * before sending quit @@ -5151,8 +4328,7 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc) */ test_zero(instance->server_failure_counter); - /* restore the instance */ - memc->number_of_hosts= number_of_hosts; + memcached_free(memc); return TEST_SUCCESS; } @@ -5161,7 +4337,7 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc) * This tests ensures expected disconnections (for some behavior changes * for instance) do not wrongly increase failure counter */ -static test_return_t wrong_failure_counter_two_test(memcached_st *memc) +test_return_t wrong_failure_counter_two_test(memcached_st *memc) { /* Set value to force connection to the server */ const char *key= "marmotte"; @@ -5201,11 +4377,39 @@ static test_return_t wrong_failure_counter_two_test(memcached_st *memc) return TEST_SUCCESS; } +test_return_t regression_996813_TEST(memcached_st *) +{ + memcached_st* memc= memcached_create(NULL); + + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 1)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, 1)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, 300)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 30)); + + // We will never connect to these servers + in_port_t base_port= 11211; + for (size_t x= 0; x < 17; x++) + { + test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "10.2.3.4", base_port +x)); + } + test_compare(6U, memcached_generate_hash(memc, test_literal_param("SZ6hu0SHweFmpwpc0w2R"))); + test_compare(1U, memcached_generate_hash(memc, test_literal_param("SQCK9eiCf53YxHWnYA.o"))); + test_compare(9U, memcached_generate_hash(memc, test_literal_param("SUSDkGXuuZC9t9VhMwa."))); + test_compare(0U, memcached_generate_hash(memc, test_literal_param("SnnqnJARfaCNT679iAF_"))); + + memcached_free(memc); + + return TEST_SUCCESS; +} + /* * Test that ensures mget_execute does not end into recursive calls that finally fails */ -static test_return_t regression_bug_490486(memcached_st *original_memc) +test_return_t regression_bug_490486(memcached_st *original_memc) { #ifdef __APPLE__ @@ -5221,20 +4425,15 @@ static test_return_t regression_bug_490486(memcached_st *original_memc) memcached_st *memc= create_single_instance_memcached(original_memc, "--BINARY-PROTOCOL --POLL-TIMEOUT=1000 --REMOVE-FAILED-SERVERS=1 --RETRY-TIMEOUT=3600"); test_true(memc); - size_t max_keys= 20480; - - char **keys= (char **)calloc(max_keys, sizeof(char*)); - size_t *key_length= (size_t *)calloc(max_keys, sizeof(size_t)); + keys_st keys(20480); /* First add all of the items.. */ char blob[1024]= { 0 }; - for (size_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { - char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); - keys[x]= strdup(k); - test_true(keys[x]); - memcached_return rc= memcached_set(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); + memcached_return rc= memcached_set(memc, + keys.key_at(x), keys.length_at(x), + blob, sizeof(blob), 0, 0); test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); // MEMCACHED_TIMEOUT <-- hash been observed on OSX } @@ -5243,8 +4442,9 @@ static test_return_t regression_bug_490486(memcached_st *original_memc) /* Try to get all of them with a large multiget */ size_t counter= 0; memcached_execute_function callbacks[]= { &callback_counter }; - memcached_return_t rc= memcached_mget_execute(memc, (const char**)keys, key_length, - (size_t)max_keys, callbacks, &counter, 1); + memcached_return_t rc= memcached_mget_execute(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size(), + callbacks, &counter, 1); test_compare(MEMCACHED_SUCCESS, rc); char* the_value= NULL; @@ -5268,23 +4468,15 @@ static test_return_t regression_bug_490486(memcached_st *original_memc) test_compare(MEMCACHED_END, rc); /* Verify that we got all of the items */ - test_compare(counter, max_keys); - } - - /* Release all allocated resources */ - for (size_t x= 0; x < max_keys; ++x) - { - free(keys[x]); + test_compare(counter, keys.size()); } - free(keys); - free(key_length); memcached_free(memc); return TEST_SUCCESS; } -static test_return_t regression_bug_583031(memcached_st *) +test_return_t regression_bug_583031(memcached_st *) { memcached_st *memc= memcached_create(NULL); test_true(memc); @@ -5312,7 +4504,7 @@ static test_return_t regression_bug_583031(memcached_st *) return TEST_SUCCESS; } -static test_return_t regression_bug_581030(memcached_st *) +test_return_t regression_bug_581030(memcached_st *) { #ifndef DEBUG memcached_stat_st *local_stat= memcached_stat(NULL, NULL, NULL); @@ -5325,7 +4517,7 @@ static test_return_t regression_bug_581030(memcached_st *) } #define regression_bug_655423_COUNT 6000 -static test_return_t regression_bug_655423(memcached_st *memc) +test_return_t regression_bug_655423(memcached_st *memc) { memcached_st *clone= memcached_clone(NULL, memc); memc= NULL; // Just to make sure it is not used @@ -5343,22 +4535,24 @@ static test_return_t regression_bug_655423(memcached_st *memc) memset(payload, int('x'), sizeof(payload)); - for (uint32_t x= 0; x < regression_bug_655423_COUNT; x++) - { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - snprintf(key, sizeof(key), "%u", x); + keys_st keys(regression_bug_655423_COUNT); - test_compare(MEMCACHED_SUCCESS, memcached_set(clone, key, strlen(key), payload, sizeof(payload), 0, 0)); + for (size_t x= 0; x < keys.size(); x++) + { + test_compare(MEMCACHED_SUCCESS, memcached_set(clone, + keys.key_at(x), + keys.length_at(x), + payload, sizeof(payload), 0, 0)); } - for (uint32_t x= 0; x < regression_bug_655423_COUNT; x++) + for (size_t x= 0; x < keys.size(); x++) { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - snprintf(key, sizeof(key), "%u", x); - size_t value_length; memcached_return_t rc; - char *value= memcached_get(clone, key, strlen(key), &value_length, NULL, &rc); + char *value= memcached_get(clone, + keys.key_at(x), + keys.length_at(x), + &value_length, NULL, &rc); if (rc == MEMCACHED_NOTFOUND) { @@ -5373,21 +4567,10 @@ static test_return_t regression_bug_655423(memcached_st *memc) free(value); } - char **keys= (char**)calloc(regression_bug_655423_COUNT, sizeof(char*)); - size_t *key_length= (size_t *)calloc(regression_bug_655423_COUNT, sizeof(size_t)); - for (uint32_t x= 0; x < regression_bug_655423_COUNT; x++) - { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - snprintf(key, sizeof(key), "%u", x); - - keys[x]= strdup(key); - test_true(keys[x]); - key_length[x]= strlen(key); - test_true(key_length[x]); - } - test_compare(MEMCACHED_SUCCESS, - memcached_mget(clone, (const char* const *)keys, key_length, regression_bug_655423_COUNT)); + memcached_mget(clone, + keys.keys_ptr(), keys.lengths_ptr(), + keys.size())); uint32_t count= 0; memcached_result_st *result= NULL; @@ -5399,15 +4582,6 @@ static test_return_t regression_bug_655423(memcached_st *memc) test_true(count > 100); // If we don't get back atleast this, something is up - /* Release all allocated resources */ - for (size_t x= 0; x < regression_bug_655423_COUNT; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); - - memcached_free(clone); return TEST_SUCCESS; @@ -5417,44 +4591,93 @@ static test_return_t regression_bug_655423(memcached_st *memc) * Test that ensures that buffered set to not trigger problems during io_flush */ #define regression_bug_490520_COUNT 200480 -static test_return_t regression_bug_490520(memcached_st *memc) +test_return_t regression_bug_490520(memcached_st *original_memc) { + memcached_st* memc= create_single_instance_memcached(original_memc, NULL); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK,1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, 1000); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT,1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 3600); - memc->number_of_hosts= 1; - - char **keys= (char **)calloc(regression_bug_490520_COUNT, sizeof(char*)); - size_t *key_length= (size_t *)calloc(regression_bug_490520_COUNT, sizeof(size_t)); - /* First add all of the items.. */ char blob[3333] = {0}; for (uint32_t x= 0; x < regression_bug_490520_COUNT; ++x) { - char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); - keys[x]= strdup(k); - test_true(keys[x]); + char key[251]; + int key_length= snprintf(key, sizeof(key), "0200%u", x); - memcached_return rc= memcached_set(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); - test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); + memcached_return rc= memcached_set(memc, key, key_length, blob, sizeof(blob), 0, 0); + test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); } - for (uint32_t x= 0; x < regression_bug_490520_COUNT; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); + memcached_free(memc); + + return TEST_SUCCESS; +} + +test_return_t regression_1009493_TEST(memcached_st*) +{ + memcached_st* memc= memcached_create(NULL); + test_true(memc); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, true)); + + memcached_st* clone= memcached_clone(NULL, memc); + test_true(clone); + + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED), + memcached_behavior_get(clone, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED)); + + memcached_free(memc); + memcached_free(clone); return TEST_SUCCESS; } +test_return_t regression_994772_TEST(memcached_st* memc) +{ + test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1)); + + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param(__func__), // Key + test_literal_param(__func__), // Value + time_t(0), uint32_t(0))); + + const char *keys[] = { __func__ }; + size_t key_length[]= { strlen(__func__) }; + test_compare(MEMCACHED_SUCCESS, + memcached_mget(memc, keys, key_length, 1)); + + memcached_return_t rc; + memcached_result_st *results= memcached_fetch_result(memc, NULL, &rc); + test_true(results); + test_compare(MEMCACHED_SUCCESS, rc); + + test_strcmp(__func__, memcached_result_value(results)); + uint64_t cas_value= memcached_result_cas(results); + test_true(cas_value); + + memcached_result_free(results); + + // Bad cas value, sanity check + test_true(cas_value != 9999); + test_compare(MEMCACHED_END, + memcached_cas(memc, + test_literal_param(__func__), // Key + test_literal_param(__FILE__), // Value + time_t(0), uint32_t(0), 9999)); + + test_compare(MEMCACHED_SUCCESS, memcached_set(memc, + "different", strlen("different"), // Key + test_literal_param(__FILE__), // Value + time_t(0), uint32_t(0))); -static test_return_t regression_bug_854604(memcached_st *) + return TEST_SUCCESS; +} + +test_return_t regression_bug_854604(memcached_st *) { char buffer[1024]; @@ -5474,7 +4697,7 @@ static test_return_t regression_bug_854604(memcached_st *) return TEST_SUCCESS; } -static void memcached_die(memcached_st* mc, memcached_return error, const char* what, uint32_t it) +static void die_message(memcached_st* mc, memcached_return error, const char* what, uint32_t it) { fprintf(stderr, "Iteration #%u: ", it); @@ -5492,7 +4715,7 @@ static void memcached_die(memcached_st* mc, memcached_return error, const char* #define TEST_CONSTANT_CREATION 200 -static test_return_t regression_bug_(memcached_st *memc) +test_return_t regression_bug_(memcached_st *memc) { const char *remote_server; (void)memc; @@ -5510,19 +4733,19 @@ static test_return_t regression_bug_(memcached_st *memc) rc= memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); if (rc != MEMCACHED_SUCCESS) { - memcached_die(mc, rc, "memcached_behavior_set", x); + die_message(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); + die_message(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); + die_message(mc, rc, "memcached_server_add", x); } const char *set_key= "akey"; @@ -5542,7 +4765,7 @@ static test_return_t regression_bug_(memcached_st *memc) &get_value_flags, &rc); if (rc != MEMCACHED_SUCCESS) { - memcached_die(mc, rc, "memcached_get", x); + die_message(mc, rc, "memcached_get", x); } else { @@ -5566,7 +4789,7 @@ static test_return_t regression_bug_(memcached_st *memc) ); if (rc != MEMCACHED_SUCCESS) { - memcached_die(mc, rc, "memcached_set", x); + die_message(mc, rc, "memcached_set", x); } } @@ -5582,446 +4805,32 @@ static test_return_t regression_bug_(memcached_st *memc) return TEST_SUCCESS; } -/* Clean the server before beginning testing */ -test_st tests[] ={ - {"util_version", true, (test_callback_fn*)util_version_test }, - {"flush", false, (test_callback_fn*)flush_test }, - {"init", false, (test_callback_fn*)init_test }, - {"allocation", false, (test_callback_fn*)allocation_test }, - {"server_list_null_test", false, (test_callback_fn*)server_list_null_test}, - {"server_unsort", false, (test_callback_fn*)server_unsort_test}, - {"server_sort", false, (test_callback_fn*)server_sort_test}, - {"server_sort2", false, (test_callback_fn*)server_sort2_test}, - {"memcached_server_remove", false, (test_callback_fn*)memcached_server_remove_test}, - {"clone_test", false, (test_callback_fn*)clone_test }, - {"connection_test", false, (test_callback_fn*)connection_test}, - {"callback_test", false, (test_callback_fn*)callback_test}, - {"userdata_test", false, (test_callback_fn*)userdata_test}, - {"set", false, (test_callback_fn*)set_test }, - {"set2", false, (test_callback_fn*)set_test2 }, - {"set3", false, (test_callback_fn*)set_test3 }, - {"dump", true, (test_callback_fn*)dump_test}, - {"add", true, (test_callback_fn*)add_test }, - {"memcached_fetch_result(MEMCACHED_NOTFOUND)", true, (test_callback_fn*)memcached_fetch_result_NOT_FOUND }, - {"replace", true, (test_callback_fn*)replace_test }, - {"delete", true, (test_callback_fn*)delete_test }, - {"get", true, (test_callback_fn*)get_test }, - {"get2", false, (test_callback_fn*)get_test2 }, - {"get3", false, (test_callback_fn*)get_test3 }, - {"get4", false, (test_callback_fn*)get_test4 }, - {"partial mget", false, (test_callback_fn*)get_test5 }, - {"stats_servername", false, (test_callback_fn*)stats_servername_test }, - {"increment", false, (test_callback_fn*)increment_test }, - {"increment_with_initial", true, (test_callback_fn*)increment_with_initial_test }, - {"decrement", false, (test_callback_fn*)decrement_test }, - {"decrement_with_initial", true, (test_callback_fn*)decrement_with_initial_test }, - {"increment_by_key", false, (test_callback_fn*)increment_by_key_test }, - {"increment_with_initial_by_key", true, (test_callback_fn*)increment_with_initial_by_key_test }, - {"decrement_by_key", false, (test_callback_fn*)decrement_by_key_test }, - {"decrement_with_initial_by_key", true, (test_callback_fn*)decrement_with_initial_by_key_test }, - {"binary_increment_with_prefix", 1, (test_callback_fn*)binary_increment_with_prefix_test }, - {"quit", false, (test_callback_fn*)quit_test }, - {"mget", true, (test_callback_fn*)mget_test }, - {"mget_result", true, (test_callback_fn*)mget_result_test }, - {"mget_result_alloc", true, (test_callback_fn*)mget_result_alloc_test }, - {"mget_result_function", true, (test_callback_fn*)mget_result_function }, - {"mget_execute", true, (test_callback_fn*)mget_execute }, - {"mget_end", false, (test_callback_fn*)mget_end }, - {"get_stats", false, (test_callback_fn*)get_stats }, - {"add_host_test", false, (test_callback_fn*)add_host_test }, - {"add_host_test_1", false, (test_callback_fn*)add_host_test1 }, - {"get_stats_keys", false, (test_callback_fn*)get_stats_keys }, - {"version_string_test", false, (test_callback_fn*)version_string_test}, - {"bad_key", true, (test_callback_fn*)bad_key_test }, - {"memcached_server_cursor", true, (test_callback_fn*)memcached_server_cursor_test }, - {"read_through", true, (test_callback_fn*)read_through }, - {"delete_through", true, (test_callback_fn*)test_MEMCACHED_CALLBACK_DELETE_TRIGGER }, - {"noreply", true, (test_callback_fn*)noreply_test}, - {"analyzer", true, (test_callback_fn*)analyzer_test}, - {"memcached_pool_st", true, (test_callback_fn*)connection_pool_test }, - {"memcached_pool_st #2", true, (test_callback_fn*)connection_pool2_test }, -#if 0 - {"memcached_pool_st #3", true, (test_callback_fn*)connection_pool3_test }, -#endif - {"memcached_pool_test", true, (test_callback_fn*)memcached_pool_test }, - {"test_get_last_disconnect", true, (test_callback_fn*)test_get_last_disconnect}, - {"verbosity", true, (test_callback_fn*)test_verbosity}, - {"memcached_stat_execute", true, (test_callback_fn*)memcached_stat_execute_test}, - {"memcached_exist(MEMCACHED_NOTFOUND)", true, (test_callback_fn*)memcached_exist_NOTFOUND }, - {"memcached_exist(MEMCACHED_SUCCESS)", true, (test_callback_fn*)memcached_exist_SUCCESS }, - {"memcached_exist_by_key(MEMCACHED_NOTFOUND)", true, (test_callback_fn*)memcached_exist_by_key_NOTFOUND }, - {"memcached_exist_by_key(MEMCACHED_SUCCESS)", true, (test_callback_fn*)memcached_exist_by_key_SUCCESS }, - {"memcached_touch", 0, (test_callback_fn*)test_memcached_touch}, - {"memcached_touch_with_prefix", 0, (test_callback_fn*)test_memcached_touch_by_key}, - {0, 0, 0} -}; - -test_st touch_tests[] ={ - {"memcached_touch", 0, (test_callback_fn*)test_memcached_touch}, - {"memcached_touch_with_prefix", 0, (test_callback_fn*)test_memcached_touch_by_key}, - {0, 0, 0} -}; - -test_st behavior_tests[] ={ - {"libmemcached_string_behavior()", false, (test_callback_fn*)libmemcached_string_behavior_test}, - {"libmemcached_string_distribution()", false, (test_callback_fn*)libmemcached_string_distribution_test}, - {"behavior_test", false, (test_callback_fn*)behavior_test}, - {"MEMCACHED_BEHAVIOR_CORK", false, (test_callback_fn*)MEMCACHED_BEHAVIOR_CORK_test}, - {"MEMCACHED_BEHAVIOR_TCP_KEEPALIVE", false, (test_callback_fn*)MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test}, - {"MEMCACHED_BEHAVIOR_TCP_KEEPIDLE", false, (test_callback_fn*)MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test}, - {"MEMCACHED_BEHAVIOR_POLL_TIMEOUT", false, (test_callback_fn*)MEMCACHED_BEHAVIOR_POLL_TIMEOUT_test}, - {"MEMCACHED_CALLBACK_DELETE_TRIGGER_and_MEMCACHED_BEHAVIOR_NOREPLY", false, (test_callback_fn*)test_MEMCACHED_CALLBACK_DELETE_TRIGGER_and_MEMCACHED_BEHAVIOR_NOREPLY}, - {0, 0, 0} -}; - -test_st libmemcachedutil_tests[] ={ - {"libmemcached_util_ping()", true, (test_callback_fn*)ping_test }, - {"libmemcached_util_getpid()", true, (test_callback_fn*)getpid_test }, - {"libmemcached_util_getpid(MEMCACHED_CONNECTION_FAILURE)", true, (test_callback_fn*)getpid_connection_failure_test }, - {0, 0, 0} -}; - -test_st basic_tests[] ={ - {"init", true, (test_callback_fn*)basic_init_test}, - {"clone", true, (test_callback_fn*)basic_clone_test}, - {"reset", true, (test_callback_fn*)basic_reset_stack_test}, - {"reset heap", true, (test_callback_fn*)basic_reset_heap_test}, - {"reset stack clone", true, (test_callback_fn*)basic_reset_stack_clone_test}, - {"reset heap clone", true, (test_callback_fn*)basic_reset_heap_clone_test}, - {"memcached_return_t", false, (test_callback_fn*)memcached_return_t_TEST }, - {0, 0, 0} -}; - -test_st regression_binary_vs_block[] ={ - {"block add", true, (test_callback_fn*)block_add_regression}, - {"binary add", true, (test_callback_fn*)binary_add_regression}, - {0, 0, 0} -}; - -test_st async_tests[] ={ - {"add", true, (test_callback_fn*)add_wrapper }, - {0, 0, 0} -}; - -test_st memcached_server_get_last_disconnect_tests[] ={ - {"memcached_server_get_last_disconnect()", false, (test_callback_fn*)test_multiple_get_last_disconnect}, - {0, 0, (test_callback_fn*)0} -}; - - -test_st result_tests[] ={ - {"result static", false, (test_callback_fn*)result_static}, - {"result alloc", false, (test_callback_fn*)result_alloc}, - {0, 0, (test_callback_fn*)0} -}; - -test_st version_1_2_3[] ={ - {"append", false, (test_callback_fn*)append_test }, - {"prepend", false, (test_callback_fn*)prepend_test }, - {"cas", false, (test_callback_fn*)cas_test }, - {"cas2", false, (test_callback_fn*)cas2_test }, - {"append_binary", false, (test_callback_fn*)append_binary_test }, - {0, 0, (test_callback_fn*)0} -}; - -test_st haldenbrand_tests[] ={ - {"memcached_set", false, (test_callback_fn*)user_supplied_bug1 }, - {"memcached_get()", false, (test_callback_fn*)user_supplied_bug2 }, - {"memcached_mget()", false, (test_callback_fn*)user_supplied_bug3 }, - {0, 0, (test_callback_fn*)0} -}; - -test_st user_tests[] ={ - {"user_supplied_bug4", true, (test_callback_fn*)user_supplied_bug4 }, - {"user_supplied_bug5", true, (test_callback_fn*)user_supplied_bug5 }, - {"user_supplied_bug6", true, (test_callback_fn*)user_supplied_bug6 }, - {"user_supplied_bug7", true, (test_callback_fn*)user_supplied_bug7 }, - {"user_supplied_bug8", true, (test_callback_fn*)user_supplied_bug8 }, - {"user_supplied_bug9", true, (test_callback_fn*)user_supplied_bug9 }, - {"user_supplied_bug10", true, (test_callback_fn*)user_supplied_bug10 }, - {"user_supplied_bug11", true, (test_callback_fn*)user_supplied_bug11 }, - {"user_supplied_bug12", true, (test_callback_fn*)user_supplied_bug12 }, - {"user_supplied_bug13", true, (test_callback_fn*)user_supplied_bug13 }, - {"user_supplied_bug14", true, (test_callback_fn*)user_supplied_bug14 }, - {"user_supplied_bug15", true, (test_callback_fn*)user_supplied_bug15 }, - {"user_supplied_bug16", true, (test_callback_fn*)user_supplied_bug16 }, -#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 - ** 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, - ** so just disable the code for now...). - */ - {"user_supplied_bug17", true, (test_callback_fn*)user_supplied_bug17 }, -#endif - {"user_supplied_bug18", true, (test_callback_fn*)user_supplied_bug18 }, - {"user_supplied_bug19", true, (test_callback_fn*)user_supplied_bug19 }, - {"user_supplied_bug20", true, (test_callback_fn*)user_supplied_bug20 }, - {"user_supplied_bug21", true, (test_callback_fn*)user_supplied_bug21 }, - {"wrong_failure_counter_test", true, (test_callback_fn*)wrong_failure_counter_test}, - {"wrong_failure_counter_two_test", true, (test_callback_fn*)wrong_failure_counter_two_test}, - {0, 0, (test_callback_fn*)0} -}; - -test_st replication_tests[]= { - {"set", true, (test_callback_fn*)replication_set_test }, - {"get", false, (test_callback_fn*)replication_get_test }, - {"mget", false, (test_callback_fn*)replication_mget_test }, - {"delete", true, (test_callback_fn*)replication_delete_test }, - {"rand_mget", false, (test_callback_fn*)replication_randomize_mget_test }, - {"fail", false, (test_callback_fn*)replication_randomize_mget_fail_test }, - {0, 0, (test_callback_fn*)0} -}; +test_return_t kill_HUP_TEST(memcached_st *original_memc) +{ + memcached_st *memc= create_single_instance_memcached(original_memc, 0); + test_true(memc); -/* - * 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", true, (test_callback_fn*)regression_bug_434484 }, - {"lp:434843", true, (test_callback_fn*)regression_bug_434843 }, - {"lp:434843-buffered", true, (test_callback_fn*)regression_bug_434843_buffered }, - {"lp:421108", true, (test_callback_fn*)regression_bug_421108 }, - {"lp:442914", true, (test_callback_fn*)regression_bug_442914 }, - {"lp:447342", true, (test_callback_fn*)regression_bug_447342 }, - {"lp:463297", true, (test_callback_fn*)regression_bug_463297 }, - {"lp:490486", true, (test_callback_fn*)regression_bug_490486 }, - {"lp:583031", true, (test_callback_fn*)regression_bug_583031 }, - {"lp:?", true, (test_callback_fn*)regression_bug_ }, - {"lp:728286", true, (test_callback_fn*)regression_bug_728286 }, - {"lp:581030", true, (test_callback_fn*)regression_bug_581030 }, - {"lp:71231153 connect()", true, (test_callback_fn*)regression_bug_71231153_connect }, - {"lp:71231153 poll()", true, (test_callback_fn*)regression_bug_71231153_poll }, - {"lp:655423", true, (test_callback_fn*)regression_bug_655423 }, - {"lp:490520", true, (test_callback_fn*)regression_bug_490520 }, - {"lp:854604", true, (test_callback_fn*)regression_bug_854604 }, - {0, false, (test_callback_fn*)0} -}; - -test_st ketama_compatibility[]= { - {"libmemcached", true, (test_callback_fn*)ketama_compatibility_libmemcached }, - {"spymemcached", true, (test_callback_fn*)ketama_compatibility_spymemcached }, - {0, 0, (test_callback_fn*)0} -}; - -test_st generate_tests[] ={ - {"generate_pairs", true, (test_callback_fn*)generate_pairs }, - {"generate_data", true, (test_callback_fn*)generate_data }, - {"get_read", false, (test_callback_fn*)get_read }, - {"delete_generate", false, (test_callback_fn*)delete_generate }, - {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data }, - {"delete_buffer", false, (test_callback_fn*)delete_buffer_generate}, - {"generate_data", true, (test_callback_fn*)generate_data }, - {"mget_read", false, (test_callback_fn*)mget_read }, - {"mget_read_result", false, (test_callback_fn*)mget_read_result }, - {"memcached_fetch_result() use internal result", false, (test_callback_fn*)mget_read_internal_result }, - {"memcached_fetch_result() partial read", false, (test_callback_fn*)mget_read_partial_result }, - {"mget_read_function", false, (test_callback_fn*)mget_read_function }, - {"cleanup", true, (test_callback_fn*)cleanup_pairs }, - {"generate_large_pairs", true, (test_callback_fn*)generate_large_pairs }, - {"generate_data", true, (test_callback_fn*)generate_data }, - {"generate_buffer_data", true, (test_callback_fn*)generate_buffer_data }, - {"cleanup", true, (test_callback_fn*)cleanup_pairs }, - {0, 0, (test_callback_fn*)0} -}; - -test_st consistent_tests[] ={ - {"generate_pairs", true, (test_callback_fn*)generate_pairs }, - {"generate_data", true, (test_callback_fn*)generate_data }, - {"get_read", 0, (test_callback_fn*)get_read_count }, - {"cleanup", true, (test_callback_fn*)cleanup_pairs }, - {0, 0, (test_callback_fn*)0} -}; - -test_st consistent_weighted_tests[] ={ - {"generate_pairs", true, (test_callback_fn*)generate_pairs }, - {"generate_data", true, (test_callback_fn*)generate_data_with_stats }, - {"get_read", false, (test_callback_fn*)get_read_count }, - {"cleanup", true, (test_callback_fn*)cleanup_pairs }, - {0, 0, (test_callback_fn*)0} -}; - -test_st hsieh_availability[] ={ - {"hsieh_avaibility_test", false, (test_callback_fn*)hsieh_avaibility_test}, - {0, 0, (test_callback_fn*)0} -}; - -test_st murmur_availability[] ={ - {"murmur_avaibility_test", false, (test_callback_fn*)murmur_avaibility_test}, - {0, 0, (test_callback_fn*)0} -}; + memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); -#if 0 -test_st hash_sanity[] ={ - {"hash sanity", 0, (test_callback_fn*)hash_sanity_test}, - {0, 0, (test_callback_fn*)0} -}; -#endif + pid_t pid; + test_true((pid= libmemcached_util_getpid(memcached_server_name(instance), + memcached_server_port(instance), NULL)) > -1); -test_st ketama_auto_eject_hosts[] ={ - {"auto_eject_hosts", true, (test_callback_fn*)auto_eject_hosts }, - {"output_ketama_weighted_keys", true, (test_callback_fn*)output_ketama_weighted_keys }, - {0, 0, (test_callback_fn*)0} -}; - -test_st hash_tests[] ={ - {"one_at_a_time_run", false, (test_callback_fn*)one_at_a_time_run }, - {"md5", false, (test_callback_fn*)md5_run }, - {"crc", false, (test_callback_fn*)crc_run }, - {"fnv1_64", false, (test_callback_fn*)fnv1_64_run }, - {"fnv1a_64", false, (test_callback_fn*)fnv1a_64_run }, - {"fnv1_32", false, (test_callback_fn*)fnv1_32_run }, - {"fnv1a_32", false, (test_callback_fn*)fnv1a_32_run }, - {"hsieh", false, (test_callback_fn*)hsieh_run }, - {"murmur", false, (test_callback_fn*)murmur_run }, - {"jenkis", false, (test_callback_fn*)jenkins_run }, - {"memcached_get_hashkit", false, (test_callback_fn*)memcached_get_hashkit_test }, - {0, 0, (test_callback_fn*)0} -}; - -test_st error_conditions[] ={ - {"memcached_get(MEMCACHED_ERRNO)", false, (test_callback_fn*)memcached_get_MEMCACHED_ERRNO }, - {"memcached_get(MEMCACHED_NOTFOUND)", false, (test_callback_fn*)memcached_get_MEMCACHED_NOTFOUND }, - {"memcached_get_by_key(MEMCACHED_ERRNO)", false, (test_callback_fn*)memcached_get_by_key_MEMCACHED_ERRNO }, - {"memcached_get_by_key(MEMCACHED_NOTFOUND)", false, (test_callback_fn*)memcached_get_by_key_MEMCACHED_NOTFOUND }, - {"memcached_get_by_key(MEMCACHED_NOTFOUND)", false, (test_callback_fn*)memcached_get_by_key_MEMCACHED_NOTFOUND }, - {"memcached_increment(MEMCACHED_NO_SERVERS)", false, (test_callback_fn*)memcached_increment_MEMCACHED_NO_SERVERS }, - {0, 0, (test_callback_fn*)0} -}; - -test_st parser_tests[] ={ - {"behavior", false, (test_callback_fn*)behavior_parser_test }, - {"boolean_options", false, (test_callback_fn*)parser_boolean_options_test }, - {"configure_file", false, (test_callback_fn*)memcached_create_with_options_with_filename }, - {"distribtions", false, (test_callback_fn*)parser_distribution_test }, - {"hash", false, (test_callback_fn*)parser_hash_test }, - {"libmemcached_check_configuration", false, (test_callback_fn*)libmemcached_check_configuration_test }, - {"libmemcached_check_configuration_with_filename", false, (test_callback_fn*)libmemcached_check_configuration_with_filename_test }, - {"number_options", false, (test_callback_fn*)parser_number_options_test }, - {"randomly generated options", false, (test_callback_fn*)random_statement_build_test }, - {"namespace", false, (test_callback_fn*)parser_key_prefix_test }, - {"server", false, (test_callback_fn*)server_test }, - {"bad server strings", false, (test_callback_fn*)servers_bad_test }, - {"server with weights", false, (test_callback_fn*)server_with_weight_test }, - {"parsing servername, port, and weight", false, (test_callback_fn*)test_hostname_port_weight }, - {"--socket=", false, (test_callback_fn*)test_parse_socket }, - {"--namespace=", false, (test_callback_fn*)test_namespace_keyword }, - {0, 0, (test_callback_fn*)0} -}; - -test_st virtual_bucket_tests[] ={ - {"basic", false, (test_callback_fn*)virtual_back_map }, - {0, 0, (test_callback_fn*)0} -}; - -test_st memcached_server_add_tests[] ={ - {"memcached_server_add(\"\")", false, (test_callback_fn*)memcached_server_add_empty_test }, - {"memcached_server_add(NULL)", false, (test_callback_fn*)memcached_server_add_null_test }, - {0, 0, (test_callback_fn*)0} -}; - -test_st namespace_tests[] ={ - {"basic tests", true, (test_callback_fn*)selection_of_namespace_tests }, - {"increment", true, (test_callback_fn*)memcached_increment_namespace }, - {0, 0, (test_callback_fn*)0} -}; - -collection_st collection[] ={ -#if 0 - {"hash_sanity", 0, 0, hash_sanity}, -#endif - {"libmemcachedutil", 0, 0, libmemcachedutil_tests}, - {"basic", 0, 0, basic_tests}, - {"hsieh_availability", 0, 0, hsieh_availability}, - {"murmur_availability", 0, 0, murmur_availability}, - {"memcached_server_add", 0, 0, memcached_server_add_tests}, - {"block", 0, 0, tests}, - {"binary", (test_callback_fn*)pre_binary, 0, tests}, - {"nonblock", (test_callback_fn*)pre_nonblock, 0, tests}, - {"nodelay", (test_callback_fn*)pre_nodelay, 0, tests}, - {"settimer", (test_callback_fn*)pre_settimer, 0, tests}, - {"md5", (test_callback_fn*)pre_md5, 0, tests}, - {"crc", (test_callback_fn*)pre_crc, 0, tests}, - {"hsieh", (test_callback_fn*)pre_hsieh, 0, tests}, - {"jenkins", (test_callback_fn*)pre_jenkins, 0, tests}, - {"fnv1_64", (test_callback_fn*)pre_hash_fnv1_64, 0, tests}, - {"fnv1a_64", (test_callback_fn*)pre_hash_fnv1a_64, 0, tests}, - {"fnv1_32", (test_callback_fn*)pre_hash_fnv1_32, 0, tests}, - {"fnv1a_32", (test_callback_fn*)pre_hash_fnv1a_32, 0, tests}, - {"ketama", (test_callback_fn*)pre_behavior_ketama, 0, tests}, - {"ketama_auto_eject_hosts", (test_callback_fn*)pre_behavior_ketama, 0, ketama_auto_eject_hosts}, - {"unix_socket", (test_callback_fn*)pre_unix_socket, 0, tests}, - {"unix_socket_nodelay", (test_callback_fn*)pre_nodelay, 0, tests}, - {"gets", (test_callback_fn*)enable_cas, 0, tests}, - {"consistent_crc", (test_callback_fn*)enable_consistent_crc, 0, tests}, - {"consistent_hsieh", (test_callback_fn*)enable_consistent_hsieh, 0, tests}, -#ifdef MEMCACHED_ENABLE_DEPRECATED - {"deprecated_memory_allocators", (test_callback_fn*)deprecated_set_memory_alloc, 0, tests}, -#endif - {"memory_allocators", (test_callback_fn*)set_memory_alloc, 0, tests}, - {"namespace", (test_callback_fn*)set_namespace, 0, tests}, - {"namespace(BINARY)", (test_callback_fn*)set_namespace_and_binary, 0, tests}, - {"specific namespace", 0, 0, namespace_tests}, - {"specific namespace(BINARY)", (test_callback_fn*)pre_binary, 0, namespace_tests}, - {"version_1_2_3", (test_callback_fn*)check_for_1_2_3, 0, version_1_2_3}, - {"result", 0, 0, result_tests}, - {"async", (test_callback_fn*)pre_nonblock, 0, async_tests}, - {"async(BINARY)", (test_callback_fn*)pre_nonblock_binary, 0, async_tests}, - {"Cal Haldenbrand's tests", 0, 0, haldenbrand_tests}, - {"user written tests", 0, 0, user_tests}, - {"generate", 0, 0, generate_tests}, - {"generate_hsieh", (test_callback_fn*)pre_hsieh, 0, generate_tests}, - {"generate_ketama", (test_callback_fn*)pre_behavior_ketama, 0, generate_tests}, - {"generate_hsieh_consistent", (test_callback_fn*)enable_consistent_hsieh, 0, generate_tests}, - {"generate_md5", (test_callback_fn*)pre_md5, 0, generate_tests}, - {"generate_murmur", (test_callback_fn*)pre_murmur, 0, generate_tests}, - {"generate_jenkins", (test_callback_fn*)pre_jenkins, 0, generate_tests}, - {"generate_nonblock", (test_callback_fn*)pre_nonblock, 0, generate_tests}, - // Too slow - {"generate_corked", (test_callback_fn*)pre_cork, 0, generate_tests}, - {"generate_corked_and_nonblock", (test_callback_fn*)pre_cork_and_nonblock, 0, generate_tests}, - {"consistent_not", 0, 0, consistent_tests}, - {"consistent_ketama", (test_callback_fn*)pre_behavior_ketama, 0, consistent_tests}, - {"consistent_ketama_weighted", (test_callback_fn*)pre_behavior_ketama_weighted, 0, consistent_weighted_tests}, - {"ketama_compat", 0, 0, ketama_compatibility}, - {"test_hashes", 0, 0, hash_tests}, - {"replication", (test_callback_fn*)pre_replication, 0, replication_tests}, - {"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}, - {"parser", 0, 0, parser_tests}, - {"virtual buckets", 0, 0, virtual_bucket_tests}, - {"memcached_server_get_last_disconnect", 0, 0, memcached_server_get_last_disconnect_tests}, - {"touch", 0, 0, touch_tests}, - {0, 0, 0, 0} -}; - -#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10 - -#include "tests/libmemcached_world.h" - -void get_world(Framework *world) -{ - world->collections= collection; - - world->_create= (test_callback_create_fn*)world_create; - world->_destroy= (test_callback_destroy_fn*)world_destroy; - - world->item._startup= (test_callback_fn*)world_test_startup; - world->item.set_pre((test_callback_fn*)world_pre_run); - world->item.set_flush((test_callback_fn*)world_flush); - world->item.set_post((test_callback_fn*)world_post_run); - world->_on_error= (test_callback_error_fn*)world_on_error; - - world->collection_startup= (test_callback_fn*)world_container_startup; - world->collection_shutdown= (test_callback_fn*)world_container_shutdown; - - world->set_runner(&defualt_libmemcached_runner); - - world->set_socket(); + + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param(__func__), // Keys + test_literal_param(__func__), // Values + 0, 0)); + test_true_got(kill(pid, SIGHUP) == 0, strerror(errno)); + + test_compare(MEMCACHED_CONNECTION_FAILURE, + memcached_set(memc, + test_literal_param(__func__), // Keys + test_literal_param(__func__), // Values + 0, 0)); + + memcached_free(memc); + + return TEST_SUCCESS; }