#include <stdint.h>
+#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
+
#include <libmemcached/options/context.h>
-#include <libmemcached/options/build.h>
-#include <libmemcached/options/string.h>
#include <libmemcached/options/symbol.h>
-#include <libmemcached/visibility.h>
-#include <libmemcached/prefix_key.h>
+#include <libmemcached/options/scanner.h>
#pragma GCC diagnostic ignored "-Wold-style-cast"
-#include <libmemcached/options/scanner.h>
int conf_lex(YYSTYPE* lvalp, void* scanner);
-#define parser_abort(A, B) do { parser::abort_func((A), (B)); YYABORT; } while (0)
+#define parser_abort(A, B) do { (A)->abort((B)); YYABORT; } while (0)
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
{
if (not context->end())
- parser::abort_func(context, error);
+ context->abort(error);
}
%}
%token UNKNOWN
/* All behavior options */
-%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
%token BUFFER_REQUESTS
-%token CACHE_LOOKUPS
%token CONNECT_TIMEOUT
%token DISTRIBUTION
%token HASH
-%token HASH_WITH_PREFIX_KEY
+%token HASH_WITH_NAMESPACE
%token IO_BYTES_WATERMARK
%token IO_KEY_PREFETCH
%token IO_MSG_WATERMARK
%token POLL_TIMEOUT
%token RANDOMIZE_REPLICA_READ
%token RCV_TIMEOUT
+%token REMOVE_FAILED_SERVERS
%token RETRY_TIMEOUT
-%token SERVER_FAILURE_LIMIT
%token SND_TIMEOUT
%token SOCKET_RECV_SIZE
%token SOCKET_SEND_SIZE
%token SORT_HOSTS
%token SUPPORT_CAS
-%token _TCP_NODELAY
-%token _TCP_KEEPALIVE
-%token _TCP_KEEPIDLE
%token USER_DATA
%token USE_UDP
%token VERIFY_KEY
+%token _TCP_KEEPALIVE
+%token _TCP_KEEPIDLE
+%token _TCP_NODELAY
/* Callbacks */
-%token PREFIX_KEY
+%token NAMESPACE
+
+/* Pool */
+%token POOL_MIN
+%token POOL_MAX
/* Hash types */
%token MD5
%nonassoc ','
%nonassoc '='
-%token <number> NUMBER
%token <number> FLOAT
-%token <string> HOSTNAME
-%token <string> HOSTNAME_WITH_PORT
-%token <string> IPADDRESS
-%token <string> IPADDRESS_WITH_PORT
+%token <number> NUMBER
+%token <number> PORT
+%token <number> WEIGHT_START
+%token <server> IPADDRESS
+%token <server> HOSTNAME
%token <string> STRING
%token <string> QUOTED_STRING
%token <string> FILE_PATH
-%type <server> server
-%type <string> string
-%type <distribution> distribution
-%type <hash> hash
%type <behavior> behavior_boolean
%type <behavior> behavior_number
+%type <distribution> distribution
+%type <hash> hash
+%type <number> optional_port
+%type <number> optional_weight
+%type <string> string
%%
}
| INCLUDE ' ' string
{
- if ((context->rc= memcached_parse_configure_file(context->memc, $3.c_str, $3.length)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_parse_configure_file(*context->memc, $3.c_str, $3.size)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);
}
expression:
- SERVER server
- {
- if ((context->rc= memcached_server_add_parsed(context->memc, $2.c_str, $2.length, $2.port, 0)) != MEMCACHED_SUCCESS)
+ SERVER HOSTNAME optional_port optional_weight
+ {
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
{
parser_abort(context, NULL);
}
+ context->unset_server();
}
- | SERVERS_OPTION server_list
+ | SERVER IPADDRESS optional_port optional_weight
{
+ if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4)))
+ {
+ parser_abort(context, NULL);
+ }
+ context->unset_server();
}
| CONFIGURE_FILE string
{
- memcached_set_configuration_file(context->memc, $2.c_str, $2.length);
+ memcached_set_configuration_file(context->memc, $2.c_str, $2.size);
+ }
+ | POOL_MIN NUMBER
+ {
+ context->memc->configure.initial_pool_size= $2;
+ }
+ | POOL_MAX NUMBER
+ {
+ context->memc->configure.max_pool_size= $2;
}
| behaviors
;
behaviors:
- PREFIX_KEY string
+ NAMESPACE string
{
- if ((context->rc= memcached_set_prefix_key(context->memc, $2.c_str, $2.length)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_set_namespace(context->memc, $2.c_str, $2.size)) != MEMCACHED_SUCCESS)
{
parser_abort(context, NULL);;
}
;
behavior_number:
- CONNECT_TIMEOUT
+ REMOVE_FAILED_SERVERS
+ {
+ $$= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
+ }
+ | CONNECT_TIMEOUT
{
$$= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
}
{
$$= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
}
- | SERVER_FAILURE_LIMIT
- {
- $$= MEMCACHED_BEHAVIOR_SERVER_FAILURE_LIMIT;
- }
| SND_TIMEOUT
{
$$= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
;
behavior_boolean:
- AUTO_EJECT_HOSTS
- {
- $$= MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS;
- }
- | BINARY_PROTOCOL
+ BINARY_PROTOCOL
{
$$= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
}
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
- | CACHE_LOOKUPS
- {
- $$= MEMCACHED_BEHAVIOR_CACHE_LOOKUPS;
- }
- | HASH_WITH_PREFIX_KEY
+ | HASH_WITH_NAMESPACE
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
- | KETAMA_WEIGHTED
- {
- $$= MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
- }
| NOREPLY
{
$$= MEMCACHED_BEHAVIOR_NOREPLY;
}
-server_list:
- server
- {
- if ((context->rc= memcached_server_add_parsed(context->memc, $1.c_str, $1.length, $1.port, 0)) != MEMCACHED_SUCCESS)
- {
- parser_abort(context, NULL);;
- }
- }
- | server_list ',' server
- {
- if ((context->rc= memcached_server_add_parsed(context->memc, $3.c_str, $3.length, $3.port, 0)) != MEMCACHED_SUCCESS)
- {
- parser_abort(context, NULL);;
- }
- }
+optional_port:
+ { $$= MEMCACHED_DEFAULT_PORT;}
+ | PORT
+ { };
;
-server:
- HOSTNAME_WITH_PORT NUMBER
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length -1; // -1 to remove :
- $$.port= $2;
- }
- | HOSTNAME
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length;
- $$.port= MEMCACHED_DEFAULT_PORT;
- }
- | STRING /* a match can be against "localhost" which is just a string */
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length;
- $$.port= MEMCACHED_DEFAULT_PORT;
- }
- | IPADDRESS_WITH_PORT NUMBER
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length -1; // -1 to remove :
- $$.port= $2;
- }
- | IPADDRESS
- {
- $$.c_str= $1.c_str;
- $$.length= $1.length;
- $$.port= MEMCACHED_DEFAULT_PORT;
- }
+optional_weight:
+ { $$= 1; }
+ | WEIGHT_START
+ { }
;
hash:
| QUOTED_STRING
{
$$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
- $$.length= $1.length -1; // -1 removes the end quote
+ $$.size= $1.size -2; // -2 removes the begin and end quote
}
;
projects / m6w6 / libmemcached / blobdiff