X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Fmem_functions.cc;h=aae725bf11390653a571aea7d42bc19d394799b5;hb=75d320430633c5458c2430d36665369e2389482a;hp=07cec98f9fd96b8f0acfd13c1ef24c0f89dc7b4c;hpb=487f4d6fb9d8a0bcc9be11ded428cbd870c131e8;p=awesomized%2Flibmemcached diff --git a/tests/libmemcached-1.0/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index 07cec98f..aae725bf 100644 --- a/tests/libmemcached-1.0/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -4216,9 +4216,6 @@ test_return_t regression_bug_442914(memcached_st *memc) test_return_t regression_bug_447342(memcached_st *memc) { - memcached_server_instance_st instance_one; - memcached_server_instance_st instance_two; - if (memcached_server_count(memc) < 3 or pre_replication(memc) != TEST_SUCCESS) { return TEST_SKIPPED; @@ -4227,19 +4224,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 +4254,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 +4263,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 +4272,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 +4281,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 +4296,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 +4311,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; @@ -4649,20 +4637,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 +4654,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 +4680,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; @@ -4771,22 +4747,24 @@ test_return_t regression_bug_655423(memcached_st *memc) memset(payload, int('x'), sizeof(payload)); - for (uint32_t x= 0; x < regression_bug_655423_COUNT; x++) - { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - snprintf(key, sizeof(key), "%u", x); + keys_st keys(regression_bug_655423_COUNT); - test_compare(MEMCACHED_SUCCESS, memcached_set(clone, key, strlen(key), payload, sizeof(payload), 0, 0)); + for (size_t x= 0; x < keys.size(); x++) + { + test_compare(MEMCACHED_SUCCESS, memcached_set(clone, + keys.key_at(x), + keys.length_at(x), + payload, sizeof(payload), 0, 0)); } - for (uint32_t x= 0; x < regression_bug_655423_COUNT; x++) + for (size_t x= 0; x < keys.size(); x++) { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - snprintf(key, sizeof(key), "%u", x); - size_t value_length; memcached_return_t rc; - char *value= memcached_get(clone, key, strlen(key), &value_length, NULL, &rc); + char *value= memcached_get(clone, + keys.key_at(x), + keys.length_at(x), + &value_length, NULL, &rc); if (rc == MEMCACHED_NOTFOUND) { @@ -4801,21 +4779,10 @@ test_return_t regression_bug_655423(memcached_st *memc) free(value); } - char **keys= (char**)calloc(regression_bug_655423_COUNT, sizeof(char*)); - size_t *key_length= (size_t *)calloc(regression_bug_655423_COUNT, sizeof(size_t)); - for (uint32_t x= 0; x < regression_bug_655423_COUNT; x++) - { - char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1]; - snprintf(key, sizeof(key), "%u", x); - - keys[x]= strdup(key); - test_true(keys[x]); - key_length[x]= strlen(key); - test_true(key_length[x]); - } - test_compare(MEMCACHED_SUCCESS, - memcached_mget(clone, (const char* const *)keys, key_length, regression_bug_655423_COUNT)); + memcached_mget(clone, + keys.keys_ptr(), keys.lengths_ptr(), + keys.size())); uint32_t count= 0; memcached_result_st *result= NULL; @@ -4827,15 +4794,6 @@ test_return_t regression_bug_655423(memcached_st *memc) test_true(count > 100); // If we don't get back atleast this, something is up - /* Release all allocated resources */ - for (size_t x= 0; x < regression_bug_655423_COUNT; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); - - memcached_free(clone); return TEST_SUCCESS; @@ -4855,29 +4813,17 @@ test_return_t regression_bug_490520(memcached_st *memc) memc->number_of_hosts= 1; - char **keys= (char **)calloc(regression_bug_490520_COUNT, sizeof(char*)); - size_t *key_length= (size_t *)calloc(regression_bug_490520_COUNT, sizeof(size_t)); - /* First add all of the items.. */ char blob[3333] = {0}; for (uint32_t x= 0; x < regression_bug_490520_COUNT; ++x) { - char k[251]; - key_length[x]= (size_t)snprintf(k, sizeof(k), "0200%u", x); - keys[x]= strdup(k); - test_true(keys[x]); + char key[251]; + int key_length= snprintf(key, sizeof(key), "0200%u", x); - memcached_return rc= memcached_set(memc, keys[x], key_length[x], blob, sizeof(blob), 0, 0); + memcached_return rc= memcached_set(memc, key, key_length, blob, sizeof(blob), 0, 0); test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc)); } - for (uint32_t x= 0; x < regression_bug_490520_COUNT; ++x) - { - free(keys[x]); - } - free(keys); - free(key_length); - return TEST_SUCCESS; }