X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmem_functions.cc;h=7418cc218ecaa7a45c02cd6c7c6eb2fbb359cc0d;hb=7b7b8c93445a962375b17f1b22d1fb1b1f693484;hp=c1bb70fec58505773a7b3360e9cc9cce5f414cb7;hpb=ecc7382f48857cb22e74ffa9496f9a31e956bde3;p=awesomized%2Flibmemcached diff --git a/tests/mem_functions.cc b/tests/mem_functions.cc index c1bb70fe..7418cc21 100644 --- a/tests/mem_functions.cc +++ b/tests/mem_functions.cc @@ -35,19 +35,23 @@ * */ +#include +#include /* Test cases */ -#define BUILDING_LIBMEMCACHED -// !NEVER use common.h, always use memcached.h in your own apps -#include +#include +#include +#include -#include +#include #include +#include #include +#include #include #include #include @@ -66,19 +70,19 @@ #include #include "tests/deprecated.h" #include "tests/parser.h" +#include "tests/ketama.h" #include "tests/pool.h" -#include "tests/string.h" +#include "tests/namespace.h" #include "tests/replication.h" +#include "tests/debug.h" #include "tests/basic.h" #include "tests/error_conditions.h" #include "tests/print.h" #include "tests/virtual_buckets.h" +using namespace libtest; -#ifdef HAVE_LIBMEMCACHEDUTIL -#include -#include "libmemcached/memcached_util.h" -#endif +#include #include "hash_results.h" @@ -153,7 +157,7 @@ static test_return_t server_sort_test(memcached_st *ptr) test_true(local_memc); memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SORT_HOSTS, 1); - for (size_t x= 0; x < TEST_PORT_COUNT; x++) + for (uint32_t x= 0; x < TEST_PORT_COUNT; x++) { test_ports[x]= (in_port_t)random() % 64000; rc= memcached_server_add_with_weight(local_memc, "localhost", test_ports[x], 0); @@ -189,16 +193,16 @@ static test_return_t server_sort2_test(memcached_st *ptr) test_compare(MEMCACHED_SUCCESS, memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43043, 0)); instance= memcached_server_instance_by_position(local_memc, 0); - test_compare(43043, memcached_server_port(instance)); + test_compare(in_port_t(43043), memcached_server_port(instance)); test_compare(MEMCACHED_SUCCESS, memcached_server_add_with_weight(local_memc, "MEMCACHED_BEHAVIOR_SORT_HOSTS", 43042, 0)); instance= memcached_server_instance_by_position(local_memc, 0); - test_compare(43042, memcached_server_port(instance)); + test_compare(in_port_t(43042), memcached_server_port(instance)); instance= memcached_server_instance_by_position(local_memc, 1); - test_compare(43043, memcached_server_port(instance)); + test_compare(in_port_t(43043), memcached_server_port(instance)); callbacks[0]= server_display_function; memcached_server_cursor(local_memc, callbacks, (void *)&bigger, 1); @@ -214,10 +218,8 @@ static 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]; - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer)), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer))); memcached_st *memc= memcached(server_string, strlen(server_string)); test_true(memc); @@ -259,7 +261,7 @@ static test_return_t server_unsort_test(memcached_st *ptr) local_memc= memcached_create(NULL); test_true(local_memc); - for (size_t x= 0; x < TEST_PORT_COUNT; x++) + for (uint32_t x= 0; x < TEST_PORT_COUNT; x++) { test_ports[x]= (in_port_t)(random() % 64000); test_compare(MEMCACHED_SUCCESS, @@ -330,7 +332,7 @@ static test_return_t clone_test(memcached_st *memc) test_true(memc_clone->flags.verify_key == memc->flags.verify_key); 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_prefix_key == memc->flags.hash_with_prefix_key); + 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.use_udp == memc->flags.use_udp); test_true(memc_clone->flags.auto_eject_hosts == memc->flags.auto_eject_hosts); @@ -402,7 +404,7 @@ static test_return_t libmemcached_string_behavior_test(memcached_st *) { test_true(libmemcached_string_behavior(memcached_behavior_t(x))); } - test_compare(36, MEMCACHED_BEHAVIOR_MAX); + test_compare(36, int(MEMCACHED_BEHAVIOR_MAX)); return TEST_SUCCESS; } @@ -413,7 +415,7 @@ static test_return_t libmemcached_string_distribution_test(memcached_st *) { test_true(libmemcached_string_distribution(memcached_server_distribution_t(x))); } - test_compare(7, MEMCACHED_DISTRIBUTION_CONSISTENT_MAX); + test_compare(7, int(MEMCACHED_DISTRIBUTION_CONSISTENT_MAX)); return TEST_SUCCESS; } @@ -447,7 +449,7 @@ static test_return_t error_test(memcached_st *memc) } test_compare(values[rc], hash_val); } - test_compare(MEMCACHED_MAXIMUM_RETURN, 47); + test_compare(47, int(MEMCACHED_MAXIMUM_RETURN)); return TEST_SUCCESS; } @@ -455,8 +457,8 @@ static test_return_t error_test(memcached_st *memc) static test_return_t set_test(memcached_st *memc) { memcached_return_t rc= memcached_set(memc, - memcached_literal_param("foo"), - memcached_literal_param("when we sanitize"), + test_literal_param("foo"), + test_literal_param("when we sanitize"), time_t(0), (uint32_t)0); test_true_got(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED, memcached_strerror(NULL, rc)); @@ -491,7 +493,7 @@ static test_return_t append_test(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, rc); out_value= memcached_get(memc, key, strlen(key), - &value_length, &flags, &rc); + &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); @@ -529,7 +531,7 @@ static test_return_t append_binary_test(memcached_st *memc) } value= (uint32_t *)memcached_get(memc, key, strlen(key), - &value_length, &flags, &rc); + &value_length, &flags, &rc); test_compare(value_length, sizeof(uint32_t) * x); test_compare(MEMCACHED_SUCCESS, rc); @@ -840,7 +842,7 @@ static test_return_t bad_key_test(memcached_st *memc) string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); test_compare(MEMCACHED_BAD_KEY_PROVIDED, rc); - test_compare(0, string_length); + test_zero(string_length); test_false(string); set= 0; @@ -851,7 +853,7 @@ static test_return_t bad_key_test(memcached_st *memc) string= memcached_get(memc_clone, key, strlen(key), &string_length, &flags, &rc); test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_strerror(NULL, rc)); - test_compare(0, string_length); + test_zero(string_length); test_false(string); /* Test multi key for bad keys */ @@ -880,7 +882,7 @@ static test_return_t bad_key_test(memcached_st *memc) binary protocol */ test_compare(MEMCACHED_SUCCESS, - memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_PREFIX_KEY, NULL)); + memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_NAMESPACE, NULL)); char *longkey= (char *)malloc(max_keylen + 1); if (longkey) @@ -889,13 +891,13 @@ static test_return_t bad_key_test(memcached_st *memc) string= memcached_get(memc_clone, longkey, max_keylen, &string_length, &flags, &rc); test_compare(MEMCACHED_NOTFOUND, rc); - test_compare(0, string_length); + test_zero(string_length); test_false(string); string= memcached_get(memc_clone, longkey, max_keylen + 1, &string_length, &flags, &rc); test_compare(MEMCACHED_BAD_KEY_PROVIDED, rc); - test_compare(0, string_length); + test_zero(string_length); test_false(string); free(longkey); @@ -909,7 +911,7 @@ static test_return_t bad_key_test(memcached_st *memc) string= memcached_get(memc_clone, key, 0, &string_length, &flags, &rc); test_compare(MEMCACHED_BAD_KEY_PROVIDED, rc); - test_compare(0, string_length); + test_zero(string_length); test_false(string); memcached_free(memc_clone); @@ -1136,30 +1138,28 @@ static test_return_t get_test3(memcached_st *memc) static test_return_t get_test4(memcached_st *memc) { - memcached_return_t rc; const char *key= "foo"; - char *value; size_t value_length= 8191; - char *string; - size_t string_length; - uint32_t flags; - uint32_t x; - value = (char*)malloc(value_length); + char *value= (char*)malloc(value_length); test_true(value); - for (x= 0; x < value_length; x++) + for (uint32_t x= 0; x < value_length; x++) + { value[x] = (char) (x % 127); + } - rc= memcached_set(memc, key, strlen(key), - value, value_length, - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + memcached_return_t rc= memcached_set(memc, key, strlen(key), + value, value_length, + (time_t)0, (uint32_t)0); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - for (x= 0; x < 10; x++) + for (uint32_t x= 0; x < 10; x++) { - string= memcached_get(memc, key, strlen(key), - &string_length, &flags, &rc); + 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); @@ -1191,20 +1191,19 @@ static test_return_t get_test5(memcached_st *memc) memcached_return_t rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); - test_compare(MEMCACHED_SUCCESS, rc); - rc= memcached_mget(memc, keys, lengths, 2); + test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, lengths, test_array_length(keys))); 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); - results=memcached_fetch_result(memc, &results_obj, &rc); + + 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.. */ - rc= memcached_set(memc, keys[0], lengths[0], keys[0], lengths[0], 0, 0); - test_compare(MEMCACHED_SUCCESS, rc); + 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); @@ -1227,11 +1226,9 @@ static test_return_t mget_end(memcached_st *memc) memcached_return_t rc; // Set foo and foo2 - for (int i= 0; i < 2; i++) + for (size_t x= 0; x < test_array_length(keys); x++) { - rc= memcached_set(memc, keys[i], lengths[i], values[i], strlen(values[i]), - (time_t)0, (uint32_t)0); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, memcached_set(memc, keys[x], lengths[x], values[x], strlen(values[x]), (time_t)0, (uint32_t)0)); } char *string; @@ -1239,21 +1236,23 @@ static test_return_t mget_end(memcached_st *memc) uint32_t flags; // retrieve both via mget - rc= memcached_mget(memc, keys, lengths, 2); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, lengths, test_array_length(keys))); char key[MEMCACHED_MAX_KEY]; size_t key_length; // this should get both - for (int i = 0; i < 2; i++) + for (size_t x= 0; x < test_array_length(keys); x++) { string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc); test_compare(MEMCACHED_SUCCESS, rc); int val = 0; if (key_length == 4) + { val= 1; + } + test_compare(string_length, strlen(values[val])); test_true(strncmp(values[val], string, string_length) == 0); free(string); @@ -1285,7 +1284,6 @@ 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) { - memcached_return_t rc; memcached_stat_st memc_stat; memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); @@ -1294,9 +1292,9 @@ static test_return_t stats_servername_test(memcached_st *memc) if (memcached_get_sasl_callbacks(memc) != NULL) return TEST_SKIPPED; #endif - rc= memcached_stat_servername(&memc_stat, NULL, - memcached_server_name(instance), - memcached_server_port(instance)); + test_compare(MEMCACHED_SUCCESS, memcached_stat_servername(&memc_stat, NULL, + memcached_server_name(instance), + memcached_server_port(instance))); return TEST_SUCCESS; } @@ -1304,47 +1302,41 @@ static test_return_t stats_servername_test(memcached_st *memc) static test_return_t increment_test(memcached_st *memc) { uint64_t new_number; - memcached_return_t rc; - const char *key= "number"; - const char *value= "0"; - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param("number"), + test_literal_param("0"), + (time_t)0, (uint32_t)0)); - rc= memcached_increment(memc, key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 1); + test_compare(MEMCACHED_SUCCESS, + memcached_increment(memc, test_literal_param("number"), 1, &new_number)); + test_compare(uint64_t(1), new_number); - rc= memcached_increment(memc, key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 2); + test_compare(MEMCACHED_SUCCESS, + memcached_increment(memc, test_literal_param("number"), 1, &new_number)); + test_compare(uint64_t(2), new_number); return TEST_SUCCESS; } static test_return_t increment_with_initial_test(memcached_st *memc) { - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) - { - uint64_t new_number; - memcached_return_t rc; - const char *key= "number"; - uint64_t initial= 0; + test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); - rc= memcached_increment_with_initial(memc, key, strlen(key), - 1, initial, 0, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == initial); + uint64_t new_number; + uint64_t initial= 0; + + test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); + + test_compare(MEMCACHED_SUCCESS, + memcached_increment_with_initial(memc, test_literal_param("number"), 1, initial, 0, &new_number)); + test_compare(new_number, initial); + + test_compare(MEMCACHED_SUCCESS, + memcached_increment_with_initial(memc, test_literal_param("number"), 1, initial, 0, &new_number)); + test_compare(new_number, (initial +1)); - rc= memcached_increment_with_initial(memc, key, strlen(key), - 1, initial, 0, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == (initial + 1)); - } return TEST_SUCCESS; } @@ -1352,46 +1344,50 @@ static test_return_t decrement_test(memcached_st *memc) { uint64_t new_number; memcached_return_t rc; - const char *key= "number"; const char *value= "3"; - rc= memcached_set(memc, key, strlen(key), + rc= memcached_set(memc, + test_literal_param("number"), value, strlen(value), (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - rc= memcached_decrement(memc, key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 2); + test_compare(MEMCACHED_SUCCESS, + memcached_decrement(memc, + test_literal_param("number"), + 1, &new_number)); + test_compare(uint64_t(2), new_number); - rc= memcached_decrement(memc, key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 1); + test_compare(MEMCACHED_SUCCESS, + memcached_decrement(memc, + test_literal_param("number"), + 1, &new_number)); + test_compare(uint64_t(1), new_number); return TEST_SUCCESS; } static test_return_t decrement_with_initial_test(memcached_st *memc) { - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) - { - uint64_t new_number; - memcached_return_t rc; - const char *key= "number"; - uint64_t initial= 3; + test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); - rc= memcached_decrement_with_initial(memc, key, strlen(key), - 1, initial, 0, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == initial); + uint64_t new_number; + uint64_t initial= 3; + + test_compare(MEMCACHED_SUCCESS, memcached_flush_buffers(memc)); + + test_compare(MEMCACHED_SUCCESS, + memcached_decrement_with_initial(memc, + test_literal_param("number"), + 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_compare(new_number, (initial - 1)); - rc= memcached_decrement_with_initial(memc, key, strlen(key), - 1, initial, 0, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == (initial - 1)); - } return TEST_SUCCESS; } @@ -1407,43 +1403,41 @@ static test_return_t increment_by_key_test(memcached_st *memc) key, strlen(key), value, strlen(value), (time_t)0, (uint32_t)0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 1); + test_compare(MEMCACHED_SUCCESS, + memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), 1, &new_number)); + test_compare(uint64_t(1), new_number); - rc= memcached_increment_by_key(memc, master_key, strlen(master_key), key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 2); + test_compare(MEMCACHED_SUCCESS, + 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) { - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) - { - uint64_t new_number; - memcached_return_t rc; - const char *master_key= "foo"; - const char *key= "number"; - uint64_t initial= 0; + test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); - 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_true(new_number == initial); + 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(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(new_number, (initial +1)); - 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_true(new_number == (initial + 1)); - } return TEST_SUCCESS; } @@ -1451,52 +1445,53 @@ static test_return_t decrement_by_key_test(memcached_st *memc) { uint64_t new_number; memcached_return_t rc; - const char *master_key= "foo"; - const char *key= "number"; const char *value= "3"; - rc= memcached_set_by_key(memc, master_key, strlen(master_key), - key, strlen(key), + 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 || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - rc= memcached_decrement_by_key(memc, master_key, strlen(master_key), - key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 2); + test_compare(MEMCACHED_SUCCESS, + memcached_decrement_by_key(memc, + test_literal_param("foo"), + test_literal_param("number"), + 1, &new_number)); + test_compare(uint64_t(2), new_number); - rc= memcached_decrement_by_key(memc, master_key, strlen(master_key), - key, strlen(key), - 1, &new_number); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(new_number == 1); + test_compare(MEMCACHED_SUCCESS, + memcached_decrement_by_key(memc, + test_literal_param("foo"), + test_literal_param("number"), + 1, &new_number)); + test_compare(uint64_t(1), new_number); return TEST_SUCCESS; } static test_return_t decrement_with_initial_by_key_test(memcached_st *memc) { - if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0) - { - uint64_t new_number; - const char *master_key= "foo"; - const char *key= "number"; - uint64_t initial= 3; + test_skip(true, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL)); - test_compare(MEMCACHED_SUCCESS, - memcached_decrement_with_initial_by_key(memc, master_key, strlen(master_key), - key, strlen(key), - 1, initial, 0, &new_number)); - test_compare(new_number, initial); + uint64_t new_number; + uint64_t initial= 3; + + test_compare(MEMCACHED_SUCCESS, + memcached_decrement_with_initial_by_key(memc, + test_literal_param("foo"), + test_literal_param("number"), + 1, initial, 0, &new_number)); + test_compare(new_number, initial); + + test_compare(MEMCACHED_SUCCESS, + memcached_decrement_with_initial_by_key(memc, + test_literal_param("foo"), + test_literal_param("number"), + 1, initial, 0, &new_number)); + test_compare(new_number, (initial - 1)); - test_compare(MEMCACHED_SUCCESS, - memcached_decrement_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; } @@ -1509,13 +1504,13 @@ static test_return_t quit_test(memcached_st *memc) rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)10, (uint32_t)3); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); memcached_quit(memc); rc= memcached_set(memc, key, strlen(key), value, strlen(value), (time_t)50, (uint32_t)9); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); return TEST_SUCCESS; } @@ -1565,10 +1560,10 @@ static test_return_t mget_result_test(memcached_st *memc) test_true(results); test_true(&results_obj == results); test_compare(MEMCACHED_SUCCESS, rc); - test_compare(memcached_result_key_length(results), memcached_result_length(results)); test_memcmp(memcached_result_key_value(results), memcached_result_value(results), memcached_result_length(results)); + test_compare(memcached_result_key_length(results), memcached_result_length(results)); } memcached_result_free(&results_obj); @@ -1614,7 +1609,7 @@ static test_return_t mget_result_alloc_test(memcached_st *memc) { test_true(results); test_compare(MEMCACHED_SUCCESS, rc); - test_true(memcached_result_key_length(results) == memcached_result_length(results)); + test_compare(memcached_result_key_length(results), memcached_result_length(results)); test_memcmp(memcached_result_key_value(results), memcached_result_value(results), memcached_result_length(results)); @@ -1659,12 +1654,10 @@ static test_return_t mget_result_function(memcached_st *memc) callbacks[0]= &callback_counter; counter= 0; - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); - test_compare(counter, 3); + test_compare(size_t(3), counter); return TEST_SUCCESS; } @@ -1694,8 +1687,8 @@ static test_return_t mget_test(memcached_st *memc) test_true(return_value); } test_false(return_value); - test_compare(0, return_value_length); - test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_strerror(NULL, rc)); + test_zero(return_value_length); + test_compare(MEMCACHED_NOTFOUND, rc); for (uint32_t x= 0; x < 3; x++) { @@ -1713,8 +1706,11 @@ static test_return_t mget_test(memcached_st *memc) { 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); + if (not memc->_namespace) + { + test_compare(return_key_length, return_value_length); + test_memcmp(return_value, return_key, return_value_length); + } free(return_value); x++; } @@ -2116,7 +2112,7 @@ 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, size_t &keys_returned, const memcached_return_t expect) +static test_return_t fetch_all_results(memcached_st *memc, unsigned int &keys_returned, const memcached_return_t expect) { memcached_return_t rc; char return_key[MEMCACHED_MAX_KEY]; @@ -2143,13 +2139,13 @@ static test_return_t fetch_all_results(memcached_st *memc, size_t &keys_returned { return TEST_SUCCESS; } - fprintf(stderr, "\n%s:%u %s(#%lu)\n", __FILE__, __LINE__, memcached_strerror(NULL, rc), (unsigned long)(keys_returned)); + 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 3000 // * 1024576 +#define HALDENBRAND_KEY_COUNT 3000U // * 1024576 #define HALDENBRAND_FLAG_KEY 99 // * 1024576 static test_return_t user_supplied_bug1(memcached_st *memc) { @@ -2180,10 +2176,8 @@ static test_return_t user_supplied_bug1(memcached_st *memc) total+= size; char key[22]; int key_length= snprintf(key, sizeof(key), "%u", x); - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_set(memc, key, key_length, randomstuff, strlen(randomstuff), time_t(0), HALDENBRAND_FLAG_KEY), - memcached_strerror(NULL, rc)); + 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); @@ -2236,7 +2230,7 @@ static test_return_t user_supplied_bug2(memcached_st *memc) continue; } - test_compare(HALDENBRAND_FLAG_KEY, flags); + test_compare(uint32_t(HALDENBRAND_FLAG_KEY), flags); total_value_length+= val_len; errors= 0; @@ -2277,9 +2271,8 @@ static test_return_t user_supplied_bug3(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, (const char **)keys, key_lengths, HALDENBRAND_KEY_COUNT)); - test_return_t foo; - size_t keys_returned; - test_compare_got(TEST_SUCCESS, foo= fetch_all_results(memc, keys_returned, MEMCACHED_SUCCESS), test_strerror(foo)); + unsigned int keys_returned; + test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_SUCCESS)); test_compare(HALDENBRAND_KEY_COUNT, keys_returned); for (uint32_t x= 0; x < HALDENBRAND_KEY_COUNT; x++) @@ -2308,9 +2301,9 @@ static test_return_t user_supplied_bug4(memcached_st *memc) test_compare(MEMCACHED_NO_SERVERS, memcached_mget(memc, keys, key_length, 3)); - size_t keys_returned; + unsigned int keys_returned; test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_NOTFOUND)); - test_compare(0, keys_returned); + test_zero(keys_returned); for (uint32_t x= 0; x < 3; x++) { @@ -2371,9 +2364,9 @@ static test_return_t user_supplied_bug5(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 4)); - size_t count; + unsigned int count; test_compare(TEST_SUCCESS, fetch_all_results(memc, count, MEMCACHED_NOTFOUND)); - test_compare(0, count); + test_zero(count); for (uint32_t x= 0; x < 4; x++) { @@ -2395,7 +2388,7 @@ static test_return_t user_supplied_bug5(memcached_st *memc) memcached_mget(memc, keys, key_length, 4)); test_compare(TEST_SUCCESS, fetch_all_results(memc, count, MEMCACHED_SUCCESS)); - test_compare(4, count); + test_compare(4U, count); } delete [] insert_data; @@ -2418,34 +2411,33 @@ static test_return_t user_supplied_bug6(memcached_st *memc) 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; - value= memcached_get(memc, keys[0], key_length[0], - &value_length, &flags, &rc); - test_false(value); - test_compare(MEMCACHED_NOTFOUND, rc); + test_compare(TEST_SUCCESS, confirm_keys_dont_exist(memc, keys, test_array_length(keys))); + // We will now confirm that memcached_mget() returns success, but we will + // then check to make sure that no actual keys are returned. test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 4)); + memcached_return_t rc; uint32_t count= 0; while ((value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc))) { count++; } - test_compare(0, count); + test_zero(count); test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_strerror(NULL, rc)); - for (uint32_t x= 0; x < 4; x++) + for (uint32_t x= 0; x < test_array_length(keys); x++) { test_compare(MEMCACHED_SUCCESS, memcached_set(memc, keys[x], key_length[x], insert_data, VALUE_SIZE_BUG5, (time_t)0, (uint32_t)0)); } + test_compare(TEST_SUCCESS, confirm_keys_exist(memc, keys, test_array_length(keys))); for (uint32_t x= 0; x < 2; x++) { @@ -2456,7 +2448,6 @@ static test_return_t user_supplied_bug6(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, keys, key_length, 4)); - count= 3; /* We test for purge of partial complete fetches */ for (count= 3; count; count--) { @@ -2538,7 +2529,7 @@ static test_return_t user_supplied_bug7(memcached_st *memc) flags= 0; value= memcached_fetch(memc, return_key, &return_key_length, &value_length, &flags, &rc); - test_compare(245, flags); + test_compare(uint32_t(245), flags); test_true(value); free(value); delete [] insert_data; @@ -2584,7 +2575,7 @@ static test_return_t user_supplied_bug9(memcached_st *memc) free(return_value); count++; } - test_compare(3, count); + test_compare(3U, count); return TEST_SUCCESS; } @@ -2895,19 +2886,14 @@ static test_return_t user_supplied_bug17(memcached_st *memc) From Andrei on IRC */ -static test_return_t user_supplied_bug19(memcached_st *not_used) +static test_return_t user_supplied_bug19(memcached_st *) { - memcached_st *memc; - const memcached_server_st *server; memcached_return_t res; - (void)not_used; - - memc= memcached_create(NULL); - memcached_server_add_with_weight(memc, "localhost", 11311, 100); - memcached_server_add_with_weight(memc, "localhost", 11312, 100); + memcached_st *memc= memcached(test_literal_param("--server=localhost:11311/?100 --server=localhost:11312/?100")); - server= memcached_server_by_key(memc, "a", 1, &res); + const memcached_server_st *server= memcached_server_by_key(memc, "a", 1, &res); + test_true(server); memcached_free(memc); @@ -2946,69 +2932,6 @@ static test_return_t user_supplied_bug20(memcached_st *memc) return TEST_SUCCESS; } -#include "ketama_test_cases.h" -static test_return_t user_supplied_bug18(memcached_st *trash) -{ - memcached_return_t rc; - uint64_t value; - int x; - memcached_st *memc; - - (void)trash; - - memc= memcached_create(NULL); - test_true(memc); - - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1); - test_compare(MEMCACHED_SUCCESS, rc); - - value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED); - test_true(value == 1); - - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - test_compare(MEMCACHED_SUCCESS, rc); - - value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_true(value == MEMCACHED_HASH_MD5); - - memcached_server_st *server_pool= memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); - memcached_server_push(memc, server_pool); - - /* verify that the server list was parsed okay. */ - test_true(memcached_server_count(memc) == 8); - test_strcmp(server_pool[0].hostname, "10.0.1.1"); - test_true(server_pool[0].port == 11211); - test_true(server_pool[0].weight == 600); - test_strcmp(server_pool[2].hostname, "10.0.1.3"); - test_true(server_pool[2].port == 11211); - test_true(server_pool[2].weight == 200); - test_strcmp(server_pool[7].hostname, "10.0.1.8"); - test_true(server_pool[7].port == 11211); - test_true(server_pool[7].weight == 100); - - /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets - * us test the boundary wraparound. - */ - test_true(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->ketama.continuum[0].index); - - /* verify the standard ketama set. */ - for (x= 0; x < 99; x++) - { - uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); - - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, server_idx); - - const char *hostname = memcached_server_name(instance); - test_strcmp(hostname, ketama_test_cases[x].server); - } - - memcached_server_list_free(server_pool); - memcached_free(memc); - - return TEST_SUCCESS; -} - /* Large mget() of missing keys with binary proto * * If many binary quiet commands (such as getq's in an mget) fill the output @@ -3076,8 +2999,8 @@ static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count) test_false(return_value); // There are no keys to fetch, so the value should never be returned } test_compare(MEMCACHED_NOTFOUND, rc); - test_compare(0, return_value_length); - test_compare(0, return_key_length); + test_zero(return_value_length); + test_zero(return_key_length); test_false(return_key[0]); test_false(return_value); @@ -3113,85 +3036,6 @@ static test_return_t user_supplied_bug21(memcached_st *memc) return TEST_SUCCESS; } -static test_return_t auto_eject_hosts(memcached_st *trash) -{ - (void) trash; - memcached_server_instance_st instance; - - memcached_return_t rc; - memcached_st *memc= memcached_create(NULL); - test_true(memc); - - 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_true(value == 1); - - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5); - test_compare(MEMCACHED_SUCCESS, rc); - - value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH); - test_true(value == MEMCACHED_HASH_MD5); - - /* server should be removed when in delay */ - rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS, 1); - test_compare(MEMCACHED_SUCCESS, rc); - - value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS); - test_true(value == 1); - - memcached_server_st *server_pool; - server_pool = memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); - memcached_server_push(memc, server_pool); - - /* verify that the server list was parsed okay. */ - test_true(memcached_server_count(memc) == 8); - test_strcmp(server_pool[0].hostname, "10.0.1.1"); - test_true(server_pool[0].port == 11211); - test_true(server_pool[0].weight == 600); - test_strcmp(server_pool[2].hostname, "10.0.1.3"); - test_true(server_pool[2].port == 11211); - test_true(server_pool[2].weight == 200); - test_strcmp(server_pool[7].hostname, "10.0.1.8"); - test_true(server_pool[7].port == 11211); - test_true(server_pool[7].weight == 100); - - instance= memcached_server_instance_by_position(memc, 2); - ((memcached_server_write_instance_st)instance)->next_retry = time(NULL) + 15; - memc->ketama.next_distribution_rebuild= time(NULL) - 1; - - /* - This would not work if there were only two hosts. - */ - for (size_t x= 0; x < 99; x++) - { - memcached_autoeject(memc); - uint32_t server_idx= memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); - test_true(server_idx != 2); - } - - /* and re-added when it's back. */ - ((memcached_server_write_instance_st)instance)->next_retry = time(NULL) - 1; - memc->ketama.next_distribution_rebuild= time(NULL) - 1; - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, - memc->distribution); - for (size_t x= 0; x < 99; x++) - { - uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); - // We re-use instance from above. - instance= - memcached_server_instance_by_position(memc, server_idx); - const char *hostname = memcached_server_name(instance); - test_strcmp(hostname, ketama_test_cases[x].server); - } - - memcached_server_list_free(server_pool); - memcached_free(memc); - - return TEST_SUCCESS; -} - static test_return_t output_ketama_weighted_keys(memcached_st *trash) { (void) trash; @@ -3325,7 +3169,7 @@ static test_return_t generate_data(memcached_st *memc) { unsigned int check_execute= execute_set(memc, global_pairs, global_count); - test_true(check_execute == global_count); + test_compare(check_execute, global_count); return TEST_SUCCESS; } @@ -3391,7 +3235,9 @@ static test_return_t get_read_count(memcached_st *memc) { count++; if (return_value) + { free(return_value); + } } } } @@ -3415,7 +3261,9 @@ static test_return_t get_read(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, rc); */ if (rc == MEMCACHED_SUCCESS && return_value) + { free(return_value); + } } return TEST_SUCCESS; @@ -3426,19 +3274,15 @@ static test_return_t mget_read(memcached_st *memc) test_skip(true, bool(libmemcached_util_version_check(memc, 1, 4, 4))); - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_mget(memc, global_keys, global_keys_length, global_count), - memcached_strerror(NULL, rc)); + 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 { - size_t keys_returned; + unsigned int keys_returned; test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_SUCCESS)); test_true(keys_returned > 0); - char buffer[30]; - snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)keys_returned); - test_compare_got(global_count, keys_returned, buffer); + test_compare_got(global_count, keys_returned, "Possible false, positive, memcached may have ejected key/value based on memory needs"); } return TEST_SUCCESS; @@ -3460,6 +3304,11 @@ static test_return_t mget_read_result(memcached_st *memc) 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); } @@ -3581,9 +3430,9 @@ static test_return_t add_host_test1(memcached_st *memc) memcached_server_st *servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc); test_true(servers); - test_compare(1, memcached_server_list_count(servers)); + test_compare(1U, memcached_server_list_count(servers)); - for (size_t x= 2; x < 20; x++) + for (uint32_t x= 2; x < 20; x++) { char buffer[SMALL_STRING_LEN]; @@ -3635,24 +3484,24 @@ static test_return_t pre_cork_and_nonblock(memcached_st *memc) static test_return_t pre_nonblock_binary(memcached_st *memc) { - memcached_return_t rc= MEMCACHED_FAILURE; - memcached_st *memc_clone; - - memc_clone= memcached_clone(NULL, 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); - rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1); + 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; } @@ -3812,12 +3661,10 @@ static test_return_t pre_replication(memcached_st *memc) * Make sure that we store the item on all servers * (master + replicas == number of servers) */ - memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, - memcached_server_count(memc) - 1); - test_compare(MEMCACHED_SUCCESS, rc); - test_true(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS) == memcached_server_count(memc) - 1); + 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)); - return rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_SKIPPED; + return TEST_SUCCESS; } @@ -3901,38 +3748,38 @@ static void *my_calloc(const memcached_st *ptr, size_t nelem, const size_t size, #endif } -static test_return_t set_prefix(memcached_st *memc) +static test_return_t selection_of_namespace_tests(memcached_st *memc) { memcached_return_t rc; const char *key= "mine"; char *value; /* Make sure be default none exists */ - value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); + value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); test_compare_got(MEMCACHED_FAILURE, rc, memcached_strerror(NULL, rc)); /* Test a clean set */ - rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, (void *)key); - test_compare_got(MEMCACHED_SUCCESS, rc , memcached_last_error_message(memc)); + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, (void *)key)); - value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); + value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); test_true(value); test_memcmp(value, key, 4); test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); /* Test that we can turn it off */ - rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, NULL)); - value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); + value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); test_false(value); test_compare_got(MEMCACHED_FAILURE, rc, memcached_strerror(NULL, rc)); /* Now setup for main test */ - rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, (void *)key); - test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, (void *)key)); - value= (char *)memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); + value= (char *)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); test_true(value); test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); test_memcmp(value, key, 4); @@ -3942,10 +3789,10 @@ static test_return_t set_prefix(memcached_st *memc) char long_key[255]; memset(long_key, 0, 255); - rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, NULL)); - value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_PREFIX_KEY, &rc); + value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); test_false(value); test_true(rc == MEMCACHED_FAILURE); test_true(value == NULL); @@ -3953,27 +3800,54 @@ static test_return_t set_prefix(memcached_st *memc) /* Test a long key for failure */ /* TODO, extend test to determine based on setting, what result should be */ strncpy(long_key, "Thisismorethentheallottednumberofcharacters", sizeof(long_key)); - rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key); - //test_compare(MEMCACHED_BAD_KEY_PROVIDED, rc); - test_compare(MEMCACHED_SUCCESS, rc); + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, long_key)); /* Now test a key with spaces (which will fail from long key, since bad key is not set) */ strncpy(long_key, "This is more then the allotted number of characters", sizeof(long_key)); - test_compare(MEMCACHED_BAD_KEY_PROVIDED, - memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key)); + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) ? MEMCACHED_SUCCESS : MEMCACHED_BAD_KEY_PROVIDED, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, long_key)); /* Test for a bad prefix, but with a short key */ - test_compare(MEMCACHED_SUCCESS, + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) ? MEMCACHED_INVALID_ARGUMENTS : MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_VERIFY_KEY, 1)); - strncpy(long_key, "dog cat", sizeof(long_key)); - test_compare(MEMCACHED_BAD_KEY_PROVIDED, - memcached_callback_set(memc, MEMCACHED_CALLBACK_PREFIX_KEY, long_key)); + test_compare(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) ? MEMCACHED_SUCCESS : MEMCACHED_BAD_KEY_PROVIDED, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, "dog cat")); } return TEST_SUCCESS; } +static test_return_t set_namespace(memcached_st *memc) +{ + memcached_return_t rc; + const char *key= "mine"; + char *value; + + /* Make sure be default none exists */ + value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); + test_compare_got(MEMCACHED_FAILURE, rc, memcached_strerror(NULL, rc)); + + /* Test a clean set */ + test_compare(MEMCACHED_SUCCESS, + memcached_callback_set(memc, MEMCACHED_CALLBACK_NAMESPACE, (void *)key)); + + value= (char*)memcached_callback_get(memc, MEMCACHED_CALLBACK_NAMESPACE, &rc); + test_true(value); + test_memcmp(value, key, 4); + test_compare_got(MEMCACHED_SUCCESS, rc, memcached_strerror(NULL, rc)); + + return TEST_SUCCESS; +} + +static test_return_t set_namespace_and_binary(memcached_st *memc) +{ + test_return_if(pre_binary(memc)); + test_return_if(set_namespace(memc)); + + return TEST_SUCCESS; +} #ifdef MEMCACHED_ENABLE_DEPRECATED static test_return_t deprecated_set_memory_alloc(memcached_st *memc) @@ -4112,7 +3986,7 @@ static test_return_t check_for_1_2_3(memcached_st *memc) memcached_server_instance_by_position(memc, 0); if ((instance->major_version >= 1 && (instance->minor_version == 2 && instance->micro_version >= 4)) - || instance->minor_version > 2) + or instance->minor_version > 2) { return TEST_SUCCESS; } @@ -4122,17 +3996,17 @@ static test_return_t check_for_1_2_3(memcached_st *memc) static test_return_t pre_unix_socket(memcached_st *memc) { - memcached_return_t rc; struct stat buf; memcached_servers_reset(memc); + const char *socket_file= default_socket(); - if (stat("/tmp/memcached.socket", &buf)) - return TEST_SKIPPED; + test_skip(0, stat(socket_file, &buf)); - rc= memcached_server_add_unix_socket_with_weight(memc, "/tmp/memcached.socket", 0); + test_compare(MEMCACHED_SUCCESS, + memcached_server_add_unix_socket_with_weight(memc, socket_file, 0)); - return ( rc == MEMCACHED_SUCCESS ? TEST_SUCCESS : TEST_FAILURE ); + return TEST_SUCCESS; } static test_return_t pre_nodelay(memcached_st *memc) @@ -4153,13 +4027,12 @@ static test_return_t pre_settimer(memcached_st *memc) static test_return_t poll_timeout(memcached_st *memc) { - size_t timeout= 100; // Not using, just checking that it sets + const uint64_t timeout= 100; // Not using, just checking that it sets memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout); - timeout= (size_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT); - test_compare(100, timeout); + test_compare(timeout, memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT)); return TEST_SUCCESS; } @@ -4324,33 +4197,16 @@ static test_return_t analyzer_test(memcached_st *memc) } /* Count the objects */ -static memcached_return_t callback_dump_counter(const memcached_st *ptr, - const char *key, - size_t key_length, - void *context) -{ - (void)ptr; (void)key; (void)key_length; - size_t *counter= (size_t *)context; - - *counter= *counter + 1; - - return MEMCACHED_SUCCESS; -} static test_return_t dump_test(memcached_st *memc) { - size_t counter= 0; - memcached_dump_fn callbacks[1]; - - callbacks[0]= &callback_dump_counter; - /* No support for Binary protocol yet */ test_skip(false, memc->flags.binary_protocol); test_compare(TEST_SUCCESS, set_test3(memc)); - test_compare(MEMCACHED_SUCCESS, - memcached_dump(memc, callbacks, (void *)&counter, 1)); + // 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); @@ -4358,8 +4214,6 @@ static test_return_t dump_test(memcached_st *memc) return TEST_SUCCESS; } -#ifdef HAVE_LIBMEMCACHEDUTIL - struct test_pool_context_st { memcached_pool_st* pool; memcached_st* mmc; @@ -4410,7 +4264,7 @@ static test_return_t connection_pool_test(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_set(mmc[0], key, keylen, "0", 1, 0, 0)); - for (size_t x= 0; x < POOL_SIZE; ++x) + for (uint64_t x= 0; x < POOL_SIZE; ++x) { uint64_t number_value; test_compare(MEMCACHED_SUCCESS, @@ -4438,12 +4292,12 @@ static test_return_t connection_pool_test(memcached_st *memc) mmc[1]= memcached_pool_pop(pool, false, &rc); test_true(mmc[1]); - test_compare(9999, memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK)); + test_compare(UINT64_C(9999), memcached_behavior_get(mmc[1], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK)); test_compare(MEMCACHED_SUCCESS, memcached_pool_push(pool, mmc[1])); test_compare(MEMCACHED_SUCCESS, memcached_pool_push(pool, mmc[0])); mmc[0]= memcached_pool_pop(pool, false, &rc); - test_compare(9999, memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK)); + test_compare(UINT64_C(9999), memcached_behavior_get(mmc[0], MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK)); test_compare(MEMCACHED_SUCCESS, memcached_pool_push(pool, mmc[0])); test_true(memcached_pool_destroy(pool) == memc); @@ -4501,6 +4355,41 @@ static test_return_t util_version_test(memcached_st *memc) return TEST_SUCCESS; } +static test_return_t getpid_connection_failure_test(memcached_st *memc) +{ + memcached_return_t rc; + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); + + // Test both the version that returns a code, and the one that does not. + test_true(libmemcached_util_getpid(memcached_server_name(instance), + memcached_server_port(instance) -1, NULL) == -1); + + test_true(libmemcached_util_getpid(memcached_server_name(instance), + memcached_server_port(instance) -1, &rc) == -1); + test_compare_got(MEMCACHED_CONNECTION_FAILURE, rc, memcached_strerror(memc, rc)); + + return TEST_SUCCESS; +} + + +static test_return_t getpid_test(memcached_st *memc) +{ + memcached_return_t rc; + memcached_server_instance_st instance= + memcached_server_instance_by_position(memc, 0); + + // Test both the version that returns a code, and the one that does not. + test_true(libmemcached_util_getpid(memcached_server_name(instance), + memcached_server_port(instance), NULL) > -1); + + test_true(libmemcached_util_getpid(memcached_server_name(instance), + memcached_server_port(instance), &rc) > -1); + test_compare(MEMCACHED_SUCCESS, rc); + + return TEST_SUCCESS; +} + static test_return_t ping_test(memcached_st *memc) { memcached_return_t rc; @@ -4518,7 +4407,6 @@ static test_return_t ping_test(memcached_st *memc) return TEST_SUCCESS; } -#endif #if 0 @@ -4570,11 +4458,10 @@ static test_return_t murmur_avaibility_test (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t one_at_a_time_run (memcached_st *memc) +static test_return_t one_at_a_time_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4587,11 +4474,10 @@ static test_return_t one_at_a_time_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t md5_run (memcached_st *memc) +static test_return_t md5_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4604,11 +4490,10 @@ static test_return_t md5_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t crc_run (memcached_st *memc) +static test_return_t crc_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4621,11 +4506,10 @@ static test_return_t crc_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t fnv1_64_run (memcached_st *memc) +static test_return_t fnv1_64_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4638,11 +4522,10 @@ static test_return_t fnv1_64_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t fnv1a_64_run (memcached_st *memc) +static test_return_t fnv1a_64_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4655,11 +4538,10 @@ static test_return_t fnv1a_64_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t fnv1_32_run (memcached_st *memc) +static test_return_t fnv1_32_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4672,11 +4554,10 @@ static test_return_t fnv1_32_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t fnv1a_32_run (memcached_st *memc) +static test_return_t fnv1a_32_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4689,11 +4570,10 @@ static test_return_t fnv1a_32_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t hsieh_run (memcached_st *memc) +static test_return_t hsieh_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4706,7 +4586,7 @@ static test_return_t hsieh_run (memcached_st *memc) return TEST_SUCCESS; } -static test_return_t murmur_run (memcached_st *memc) +static test_return_t murmur_run (memcached_st *) { #ifdef WORDS_BIGENDIAN (void)murmur_values; @@ -4714,7 +4594,6 @@ static test_return_t murmur_run (memcached_st *memc) #else uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4728,11 +4607,10 @@ static test_return_t murmur_run (memcached_st *memc) #endif } -static test_return_t jenkins_run (memcached_st *memc) +static test_return_t jenkins_run (memcached_st *) { uint32_t x; const char **ptr; - (void)memc; for (ptr= list_to_hash, x= 0; *ptr; ptr++, x++) { @@ -4757,22 +4635,21 @@ 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 *memc) +static test_return_t memcached_get_hashkit_test (memcached_st *) { uint32_t x; const char **ptr; - const hashkit_st *kit; hashkit_st new_kit; - hashkit_return_t hash_rc; + + memcached_st *memc= memcached(test_literal_param("--server=localhost:1 --server=localhost:2 --server=localhost:3 --server=localhost:4 --server=localhost5")); uint32_t md5_hosts[]= {4U, 1U, 0U, 1U, 4U, 2U, 0U, 3U, 0U, 0U, 3U, 1U, 0U, 0U, 1U, 3U, 0U, 0U, 0U, 3U, 1U, 0U, 4U, 4U, 3U}; uint32_t crc_hosts[]= {2U, 4U, 1U, 0U, 2U, 4U, 4U, 4U, 1U, 2U, 3U, 4U, 3U, 4U, 1U, 3U, 3U, 2U, 0U, 0U, 0U, 1U, 2U, 4U, 0U}; - kit= memcached_get_hashkit(memc); + const hashkit_st *kit= memcached_get_hashkit(memc); hashkit_clone(&new_kit, kit); - hash_rc= hashkit_set_custom_function(&new_kit, hash_md5_test_function, NULL); - test_true(hash_rc == HASHKIT_SUCCESS); + test_compare(HASHKIT_SUCCESS, hashkit_set_custom_function(&new_kit, hash_md5_test_function, NULL)); memcached_set_hashkit(memc, &new_kit); @@ -4784,7 +4661,7 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) uint32_t hash_val; hash_val= hashkit_digest(kit, *ptr, strlen(*ptr)); - test_true(md5_values[x] == hash_val); + test_compare_got(md5_values[x], hash_val, *ptr); } @@ -4796,11 +4673,10 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) uint32_t hash_val; hash_val= memcached_generate_hash(memc, *ptr, strlen(*ptr)); - test_true(md5_hosts[x] == hash_val); + test_compare_got(md5_hosts[x], hash_val, *ptr); } - hash_rc= hashkit_set_custom_function(&new_kit, hash_crc_test_function, NULL); - test_true(hash_rc == HASHKIT_SUCCESS); + test_compare(HASHKIT_SUCCESS, hashkit_set_custom_function(&new_kit, hash_crc_test_function, NULL)); memcached_set_hashkit(memc, &new_kit); @@ -4820,9 +4696,11 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) uint32_t hash_val; hash_val= memcached_generate_hash(memc, *ptr, strlen(*ptr)); - test_true(crc_hosts[x] == hash_val); + test_compare(crc_hosts[x], hash_val); } + memcached_free(memc); + return TEST_SUCCESS; } @@ -4832,29 +4710,21 @@ static test_return_t memcached_get_hashkit_test (memcached_st *memc) We are testing the error condition when we connect to a server via memcached_get() but find that the server is not available. */ -static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *memc) +static test_return_t memcached_get_MEMCACHED_ERRNO(memcached_st *) { - (void)memc; - memcached_st *tl_memc_h; - const char *key= "MemcachedLives"; size_t len; uint32_t flags; memcached_return rc; - char *value; // Create a handle. - tl_memc_h= memcached_create(NULL); - memcached_server_st *servers= memcached_servers_parse("localhost:9898,localhost:9899"); // This server should not exist - test_true(servers); - memcached_server_push(tl_memc_h, servers); - memcached_server_list_free(servers); + 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. - value= memcached_get(tl_memc_h, key, strlen(key), &len, &flags, &rc); + char *value= memcached_get(tl_memc_h, key, strlen(key), &len, &flags, &rc); test_false(value); - test_compare(0, len); + test_zero(len); test_true(memcached_failed(rc)); memcached_free(tl_memc_h); @@ -4877,7 +4747,7 @@ static test_return_t memcached_get_MEMCACHED_NOTFOUND(memcached_st *memc) value= memcached_get(memc, key, strlen(key), &len, &flags, &rc); test_false(value); - test_compare(0, len); + test_zero(len); test_compare(MEMCACHED_NOTFOUND, rc); return TEST_SUCCESS; @@ -4911,7 +4781,7 @@ static test_return_t memcached_get_by_key_MEMCACHED_ERRNO(memcached_st *memc) value= memcached_get_by_key(tl_memc_h, key, strlen(key), key, strlen(key), &len, &flags, &rc); test_false(value); - test_compare(0, len); + test_zero(len); test_true(memcached_failed(rc)); memcached_free(tl_memc_h); @@ -4934,120 +4804,12 @@ static test_return_t memcached_get_by_key_MEMCACHED_NOTFOUND(memcached_st *memc) value= memcached_get_by_key(memc, key, strlen(key), key, strlen(key), &len, &flags, &rc); test_false(value); - test_compare(0, len); + test_zero(len); test_compare(MEMCACHED_NOTFOUND, rc); return TEST_SUCCESS; } - -static test_return_t ketama_compatibility_libmemcached(memcached_st *) -{ - memcached_st *memc= memcached_create(NULL); - test_true(memc); - - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1)); - - uint64_t value; - test_compare(1, value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED)); - - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA)); - test_compare(MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA, memcached_behavior_get_distribution(memc)); - - - memcached_server_st *server_pool= memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); - memcached_server_push(memc, server_pool); - - /* verify that the server list was parsed okay. */ - test_compare(8, memcached_server_count(memc)); - test_strcmp(server_pool[0].hostname, "10.0.1.1"); - test_compare(11211, server_pool[0].port); - test_compare(600, server_pool[0].weight); - test_strcmp(server_pool[2].hostname, "10.0.1.3"); - test_compare(11211, server_pool[2].port); - test_compare(200, server_pool[2].weight); - test_strcmp(server_pool[7].hostname, "10.0.1.8"); - test_compare(11211, server_pool[7].port); - test_compare(100, server_pool[7].weight); - - /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets - * us test the boundary wraparound. - */ - test_true(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->ketama.continuum[0].index); - - /* verify the standard ketama set. */ - for (uint32_t x= 0; x < 99; x++) - { - uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key)); - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, server_idx); - const char *hostname = memcached_server_name(instance); - - test_strcmp(hostname, ketama_test_cases[x].server); - } - - memcached_server_list_free(server_pool); - memcached_free(memc); - - return TEST_SUCCESS; -} - -static test_return_t ketama_compatibility_spymemcached(memcached_st *) -{ - uint64_t value; - - memcached_st *memc= memcached_create(NULL); - test_true(memc); - - test_compare(MEMCACHED_SUCCESS, - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1)); - - test_compare(1, value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED)); - - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set_distribution(memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY)); - test_compare(MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY, memcached_behavior_get_distribution(memc)); - - memcached_server_st *server_pool= memcached_servers_parse("10.0.1.1:11211 600,10.0.1.2:11211 300,10.0.1.3:11211 200,10.0.1.4:11211 350,10.0.1.5:11211 1000,10.0.1.6:11211 800,10.0.1.7:11211 950,10.0.1.8:11211 100"); - test_true(server_pool); - memcached_server_push(memc, server_pool); - - /* verify that the server list was parsed okay. */ - test_compare(8, memcached_server_count(memc)); - test_strcmp(server_pool[0].hostname, "10.0.1.1"); - test_compare(11211, server_pool[0].port); - test_compare(600, server_pool[0].weight); - test_strcmp(server_pool[2].hostname, "10.0.1.3"); - test_compare(11211, server_pool[2].port); - test_compare(200, server_pool[2].weight); - test_strcmp(server_pool[7].hostname, "10.0.1.8"); - test_compare(11211, server_pool[7].port); - test_compare(100, server_pool[7].weight); - - /* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets - * us test the boundary wraparound. - */ - test_true(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->ketama.continuum[0].index); - - /* verify the standard ketama set. */ - for (uint32_t x= 0; x < 99; x++) - { - uint32_t server_idx= memcached_generate_hash(memc, ketama_test_cases_spy[x].key, strlen(ketama_test_cases_spy[x].key)); - - memcached_server_instance_st instance= - memcached_server_instance_by_position(memc, server_idx); - - const char *hostname= memcached_server_name(instance); - - test_strcmp(hostname, ketama_test_cases_spy[x].server); - } - - memcached_server_list_free(server_pool); - memcached_free(memc); - - return TEST_SUCCESS; -} - static test_return_t regression_bug_434484(memcached_st *memc) { test_return_t test_rc; @@ -5249,11 +5011,11 @@ static test_return_t regression_bug_447342(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2)); - const size_t max_keys= 100; + 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)); - for (size_t x= 0; x < max_keys; ++x) + for (unsigned int x= 0; x < max_keys; ++x) { char k[251]; @@ -5285,12 +5047,10 @@ static test_return_t regression_bug_447342(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); - size_t counter= 0; + unsigned int counter= 0; memcached_execute_fn callbacks[]= { &callback_counter }; - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); /* Verify that we received all of the key/value pairs */ test_compare(counter, max_keys); @@ -5343,9 +5103,8 @@ static test_return_t regression_bug_447342(memcached_st *memc) memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); counter= 0; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); test_compare(counter, (unsigned int)(max_keys >> 1)); /* Release allocated resources */ @@ -5468,7 +5227,7 @@ static test_return_t test_get_last_disconnect(memcached_st *memc) disconnected_server= memcached_server_get_last_disconnect(mine); test_true_got(disconnected_server, memcached_strerror(mine, rc)); - test_compare(9, memcached_server_port(disconnected_server)); + test_compare(in_port_t(9), memcached_server_port(disconnected_server)); test_false(strncmp(memcached_server_name(disconnected_server),"localhost",9)); memcached_quit(mine); @@ -5482,10 +5241,8 @@ static 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]; - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer)), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + libmemcached_check_configuration(server_string, strlen(server_string), buffer, sizeof(buffer))); memcached_st *memc= memcached(server_string, strlen(server_string)); test_true(memc); @@ -5526,6 +5283,9 @@ static test_return_t test_verbosity(memcached_st *memc) static test_return_t test_server_failure(memcached_st *memc) { + if (memcached_server_count(memc) < 2) + return TEST_SKIPPED; + memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); memcached_st *local_memc= memcached_create(NULL); @@ -5534,7 +5294,7 @@ static test_return_t test_server_failure(memcached_st *memc) memcached_behavior_set(local_memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT, 2); uint32_t server_count= memcached_server_count(local_memc); - test_compare(1, server_count); + test_compare(1U, server_count); // Disable the server instance= memcached_server_instance_by_position(local_memc, 0); @@ -5546,11 +5306,10 @@ static test_return_t test_server_failure(memcached_st *memc) memcached_last_error_message(local_memc)); ((memcached_server_write_instance_st)instance)->server_failure_counter= 0; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_set(local_memc, "foo", strlen("foo"), NULL, 0, (time_t)0, (uint32_t)0), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_set(local_memc, "foo", strlen("foo"), NULL, 0, (time_t)0, (uint32_t)0)); #if 0 - memcached_last_error_message(local_memc)); + memcached_last_error_message(local_memc)); #endif @@ -5561,7 +5320,12 @@ static test_return_t test_server_failure(memcached_st *memc) static test_return_t test_cull_servers(memcached_st *memc) { - uint32_t count = memcached_server_count(memc); + uint32_t count= memcached_server_count(memc); + + if (count < 2) + { + return TEST_SKIPPED; + } // Do not do this in your code, it is not supported. memc->servers[1].options.is_dead= true; @@ -5651,7 +5415,7 @@ static test_return_t wrong_failure_counter_test(memcached_st *memc) * Please note that this isn't bullet proof, because an error could * occur... */ - test_compare(0, instance->server_failure_counter); + test_zero(instance->server_failure_counter); /* restore the instance */ memc->number_of_hosts= number_of_hosts; @@ -5816,9 +5580,9 @@ static test_return_t regression_bug_583031(memcached_st *) const char *value= memcached_get(memc, "dsf", 3, &length, &flags, &rc); test_false(value); - test_compare(0, length); + test_zero(length); - test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_strerror(memc, rc)); + test_compare_got(MEMCACHED_TIMEOUT, rc, memcached_last_error_message(memc)); memcached_free(memc); @@ -5876,13 +5640,13 @@ static test_return_t regression_bug_655423(memcached_st *memc) if (rc == MEMCACHED_NOTFOUND) { test_false(value); - test_compare(0, value_length); + test_zero(value_length); continue; } test_compare(MEMCACHED_SUCCESS, rc); test_true(value); - test_compare(100, value_length); + test_compare(100UL, value_length); free(value); } @@ -5899,16 +5663,14 @@ static test_return_t regression_bug_655423(memcached_st *memc) test_true(key_length[x]); } - memcached_return_t rc; - test_compare_got(MEMCACHED_SUCCESS, - rc= memcached_mget(clone, (const char* const *)keys, key_length, regression_bug_655423_COUNT), - memcached_strerror(NULL, rc)); + test_compare(MEMCACHED_SUCCESS, + memcached_mget(clone, (const char* const *)keys, key_length, regression_bug_655423_COUNT)); uint32_t count= 0; memcached_result_st *result= NULL; while ((result= memcached_fetch_result(clone, result, NULL))) { - test_compare(100, memcached_result_length(result)); + test_compare(size_t(100), memcached_result_length(result)); count++; } @@ -5972,7 +5734,7 @@ static void memcached_die(memcached_st* mc, memcached_return error, const char* { fprintf(stderr, "Iteration #%u: ", it); - if(error == MEMCACHED_ERRNO) + if (error == MEMCACHED_ERRNO) { fprintf(stderr, "system error %d from %s: %s\n", errno, what, strerror(errno)); @@ -6111,155 +5873,150 @@ static test_return_t sasl_auth_test(memcached_st *memc) /* Clean the server before beginning testing */ test_st tests[] ={ - {"util_version", 1, (test_callback_fn*)util_version_test }, - {"flush", 0, (test_callback_fn*)flush_test }, - {"init", 0, (test_callback_fn*)init_test }, - {"allocation", 0, (test_callback_fn*)allocation_test }, - {"server_list_null_test", 0, (test_callback_fn*)server_list_null_test}, - {"server_unsort", 0, (test_callback_fn*)server_unsort_test}, - {"server_sort", 0, (test_callback_fn*)server_sort_test}, - {"server_sort2", 0, (test_callback_fn*)server_sort2_test}, - {"memcached_server_remove", 0, (test_callback_fn*)memcached_server_remove_test}, - {"clone_test", 0, (test_callback_fn*)clone_test }, - {"connection_test", 0, (test_callback_fn*)connection_test}, - {"callback_test", 0, (test_callback_fn*)callback_test}, - {"userdata_test", 0, (test_callback_fn*)userdata_test}, - {"error", 0, (test_callback_fn*)error_test }, - {"set", 0, (test_callback_fn*)set_test }, - {"set2", 0, (test_callback_fn*)set_test2 }, - {"set3", 0, (test_callback_fn*)set_test3 }, - {"dump", 1, (test_callback_fn*)dump_test}, - {"add", 1, (test_callback_fn*)add_test }, - {"memcached_fetch_result(MEMCACHED_NOTFOUND)", 1, (test_callback_fn*)memcached_fetch_result_NOT_FOUND }, - {"replace", 1, (test_callback_fn*)replace_test }, - {"delete", 1, (test_callback_fn*)delete_test }, - {"get", 1, (test_callback_fn*)get_test }, - {"get2", 0, (test_callback_fn*)get_test2 }, - {"get3", 0, (test_callback_fn*)get_test3 }, - {"get4", 0, (test_callback_fn*)get_test4 }, - {"partial mget", 0, (test_callback_fn*)get_test5 }, - {"stats_servername", 0, (test_callback_fn*)stats_servername_test }, - {"increment", 0, (test_callback_fn*)increment_test }, - {"increment_with_initial", 1, (test_callback_fn*)increment_with_initial_test }, - {"decrement", 0, (test_callback_fn*)decrement_test }, - {"decrement_with_initial", 1, (test_callback_fn*)decrement_with_initial_test }, - {"increment_by_key", 0, (test_callback_fn*)increment_by_key_test }, - {"increment_with_initial_by_key", 1, (test_callback_fn*)increment_with_initial_by_key_test }, - {"decrement_by_key", 0, (test_callback_fn*)decrement_by_key_test }, - {"decrement_with_initial_by_key", 1, (test_callback_fn*)decrement_with_initial_by_key_test }, - {"quit", 0, (test_callback_fn*)quit_test }, - {"mget", 1, (test_callback_fn*)mget_test }, - {"mget_result", 1, (test_callback_fn*)mget_result_test }, - {"mget_result_alloc", 1, (test_callback_fn*)mget_result_alloc_test }, - {"mget_result_function", 1, (test_callback_fn*)mget_result_function }, - {"mget_execute", 1, (test_callback_fn*)mget_execute }, - {"mget_end", 0, (test_callback_fn*)mget_end }, - {"get_stats", 0, (test_callback_fn*)get_stats }, - {"add_host_test", 0, (test_callback_fn*)add_host_test }, - {"add_host_test_1", 0, (test_callback_fn*)add_host_test1 }, - {"get_stats_keys", 0, (test_callback_fn*)get_stats_keys }, - {"version_string_test", 0, (test_callback_fn*)version_string_test}, - {"bad_key", 1, (test_callback_fn*)bad_key_test }, - {"memcached_server_cursor", 1, (test_callback_fn*)memcached_server_cursor_test }, - {"read_through", 1, (test_callback_fn*)read_through }, - {"delete_through", 1, (test_callback_fn*)delete_through }, - {"noreply", 1, (test_callback_fn*)noreply_test}, - {"analyzer", 1, (test_callback_fn*)analyzer_test}, - {"connectionpool", 1, (test_callback_fn*)connection_pool_test }, - {"memcached_pool_test", 1, (test_callback_fn*)memcached_pool_test }, - {"ping", 1, (test_callback_fn*)ping_test }, - {"test_get_last_disconnect", 1, (test_callback_fn*)test_get_last_disconnect}, - {"verbosity", 1, (test_callback_fn*)test_verbosity}, - {"test_server_failure", 1, (test_callback_fn*)test_server_failure}, - {"cull_servers", 1, (test_callback_fn*)test_cull_servers}, - {"memcached_stat_execute", 1, (test_callback_fn*)memcached_stat_execute_test}, + {"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}, + {"error", false, (test_callback_fn*)error_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 }, + {"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*)delete_through }, + {"noreply", true, (test_callback_fn*)noreply_test}, + {"analyzer", true, (test_callback_fn*)analyzer_test}, + {"connectionpool", true, (test_callback_fn*)connection_pool_test }, + {"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}, + {"test_server_failure", true, (test_callback_fn*)test_server_failure}, + {"cull_servers", true, (test_callback_fn*)test_cull_servers}, + {"memcached_stat_execute", true, (test_callback_fn*)memcached_stat_execute_test}, {0, 0, 0} }; test_st behavior_tests[] ={ - {"libmemcached_string_behavior()", 0, (test_callback_fn*)libmemcached_string_behavior_test}, - {"libmemcached_string_distribution()", 0, (test_callback_fn*)libmemcached_string_distribution_test}, - {"behavior_test", 0, (test_callback_fn*)behavior_test}, - {"MEMCACHED_BEHAVIOR_CORK", 0, (test_callback_fn*)MEMCACHED_BEHAVIOR_CORK_test}, - {"MEMCACHED_BEHAVIOR_TCP_KEEPALIVE", 0, (test_callback_fn*)MEMCACHED_BEHAVIOR_TCP_KEEPALIVE_test}, - {"MEMCACHED_BEHAVIOR_TCP_KEEPIDLE", 0, (test_callback_fn*)MEMCACHED_BEHAVIOR_TCP_KEEPIDLE_test}, + {"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}, + {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", 1, (test_callback_fn*)basic_init_test}, - {"clone", 1, (test_callback_fn*)basic_clone_test}, - {"reset", 1, (test_callback_fn*)basic_reset_stack_test}, - {"reset heap", 1, (test_callback_fn*)basic_reset_heap_test}, - {"reset stack clone", 1, (test_callback_fn*)basic_reset_stack_clone_test}, - {"reset heap clone", 1, (test_callback_fn*)basic_reset_heap_clone_test}, + {"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}, {0, 0, 0} }; test_st regression_binary_vs_block[] ={ - {"block add", 1, (test_callback_fn*)block_add_regression}, - {"binary add", 1, (test_callback_fn*)binary_add_regression}, + {"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", 1, (test_callback_fn*)add_wrapper }, + {"add", true, (test_callback_fn*)add_wrapper }, {0, 0, 0} }; -test_st string_tests[] ={ - {"string static with null", 0, (test_callback_fn*)string_static_null }, - {"string alloc with null", 0, (test_callback_fn*)string_alloc_null }, - {"string alloc with 1K", 0, (test_callback_fn*)string_alloc_with_size }, - {"string alloc with malloc failure", 0, (test_callback_fn*)string_alloc_with_size_toobig }, - {"string append", 0, (test_callback_fn*)string_alloc_append }, - {"string append failure (too big)", 0, (test_callback_fn*)string_alloc_append_toobig }, - {"string_alloc_append_multiple", 0, (test_callback_fn*)string_alloc_append_multiple }, - {0, 0, (test_callback_fn*)0} -}; - test_st memcached_server_get_last_disconnect_tests[] ={ - {"memcached_server_get_last_disconnect()", 0, (test_callback_fn*)test_multiple_get_last_disconnect}, + {"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", 0, (test_callback_fn*)result_static}, - {"result alloc", 0, (test_callback_fn*)result_alloc}, + {"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", 0, (test_callback_fn*)append_test }, - {"prepend", 0, (test_callback_fn*)prepend_test }, - {"cas", 0, (test_callback_fn*)cas_test }, - {"cas2", 0, (test_callback_fn*)cas2_test }, - {"append_binary", 0, (test_callback_fn*)append_binary_test }, + {"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", 0, (test_callback_fn*)user_supplied_bug1 }, - {"memcached_get()", 0, (test_callback_fn*)user_supplied_bug2 }, - {"memcached_mget()", 0, (test_callback_fn*)user_supplied_bug3 }, + {"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", 1, (test_callback_fn*)user_supplied_bug5 }, - {"user_supplied_bug6", 1, (test_callback_fn*)user_supplied_bug6 }, - {"user_supplied_bug7", 1, (test_callback_fn*)user_supplied_bug7 }, - {"user_supplied_bug8", 1, (test_callback_fn*)user_supplied_bug8 }, - {"user_supplied_bug9", 1, (test_callback_fn*)user_supplied_bug9 }, - {"user_supplied_bug10", 1, (test_callback_fn*)user_supplied_bug10 }, - {"user_supplied_bug11", 1, (test_callback_fn*)user_supplied_bug11 }, - {"user_supplied_bug12", 1, (test_callback_fn*)user_supplied_bug12 }, - {"user_supplied_bug13", 1, (test_callback_fn*)user_supplied_bug13 }, - {"user_supplied_bug14", 1, (test_callback_fn*)user_supplied_bug14 }, - {"user_supplied_bug15", 1, (test_callback_fn*)user_supplied_bug15 }, - {"user_supplied_bug16", 1, (test_callback_fn*)user_supplied_bug16 }, + {"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.. @@ -6268,24 +6025,24 @@ test_st user_tests[] ={ ** 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", 1, (test_callback_fn*)user_supplied_bug17 }, + {"user_supplied_bug17", true, (test_callback_fn*)user_supplied_bug17 }, #endif - {"user_supplied_bug18", 1, (test_callback_fn*)user_supplied_bug18 }, - {"user_supplied_bug19", 1, (test_callback_fn*)user_supplied_bug19 }, - {"user_supplied_bug20", 1, (test_callback_fn*)user_supplied_bug20 }, - {"user_supplied_bug21", 1, (test_callback_fn*)user_supplied_bug21 }, - {"wrong_failure_counter_test", 1, (test_callback_fn*)wrong_failure_counter_test}, - {"wrong_failure_counter_two_test", 1, (test_callback_fn*)wrong_failure_counter_two_test}, + {"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", 1, (test_callback_fn*)replication_set_test }, - {"get", 0, (test_callback_fn*)replication_get_test }, - {"mget", 0, (test_callback_fn*)replication_mget_test }, - {"delete", 0, (test_callback_fn*)replication_delete_test }, - {"rand_mget", 0, (test_callback_fn*)replication_randomize_mget_test }, - {"fail", 0, (test_callback_fn*)replication_randomize_mget_fail_test }, + {"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} }; @@ -6296,80 +6053,80 @@ test_st replication_tests[]= { * http://bugs.launchpad.net/libmemcached */ test_st regression_tests[]= { - {"lp:434484", 1, (test_callback_fn*)regression_bug_434484 }, - {"lp:434843", 1, (test_callback_fn*)regression_bug_434843 }, - {"lp:434843-buffered", 1, (test_callback_fn*)regression_bug_434843_buffered }, - {"lp:421108", 1, (test_callback_fn*)regression_bug_421108 }, - {"lp:442914", 1, (test_callback_fn*)regression_bug_442914 }, - {"lp:447342", 1, (test_callback_fn*)regression_bug_447342 }, - {"lp:463297", 1, (test_callback_fn*)regression_bug_463297 }, - {"lp:490486", 1, (test_callback_fn*)regression_bug_490486 }, - {"lp:583031", 1, (test_callback_fn*)regression_bug_583031 }, - {"lp:?", 1, (test_callback_fn*)regression_bug_ }, - {"lp:728286", 1, (test_callback_fn*)regression_bug_728286 }, - {"lp:581030", 1, (test_callback_fn*)regression_bug_581030 }, - {"lp:71231153 connect()", 1, (test_callback_fn*)regression_bug_71231153_connect }, - {"lp:71231153 poll()", 1, (test_callback_fn*)regression_bug_71231153_poll }, - {"lp:655423", 1, (test_callback_fn*)regression_bug_655423 }, - {"lp:490520", 1, (test_callback_fn*)regression_bug_490520 }, - {0, 0, (test_callback_fn*)0} + {"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 }, + {0, false, (test_callback_fn*)0} }; test_st sasl_auth_tests[]= { - {"sasl_auth", 1, (test_callback_fn*)sasl_auth_test }, + {"sasl_auth", true, (test_callback_fn*)sasl_auth_test }, {0, 0, (test_callback_fn*)0} }; test_st ketama_compatibility[]= { - {"libmemcached", 1, (test_callback_fn*)ketama_compatibility_libmemcached }, - {"spymemcached", 1, (test_callback_fn*)ketama_compatibility_spymemcached }, + {"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", 1, (test_callback_fn*)generate_pairs }, - {"generate_data", 1, (test_callback_fn*)generate_data }, - {"get_read", 0, (test_callback_fn*)get_read }, - {"delete_generate", 0, (test_callback_fn*)delete_generate }, - {"generate_buffer_data", 1, (test_callback_fn*)generate_buffer_data }, - {"delete_buffer", 0, (test_callback_fn*)delete_buffer_generate}, - {"generate_data", 1, (test_callback_fn*)generate_data }, - {"mget_read", 0, (test_callback_fn*)mget_read }, - {"mget_read_result", 0, (test_callback_fn*)mget_read_result }, - {"memcached_fetch_result() use internal result", 0, (test_callback_fn*)mget_read_internal_result }, - {"memcached_fetch_result() partial read", 0, (test_callback_fn*)mget_read_partial_result }, - {"mget_read_function", 0, (test_callback_fn*)mget_read_function }, - {"cleanup", 1, (test_callback_fn*)cleanup_pairs }, - {"generate_large_pairs", 1, (test_callback_fn*)generate_large_pairs }, - {"generate_data", 1, (test_callback_fn*)generate_data }, - {"generate_buffer_data", 1, (test_callback_fn*)generate_buffer_data }, - {"cleanup", 1, (test_callback_fn*)cleanup_pairs }, + {"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", 1, (test_callback_fn*)generate_pairs }, - {"generate_data", 1, (test_callback_fn*)generate_data }, + {"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", 1, (test_callback_fn*)cleanup_pairs }, + {"cleanup", true, (test_callback_fn*)cleanup_pairs }, {0, 0, (test_callback_fn*)0} }; test_st consistent_weighted_tests[] ={ - {"generate_pairs", 1, (test_callback_fn*)generate_pairs }, - {"generate_data", 1, (test_callback_fn*)generate_data_with_stats }, - {"get_read", 0, (test_callback_fn*)get_read_count }, - {"cleanup", 1, (test_callback_fn*)cleanup_pairs }, + {"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", 0, (test_callback_fn*)hsieh_avaibility_test}, + {"hsieh_avaibility_test", false, (test_callback_fn*)hsieh_avaibility_test}, {0, 0, (test_callback_fn*)0} }; test_st murmur_availability[] ={ - {"murmur_avaibility_test", 0, (test_callback_fn*)murmur_avaibility_test}, + {"murmur_avaibility_test", false, (test_callback_fn*)murmur_avaibility_test}, {0, 0, (test_callback_fn*)0} }; @@ -6381,57 +6138,65 @@ test_st hash_sanity[] ={ #endif test_st ketama_auto_eject_hosts[] ={ - {"auto_eject_hosts", 1, (test_callback_fn*)auto_eject_hosts }, - {"output_ketama_weighted_keys", 1, (test_callback_fn*)output_ketama_weighted_keys }, + {"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", 0, (test_callback_fn*)one_at_a_time_run }, - {"md5", 0, (test_callback_fn*)md5_run }, - {"crc", 0, (test_callback_fn*)crc_run }, - {"fnv1_64", 0, (test_callback_fn*)fnv1_64_run }, - {"fnv1a_64", 0, (test_callback_fn*)fnv1a_64_run }, - {"fnv1_32", 0, (test_callback_fn*)fnv1_32_run }, - {"fnv1a_32", 0, (test_callback_fn*)fnv1a_32_run }, - {"hsieh", 0, (test_callback_fn*)hsieh_run }, - {"murmur", 0, (test_callback_fn*)murmur_run }, - {"jenkis", 0, (test_callback_fn*)jenkins_run }, - {"memcached_get_hashkit", 0, (test_callback_fn*)memcached_get_hashkit_test }, + {"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)", 0, (test_callback_fn*)memcached_get_MEMCACHED_ERRNO }, - {"memcached_get(MEMCACHED_NOTFOUND)", 0, (test_callback_fn*)memcached_get_MEMCACHED_NOTFOUND }, - {"memcached_get_by_key(MEMCACHED_ERRNO)", 0, (test_callback_fn*)memcached_get_by_key_MEMCACHED_ERRNO }, - {"memcached_get_by_key(MEMCACHED_NOTFOUND)", 0, (test_callback_fn*)memcached_get_by_key_MEMCACHED_NOTFOUND }, - {"memcached_get_by_key(MEMCACHED_NOTFOUND)", 0, (test_callback_fn*)memcached_get_by_key_MEMCACHED_NOTFOUND }, - {"memcached_increment(MEMCACHED_NO_SERVERS)", 0, (test_callback_fn*)memcached_increment_MEMCACHED_NO_SERVERS }, + {"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", 0, (test_callback_fn*)behavior_parser_test }, - {"boolean_options", 0, (test_callback_fn*)parser_boolean_options_test }, - {"configure_file", 0, (test_callback_fn*)memcached_create_with_options_with_filename }, - {"distribtions", 0, (test_callback_fn*)parser_distribution_test }, - {"hash", 0, (test_callback_fn*)parser_hash_test }, - {"libmemcached_check_configuration", 0, (test_callback_fn*)libmemcached_check_configuration_test }, - {"libmemcached_check_configuration_with_filename", 0, (test_callback_fn*)libmemcached_check_configuration_with_filename_test }, - {"number_options", 0, (test_callback_fn*)parser_number_options_test }, - {"randomly generated options", 0, (test_callback_fn*)random_statement_build_test }, - {"prefix_key", 0, (test_callback_fn*)parser_key_prefix_test }, - {"server", 0, (test_callback_fn*)server_test }, - {"bad server strings", 0, (test_callback_fn*)servers_bad_test }, - {"server with weights", 0, (test_callback_fn*)server_with_weight_test }, - {"parsing servername, port, and weight", 0, (test_callback_fn*)test_hostname_port_weight }, + {"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", 0, (test_callback_fn*)virtual_back_map }, + {"basic", false, (test_callback_fn*)virtual_back_map }, + {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} }; @@ -6439,6 +6204,7 @@ 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}, @@ -6467,14 +6233,16 @@ collection_st collection[] ={ {"deprecated_memory_allocators", (test_callback_fn*)deprecated_set_memory_alloc, 0, tests}, #endif {"memory_allocators", (test_callback_fn*)set_memory_alloc, 0, tests}, - {"prefix", (test_callback_fn*)set_prefix, 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}, {"sasl_auth", (test_callback_fn*)pre_sasl, 0, sasl_auth_tests }, {"sasl", (test_callback_fn*)pre_sasl, 0, tests }, {"version_1_2_3", (test_callback_fn*)check_for_1_2_3, 0, version_1_2_3}, - {"string", 0, 0, string_tests}, {"result", 0, 0, result_tests}, {"async", (test_callback_fn*)pre_nonblock, 0, async_tests}, - {"async_binary", (test_callback_fn*)pre_nonblock_binary, 0, async_tests}, + {"async(BINARY)", (test_callback_fn*)pre_nonblock_binary, 0, async_tests}, {"Cal Haldenbrand's tests", 0, 0, haldenbrand_tests}, {"user", 0, 0, user_tests}, {"generate", 0, 0, generate_tests}, @@ -6512,16 +6280,18 @@ void get_world(Framework *world) world->collections= collection; world->_create= (test_callback_create_fn*)world_create; - world->_destroy= (test_callback_fn*)world_destroy; + world->_destroy= (test_callback_destroy_fn*)world_destroy; world->item._startup= (test_callback_fn*)world_test_startup; - world->item._flush= (test_callback_fn*)world_flush; 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->runner= &defualt_libmemcached_runner; + world->set_runner(&defualt_libmemcached_runner); + + world->set_socket(); }