};
scanner_variable_t test_number_options[]= {
- { ARRAY, make_scanner_string("--CONNECT_TIMEOUT=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--IO_BYTES_WATERMARK=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--IO_KEY_PREFETCH=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--IO_MSG_WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK },
- { ARRAY, make_scanner_string("--NUMBER_OF_REPLICAS=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--POLL_TIMEOUT=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--RCV_TIMEOUT=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--CONNECT-TIMEOUT=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--IO-BYTES-WATERMARK=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--IO-KEY-PREFETCH=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--IO-MSG-WATERMARK=456"), make_scanner_string("456"), __check_IO_MSG_WATERMARK },
+ { ARRAY, make_scanner_string("--NUMBER-OF-REPLICAS=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--POLL-TIMEOUT=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--RCV-TIMEOUT=456"), scanner_string_null, NULL },
{ ARRAY, make_scanner_string("--REMOVE-FAILED-SERVERS=3"), scanner_string_null, __check_REMOVE_FAILED_SERVERS },
- { ARRAY, make_scanner_string("--RETRY_TIMEOUT=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--SND_TIMEOUT=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--SOCKET_RECV_SIZE=456"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--SOCKET_SEND_SIZE=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--RETRY-TIMEOUT=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--SND-TIMEOUT=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--SOCKET-RECV-SIZE=456"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--SOCKET-SEND-SIZE=456"), scanner_string_null, NULL },
{ NIL, scanner_string_null, scanner_string_null, NULL}
};
scanner_variable_t test_boolean_options[]= {
- { ARRAY, make_scanner_string("--BINARY_PROTOCOL"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--BUFFER_REQUESTS"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--HASH_WITH_PREFIX_KEY"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--BINARY-PROTOCOL"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--BUFFER-REQUESTS"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--HASH-WITH-NAMESPACE"), scanner_string_null, NULL },
{ ARRAY, make_scanner_string("--NOREPLY"), scanner_string_null, __check_NOREPLY },
- { ARRAY, make_scanner_string("--RANDOMIZE_REPLICA_READ"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--SORT_HOSTS"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--SUPPORT_CAS"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--TCP_NODELAY"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--TCP_KEEPALIVE"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--TCP_KEEPIDLE"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--USE_UDP"), scanner_string_null, NULL },
- { ARRAY, make_scanner_string("--VERIFY_KEY"), scanner_string_null, __check_VERIFY_KEY },
+ { ARRAY, make_scanner_string("--RANDOMIZE-REPLICA-READ"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--SORT-HOSTS"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--SUPPORT-CAS"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--TCP-NODELAY"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--TCP-KEEPALIVE"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--TCP-KEEPIDLE"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--USE-UDP"), scanner_string_null, NULL },
+ { ARRAY, make_scanner_string("--VERIFY-KEY"), scanner_string_null, __check_VERIFY_KEY },
{ NIL, scanner_string_null, scanner_string_null, NULL}
};
scanner_variable_t prefix_key_strings[]= {
- { ARRAY, make_scanner_string("--PREFIX_KEY=foo"), make_scanner_string("foo"), __check_prefix_key },
- { ARRAY, make_scanner_string("--PREFIX-KEY=\"foo\""), make_scanner_string("foo"), __check_prefix_key },
- { ARRAY, make_scanner_string("--PREFIX-KEY=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key },
+ { ARRAY, make_scanner_string("--NAMESPACE=foo"), make_scanner_string("foo"), __check_prefix_key },
+ { ARRAY, make_scanner_string("--NAMESPACE=\"foo\""), make_scanner_string("foo"), __check_prefix_key },
+ { ARRAY, make_scanner_string("--NAMESPACE=\"This_is_a_very_long_key\""), make_scanner_string("This_is_a_very_long_key"), __check_prefix_key },
{ NIL, scanner_string_null, scanner_string_null, NULL}
};
for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++)
{
memcached_st *memc;
- memc= memcached_create_with_options(ptr->option.c_str, ptr->option.size);
+ memc= memcached(ptr->option.c_str, ptr->option.size);
if (test_true)
{
if (not memc)
return TEST_SKIPPED;
memcached_st *memc_ptr;
- memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""));
+ memc_ptr= memcached(STRING_WITH_LEN("--CONFIGURE-FILE=\"support/example.cnf\""));
test_true_got(memc_ptr, memcached_last_error_message(memc_ptr));
memcached_free(memc_ptr);
test_return_t memcached_create_with_options_test(memcached_st*)
{
memcached_st *memc_ptr;
- memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--server=localhost"));
+ memc_ptr= memcached(STRING_WITH_LEN("--server=localhost"));
test_true_got(memc_ptr, memcached_last_error_message(memc_ptr));
memcached_free(memc_ptr);
- memc_ptr= memcached_create_with_options(STRING_WITH_LEN("--dude=localhost"));
+ memc_ptr= memcached(STRING_WITH_LEN("--dude=localhost"));
test_false_with(memc_ptr, memcached_last_error_message(memc_ptr));
return TEST_SUCCESS;
random_options+= " ";
}
- memcached_st *memc_ptr= memcached_create(NULL);
- memc_ptr= memcached_create_with_options(random_options.c_str(), random_options.size() -1);
+ memcached_st *memc_ptr= memcached(random_options.c_str(), random_options.size() -1);
if (not memc_ptr)
{
switch (errno)
break;
case ENOMEM:
std::cerr << "Failed to allocate memory for memcached_create_with_options()" << std::endl;
+ memcached_free(memc_ptr);
return TEST_FAILURE;
default:
std::cerr << "Unknown error from memcached_create_with_options?!!" << std::endl;
+ memcached_free(memc_ptr);
return TEST_FAILURE;
}
}