From f65019dc4582ad3917ae3009b3e77caaedf1f5bf Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Tue, 11 Jun 2013 13:53:03 +0400
Subject: [PATCH] Add prefix to memcached methods to prevent future overloading
problems
---
src/memcached-grammar.cc | 609 ++++++++++++++++++++-------------------
src/memcached-grammar.rl | 49 ++--
src/memcached.cc | 27 +-
3 files changed, 345 insertions(+), 340 deletions(-)
diff --git a/src/memcached-grammar.cc b/src/memcached-grammar.cc
index 976e699bbd..b526f6147f 100644
--- a/src/memcached-grammar.cc
+++ b/src/memcached-grammar.cc
@@ -146,7 +146,7 @@ case 5:
goto st0;
goto tr15;
tr15:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -176,7 +176,7 @@ case 7:
goto tr17;
goto st0;
tr17:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st8;
st8:
@@ -190,8 +190,8 @@ case 8:
goto st8;
goto st0;
tr18:
-#line 245 "src/memcached-grammar.rl"
- {flags = natoq(fstart, p);}
+#line 246 "src/memcached-grammar.rl"
+ {flags = memcached_natoq(fstart, p);}
goto st9;
st9:
if ( ++p == pe )
@@ -204,7 +204,7 @@ case 9:
goto tr21;
goto st0;
tr21:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st10;
st10:
@@ -218,9 +218,9 @@ case 10:
goto st10;
goto st0;
tr22:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
@@ -236,7 +236,7 @@ case 11:
goto tr25;
goto st0;
tr25:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st12;
st12:
@@ -253,11 +253,11 @@ case 12:
goto st12;
goto st0;
tr26:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -280,7 +280,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -289,17 +289,17 @@ case 12:
#line 68 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple != NULL && !expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple != NULL && !memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
}
goto st197;
tr30:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -322,7 +322,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -331,19 +331,19 @@ case 12:
#line 68 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple != NULL && !expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple != NULL && !memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
}
goto st197;
tr39:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -366,7 +366,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -375,19 +375,19 @@ case 12:
#line 68 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple != NULL && !expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple != NULL && !memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
}
goto st197;
tr58:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -410,7 +410,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -423,7 +423,7 @@ case 12:
u32 value_len;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
+ struct tuple *tuple = memcached_find(key);
if (tuple == NULL) {
obuf_dup(out, "NOT_STORED\r\n", 12);
} else {
@@ -445,9 +445,9 @@ case 12:
}
goto st197;
tr62:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -470,7 +470,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -483,7 +483,7 @@ case 12:
u32 value_len;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
+ struct tuple *tuple = memcached_find(key);
if (tuple == NULL) {
obuf_dup(out, "NOT_STORED\r\n", 12);
} else {
@@ -505,11 +505,11 @@ case 12:
}
goto st197;
tr71:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -532,7 +532,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -545,7 +545,7 @@ case 12:
u32 value_len;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
+ struct tuple *tuple = memcached_find(key);
if (tuple == NULL) {
obuf_dup(out, "NOT_STORED\r\n", 12);
} else {
@@ -567,11 +567,11 @@ case 12:
}
goto st197;
tr91:
-#line 247 "src/memcached-grammar.rl"
- {cas = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 248 "src/memcached-grammar.rl"
+ {cas = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -594,7 +594,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -603,19 +603,19 @@ case 12:
#line 86 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_FOUND\r\n", 11);
- else if (meta(tuple)->cas != cas)
+ else if (memcached_meta(tuple)->cas != cas)
obuf_dup(out, "EXISTS\r\n", 8);
else
STORE;
}
goto st197;
tr95:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -638,7 +638,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -647,21 +647,21 @@ case 12:
#line 86 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_FOUND\r\n", 11);
- else if (meta(tuple)->cas != cas)
+ else if (memcached_meta(tuple)->cas != cas)
obuf_dup(out, "EXISTS\r\n", 8);
else
STORE;
}
goto st197;
tr105:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -684,7 +684,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -693,21 +693,21 @@ case 12:
#line 86 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_FOUND\r\n", 11);
- else if (meta(tuple)->cas != cas)
+ else if (memcached_meta(tuple)->cas != cas)
obuf_dup(out, "EXISTS\r\n", 8);
else
STORE;
}
goto st197;
tr118:
-#line 248 "src/memcached-grammar.rl"
- {incr = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 249 "src/memcached-grammar.rl"
+ {incr = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -722,16 +722,16 @@ case 12:
u64 value;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
- m = meta(tuple);
+ m = memcached_meta(tuple);
field = tuple_field(tuple, 3);
value_len = load_varint32(&field);
- if (is_numeric(field, value_len)) {
- value = natoq((const char *) field,
+ if (memcached_is_numeric(field, value_len)) {
+ value = memcached_natoq((const char *) field,
(const char *) field + value_len);
if (incr_sign > 0) {
@@ -753,7 +753,7 @@ case 12:
stats.cmd_set++;
try {
- store(key, exptime, flags, bytes, data);
+ memcached_store(key, exptime, flags, bytes, data);
stats.total_items++;
obuf_dup(out, b->data, b->size);
obuf_dup(out, "\r\n", 2);
@@ -770,9 +770,9 @@ case 12:
}
goto st197;
tr122:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -787,16 +787,16 @@ case 12:
u64 value;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
- m = meta(tuple);
+ m = memcached_meta(tuple);
field = tuple_field(tuple, 3);
value_len = load_varint32(&field);
- if (is_numeric(field, value_len)) {
- value = natoq((const char *) field,
+ if (memcached_is_numeric(field, value_len)) {
+ value = memcached_natoq((const char *) field,
(const char *) field + value_len);
if (incr_sign > 0) {
@@ -818,7 +818,7 @@ case 12:
stats.cmd_set++;
try {
- store(key, exptime, flags, bytes, data);
+ memcached_store(key, exptime, flags, bytes, data);
stats.total_items++;
obuf_dup(out, b->data, b->size);
obuf_dup(out, "\r\n", 2);
@@ -835,11 +835,11 @@ case 12:
}
goto st197;
tr132:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -854,16 +854,16 @@ case 12:
u64 value;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
- m = meta(tuple);
+ m = memcached_meta(tuple);
field = tuple_field(tuple, 3);
value_len = load_varint32(&field);
- if (is_numeric(field, value_len)) {
- value = natoq((const char *) field,
+ if (memcached_is_numeric(field, value_len)) {
+ value = memcached_natoq((const char *) field,
(const char *) field + value_len);
if (incr_sign > 0) {
@@ -885,7 +885,7 @@ case 12:
stats.cmd_set++;
try {
- store(key, exptime, flags, bytes, data);
+ memcached_store(key, exptime, flags, bytes, data);
stats.total_items++;
obuf_dup(out, b->data, b->size);
obuf_dup(out, "\r\n", 2);
@@ -902,9 +902,9 @@ case 12:
}
goto st197;
tr141:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -913,8 +913,8 @@ case 12:
#line 179 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
try {
@@ -930,15 +930,15 @@ case 12:
}
goto st197;
tr146:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -947,8 +947,8 @@ case 12:
#line 179 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
try {
@@ -964,11 +964,11 @@ case 12:
}
goto st197;
tr157:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -977,8 +977,8 @@ case 12:
#line 179 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
try {
@@ -994,9 +994,9 @@ case 12:
}
goto st197;
tr169:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1004,17 +1004,18 @@ case 12:
}
#line 208 "src/memcached-grammar.rl"
{
- struct fiber *f = fiber_new("flush_all", flush_all);
+ struct fiber *f = fiber_new("flush_all",
+ memcached_flush_all);
fiber_call(f, flush_delay);
obuf_dup(out, "OK\r\n", 4);
}
goto st197;
tr174:
-#line 249 "src/memcached-grammar.rl"
- {flush_delay = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 250 "src/memcached-grammar.rl"
+ {flush_delay = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1022,17 +1023,18 @@ case 12:
}
#line 208 "src/memcached-grammar.rl"
{
- struct fiber *f = fiber_new("flush_all", flush_all);
+ struct fiber *f = fiber_new("flush_all",
+ memcached_flush_all);
fiber_call(f, flush_delay);
obuf_dup(out, "OK\r\n", 4);
}
goto st197;
tr185:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1040,15 +1042,16 @@ case 12:
}
#line 208 "src/memcached-grammar.rl"
{
- struct fiber *f = fiber_new("flush_all", flush_all);
+ struct fiber *f = fiber_new("flush_all",
+ memcached_flush_all);
fiber_call(f, flush_delay);
obuf_dup(out, "OK\r\n", 4);
}
goto st197;
tr195:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1067,25 +1070,25 @@ case 12:
}
goto st197;
tr213:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 218 "src/memcached-grammar.rl"
+#line 219 "src/memcached-grammar.rl"
{
return -1;
}
goto st197;
tr233:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1108,7 +1111,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1117,17 +1120,17 @@ case 12:
#line 77 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
}
goto st197;
tr237:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1150,7 +1153,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1159,19 +1162,19 @@ case 12:
#line 77 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
}
goto st197;
tr246:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1194,7 +1197,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1203,19 +1206,19 @@ case 12:
#line 77 "src/memcached-grammar.rl"
{
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
}
goto st197;
tr263:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
-#line 280 "src/memcached-grammar.rl"
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1238,7 +1241,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1251,9 +1254,9 @@ case 12:
}
goto st197;
tr267:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1276,7 +1279,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1289,11 +1292,11 @@ case 12:
}
goto st197;
tr276:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 251 "src/memcached-grammar.rl"
+#line 252 "src/memcached-grammar.rl"
{
size_t parsed = p - in->pos;
while (ibuf_size(in) - parsed < bytes + 2) {
@@ -1316,7 +1319,7 @@ case 12:
goto exit;
}
}
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
@@ -1329,50 +1332,50 @@ case 12:
}
goto st197;
tr281:
-#line 280 "src/memcached-grammar.rl"
+#line 281 "src/memcached-grammar.rl"
{ p++; }
-#line 274 "src/memcached-grammar.rl"
+#line 275 "src/memcached-grammar.rl"
{
done = true;
stats.bytes_read += p - in->pos;
in->pos = p;
}
-#line 214 "src/memcached-grammar.rl"
+#line 215 "src/memcached-grammar.rl"
{
- print_stats(out);
+ memcached_print_stats(out);
}
goto st197;
st197:
if ( ++p == pe )
goto _test_eof197;
case 197:
-#line 1350 "src/memcached-grammar.cc"
+#line 1353 "src/memcached-grammar.cc"
goto st0;
tr27:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st13;
tr40:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st13;
st13:
if ( ++p == pe )
goto _test_eof13;
case 13:
-#line 1364 "src/memcached-grammar.cc"
+#line 1367 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr30;
goto st0;
tr28:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st14;
st14:
if ( ++p == pe )
goto _test_eof14;
case 14:
-#line 1376 "src/memcached-grammar.cc"
+#line 1379 "src/memcached-grammar.cc"
switch( (*p) ) {
case 32: goto st14;
case 78: goto st15;
@@ -1486,18 +1489,18 @@ case 26:
goto tr45;
goto st0;
tr45:
-#line 288 "src/memcached-grammar.rl"
+#line 289 "src/memcached-grammar.rl"
{append = true; }
goto st27;
tr209:
-#line 289 "src/memcached-grammar.rl"
+#line 290 "src/memcached-grammar.rl"
{append = false;}
goto st27;
st27:
if ( ++p == pe )
goto _test_eof27;
case 27:
-#line 1501 "src/memcached-grammar.cc"
+#line 1504 "src/memcached-grammar.cc"
switch( (*p) ) {
case 13: goto st0;
case 32: goto st27;
@@ -1506,7 +1509,7 @@ case 27:
goto st0;
goto tr46;
tr46:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -1522,7 +1525,7 @@ case 27:
if ( ++p == pe )
goto _test_eof28;
case 28:
-#line 1526 "src/memcached-grammar.cc"
+#line 1529 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st29;
goto st0;
@@ -1536,51 +1539,51 @@ case 29:
goto tr49;
goto st0;
tr49:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st30;
st30:
if ( ++p == pe )
goto _test_eof30;
case 30:
-#line 1547 "src/memcached-grammar.cc"
+#line 1550 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr50;
if ( 48 <= (*p) && (*p) <= 57 )
goto st30;
goto st0;
tr50:
-#line 245 "src/memcached-grammar.rl"
- {flags = natoq(fstart, p);}
+#line 246 "src/memcached-grammar.rl"
+ {flags = memcached_natoq(fstart, p);}
goto st31;
st31:
if ( ++p == pe )
goto _test_eof31;
case 31:
-#line 1561 "src/memcached-grammar.cc"
+#line 1564 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st31;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr53;
goto st0;
tr53:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st32;
st32:
if ( ++p == pe )
goto _test_eof32;
case 32:
-#line 1575 "src/memcached-grammar.cc"
+#line 1578 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr54;
if ( 48 <= (*p) && (*p) <= 57 )
goto st32;
goto st0;
tr54:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
@@ -1589,21 +1592,21 @@ case 32:
if ( ++p == pe )
goto _test_eof33;
case 33:
-#line 1593 "src/memcached-grammar.cc"
+#line 1596 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st33;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr57;
goto st0;
tr57:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st34;
st34:
if ( ++p == pe )
goto _test_eof34;
case 34:
-#line 1607 "src/memcached-grammar.cc"
+#line 1610 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr58;
case 13: goto tr59;
@@ -1613,30 +1616,30 @@ case 34:
goto st34;
goto st0;
tr59:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st35;
tr72:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st35;
st35:
if ( ++p == pe )
goto _test_eof35;
case 35:
-#line 1628 "src/memcached-grammar.cc"
+#line 1631 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr62;
goto st0;
tr60:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st36;
st36:
if ( ++p == pe )
goto _test_eof36;
case 36:
-#line 1640 "src/memcached-grammar.cc"
+#line 1643 "src/memcached-grammar.cc"
switch( (*p) ) {
case 32: goto st36;
case 78: goto st37;
@@ -1743,7 +1746,7 @@ case 47:
goto st0;
goto tr76;
tr76:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -1759,7 +1762,7 @@ case 47:
if ( ++p == pe )
goto _test_eof48;
case 48:
-#line 1763 "src/memcached-grammar.cc"
+#line 1766 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st49;
goto st0;
@@ -1773,51 +1776,51 @@ case 49:
goto tr78;
goto st0;
tr78:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st50;
st50:
if ( ++p == pe )
goto _test_eof50;
case 50:
-#line 1784 "src/memcached-grammar.cc"
+#line 1787 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr79;
if ( 48 <= (*p) && (*p) <= 57 )
goto st50;
goto st0;
tr79:
-#line 245 "src/memcached-grammar.rl"
- {flags = natoq(fstart, p);}
+#line 246 "src/memcached-grammar.rl"
+ {flags = memcached_natoq(fstart, p);}
goto st51;
st51:
if ( ++p == pe )
goto _test_eof51;
case 51:
-#line 1798 "src/memcached-grammar.cc"
+#line 1801 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st51;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr82;
goto st0;
tr82:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st52;
st52:
if ( ++p == pe )
goto _test_eof52;
case 52:
-#line 1812 "src/memcached-grammar.cc"
+#line 1815 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr83;
if ( 48 <= (*p) && (*p) <= 57 )
goto st52;
goto st0;
tr83:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
@@ -1826,49 +1829,49 @@ case 52:
if ( ++p == pe )
goto _test_eof53;
case 53:
-#line 1830 "src/memcached-grammar.cc"
+#line 1833 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st53;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr86;
goto st0;
tr86:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st54;
st54:
if ( ++p == pe )
goto _test_eof54;
case 54:
-#line 1844 "src/memcached-grammar.cc"
+#line 1847 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr87;
if ( 48 <= (*p) && (*p) <= 57 )
goto st54;
goto st0;
tr87:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st55;
st55:
if ( ++p == pe )
goto _test_eof55;
case 55:
-#line 1858 "src/memcached-grammar.cc"
+#line 1861 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st55;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr90;
goto st0;
tr90:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st56;
st56:
if ( ++p == pe )
goto _test_eof56;
case 56:
-#line 1872 "src/memcached-grammar.cc"
+#line 1875 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr91;
case 13: goto tr92;
@@ -1878,30 +1881,30 @@ case 56:
goto st56;
goto st0;
tr106:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st57;
tr92:
-#line 247 "src/memcached-grammar.rl"
- {cas = natoq(fstart, p);}
+#line 248 "src/memcached-grammar.rl"
+ {cas = memcached_natoq(fstart, p);}
goto st57;
st57:
if ( ++p == pe )
goto _test_eof57;
case 57:
-#line 1893 "src/memcached-grammar.cc"
+#line 1896 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr95;
goto st0;
tr93:
-#line 247 "src/memcached-grammar.rl"
- {cas = natoq(fstart, p);}
+#line 248 "src/memcached-grammar.rl"
+ {cas = memcached_natoq(fstart, p);}
goto st58;
st58:
if ( ++p == pe )
goto _test_eof58;
case 58:
-#line 1905 "src/memcached-grammar.cc"
+#line 1908 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr95;
case 13: goto st57;
@@ -1975,14 +1978,14 @@ case 65:
}
goto st0;
tr107:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st66;
st66:
if ( ++p == pe )
goto _test_eof66;
case 66:
-#line 1986 "src/memcached-grammar.cc"
+#line 1989 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr95;
case 13: goto st57;
@@ -2026,18 +2029,18 @@ case 70:
goto tr113;
goto st0;
tr113:
-#line 297 "src/memcached-grammar.rl"
+#line 298 "src/memcached-grammar.rl"
{incr_sign = -1;}
goto st71;
tr202:
-#line 296 "src/memcached-grammar.rl"
+#line 297 "src/memcached-grammar.rl"
{incr_sign = 1; }
goto st71;
st71:
if ( ++p == pe )
goto _test_eof71;
case 71:
-#line 2041 "src/memcached-grammar.cc"
+#line 2044 "src/memcached-grammar.cc"
switch( (*p) ) {
case 13: goto st0;
case 32: goto st71;
@@ -2046,7 +2049,7 @@ case 71:
goto st0;
goto tr114;
tr114:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2062,7 +2065,7 @@ case 71:
if ( ++p == pe )
goto _test_eof72;
case 72:
-#line 2066 "src/memcached-grammar.cc"
+#line 2069 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st73;
goto st0;
@@ -2076,14 +2079,14 @@ case 73:
goto tr117;
goto st0;
tr117:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st74;
st74:
if ( ++p == pe )
goto _test_eof74;
case 74:
-#line 2087 "src/memcached-grammar.cc"
+#line 2090 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr118;
case 13: goto tr119;
@@ -2093,30 +2096,30 @@ case 74:
goto st74;
goto st0;
tr133:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st75;
tr119:
-#line 248 "src/memcached-grammar.rl"
- {incr = natoq(fstart, p);}
+#line 249 "src/memcached-grammar.rl"
+ {incr = memcached_natoq(fstart, p);}
goto st75;
st75:
if ( ++p == pe )
goto _test_eof75;
case 75:
-#line 2108 "src/memcached-grammar.cc"
+#line 2111 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr122;
goto st0;
tr120:
-#line 248 "src/memcached-grammar.rl"
- {incr = natoq(fstart, p);}
+#line 249 "src/memcached-grammar.rl"
+ {incr = memcached_natoq(fstart, p);}
goto st76;
st76:
if ( ++p == pe )
goto _test_eof76;
case 76:
-#line 2120 "src/memcached-grammar.cc"
+#line 2123 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr122;
case 13: goto st75;
@@ -2190,14 +2193,14 @@ case 83:
}
goto st0;
tr134:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st84;
st84:
if ( ++p == pe )
goto _test_eof84;
case 84:
-#line 2201 "src/memcached-grammar.cc"
+#line 2204 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr122;
case 13: goto st75;
@@ -2250,7 +2253,7 @@ case 89:
goto st0;
goto tr140;
tr140:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2266,7 +2269,7 @@ case 89:
if ( ++p == pe )
goto _test_eof90;
case 90:
-#line 2270 "src/memcached-grammar.cc"
+#line 2273 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr141;
case 13: goto st91;
@@ -2274,22 +2277,22 @@ case 90:
}
goto st0;
tr147:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
goto st91;
tr158:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st91;
st91:
if ( ++p == pe )
goto _test_eof91;
case 91:
-#line 2293 "src/memcached-grammar.cc"
+#line 2296 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr141;
goto st0;
@@ -2308,14 +2311,14 @@ case 92:
goto tr144;
goto st0;
tr144:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st93;
st93:
if ( ++p == pe )
goto _test_eof93;
case 93:
-#line 2319 "src/memcached-grammar.cc"
+#line 2322 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr146;
case 13: goto tr147;
@@ -2325,9 +2328,9 @@ case 93:
goto st93;
goto st0;
tr148:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
@@ -2336,7 +2339,7 @@ case 93:
if ( ++p == pe )
goto _test_eof94;
case 94:
-#line 2340 "src/memcached-grammar.cc"
+#line 2343 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr141;
case 13: goto st91;
@@ -2410,14 +2413,14 @@ case 101:
}
goto st0;
tr159:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st102;
st102:
if ( ++p == pe )
goto _test_eof102;
case 102:
-#line 2421 "src/memcached-grammar.cc"
+#line 2424 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr141;
case 13: goto st91;
@@ -2505,18 +2508,18 @@ case 111:
}
goto st0;
tr186:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st112;
tr175:
-#line 249 "src/memcached-grammar.rl"
- {flush_delay = natoq(fstart, p);}
+#line 250 "src/memcached-grammar.rl"
+ {flush_delay = memcached_natoq(fstart, p);}
goto st112;
st112:
if ( ++p == pe )
goto _test_eof112;
case 112:
-#line 2520 "src/memcached-grammar.cc"
+#line 2523 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr169;
goto st0;
@@ -2535,14 +2538,14 @@ case 113:
goto tr172;
goto st0;
tr172:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st114;
st114:
if ( ++p == pe )
goto _test_eof114;
case 114:
-#line 2546 "src/memcached-grammar.cc"
+#line 2549 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr174;
case 13: goto tr175;
@@ -2552,14 +2555,14 @@ case 114:
goto st114;
goto st0;
tr176:
-#line 249 "src/memcached-grammar.rl"
- {flush_delay = natoq(fstart, p);}
+#line 250 "src/memcached-grammar.rl"
+ {flush_delay = memcached_natoq(fstart, p);}
goto st115;
st115:
if ( ++p == pe )
goto _test_eof115;
case 115:
-#line 2563 "src/memcached-grammar.cc"
+#line 2566 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr169;
case 13: goto st112;
@@ -2633,14 +2636,14 @@ case 122:
}
goto st0;
tr187:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st123;
st123:
if ( ++p == pe )
goto _test_eof123;
case 123:
-#line 2644 "src/memcached-grammar.cc"
+#line 2647 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr169;
case 13: goto st112;
@@ -2676,18 +2679,18 @@ case 126:
}
goto st0;
tr191:
-#line 293 "src/memcached-grammar.rl"
+#line 294 "src/memcached-grammar.rl"
{show_cas = false;}
goto st127;
tr198:
-#line 294 "src/memcached-grammar.rl"
+#line 295 "src/memcached-grammar.rl"
{show_cas = true;}
goto st127;
st127:
if ( ++p == pe )
goto _test_eof127;
case 127:
-#line 2691 "src/memcached-grammar.cc"
+#line 2694 "src/memcached-grammar.cc"
switch( (*p) ) {
case 13: goto st0;
case 32: goto st127;
@@ -2696,7 +2699,7 @@ case 127:
goto st0;
goto tr193;
tr193:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2712,7 +2715,7 @@ case 127:
if ( ++p == pe )
goto _test_eof128;
case 128:
-#line 2716 "src/memcached-grammar.cc"
+#line 2719 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr195;
case 13: goto st129;
@@ -2955,7 +2958,7 @@ case 155:
goto st0;
goto tr222;
tr222:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -2971,7 +2974,7 @@ case 155:
if ( ++p == pe )
goto _test_eof156;
case 156:
-#line 2975 "src/memcached-grammar.cc"
+#line 2978 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st157;
goto st0;
@@ -2985,51 +2988,51 @@ case 157:
goto tr224;
goto st0;
tr224:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st158;
st158:
if ( ++p == pe )
goto _test_eof158;
case 158:
-#line 2996 "src/memcached-grammar.cc"
+#line 2999 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr225;
if ( 48 <= (*p) && (*p) <= 57 )
goto st158;
goto st0;
tr225:
-#line 245 "src/memcached-grammar.rl"
- {flags = natoq(fstart, p);}
+#line 246 "src/memcached-grammar.rl"
+ {flags = memcached_natoq(fstart, p);}
goto st159;
st159:
if ( ++p == pe )
goto _test_eof159;
case 159:
-#line 3010 "src/memcached-grammar.cc"
+#line 3013 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st159;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr228;
goto st0;
tr228:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st160;
st160:
if ( ++p == pe )
goto _test_eof160;
case 160:
-#line 3024 "src/memcached-grammar.cc"
+#line 3027 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr229;
if ( 48 <= (*p) && (*p) <= 57 )
goto st160;
goto st0;
tr229:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
@@ -3038,21 +3041,21 @@ case 160:
if ( ++p == pe )
goto _test_eof161;
case 161:
-#line 3042 "src/memcached-grammar.cc"
+#line 3045 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st161;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr232;
goto st0;
tr232:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st162;
st162:
if ( ++p == pe )
goto _test_eof162;
case 162:
-#line 3056 "src/memcached-grammar.cc"
+#line 3059 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr233;
case 13: goto tr234;
@@ -3062,30 +3065,30 @@ case 162:
goto st162;
goto st0;
tr234:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st163;
tr247:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st163;
st163:
if ( ++p == pe )
goto _test_eof163;
case 163:
-#line 3077 "src/memcached-grammar.cc"
+#line 3080 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr237;
goto st0;
tr235:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st164;
st164:
if ( ++p == pe )
goto _test_eof164;
case 164:
-#line 3089 "src/memcached-grammar.cc"
+#line 3092 "src/memcached-grammar.cc"
switch( (*p) ) {
case 32: goto st164;
case 78: goto st165;
@@ -3194,7 +3197,7 @@ case 175:
goto st0;
goto tr252;
tr252:
-#line 223 "src/memcached-grammar.rl"
+#line 224 "src/memcached-grammar.rl"
{
fstart = p;
for (; p < pe && *p != ' ' && *p != '\r' && *p != '\n'; p++);
@@ -3210,7 +3213,7 @@ case 175:
if ( ++p == pe )
goto _test_eof176;
case 176:
-#line 3214 "src/memcached-grammar.cc"
+#line 3217 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st177;
goto st0;
@@ -3224,51 +3227,51 @@ case 177:
goto tr254;
goto st0;
tr254:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st178;
st178:
if ( ++p == pe )
goto _test_eof178;
case 178:
-#line 3235 "src/memcached-grammar.cc"
+#line 3238 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr255;
if ( 48 <= (*p) && (*p) <= 57 )
goto st178;
goto st0;
tr255:
-#line 245 "src/memcached-grammar.rl"
- {flags = natoq(fstart, p);}
+#line 246 "src/memcached-grammar.rl"
+ {flags = memcached_natoq(fstart, p);}
goto st179;
st179:
if ( ++p == pe )
goto _test_eof179;
case 179:
-#line 3249 "src/memcached-grammar.cc"
+#line 3252 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st179;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr258;
goto st0;
tr258:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st180;
st180:
if ( ++p == pe )
goto _test_eof180;
case 180:
-#line 3263 "src/memcached-grammar.cc"
+#line 3266 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto tr259;
if ( 48 <= (*p) && (*p) <= 57 )
goto st180;
goto st0;
tr259:
-#line 238 "src/memcached-grammar.rl"
+#line 239 "src/memcached-grammar.rl"
{
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
@@ -3277,21 +3280,21 @@ case 180:
if ( ++p == pe )
goto _test_eof181;
case 181:
-#line 3281 "src/memcached-grammar.cc"
+#line 3284 "src/memcached-grammar.cc"
if ( (*p) == 32 )
goto st181;
if ( 48 <= (*p) && (*p) <= 57 )
goto tr262;
goto st0;
tr262:
-#line 222 "src/memcached-grammar.rl"
+#line 223 "src/memcached-grammar.rl"
{ fstart = p; }
goto st182;
st182:
if ( ++p == pe )
goto _test_eof182;
case 182:
-#line 3295 "src/memcached-grammar.cc"
+#line 3298 "src/memcached-grammar.cc"
switch( (*p) ) {
case 10: goto tr263;
case 13: goto tr264;
@@ -3301,30 +3304,30 @@ case 182:
goto st182;
goto st0;
tr264:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st183;
tr277:
-#line 282 "src/memcached-grammar.rl"
+#line 283 "src/memcached-grammar.rl"
{ noreply = true; }
goto st183;
st183:
if ( ++p == pe )
goto _test_eof183;
case 183:
-#line 3316 "src/memcached-grammar.cc"
+#line 3319 "src/memcached-grammar.cc"
if ( (*p) == 10 )
goto tr267;
goto st0;
tr265:
-#line 246 "src/memcached-grammar.rl"
- {bytes = natoq(fstart, p);}
+#line 247 "src/memcached-grammar.rl"
+ {bytes = memcached_natoq(fstart, p);}
goto st184;
st184:
if ( ++p == pe )
goto _test_eof184;
case 184:
-#line 3328 "src/memcached-grammar.cc"
+#line 3331 "src/memcached-grammar.cc"
switch( (*p) ) {
case 32: goto st184;
case 78: goto st185;
@@ -3639,7 +3642,7 @@ case 196:
_out: {}
}
-#line 307 "src/memcached-grammar.rl"
+#line 308 "src/memcached-grammar.rl"
if (!done) {
diff --git a/src/memcached-grammar.rl b/src/memcached-grammar.rl
index 2ecd280482..62b738e345 100644
--- a/src/memcached-grammar.rl
+++ b/src/memcached-grammar.rl
@@ -67,8 +67,8 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
action add {
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple != NULL && !expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple != NULL && !memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
@@ -76,8 +76,8 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
action replace {
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_STORED\r\n", 12);
else
STORE;
@@ -85,10 +85,10 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
action cas {
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple))
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple))
obuf_dup(out, "NOT_FOUND\r\n", 11);
- else if (meta(tuple)->cas != cas)
+ else if (memcached_meta(tuple)->cas != cas)
obuf_dup(out, "EXISTS\r\n", 8);
else
STORE;
@@ -100,7 +100,7 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
u32 value_len;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
+ struct tuple *tuple = memcached_find(key);
if (tuple == NULL) {
obuf_dup(out, "NOT_STORED\r\n", 12);
} else {
@@ -129,16 +129,16 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
u64 value;
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
- m = meta(tuple);
+ m = memcached_meta(tuple);
field = tuple_field(tuple, 3);
value_len = load_varint32(&field);
- if (is_numeric(field, value_len)) {
- value = natoq((const char *) field,
+ if (memcached_is_numeric(field, value_len)) {
+ value = memcached_natoq((const char *) field,
(const char *) field + value_len);
if (incr_sign > 0) {
@@ -160,7 +160,7 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
stats.cmd_set++;
try {
- store(key, exptime, flags, bytes, data);
+ memcached_store(key, exptime, flags, bytes, data);
stats.total_items++;
obuf_dup(out, b->data, b->size);
obuf_dup(out, "\r\n", 2);
@@ -178,8 +178,8 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
action delete {
key = tbuf_read_field(keys);
- struct tuple *tuple = find(key);
- if (tuple == NULL || expired(tuple)) {
+ struct tuple *tuple = memcached_find(key);
+ if (tuple == NULL || memcached_is_expired(tuple)) {
obuf_dup(out, "NOT_FOUND\r\n", 11);
} else {
try {
@@ -206,13 +206,14 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
}
action flush_all {
- struct fiber *f = fiber_new("flush_all", flush_all);
+ struct fiber *f = fiber_new("flush_all",
+ memcached_flush_all);
fiber_call(f, flush_delay);
obuf_dup(out, "OK\r\n", 4);
}
action stats {
- print_stats(out);
+ memcached_print_stats(out);
}
action quit {
@@ -236,17 +237,17 @@ memcached_dispatch(struct ev_io *coio, struct iobuf *iobuf)
key = printable >key_start ;
action exptime {
- exptime = natoq(fstart, p);
+ exptime = memcached_natoq(fstart, p);
if (exptime > 0 && exptime <= 60*60*24*30)
exptime = exptime + ev_now();
}
exptime = digit+ >fstart %exptime;
- flags = digit+ >fstart %{flags = natoq(fstart, p);};
- bytes = digit+ >fstart %{bytes = natoq(fstart, p);};
- cas_value = digit+ >fstart %{cas = natoq(fstart, p);};
- incr_value = digit+ >fstart %{incr = natoq(fstart, p);};
- flush_delay = digit+ >fstart %{flush_delay = natoq(fstart, p);};
+ flags = digit+ >fstart %{flags = memcached_natoq(fstart, p);};
+ bytes = digit+ >fstart %{bytes = memcached_natoq(fstart, p);};
+ cas_value = digit+ >fstart %{cas = memcached_natoq(fstart, p);};
+ incr_value = digit+ >fstart %{incr = memcached_natoq(fstart, p);};
+ flush_delay = digit+ >fstart %{flush_delay = memcached_natoq(fstart, p);};
action read_data {
size_t parsed = p - in->pos;
diff --git a/src/memcached.cc b/src/memcached.cc
index bf70358349..de12a2f0b4 100644
--- a/src/memcached.cc
+++ b/src/memcached.cc
@@ -73,7 +73,7 @@ struct meta {
} __packed__;
static u64
-natoq(const char *start, const char *end)
+memcached_natoq(const char *start, const char *end)
{
u64 num = 0;
while (start < end) {
@@ -119,7 +119,8 @@ tbuf_read_field(struct tbuf *buf)
}
static void
-store(const char *key, u32 exptime, u32 flags, u32 bytes, const char *data)
+memcached_store(const char *key, u32 exptime, u32 flags, u32 bytes,
+ const char *data)
{
u32 box_flags = 0;
u32 field_count = 4;
@@ -171,27 +172,27 @@ memcached_delete(const char *key)
}
static struct tuple *
-find(const char *key)
+memcached_find(const char *key)
{
return memcached_index->findByKey(key, 1);
}
static struct meta *
-meta(struct tuple *tuple)
+memcached_meta(struct tuple *tuple)
{
const char *field = tuple_field(tuple, 1);
return (struct meta *) (field + 1);
}
static bool
-expired(struct tuple *tuple)
+memcached_is_expired(struct tuple *tuple)
{
- struct meta *m = meta(tuple);
+ struct meta *m = memcached_meta(tuple);
return m->exptime == 0 ? 0 : m->exptime < ev_now();
}
static bool
-is_numeric(const char *field, u32 value_len)
+memcached_is_numeric(const char *field, u32 value_len)
{
for (int i = 0; i < value_len; i++)
if (*(field + i) < '0' || '9' < *(field + i))
@@ -228,7 +229,7 @@ salloc_stat_memcached_cb(const struct slab_cache_stats *cstat, void *cb_ctx)
}
static void
-print_stats(struct obuf *out)
+memcached_print_stats(struct obuf *out)
{
struct tbuf *buf = tbuf_new(fiber->gc_pool);
@@ -278,7 +279,7 @@ void memcached_get(struct obuf *out, size_t keys_count, struct tbuf *keys,
u32 _l;
const char *key = tbuf_read_field(keys);
- tuple = find(key);
+ tuple = memcached_find(key);
key_len = load_varint32(&key);
if (tuple == NULL) {
@@ -334,7 +335,7 @@ void memcached_get(struct obuf *out, size_t keys_count, struct tbuf *keys,
}
static void
-flush_all(va_list ap)
+memcached_flush_all(va_list ap)
{
uintptr_t delay = va_arg(ap, uintptr_t);
fiber_sleep(delay - ev_now());
@@ -342,7 +343,7 @@ flush_all(va_list ap)
struct iterator *it = memcached_index->allocIterator();
memcached_index->initIterator(it, ITER_ALL, NULL, 0);
while ((tuple = it->next(it))) {
- meta(tuple)->exptime = 1;
+ memcached_meta(tuple)->exptime = 1;
}
it->free(it);
}
@@ -354,7 +355,7 @@ do { \
obuf_dup(out, "SERVER_ERROR object too large for cache\r\n", 41);\
} else { \
try { \
- store(key, exptime, flags, bytes, data); \
+ memcached_store(key, exptime, flags, bytes, data); \
stats.total_items++; \
obuf_dup(out, "STORED\r\n", 8); \
} \
@@ -580,7 +581,7 @@ memcached_expire_loop(va_list ap __attribute__((unused)))
if (tuple == NULL)
break;
- if (!expired(tuple))
+ if (!memcached_is_expired(tuple))
continue;
say_debug("expire tuple %p", tuple);
--
GitLab