X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibmemcached-1.0%2Fmem_functions.cc;h=3fcba9958fa3b0fc42c69f6671cad28310993977;hb=c119fee4aeefd8311b8438a08eb6e43bd3e6c6fb;hp=c8475f3f8e012858024670b3cae8afc6d52a3276;hpb=187eaf7c9435ff284ee8d98a112a1bc537373019;p=awesomized%2Flibmemcached diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index c8475f3f..3fcba995 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -205,6 +205,18 @@ static memcached_return_t return_value_based_on_buffering(memcached_st *memc) static memcached_st * create_single_instance_memcached(const memcached_st *original_memc, const char *options) { + /* + If no options are given, copy over at least the binary flag. + */ + char options_buffer[1024]= { 0 }; + if (options == NULL) + { + if (memcached_is_binary(original_memc)) + { + snprintf(options_buffer, sizeof(options_buffer), "--BINARY"); + } + } + /* * I only want to hit _one_ server so I know the number of requests I'm * sending in the pipeline. @@ -246,10 +258,10 @@ static memcached_st * create_single_instance_memcached(const memcached_st *origi return NULL; } - char buffer[1024]; - if (memcached_failed(libmemcached_check_configuration(server_string, server_string_length, buffer, sizeof(buffer)))) + char errror_buffer[1024]; + if (memcached_failed(libmemcached_check_configuration(server_string, server_string_length, errror_buffer, sizeof(errror_buffer)))) { - Error << "Failed to parse (" << server_string << ") " << buffer; + Error << "Failed to parse (" << server_string << ") " << errror_buffer; return NULL; } @@ -1176,23 +1188,20 @@ test_return_t read_through(memcached_st *memc) test_return_t get_test(memcached_st *memc) { - memcached_return_t rc; - char *string; - size_t string_length; - uint32_t flags; - uint64_t query_id= memcached_query_id(memc); - rc= memcached_delete(memc, - test_literal_param(__func__), - time_t(0)); - test_true_got(rc == MEMCACHED_BUFFERED or rc == MEMCACHED_NOTFOUND, memcached_last_error_message(memc)); + memcached_return_t rc= memcached_delete(memc, + test_literal_param(__func__), + time_t(0)); + test_true_hint(rc == MEMCACHED_BUFFERED or rc == MEMCACHED_NOTFOUND, memcached_last_error_message(memc)); test_compare(query_id +1, memcached_query_id(memc)); - string= memcached_get(memc, + size_t string_length; + uint32_t flags; + char *string= memcached_get(memc, test_literal_param(__func__), &string_length, &flags, &rc); - test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_strerror(NULL, rc)); + test_compare_got(MEMCACHED_NOTFOUND, rc, memcached_last_error_message(memc)); test_false(string_length); test_false(string); @@ -2706,7 +2715,7 @@ test_return_t user_supplied_bug14(memcached_st *memc) value.push_back((char) (x % 127)); } - for (size_t current_length= 0; current_length < value.size(); current_length++) + for (size_t current_length= 1; current_length < value.size(); current_length++) { memcached_return_t rc= memcached_set(memc, test_literal_param("foo"), &value[0], current_length, @@ -2720,7 +2729,9 @@ test_return_t user_supplied_bug14(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, rc); test_compare(string_length, current_length); - test_memcmp(string, &value[0], string_length); + char buffer[1024]; + snprintf(buffer, sizeof(buffer), "%u", uint32_t(string_length)); + test_memcmp_hint(string, &value[0], string_length, buffer); free(string); } @@ -4182,20 +4193,18 @@ test_return_t regression_bug_421108(memcached_st *memc) * delete command or the watermarks, we need to update this * test.... */ -test_return_t regression_bug_442914(memcached_st *memc) +test_return_t regression_bug_442914(memcached_st *original_memc) { - test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1)); - memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1); - - uint32_t number_of_hosts= memcached_server_count(memc); - memc->number_of_hosts= 1; + memcached_st* memc= create_single_instance_memcached(original_memc, "--NOREPLY --TCP-NODELAY"); for (uint32_t x= 0; x < 250; ++x) { char key[250]; size_t len= (size_t)snprintf(key, sizeof(key), "%0250u", x); memcached_return_t rc= memcached_delete(memc, key, len, 0); - test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); + char error_buffer[2048]= { 0 }; + snprintf(error_buffer, sizeof(error_buffer), "%s key: %s", memcached_last_error_message(memc), key); + test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, error_buffer); } // Delete, and then delete again to look for not found @@ -4203,22 +4212,19 @@ test_return_t regression_bug_442914(memcached_st *memc) char key[250]; size_t len= snprintf(key, sizeof(key), "%037u", 251U); memcached_return_t rc= memcached_delete(memc, key, len, 0); - test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED); + test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 0)); + test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, false)); test_compare(MEMCACHED_NOTFOUND, memcached_delete(memc, key, len, 0)); } - memc->number_of_hosts= number_of_hosts; + memcached_free(memc); return TEST_SUCCESS; } test_return_t regression_bug_447342(memcached_st *memc) { - memcached_server_instance_st instance_one; - memcached_server_instance_st instance_two; - if (memcached_server_count(memc) < 3 or pre_replication(memc) != TEST_SUCCESS) { return TEST_SKIPPED; @@ -4227,19 +4233,15 @@ test_return_t regression_bug_447342(memcached_st *memc) test_compare(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2)); - const unsigned int max_keys= 100; - char **keys= (char**)calloc(max_keys, sizeof(char*)); - size_t *key_length= (size_t *)calloc(max_keys, sizeof(size_t)); + keys_st keys(100); - for (unsigned int x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { - char k[251]; - - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); - keys[x]= strdup(k); - test_true(keys[x]); test_compare(MEMCACHED_SUCCESS, - memcached_set(memc, k, key_length[x], k, key_length[x], 0, 0)); + memcached_set(memc, + keys.key_at(x), keys.length_at(x), // Keys + keys.key_at(x), keys.length_at(x), // Values + 0, 0)); } /* @@ -4261,7 +4263,8 @@ test_return_t regression_bug_447342(memcached_st *memc) * into the servers */ test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); + memcached_mget(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size())); unsigned int counter= 0; memcached_execute_fn callbacks[]= { &callback_counter }; @@ -4269,7 +4272,7 @@ test_return_t regression_bug_447342(memcached_st *memc) memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); /* Verify that we received all of the key/value pairs */ - test_compare(counter, max_keys); + test_compare(counter, keys.size()); memcached_quit(memc); /* @@ -4278,8 +4281,8 @@ test_return_t regression_bug_447342(memcached_st *memc) * This is to verify correct behavior in the library. Fake that two servers * are dead.. */ - instance_one= memcached_server_instance_by_position(memc, 0); - instance_two= memcached_server_instance_by_position(memc, 2); + memcached_server_instance_st instance_one= memcached_server_instance_by_position(memc, 0); + memcached_server_instance_st instance_two= memcached_server_instance_by_position(memc, 2); in_port_t port0= instance_one->port; in_port_t port2= instance_two->port; @@ -4287,12 +4290,13 @@ test_return_t regression_bug_447342(memcached_st *memc) ((memcached_server_write_instance_st)instance_two)->port= 0; test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); + memcached_mget(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size())); counter= 0; test_compare(MEMCACHED_SUCCESS, memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); - test_compare(counter, (unsigned int)max_keys); + test_compare(counter, keys.size()); /* restore the memc handle */ ((memcached_server_write_instance_st)instance_one)->port= port0; @@ -4301,12 +4305,12 @@ test_return_t regression_bug_447342(memcached_st *memc) memcached_quit(memc); /* Remove half of the objects */ - for (size_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { if (x & 1) { test_compare(MEMCACHED_SUCCESS, - memcached_delete(memc, keys[x], key_length[x], 0)); + memcached_delete(memc, keys.key_at(x), keys.length_at(x), 0)); } } @@ -4316,20 +4320,13 @@ test_return_t regression_bug_447342(memcached_st *memc) /* now retry the command, this time we should have cache misses */ test_compare(MEMCACHED_SUCCESS, - memcached_mget(memc, (const char* const *)keys, key_length, max_keys)); + memcached_mget(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size())); counter= 0; test_compare(MEMCACHED_SUCCESS, memcached_fetch_execute(memc, callbacks, (void *)&counter, 1)); - test_compare(counter, (unsigned int)(max_keys >> 1)); - - /* Release allocated resources */ - for (size_t x= 0; x < max_keys; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); + test_compare(counter, (unsigned int)(keys.size() >> 1)); /* restore the memc handle */ ((memcached_server_write_instance_st)instance_one)->port= port0; @@ -4540,31 +4537,20 @@ test_return_t memcached_stat_execute_test(memcached_st *memc) * This test ensures that the failure counter isn't incremented during * normal termination of the memcached instance. */ -test_return_t wrong_failure_counter_test(memcached_st *memc) +test_return_t wrong_failure_counter_test(memcached_st *original_memc) { - memcached_return_t rc; - memcached_server_instance_st instance; - - /* Set value to force connection to the server */ - const char *key= "marmotte"; - const char *value= "milka"; - - /* - * Please note that I'm abusing the internal structures in libmemcached - * in a non-portable way and you shouldn't be doing this. I'm only - * doing this in order to verify that the library works the way it should - */ - uint32_t number_of_hosts= memcached_server_count(memc); - memc->number_of_hosts= 1; + memcached_st* memc= create_single_instance_memcached(original_memc, NULL); /* Ensure that we are connected to the server by setting a value */ - rc= memcached_set(memc, key, strlen(key), - value, strlen(value), - (time_t)0, (uint32_t)0); + memcached_return_t rc= memcached_set(memc, + test_literal_param(__func__), // Key + test_literal_param(__func__), // Value + time_t(0), uint32_t(0)); test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); - instance= memcached_server_instance_by_position(memc, 0); + memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); + /* The test is to see that the memcached_quit doesn't increase the * the server failure conter, so let's ensure that it is zero * before sending quit @@ -4579,8 +4565,7 @@ test_return_t wrong_failure_counter_test(memcached_st *memc) */ test_zero(instance->server_failure_counter); - /* restore the instance */ - memc->number_of_hosts= number_of_hosts; + memcached_free(memc); return TEST_SUCCESS; } @@ -4649,20 +4634,15 @@ test_return_t regression_bug_490486(memcached_st *original_memc) memcached_st *memc= create_single_instance_memcached(original_memc, "--BINARY-PROTOCOL --POLL-TIMEOUT=1000 --REMOVE-FAILED-SERVERS=1 --RETRY-TIMEOUT=3600"); test_true(memc); - size_t max_keys= 20480; - - char **keys= (char **)calloc(max_keys, sizeof(char*)); - size_t *key_length= (size_t *)calloc(max_keys, sizeof(size_t)); + keys_st keys(20480); /* First add all of the items.. */ char blob[1024]= { 0 }; - for (size_t x= 0; x < max_keys; ++x) + for (size_t x= 0; x < keys.size(); ++x) { - char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%lu", (unsigned long)x); - keys[x]= strdup(k); - test_true(keys[x]); - memcached_return rc= memcached_set(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); + memcached_return rc= memcached_set(memc, + keys.key_at(x), keys.length_at(x), + blob, sizeof(blob), 0, 0); test_true(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED); // MEMCACHED_TIMEOUT <-- hash been observed on OSX } @@ -4671,8 +4651,9 @@ test_return_t regression_bug_490486(memcached_st *original_memc) /* Try to get all of them with a large multiget */ size_t counter= 0; memcached_execute_function callbacks[]= { &callback_counter }; - memcached_return_t rc= memcached_mget_execute(memc, (const char**)keys, key_length, - (size_t)max_keys, callbacks, &counter, 1); + memcached_return_t rc= memcached_mget_execute(memc, + keys.keys_ptr(), keys.lengths_ptr(), keys.size(), + callbacks, &counter, 1); test_compare(MEMCACHED_SUCCESS, rc); char* the_value= NULL; @@ -4696,17 +4677,9 @@ test_return_t regression_bug_490486(memcached_st *original_memc) test_compare(MEMCACHED_END, rc); /* Verify that we got all of the items */ - test_compare(counter, max_keys); + test_compare(counter, keys.size()); } - /* Release all allocated resources */ - for (size_t x= 0; x < max_keys; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); - memcached_free(memc); return TEST_SUCCESS; @@ -4827,16 +4800,16 @@ test_return_t regression_bug_655423(memcached_st *memc) * Test that ensures that buffered set to not trigger problems during io_flush */ #define regression_bug_490520_COUNT 200480 -test_return_t regression_bug_490520(memcached_st *memc) +test_return_t regression_bug_490520(memcached_st *original_memc) { + memcached_st* memc= create_single_instance_memcached(original_memc, NULL); + memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK,1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, 1000); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT,1); memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RETRY_TIMEOUT, 3600); - memc->number_of_hosts= 1; - /* First add all of the items.. */ char blob[3333] = {0}; for (uint32_t x= 0; x < regression_bug_490520_COUNT; ++x) @@ -4848,6 +4821,8 @@ test_return_t regression_bug_490520(memcached_st *memc) test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); } + memcached_free(memc); + return TEST_SUCCESS; } @@ -4979,3 +4954,33 @@ test_return_t regression_bug_(memcached_st *memc) return TEST_SUCCESS; } + +test_return_t kill_HUP_TEST(memcached_st *original_memc) +{ + memcached_st *memc= create_single_instance_memcached(original_memc, 0); + test_true(memc); + + memcached_server_instance_st instance= memcached_server_instance_by_position(memc, 0); + + pid_t pid; + test_true((pid= libmemcached_util_getpid(memcached_server_name(instance), + memcached_server_port(instance), NULL)) > -1); + + + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param(__func__), // Keys + test_literal_param(__func__), // Values + 0, 0)); + test_true_got(kill(pid, SIGHUP) == 0, strerror(errno)); + + test_compare(MEMCACHED_SUCCESS, + memcached_set(memc, + test_literal_param(__func__), // Keys + test_literal_param(__func__), // Values + 0, 0)); + + memcached_free(memc); + + return TEST_SUCCESS; +}