projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in fixes for deprecated bits in behavior.
[awesomized/libmemcached]
/
libmemcached
/
options
/
parser.yy
diff --git
a/libmemcached/options/parser.yy
b/libmemcached/options/parser.yy
index 6071a99bd02c83087c3259b94870a69d6c090646..e61f69ca892e479f58f57a80636d9cb789b4ef24 100644
(file)
--- a/
libmemcached/options/parser.yy
+++ b/
libmemcached/options/parser.yy
@@
-59,13
+59,6
@@
inline void config_error(Context *context, yyscan_t *scanner, const char *error)
parser::abort_func(context, error);
}
parser::abort_func(context, error);
}
-int config_parse(Context*, yyscan_t *);
-
-void Context::start()
-{
- config_parse(this, scanner);
-}
-
%}
%token COMMENT
%}
%token COMMENT
@@
-86,16
+79,13
@@
void Context::start()
%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
%token BUFFER_REQUESTS
%token AUTO_EJECT_HOSTS
%token BINARY_PROTOCOL
%token BUFFER_REQUESTS
-%token CACHE_LOOKUPS
%token CONNECT_TIMEOUT
%token CONNECT_TIMEOUT
-%token _CORK
%token DISTRIBUTION
%token HASH
%token HASH_WITH_PREFIX_KEY
%token IO_BYTES_WATERMARK
%token IO_KEY_PREFETCH
%token IO_MSG_WATERMARK
%token DISTRIBUTION
%token HASH
%token HASH_WITH_PREFIX_KEY
%token IO_BYTES_WATERMARK
%token IO_KEY_PREFETCH
%token IO_MSG_WATERMARK
-%token KETAMA
%token KETAMA_HASH
%token KETAMA_WEIGHTED
%token NOREPLY
%token KETAMA_HASH
%token KETAMA_WEIGHTED
%token NOREPLY
@@
-235,18
+225,22
@@
behaviors:
parser_abort(context, NULL);;
}
}
parser_abort(context, NULL);;
}
}
- |
HASH
hash
+ |
DISTRIBUTION distribution ','
hash
{
{
- if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_
HASH
, $2)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_
DISTRIBUTION
, $2)) != MEMCACHED_SUCCESS)
{
{
- parser_abort(context, NULL);;
+ parser_abort(context, NULL);;
+ }
+ if ((context->rc= memcached_behavior_set_distribution_hash(context->memc, $4)) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, NULL);;
}
}
}
}
- |
KETAMA_
HASH hash
+ | HASH hash
{
{
- if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_
KETAMA_
HASH, $2)) != MEMCACHED_SUCCESS)
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, $2)) != MEMCACHED_SUCCESS)
{
{
- parser_abort(context, NULL);;
+ parser_abort(context, NULL);;
}
}
| behavior_number NUMBER
}
}
| behavior_number NUMBER
@@
-332,22
+326,10
@@
behavior_boolean:
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
{
$$= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
}
- | CACHE_LOOKUPS
- {
- $$= MEMCACHED_BEHAVIOR_CACHE_LOOKUPS;
- }
- | _CORK
- {
- $$= MEMCACHED_BEHAVIOR_CORK;
- }
| HASH_WITH_PREFIX_KEY
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
| HASH_WITH_PREFIX_KEY
{
$$= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
}
- | KETAMA
- {
- $$= MEMCACHED_BEHAVIOR_KETAMA;
- }
| KETAMA_WEIGHTED
{
$$= MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
| KETAMA_WEIGHTED
{
$$= MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED;
@@
-505,3
+487,11
@@
distribution:
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
$$= MEMCACHED_DISTRIBUTION_RANDOM;
}
;
+
+%%
+
+void Context::start()
+{
+ config_parse(this, (void **)scanner);
+}
+