#include <libhashkit-1.0/hashkit.h>
-#include <cassert>
#include <cerrno>
#include <memory>
#include <pthread.h>
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.
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;
}
/* Do Nothing */
size_t bigger= *((size_t *)(context));
(void)ptr;
- assert(bigger <= memcached_server_port(server));
+ fatal_assert(bigger <= memcached_server_port(server));
*((size_t *)(context))= memcached_server_port(server);
return MEMCACHED_SUCCESS;
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);
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,
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);
}
/* sighandler_t function that always asserts false */
static void fail(int)
{
- assert(0);
+ fatal_assert(0);
}
* 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);
+ test_skip(original_memc->servers[0].type, MEMCACHED_CONNECTION_TCP);
- 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
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;
}
* 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
*/
test_zero(instance->server_failure_counter);
- /* restore the instance */
- memc->number_of_hosts= number_of_hosts;
+ memcached_free(memc);
return TEST_SUCCESS;
}
* 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)
test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_BUFFERED, memcached_last_error_message(memc));
}
+ memcached_free(memc);
+
return TEST_SUCCESS;
}
test_literal_param(__func__), // Values
0, 0));
+ memcached_free(memc);
+
return TEST_SUCCESS;
}
projects / m6w6 / libmemcached / blobdiff