projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update chop rule.
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index a628ac22968f3dd0b9f495184fd10c08fbcac8ba..81415226e82e002e49b947de5645abd11df9b3f9 100644
(file)
--- a/
libmemcached/options/parser.yy
+++ b/
libmemcached/options/parser.yy
@@
-29,24
+29,22
@@
%parse-param { Context *context }
%parse-param { yyscan_t *scanner }
%pure-parser
%parse-param { Context *context }
%parse-param { yyscan_t *scanner }
%pure-parser
-%require "2.
2
"
+%require "2.
4
"
%start begin
%verbose
%{
%start begin
%verbose
%{
-#include <config.h>
-
-#include <stdint.h>
+#include <libmemcached/common.h>
+#include <libmemcached/options.hpp>
#include <libmemcached/options/context.h>
#include <libmemcached/options/context.h>
-#include <libmemcached/options/string.h>
#include <libmemcached/options/symbol.h>
#include <libmemcached/options/symbol.h>
-#include <libmemcached/visibility.h>
-#include <libmemcached/prefix_key.h>
+#include <libmemcached/options/scanner.h>
+
+#include <iostream>
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wold-style-cast"
-#include <libmemcached/options/scanner.h>
int conf_lex(YYSTYPE* lvalp, void* scanner);
int conf_lex(YYSTYPE* lvalp, void* scanner);
@@
-69,6
+67,7
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
%token CONFIGURE_FILE
%token EMPTY_LINE
%token SERVER
%token CONFIGURE_FILE
%token EMPTY_LINE
%token SERVER
+%token SOCKET
%token SERVERS
%token SERVERS_OPTION
%token UNKNOWN_OPTION
%token SERVERS
%token SERVERS_OPTION
%token UNKNOWN_OPTION
@@
-80,7
+79,7
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
%token CONNECT_TIMEOUT
%token DISTRIBUTION
%token HASH
%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 IO_BYTES_WATERMARK
%token IO_KEY_PREFETCH
%token IO_MSG_WATERMARK
@@
-106,7
+105,11
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
%token _TCP_NODELAY
/* Callbacks */
%token _TCP_NODELAY
/* Callbacks */
-%token PREFIX_KEY
+%token NAMESPACE
+
+/* Pool */
+%token POOL_MIN
+%token POOL_MAX
/* Hash types */
%token MD5
/* Hash types */
%token MD5
@@
-133,19
+136,21
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
%token <number> FLOAT
%token <number> NUMBER
%token <number> FLOAT
%token <number> NUMBER
-%token PORT
-%token WEIGHT_START
+%token
<number>
PORT
+%token
<number>
WEIGHT_START
%token <server> IPADDRESS
%token <server> HOSTNAME
%token <string> STRING
%token <string> QUOTED_STRING
%token <string> FILE_PATH
%token <server> IPADDRESS
%token <server> HOSTNAME
%token <string> STRING
%token <string> QUOTED_STRING
%token <string> FILE_PATH
-%type <string> string
-%type <distribution> distribution
-%type <hash> hash
%type <behavior> behavior_boolean
%type <behavior> behavior_number
%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
%%
%%
@@
-181,7
+186,7
@@
statement:
}
| INCLUDE ' ' 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);
}
{
parser_abort(context, NULL);
}
@@
-192,7
+197,7
@@
statement:
expression:
SERVER HOSTNAME optional_port optional_weight
{
expression:
SERVER HOSTNAME optional_port optional_weight
{
- if (
(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS
)
+ if (
memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4))
)
{
parser_abort(context, NULL);
}
{
parser_abort(context, NULL);
}
@@
-200,23
+205,38
@@
expression:
}
| SERVER IPADDRESS optional_port optional_weight
{
}
| SERVER IPADDRESS optional_port optional_weight
{
- if (
(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $2.port, $2.weight)) != MEMCACHED_SUCCESS
)
+ if (
memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, $2.c_str, $3, $4))
)
{
parser_abort(context, NULL);
}
context->unset_server();
}
{
parser_abort(context, NULL);
}
context->unset_server();
}
+ | SOCKET string optional_weight
+ {
+ if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, $2.c_str, $3)))
+ {
+ parser_abort(context, NULL);
+ }
+ }
| CONFIGURE_FILE string
{
| 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:
}
| 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);;
}
{
parser_abort(context, NULL);;
}
@@
-325,7
+345,7
@@
behavior_boolean:
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
- | HASH_WITH_
PREFIX_KEY
+ | HASH_WITH_
NAMESPACE
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
@@
-368,13
+388,13
@@
behavior_boolean:
optional_port:
optional_port:
- { }
+ {
$$= MEMCACHED_DEFAULT_PORT;
}
| PORT
{ };
;
optional_weight:
| PORT
{ };
;
optional_weight:
- { }
+ {
$$= 1;
}
| WEIGHT_START
{ }
;
| WEIGHT_START
{ }
;
@@
-425,8
+445,11
@@
string:
}
| QUOTED_STRING
{
}
| QUOTED_STRING
{
+ $$= $1;
+ #if 0
$$.c_str= $1.c_str +1; // +1 to move use passed the initial quote
$$.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
+ #endif
}
;
}
;