return 0;
}
+/*
+ From Andrei on IRC
+*/
+
+test_return user_supplied_bug19(memcached_st *memc)
+{
+ memcached_st *m;
+ memcached_server_st *s;
+ memcached_return res;
+
+ (void)memc;
+
+ m= memcached_create(NULL);
+ memcached_server_add_with_weight(m, "localhost", 11311, 100);
+ memcached_server_add_with_weight(m, "localhost", 11312, 100);
+
+ s= memcached_server_by_key(m, "a", 1, &res);
+ memcached_server_free(s);
+
+ memcached_free(m);
+
+ return 0;
+}
+
#include "ketama_test_cases.h"
-test_return user_supplied_bug18(memcached_st *memc)
+test_return user_supplied_bug18(memcached_st *trash)
{
memcached_return rc;
int value;
int i;
memcached_server_st *server_pool;
+ memcached_st *memc;
+
+ (void)trash;
+
+ memc= memcached_create(NULL);
+ assert(memc);
rc= memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, 1);
assert(rc == MEMCACHED_SUCCESS);
value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_KETAMA_HASH);
assert(value == MEMCACHED_HASH_MD5);
- while (memc->number_of_hosts > 0)
- {
- memcached_server_remove(memc->hosts);
- }
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);
/* VDEAAAAA hashes to fffcd1b5, after the last continuum point, and lets
* us test the boundary wraparound.
*/
- assert(memcached_generate_hash(memc, (unsigned char *)"VDEAAAAA", 8) == memc->continuum[0].index);
+ assert(memcached_generate_hash(memc, (char *)"VDEAAAAA", 8) == memc->continuum[0].index);
/* verify the standard ketama set. */
for (i= 0; i < 99; i++)
char *hostname = memc->hosts[server_idx].hostname;
assert(strcmp(hostname, test_cases[i].server) == 0);
}
+
+ memcached_server_list_free(server_pool);
+ memcached_free(memc);
+
return 0;
}
memcached_result_st *result_ptr;
result_ptr= memcached_result_create(memc, &result);
- assert(result.is_allocated == MEMCACHED_NOT_ALLOCATED);
+ assert(result.is_allocated == false);
assert(result_ptr);
memcached_result_free(&result);
memcached_string_st *string_ptr;
string_ptr= memcached_string_create(memc, &string, 0);
- assert(string.is_allocated == MEMCACHED_NOT_ALLOCATED);
+ assert(string.is_allocated == false);
assert(string_ptr);
memcached_string_free(&string);
return MEMCACHED_SUCCESS;
}
+static memcached_return pre_nonblock_binary(memcached_st *memc)
+{
+ memcached_return rc= MEMCACHED_FAILURE;
+ memcached_st *clone;
+
+ clone= memcached_clone(NULL, memc);
+ assert(clone);
+ // The memcached_version needs to be done on a clone, because the server
+ // will not toggle protocol on an connection.
+ memcached_version(clone);
+
+ if (clone->hosts[0].major_version >= 1 && clone->hosts[0].minor_version > 2)
+ {
+ memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, 0);
+ rc = memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
+ assert(rc == MEMCACHED_SUCCESS);
+ assert(memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1);
+ }
+
+ memcached_free(clone);
+ return rc;
+}
+
static memcached_return pre_murmur(memcached_st *memc)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_MURMUR);
{"user_supplied_bug8", 1, user_supplied_bug8 },
{"user_supplied_bug9", 1, user_supplied_bug9 },
{"user_supplied_bug10", 1, user_supplied_bug10 },
- {"user_supplied_bug11", 1, user_supplied_bug11 },
+// {"user_supplied_bug11", 1, user_supplied_bug11 },
{"user_supplied_bug12", 1, user_supplied_bug12 },
{"user_supplied_bug13", 1, user_supplied_bug13 },
{"user_supplied_bug14", 1, user_supplied_bug14 },
{"user_supplied_bug15", 1, user_supplied_bug15 },
{"user_supplied_bug16", 1, user_supplied_bug16 },
+#ifndef __sun
+ /*
+ ** It seems to be something weird with the character sets..
+ ** value_fetch is unable to parse the value line (iscntrl "fails"), so I
+ ** guess I need to find out how this is supposed to work.. Perhaps I need
+ ** 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, user_supplied_bug17 },
-// {"user_supplied_bug18", 1, user_supplied_bug18 },
+#endif
+ {"user_supplied_bug18", 1, user_supplied_bug18 },
+ {"user_supplied_bug19", 1, user_supplied_bug19 },
{0, 0, 0}
};
{"string", 0, 0, string_tests},
{"result", 0, 0, result_tests},
{"async", pre_nonblock, 0, async_tests},
+ {"async_binary", pre_nonblock_binary, 0, async_tests},
{"user", 0, 0, user_tests},
{"generate", 0, 0, generate_tests},
{"generate_hsieh", pre_hsieh, 0, generate_tests},