static test_return_t server_list_null_test(memcached_st *ptr __attribute__((unused)))
{
memcached_server_st *server_list;
- memcached_return rc;
+ memcached_return_t rc;
server_list= memcached_server_list_append_with_weight(NULL, NULL, 0, 0, NULL);
test_truth(server_list == NULL);
#define TEST_PORT_COUNT 7
uint32_t test_ports[TEST_PORT_COUNT];
-static memcached_return server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
+static memcached_return_t server_display_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
{
/* Do Nothing */
uint32_t bigger= *((uint32_t *)(context));
{
uint32_t x;
uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */
- memcached_return rc;
- memcached_server_function callbacks[1];
+ memcached_return_t rc;
+ memcached_server_fn callbacks[1];
memcached_st *local_memc;
local_memc= memcached_create(NULL);
static test_return_t server_sort2_test(memcached_st *ptr __attribute__((unused)))
{
uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */
- memcached_return rc;
- memcached_server_function callbacks[1];
+ memcached_return_t rc;
+ memcached_server_fn callbacks[1];
memcached_st *local_memc;
local_memc= memcached_create(NULL);
return TEST_SUCCESS;
}
-static memcached_return server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
+static memcached_return_t server_display_unsort_function(memcached_st *ptr __attribute__((unused)), memcached_server_st *server, void *context)
{
/* Do Nothing */
uint32_t x= *((uint32_t *)(context));
uint32_t x;
uint32_t counter= 0; /* Prime the value for the test_truth in server_display_function */
uint32_t bigger= 0; /* Prime the value for the test_truth in server_display_function */
- memcached_return rc;
- memcached_server_function callbacks[1];
+ memcached_return_t rc;
+ memcached_server_fn callbacks[1];
memcached_st *local_memc;
local_memc= memcached_create(NULL);
test_truth(memc_clone->connect_timeout == memc->connect_timeout);
test_truth(memc_clone->delete_trigger == memc->delete_trigger);
test_truth(memc_clone->distribution == memc->distribution);
- test_truth(memc_clone->flags == memc->flags);
+ { // Test all of the flags
+ test_truth(memc_clone->flags.no_block == memc->flags.no_block);
+ test_truth(memc_clone->flags.tcp_nodelay == memc->flags.tcp_nodelay);
+ test_truth(memc_clone->flags.reuse_memory == memc->flags.reuse_memory);
+ test_truth(memc_clone->flags.use_md5 == memc->flags.use_md5);
+ test_truth(memc_clone->flags.use_crc == memc->flags.use_crc);
+ test_truth(memc_clone->flags.use_cache_lookups == memc->flags.use_cache_lookups);
+ test_truth(memc_clone->flags.support_cas == memc->flags.support_cas);
+ test_truth(memc_clone->flags.buffer_requests == memc->flags.buffer_requests);
+ test_truth(memc_clone->flags.use_sort_hosts == memc->flags.use_sort_hosts);
+ test_truth(memc_clone->flags.verify_key == memc->flags.verify_key);
+ test_truth(memc_clone->flags.ketama_weighted == memc->flags.ketama_weighted);
+ test_truth(memc_clone->flags.binary_protocol == memc->flags.binary_protocol);
+ test_truth(memc_clone->flags.hash_with_prefix_key == memc->flags.hash_with_prefix_key);
+ test_truth(memc_clone->flags.no_reply == memc->flags.no_reply);
+ test_truth(memc_clone->flags.use_udp == memc->flags.use_udp);
+ test_truth(memc_clone->flags.auto_eject_hosts == memc->flags.auto_eject_hosts);
+ test_truth(memc_clone->flags.randomize_replica_read == memc->flags.randomize_replica_read);
+ }
test_truth(memc_clone->get_key_failure == memc->get_key_failure);
test_truth(memc_clone->hash == memc->hash);
test_truth(memc_clone->hash_continuum == memc->hash_continuum);
static test_return_t connection_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_server_add_with_weight(memc, "localhost", 0, 0);
test_truth(rc == MEMCACHED_SUCCESS);
static test_return_t error_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint32_t values[] = { 851992627U, 2337886783U, 3196981036U, 4001849190U,
982370485U, 1263635348U, 4242906218U, 3829656100U,
1891735253U, 334139633U, 2257084983U, 3088286104U,
static test_return_t set_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "when we sanitize";
static test_return_t append_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "fig";
const char *in_value= "we";
char *out_value= NULL;
static test_return_t append_binary_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "numbers";
unsigned int *store_ptr;
unsigned int store_list[] = { 23, 56, 499, 98, 32847, 0 };
static test_return_t cas2_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
const char *value= "we the people";
static test_return_t cas_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "fun";
size_t key_length= strlen(key);
const char *value= "we the people";
static test_return_t prepend_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "fig";
const char *value= "people";
char *out_value= NULL;
*/
static test_return_t add_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "when we sanitize";
unsigned long long setting_value;
static test_return_t replace_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "when we sanitize";
const char *original= "first we insert some data";
static test_return_t delete_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "when we sanitize";
static test_return_t flush_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_flush(memc, 0);
test_truth(rc == MEMCACHED_SUCCESS);
return TEST_SUCCESS;
}
-static memcached_return server_function(memcached_st *ptr __attribute__((unused)),
+static memcached_return_t server_function(memcached_st *ptr __attribute__((unused)),
memcached_server_st *server __attribute__((unused)),
void *context __attribute__((unused)))
{
{
char context[8];
strcpy(context, "foo bad");
- memcached_server_function callbacks[1];
+ memcached_server_fn callbacks[1];
callbacks[0]= server_function;
memcached_server_cursor(memc, callbacks, context, 1);
static test_return_t bad_key_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo bad";
char *string;
size_t string_length;
}
#define READ_THROUGH_VALUE "set for me"
-static memcached_return read_through_trigger(memcached_st *memc __attribute__((unused)),
+static memcached_return_t read_through_trigger(memcached_st *memc __attribute__((unused)),
char *key __attribute__((unused)),
size_t key_length __attribute__((unused)),
memcached_result_st *result)
static test_return_t read_through(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
char *string;
size_t string_length;
uint32_t flags;
- memcached_trigger_key cb= (memcached_trigger_key)read_through_trigger;
+ memcached_trigger_key_fn cb= (memcached_trigger_key_fn)read_through_trigger;
string= memcached_get(memc, key, strlen(key),
&string_length, &flags, &rc);
return TEST_SUCCESS;
}
-static memcached_return delete_trigger(memcached_st *ptr __attribute__((unused)),
+static memcached_return_t delete_trigger(memcached_st *ptr __attribute__((unused)),
const char *key,
size_t key_length __attribute__((unused)))
{
static test_return_t delete_through(memcached_st *memc)
{
- memcached_trigger_delete_key callback;
- memcached_return rc;
+ memcached_trigger_delete_key_fn callback;
+ memcached_return_t rc;
- callback= (memcached_trigger_delete_key)delete_trigger;
+ callback= (memcached_trigger_delete_key_fn)delete_trigger;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_DELETE_TRIGGER, *(void**)&callback);
test_truth(rc == MEMCACHED_SUCCESS);
static test_return_t get_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
char *string;
size_t string_length;
static test_return_t get_test2(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "when we sanitize";
char *string;
static test_return_t set_test2(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "train in the brain";
size_t value_length= strlen(value);
static test_return_t set_test3(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
char *value;
size_t value_length= 8191;
unsigned int x;
static test_return_t get_test3(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
char *value;
size_t value_length= 8191;
static test_return_t get_test4(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
char *value;
size_t value_length= 8191;
uint32_t flags;
size_t rlen;
- memcached_return rc= memcached_set(memc, keys[0], lengths[0],
+ memcached_return_t rc= memcached_set(memc, keys[0], lengths[0],
keys[0], lengths[0], 0, 0);
test_truth(rc == MEMCACHED_SUCCESS);
rc= memcached_mget(memc, keys, lengths, 2);
size_t lengths[]= { 3, 4 };
const char *values[]= { "fjord", "41" };
- memcached_return rc;
+ memcached_return_t rc;
// Set foo and foo2
for (int i= 0; i < 2; i++)
/* 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 rc;
+ memcached_return_t rc;
memcached_stat_st memc_stat;
rc= memcached_stat_servername(&memc_stat, NULL,
memc->hosts[0].hostname,
static test_return_t increment_test(memcached_st *memc)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "number";
const char *value= "0";
if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "number";
uint64_t initial= 0;
static test_return_t decrement_test(memcached_st *memc)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "number";
const char *value= "3";
if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "number";
uint64_t initial= 3;
static test_return_t increment_by_key_test(memcached_st *memc)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *master_key= "foo";
const char *key= "number";
const char *value= "0";
if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *master_key= "foo";
const char *key= "number";
uint64_t initial= 0;
static test_return_t decrement_by_key_test(memcached_st *memc)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *master_key= "foo";
const char *key= "number";
const char *value= "3";
if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) != 0)
{
uint64_t new_number;
- memcached_return rc;
+ memcached_return_t rc;
const char *master_key= "foo";
const char *key= "number";
uint64_t initial= 3;
static test_return_t quit_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "fudge";
const char *value= "sanford and sun";
static test_return_t mget_result_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
static test_return_t mget_result_alloc_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
}
/* Count the results */
-static memcached_return callback_counter(memcached_st *ptr __attribute__((unused)),
+static memcached_return_t callback_counter(memcached_st *ptr __attribute__((unused)),
memcached_result_st *result __attribute__((unused)),
void *context)
{
static test_return_t mget_result_function(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
unsigned int counter;
- memcached_execute_function callbacks[1];
+ memcached_execute_fn callbacks[1];
/* We need to empty the server before continueing test */
rc= memcached_flush(memc, 0);
static test_return_t mget_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
/* First add all of the items.. */
char blob[1024] = {0};
- memcached_return rc;
+ memcached_return_t rc;
for (int x= 0; x < max_keys; ++x)
{
char k[251];
/* Try to get all of them with a large multiget */
unsigned int counter= 0;
- memcached_execute_function callbacks[1]= { [0]= &callback_counter };
+ memcached_execute_fn callbacks[1]= { [0]= &callback_counter };
rc= memcached_mget_execute(memc, (const char**)keys, key_length,
(size_t)max_keys, callbacks, &counter, 1);
char **list;
char **ptr;
memcached_stat_st memc_stat;
- memcached_return rc;
+ memcached_return_t rc;
list= memcached_stat_get_keys(memc, &memc_stat, &rc);
test_truth(rc == MEMCACHED_SUCCESS);
unsigned int x;
char **list;
char **ptr;
- memcached_return rc;
+ memcached_return_t rc;
memcached_stat_st *memc_stat;
memc_stat= memcached_stat(memc, NULL, &rc);
{
unsigned int x;
memcached_server_st *servers;
- memcached_return rc;
+ memcached_return_t rc;
char servername[]= "0.example.com";
servers= memcached_server_list_append_with_weight(NULL, servername, 400, 0, &rc);
return TEST_SUCCESS;
}
-static memcached_return clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused)))
+static memcached_return_t clone_test_callback(memcached_st *parent __attribute__((unused)), memcached_st *memc_clone __attribute__((unused)))
{
return MEMCACHED_SUCCESS;
}
-static memcached_return cleanup_test_callback(memcached_st *ptr __attribute__((unused)))
+static memcached_return_t cleanup_test_callback(memcached_st *ptr __attribute__((unused)))
{
return MEMCACHED_SUCCESS;
}
{
int x= 5;
int *test_ptr;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_USER_DATA, &x);
test_truth(rc == MEMCACHED_SUCCESS);
/* Test Clone Callback */
{
- memcached_clone_func clone_cb= (memcached_clone_func)clone_test_callback;
+ memcached_clone_fn clone_cb= (memcached_clone_fn)clone_test_callback;
void *clone_cb_ptr= *(void **)&clone_cb;
void *temp_function= NULL;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION,
clone_cb_ptr);
/* Test Cleanup Callback */
{
- memcached_cleanup_func cleanup_cb=
- (memcached_cleanup_func)cleanup_test_callback;
+ memcached_cleanup_fn cleanup_cb=
+ (memcached_cleanup_fn)cleanup_test_callback;
void *cleanup_cb_ptr= *(void **)&cleanup_cb;
void *temp_function= NULL;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_CLONE_FUNCTION,
cleanup_cb_ptr);
static test_return_t fetch_all_results(memcached_st *memc)
{
- memcached_return rc= MEMCACHED_SUCCESS;
+ memcached_return_t rc= MEMCACHED_SUCCESS;
char return_key[MEMCACHED_MAX_KEY];
size_t return_key_length;
char *return_value;
uint32_t size= 0;
char key[10];
char randomstuff[6 * 1024];
- memcached_return rc;
+ memcached_return_t rc;
memset(randomstuff, 0, 6 * 1024);
for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++)
{
- memcached_return rc= MEMCACHED_SUCCESS;
+ memcached_return_t rc= MEMCACHED_SUCCESS;
char buffer[SMALL_STRING_LEN];
uint32_t flags= 0;
size_t val_len= 0;
#define KEY_COUNT 3000 // * 1024576
static test_return_t user_supplied_bug3(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
unsigned int setter;
unsigned int x;
char **keys;
/* Make sure we behave properly if server list has no values */
static test_return_t user_supplied_bug4(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"fudge", "son", "food"};
size_t key_length[]= {5, 3, 4};
unsigned int x;
#define VALUE_SIZE_BUG5 1048064
static test_return_t user_supplied_bug5(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")};
char return_key[MEMCACHED_MAX_KEY];
static test_return_t user_supplied_bug6(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"036790384900", "036790384902", "036790384904", "036790384906"};
size_t key_length[]= {strlen("036790384900"), strlen("036790384902"), strlen("036790384904"), strlen("036790384906")};
char return_key[MEMCACHED_MAX_KEY];
static test_return_t user_supplied_bug8(memcached_st *memc __attribute__((unused)))
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *mine;
memcached_st *memc_clone;
/* Test flag store/retrieve */
static test_return_t user_supplied_bug7(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys= "036790384900";
size_t key_length= strlen(keys);
char return_key[MEMCACHED_MAX_KEY];
static test_return_t user_supplied_bug9(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *keys[]= {"UDATA:edevil@sapo.pt", "fudge&*@#", "for^#@&$not"};
size_t key_length[3];
unsigned int x;
size_t value_length= 512;
unsigned int x;
size_t key_len= 3;
- memcached_return rc;
+ memcached_return_t rc;
unsigned int set= 1;
memcached_st *mclone= memcached_clone(NULL, memc);
int32_t timeout;
size_t value_length= 512;
unsigned int x;
size_t key_len= 3;
- memcached_return rc;
+ memcached_return_t rc;
unsigned int set= 1;
int32_t timeout;
memcached_st *mclone= memcached_clone(NULL, memc);
*/
static test_return_t user_supplied_bug12(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint32_t flags;
size_t value_length;
char *value;
{
char key[] = "key34567890";
char *overflow;
- memcached_return rc;
+ memcached_return_t rc;
size_t overflowSize;
char commandFirst[]= "set key34567890 0 0 ";
{
size_t setter= 1;
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, setter);
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
char *value;
size_t value_length= 18000;
static test_return_t user_supplied_bug15(memcached_st *memc)
{
uint32_t x;
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "mykey";
char *value;
size_t length;
/* Check the return sizes on FLAGS to make sure it stores 32bit unsigned values correctly */
static test_return_t user_supplied_bug16(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "mykey";
char *value;
size_t length;
/* Check the validity of chinese key*/
static test_return_t user_supplied_bug17(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "豆瓣";
const char *value="我们在炎热抑郁的夏天无法停止豆瓣";
char *value2;
{
memcached_st *m;
memcached_server_st *s;
- memcached_return res;
+ memcached_return_t res;
(void)memc;
/* CAS test from Andei */
static test_return_t user_supplied_bug20(memcached_st *memc)
{
- memcached_return status;
+ memcached_return_t status;
memcached_result_st *result, result_obj;
const char *key = "abc";
size_t key_len = strlen("abc");
#include "ketama_test_cases.h"
static test_return_t user_supplied_bug18(memcached_st *trash)
{
- memcached_return rc;
+ memcached_return_t rc;
uint64_t value;
int x;
memcached_server_st *server_pool;
static test_return_t _user_supplied_bug21(memcached_st* memc, size_t key_count)
{
- memcached_return rc;
+ memcached_return_t rc;
unsigned int x;
char **keys;
size_t* key_lengths;
return TEST_SUCCESS;
}
-static memcached_return pre_binary(memcached_st *memc);
+static memcached_return_t pre_binary(memcached_st *memc);
static test_return_t user_supplied_bug21(memcached_st *memc)
{
{
(void) trash;
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *memc= memcached_create(NULL);
test_truth(memc);
/* and re-added when it's back. */
memc->hosts[2].next_retry = time(NULL) - 1;
memc->next_distribution_rebuild= time(NULL) - 1;
- run_distribution(memc);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION,
+ memc->distribution);
for (int x= 0; x < 99; x++)
{
uint32_t server_idx = memcached_generate_hash(memc, ketama_test_cases[x].key, strlen(ketama_test_cases[x].key));
{
(void) trash;
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *memc= memcached_create(NULL);
test_truth(memc);
memcached_result_st *result_ptr;
result_ptr= memcached_result_create(memc, &result);
- test_truth(result.is_allocated == false);
+ test_truth(result.options.is_allocated == false);
+ test_truth(memcached_is_initialized(&result) == true);
test_truth(result_ptr);
+ test_truth(result_ptr == &result);
+
memcached_result_free(&result);
+ test_truth(result.options.is_allocated == false);
+ test_truth(memcached_is_initialized(&result) == false);
+
return TEST_SUCCESS;
}
static test_return_t result_alloc(memcached_st *memc)
{
- memcached_result_st *result;
+ memcached_result_st *result_ptr;
- result= memcached_result_create(memc, NULL);
- test_truth(result);
- memcached_result_free(result);
+ result_ptr= memcached_result_create(memc, NULL);
+ test_truth(result_ptr);
+ test_truth(result_ptr->options.is_allocated == true);
+ test_truth(memcached_is_initialized(result_ptr) == true);
+ memcached_result_free(result_ptr);
return TEST_SUCCESS;
}
memcached_string_st *string_ptr;
string_ptr= memcached_string_create(memc, &string, 0);
- test_truth(string.is_allocated == false);
+ test_truth(string.options.is_initialized == true);
test_truth(string_ptr);
+
+ /* The following two better be the same! */
+ test_truth(memcached_is_allocated(string_ptr) == false);
+ test_truth(memcached_is_allocated(&string) == false);
+ test_truth(&string == string_ptr);
+
+ test_truth(string.options.is_initialized == true);
+ test_truth(memcached_is_initialized(&string) == true);
memcached_string_free(&string);
+ test_truth(memcached_is_initialized(&string) == false);
return TEST_SUCCESS;
}
string= memcached_string_create(memc, NULL, 0);
test_truth(string);
+ test_truth(memcached_is_allocated(string) == true);
+ test_truth(memcached_is_initialized(string) == true);
memcached_string_free(string);
return TEST_SUCCESS;
string= memcached_string_create(memc, NULL, 1024);
test_truth(string);
+ test_truth(memcached_is_allocated(string) == true);
+ test_truth(memcached_is_initialized(string) == true);
memcached_string_free(string);
return TEST_SUCCESS;
string= memcached_string_create(memc, NULL, 100);
test_truth(string);
+ test_truth(memcached_is_allocated(string) == true);
+ test_truth(memcached_is_initialized(string) == true);
for (x= 0; x < 1024; x++)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_string_append(string, buffer, SMALL_STRING_LEN);
test_truth(rc == MEMCACHED_SUCCESS);
}
+ test_truth(memcached_is_allocated(string) == true);
memcached_string_free(string);
return TEST_SUCCESS;
static test_return_t string_alloc_append_toobig(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
unsigned int x;
char buffer[SMALL_STRING_LEN];
memcached_string_st *string;
string= memcached_string_create(memc, NULL, 100);
test_truth(string);
+ test_truth(memcached_is_allocated(string) == true);
+ test_truth(memcached_is_initialized(string) == true);
for (x= 0; x < 1024; x++)
{
}
rc= memcached_string_append(string, buffer, SIZE_MAX);
test_truth(rc == MEMCACHED_MEMORY_ALLOCATION_FAILURE);
+ test_truth(memcached_is_allocated(string) == true);
memcached_string_free(string);
return TEST_SUCCESS;
static test_return_t generate_data_with_stats(memcached_st *memc)
{
memcached_stat_st *stat_p;
- memcached_return rc;
+ memcached_return_t rc;
uint32_t host_index= 0;
execute_set(memc, global_pairs, global_count);
static test_return_t get_read_count(memcached_st *memc)
{
unsigned int x;
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *memc_clone;
memc_clone= memcached_clone(NULL, memc);
static test_return_t get_read(memcached_st *memc)
{
unsigned int x;
- memcached_return rc;
+ memcached_return_t rc;
{
char *return_value;
static test_return_t mget_read(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_mget(memc, global_keys, global_keys_length, global_count);
test_truth(rc == MEMCACHED_SUCCESS);
static test_return_t mget_read_result(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_mget(memc, global_keys, global_keys_length, global_count);
test_truth(rc == MEMCACHED_SUCCESS);
static test_return_t mget_read_function(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
unsigned int counter;
- memcached_execute_function callbacks[1];
+ memcached_execute_fn callbacks[1];
rc= memcached_mget(memc, global_keys, global_keys_length, global_count);
test_truth(rc == MEMCACHED_SUCCESS);
static test_return_t add_host_test1(memcached_st *memc)
{
unsigned int x;
- memcached_return rc;
+ memcached_return_t rc;
char servername[]= "0.example.com";
memcached_server_st *servers;
return TEST_SUCCESS;
}
-static memcached_return pre_nonblock(memcached_st *memc)
+static memcached_return_t pre_nonblock(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_nonblock_binary(memcached_st *memc)
+static memcached_return_t pre_nonblock_binary(memcached_st *memc)
{
- memcached_return rc= MEMCACHED_FAILURE;
+ memcached_return_t rc= MEMCACHED_FAILURE;
memcached_st *memc_clone;
memc_clone= memcached_clone(NULL, memc);
return rc;
}
-static memcached_return pre_murmur(memcached_st *memc)
+static memcached_return_t pre_murmur(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_jenkins(memcached_st *memc)
+static memcached_return_t pre_jenkins(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_JENKINS);
}
-static memcached_return pre_md5(memcached_st *memc)
+static memcached_return_t pre_md5(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MD5);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_crc(memcached_st *memc)
+static memcached_return_t pre_crc(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_CRC);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_hsieh(memcached_st *memc)
+static memcached_return_t pre_hsieh(memcached_st *memc)
{
#ifdef HAVE_HSIEH_HASH
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_HSIEH);
#endif
}
-static memcached_return pre_hash_fnv1_64(memcached_st *memc)
+static memcached_return_t pre_hash_fnv1_64(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_64);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_hash_fnv1a_64(memcached_st *memc)
+static memcached_return_t pre_hash_fnv1a_64(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_64);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_hash_fnv1_32(memcached_st *memc)
+static memcached_return_t pre_hash_fnv1_32(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1_32);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_hash_fnv1a_32(memcached_st *memc)
+static memcached_return_t pre_hash_fnv1a_32(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_FNV1A_32);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_behavior_ketama(memcached_st *memc)
+static memcached_return_t pre_behavior_ketama(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint64_t value;
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA, 1);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_behavior_ketama_weighted(memcached_st *memc)
+static memcached_return_t pre_behavior_ketama_weighted(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint64_t value;
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_binary(memcached_st *memc)
+static memcached_return_t pre_binary(memcached_st *memc)
{
- memcached_return rc= MEMCACHED_FAILURE;
+ memcached_return_t rc= MEMCACHED_FAILURE;
memcached_st *memc_clone;
memc_clone= memcached_clone(NULL, memc);
return rc;
}
-static memcached_return pre_replication(memcached_st *memc)
+static memcached_return_t pre_replication(memcached_st *memc)
{
if (pre_binary(memc) != MEMCACHED_SUCCESS)
return MEMCACHED_FAILURE;
* Make sure that we store the item on all servers
* (master + replicas == number of servers)
*/
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS,
memc->number_of_hosts - 1);
assert(rc == MEMCACHED_SUCCESS);
return rc;
}
-static memcached_return pre_replication_noblock(memcached_st *memc)
+static memcached_return_t pre_replication_noblock(memcached_st *memc)
{
- memcached_return rc= MEMCACHED_FAILURE;
+ memcached_return_t rc= MEMCACHED_FAILURE;
if (pre_replication(memc) == MEMCACHED_SUCCESS &&
pre_nonblock(memc) == MEMCACHED_SUCCESS)
rc= MEMCACHED_SUCCESS;
return calloc(nelem, size);
}
-static memcached_return set_prefix(memcached_st *memc)
+static memcached_return_t set_prefix(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "mine";
char *value;
}
#ifdef MEMCACHED_ENABLE_DEPRECATED
-static memcached_return deprecated_set_memory_alloc(memcached_st *memc)
+static memcached_return_t deprecated_set_memory_alloc(memcached_st *memc)
{
void *test_ptr= NULL;
void *cb_ptr= NULL;
{
- memcached_malloc_function malloc_cb=
- (memcached_malloc_function)my_malloc;
+ memcached_malloc_fn malloc_cb=
+ (memcached_malloc_fn)my_malloc;
cb_ptr= *(void **)&malloc_cb;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_MALLOC_FUNCTION, cb_ptr);
assert(rc == MEMCACHED_SUCCESS);
}
{
- memcached_realloc_function realloc_cb=
- (memcached_realloc_function)my_realloc;
+ memcached_realloc_fn realloc_cb=
+ (memcached_realloc_fn)my_realloc;
cb_ptr= *(void **)&realloc_cb;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_REALLOC_FUNCTION, cb_ptr);
assert(rc == MEMCACHED_SUCCESS);
}
{
- memcached_free_function free_cb=
- (memcached_free_function)my_free;
+ memcached_free_fn free_cb=
+ (memcached_free_fn)my_free;
cb_ptr= *(void **)&free_cb;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_callback_set(memc, MEMCACHED_CALLBACK_FREE_FUNCTION, cb_ptr);
assert(rc == MEMCACHED_SUCCESS);
}
#endif
-static memcached_return set_memory_alloc(memcached_st *memc)
+static memcached_return_t set_memory_alloc(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_set_memory_allocators(memc, NULL, my_free,
my_realloc, my_calloc);
assert(rc == MEMCACHED_FAILURE);
rc= memcached_set_memory_allocators(memc, my_malloc, my_free,
my_realloc, my_calloc);
- memcached_malloc_function mem_malloc;
- memcached_free_function mem_free;
- memcached_realloc_function mem_realloc;
- memcached_calloc_function mem_calloc;
+ memcached_malloc_fn mem_malloc;
+ memcached_free_fn mem_free;
+ memcached_realloc_fn mem_realloc;
+ memcached_calloc_fn mem_calloc;
memcached_get_memory_allocators(memc, &mem_malloc, &mem_free,
&mem_realloc, &mem_calloc);
return MEMCACHED_SUCCESS;
}
-static memcached_return enable_consistent(memcached_st *memc)
+static memcached_return_t enable_consistent(memcached_st *memc)
{
- memcached_server_distribution value= MEMCACHED_DISTRIBUTION_CONSISTENT;
- memcached_hash hash;
+ memcached_server_distribution_t value= MEMCACHED_DISTRIBUTION_CONSISTENT;
+ memcached_hash_t hash;
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, value);
if (pre_hsieh(memc) != MEMCACHED_SUCCESS)
return MEMCACHED_FAILURE;
- value= (memcached_server_distribution)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);
+ value= (memcached_server_distribution_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION);
assert(value == MEMCACHED_DISTRIBUTION_CONSISTENT);
- hash= (memcached_hash)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
+ hash= (memcached_hash_t)memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_HASH);
assert(hash == MEMCACHED_HASH_HSIEH);
return MEMCACHED_SUCCESS;
}
-static memcached_return enable_cas(memcached_st *memc)
+static memcached_return_t enable_cas(memcached_st *memc)
{
unsigned int set= 1;
return MEMCACHED_FAILURE;
}
-static memcached_return check_for_1_2_3(memcached_st *memc)
+static memcached_return_t check_for_1_2_3(memcached_st *memc)
{
memcached_version(memc);
return MEMCACHED_FAILURE;
}
-static memcached_return pre_unix_socket(memcached_st *memc)
+static memcached_return_t pre_unix_socket(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
struct stat buf;
memcached_server_list_free(memc->hosts);
return rc;
}
-static memcached_return pre_nodelay(memcached_st *memc)
+static memcached_return_t pre_nodelay(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 0);
return MEMCACHED_SUCCESS;
}
-static memcached_return pre_settimer(memcached_st *memc)
+static memcached_return_t pre_settimer(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SND_TIMEOUT, 1000);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_RCV_TIMEOUT, 1000);
return MEMCACHED_SUCCESS;
}
-static memcached_return poll_timeout(memcached_st *memc)
+static memcached_return_t poll_timeout(memcached_st *memc)
{
size_t timeout;
static test_return_t noreply_test(memcached_st *memc)
{
- memcached_return ret;
+ memcached_return_t ret;
ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1);
test_truth(ret == MEMCACHED_SUCCESS);
ret= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1);
static test_return_t analyzer_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_stat_st *memc_stat;
memcached_analysis_st *report;
}
/* Count the objects */
-static memcached_return callback_dump_counter(memcached_st *ptr __attribute__((unused)),
+static memcached_return_t callback_dump_counter(memcached_st *ptr __attribute__((unused)),
const char *key __attribute__((unused)),
size_t key_length __attribute__((unused)),
void *context)
static test_return_t dump_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint32_t counter= 0;
- memcached_dump_func callbacks[1];
+ memcached_dump_fn callbacks[1];
test_return_t main_rc;
callbacks[0]= &callback_dump_counter;
/* No support for Binary protocol yet */
- if (memc->flags & MEM_BINARY_PROTOCOL)
+ if (memc->flags.binary_protocol)
return TEST_SUCCESS;
main_rc= set_test3(memc);
memcached_pool_st* pool= memcached_pool_create(memc, 5, 10);
test_truth(pool != NULL);
memcached_st* mmc[10];
- memcached_return rc;
+ memcached_return_t rc;
for (int x= 0; x < 10; ++x) {
mmc[x]= memcached_pool_pop(pool, false, &rc);
static test_return_t replication_set_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *memc_clone= memcached_clone(NULL, memc);
memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0);
static test_return_t replication_get_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
/*
* Don't do the following in your code. I am abusing the internal details
static test_return_t replication_mget_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *memc_clone= memcached_clone(NULL, memc);
memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 0);
return TEST_SUCCESS;
}
+static test_return_t replication_randomize_mget_test(memcached_st *memc)
+{
+ memcached_result_st result_obj;
+ memcached_return_t rc;
+ memcached_st *memc_clone= memcached_clone(NULL, memc);
+ memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 3);
+ memcached_behavior_set(memc_clone, MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ, 1);
+
+ const char *keys[]= { "key1", "key2", "key3", "key4", "key5", "key6", "key7" };
+ size_t len[]= { 4, 4, 4, 4, 4, 4, 4 };
+
+ for (int x=0; x< 7; ++x)
+ {
+ rc= memcached_set(memc, keys[x], len[x], "1", 1, 0, 0);
+ test_truth(rc == MEMCACHED_SUCCESS);
+ }
+
+ memcached_quit(memc);
+
+ for (int x=0; x< 7; ++x) {
+ const char key[2]= { [0]= (const char)x };
+
+ rc= memcached_mget_by_key(memc_clone, key, 1, keys, len, 7);
+ test_truth(rc == MEMCACHED_SUCCESS);
+
+ memcached_result_st *results= memcached_result_create(memc_clone, &result_obj);
+ test_truth(results);
+
+ int hits= 0;
+ while ((results= memcached_fetch_result(memc_clone, &result_obj, &rc)) != NULL)
+ {
+ ++hits;
+ }
+ test_truth(hits == 7);
+ memcached_result_free(&result_obj);
+ }
+ memcached_free(memc_clone);
+ return TEST_SUCCESS;
+}
+
static test_return_t replication_delete_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_st *memc_clone= memcached_clone(NULL, memc);
/* Delete the items from all of the servers except 1 */
uint64_t repl= memcached_behavior_get(memc,
** There is a little bit of a hack here, instead of removing
** the servers, I just set num host to 0 and them add then new udp servers
**/
-static memcached_return init_udp(memcached_st *memc)
+static memcached_return_t init_udp(memcached_st *memc)
{
memcached_version(memc);
/* For the time being, only support udp test for >= 1.2.6 && < 1.3 */
return MEMCACHED_SUCCESS;
}
-static memcached_return binary_init_udp(memcached_st *memc)
+static memcached_return_t binary_init_udp(memcached_st *memc)
{
pre_binary(memc);
return init_udp(memc);
memcached_st tcp_client;
memcached_create(&tcp_client);
test_truth(memcached_server_add_udp(&tcp_client, server.hostname, server.port) == MEMCACHED_INVALID_HOST_PROTOCOL);
+
return TEST_SUCCESS;
}
memcached_quit(memc);
memc->number_of_hosts= 0;
- run_distribution(memc);
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution);
test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS);
- test_truth(memc->flags & MEM_USE_UDP);
- test_truth(memc->flags & MEM_NOREPLY);;
+ test_truth(memc->flags.use_udp);
+ test_truth(memc->flags.no_reply);
test_truth(memc->number_of_hosts == 0);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0);
- test_truth(!(memc->flags & MEM_USE_UDP));
+ test_truth(! (memc->flags.use_udp));
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0);
- test_truth(!(memc->flags & MEM_NOREPLY));
+ test_truth(! (memc->flags.no_reply));
+
return TEST_SUCCESS;
}
unsigned int num_iters= 1025; //request id rolls over at 1024
for (x= 0; x < num_iters;x++)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
const char *value= "when we sanitize";
uint16_t *expected_ids= get_udp_request_ids(memc);
static test_return_t udp_set_too_big_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "bar";
char value[MAX_UDP_DATAGRAM_LENGTH];
uint16_t *expected_ids= get_udp_request_ids(memc);
unsigned int num_iters= 1025; //request id rolls over at 1024
for (x= 0; x < num_iters;x++)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
uint16_t *expected_ids=get_udp_request_ids(memc);
unsigned int server_key= memcached_generate_hash(memc, key, strlen(key));
static test_return_t udp_verbosity_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint16_t *expected_ids= get_udp_request_ids(memc);
unsigned int x;
for (x= 0; x < memc->number_of_hosts;x++)
static test_return_t udp_flush_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint16_t *expected_ids= get_udp_request_ids(memc);
unsigned int x;
for (x= 0; x < memc->number_of_hosts;x++)
static test_return_t udp_incr_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "incr";
const char *value= "1";
rc= memcached_set(memc, key, strlen(key),
static test_return_t udp_decr_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "decr";
const char *value= "1";
rc= memcached_set(memc, key, strlen(key),
static test_return_t udp_stat_test(memcached_st *memc)
{
memcached_stat_st * rv= NULL;
- memcached_return rc;
+ memcached_return_t rc;
char args[]= "";
uint16_t *expected_ids = get_udp_request_ids(memc);
rv = memcached_stat(memc, args, &rc);
static test_return_t udp_version_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
uint16_t *expected_ids = get_udp_request_ids(memc);
rc = memcached_version(memc);
test_truth(rc == MEMCACHED_NOT_SUPPORTED);
static test_return_t udp_get_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
const char *key= "foo";
size_t vlen;
uint16_t *expected_ids = get_udp_request_ids(memc);
static test_return_t hsieh_avaibility_test (memcached_st *memc)
{
- memcached_return expected_rc= MEMCACHED_FAILURE;
+ memcached_return_t expected_rc= MEMCACHED_FAILURE;
#ifdef HAVE_HSIEH_HASH
expected_rc= MEMCACHED_SUCCESS;
#endif
- memcached_return rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH,
+ memcached_return_t rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH,
(uint64_t)MEMCACHED_HASH_HSIEH);
test_truth(rc == expected_rc);
return TEST_SUCCESS;
static test_return_t ketama_compatibility_libmemcached(memcached_st *trash)
{
- memcached_return rc;
+ memcached_return_t rc;
uint64_t value;
int x;
memcached_server_st *server_pool;
static test_return_t ketama_compatibility_spymemcached(memcached_st *trash)
{
- memcached_return rc;
+ memcached_return_t rc;
uint64_t value;
int x;
memcached_server_st *server_pool;
if (pre_binary(memc) != MEMCACHED_SUCCESS)
return TEST_SKIPPED;
- memcached_return ret;
+ memcached_return_t ret;
const char *key= "regression_bug_434484";
size_t keylen= strlen(key);
if (pre_binary(memc) != MEMCACHED_SUCCESS)
return TEST_SKIPPED;
- memcached_return rc;
+ memcached_return_t rc;
unsigned int counter= 0;
- memcached_execute_function callbacks[1]= { [0]= &callback_counter };
+ memcached_execute_fn callbacks[1]= { [0]= &callback_counter };
/*
* I only want to hit only _one_ server so I know the number of requests I'm
static test_return_t regression_bug_434843_buffered(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BUFFER_REQUESTS, 1);
assert(rc == MEMCACHED_SUCCESS);
static test_return_t regression_bug_421108(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_stat_st *memc_stat= memcached_stat(memc, NULL, &rc);
assert(rc == MEMCACHED_SUCCESS);
*/
static test_return_t regression_bug_442914(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY, 1);
assert(rc == MEMCACHED_SUCCESS);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, 1);
if (memc->number_of_hosts < 3 || pre_replication(memc) != MEMCACHED_SUCCESS)
return TEST_SKIPPED;
- memcached_return rc;
+ memcached_return_t rc;
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS, 2);
assert(rc == MEMCACHED_SUCCESS);
assert(rc == MEMCACHED_SUCCESS);
unsigned int counter= 0;
- memcached_execute_function callbacks[1]= { [0]= &callback_counter };
+ memcached_execute_fn callbacks[1]= { [0]= &callback_counter };
rc= memcached_fetch_execute(memc, callbacks, (void *)&counter, 1);
/* Verify that we received all of the key/value pairs */
assert(counter == (unsigned int)max_keys);
assert(memcached_delete(memc_clone, "foo", 3, 1) == MEMCACHED_INVALID_ARGUMENTS);
/* If we don't know the server version, we should get a protocol error */
- memcached_return rc= memcached_delete(memc, "foo", 3, 1);
+ memcached_return_t rc= memcached_delete(memc, "foo", 3, 1);
/* but there is a bug in some of the memcached servers (1.4) that treats
* the counter as noreply so it doesn't send the proper error message
*/
*/
static test_return_t test_get_last_disconnect(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
memcached_server_st *disconnected_server;
/* With the working set of server */
*/
static test_return_t wrong_failure_counter_test(memcached_st *memc)
{
- memcached_return rc;
+ memcached_return_t rc;
/* Set value to force connection to the server */
const char *key= "marmotte";
{"get", 0, replication_get_test },
{"mget", 0, replication_mget_test },
{"delete", 0, replication_delete_test },
+ {"rand_mget", 0, replication_randomize_mget_test },
{0, 0, 0}
};
projects / m6w6 / libmemcached / blobdiff