-/* A Bison parser, made by GNU Bison 2.4.3. */
+/* A Bison parser, made by GNU Bison 2.5. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.3"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
/* Copy the first part of user declarations. */
-/* Line 189 of yacc.c */
+/* Line 268 of yacc.c */
#line 36 "libmemcached/csl/parser.yy"
-/* Line 189 of yacc.c */
-#line 120 "libmemcached/csl/parser.cc"
+/* Line 268 of yacc.c */
+#line 119 "libmemcached/csl/parser.cc"
/* Enabling traces. */
#ifndef YYDEBUG
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 232 "libmemcached/csl/parser.cc"
+/* Line 343 of yacc.c */
+#line 231 "libmemcached/csl/parser.cc"
#ifdef short
# undef short
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 71
/* YYLAST -- Last index in YYTABLE. */
static const yytype_uint16 yyrline[] =
{
0, 172, 172, 173, 177, 179, 181, 183, 188, 193,
- 197, 201, 212, 220, 228, 235, 239, 243, 247, 251,
- 258, 265, 276, 283, 290, 297, 303, 307, 311, 315,
- 319, 323, 327, 331, 335, 339, 343, 347, 354, 358,
- 362, 366, 370, 374, 378, 382, 386, 390, 394, 398,
- 405, 406, 411, 412, 417, 421, 425, 429, 433, 437,
- 441, 445, 449, 456, 460, 467, 471, 475
+ 197, 201, 212, 222, 232, 241, 245, 249, 253, 257,
+ 269, 282, 295, 302, 309, 318, 324, 328, 332, 336,
+ 340, 344, 348, 352, 356, 360, 364, 368, 375, 379,
+ 383, 387, 391, 395, 399, 403, 407, 411, 415, 419,
+ 426, 427, 432, 433, 438, 442, 446, 450, 454, 458,
+ 462, 466, 470, 477, 481, 488, 492, 496
};
#endif
1, 1, 1, 1, 1, 1, 1, 1
};
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
+ number is the opposite. If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -1
static const yytype_uint8 yytable[] =
{
66, 84, 0, 0, 72
};
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-61))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
static const yytype_int8 yycheck[] =
{
0, 3, 4, 5, 6, 7, 8, 9, 10, 11,
{ \
yychar = (Token); \
yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \
goto yybackup; \
} \
#endif
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
+/* This macro is provided for backward compatibility. */
#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
# define YYMAXDEPTH 10000
#endif
-\f
#if YYERROR_VERBOSE
}
# endif
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
- int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
- {
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+{
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = 0;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+ - Assume YYFAIL is not used. It's too flawed to consider. See
+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+ for details. YYERROR is fine as it does not invoke this
+ function.
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
+ {
+ int yyn = yypact[*yyssp];
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
+ }
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
- if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
- return yysize;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
}
+
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ {
+ char *yyp = *yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-\f
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
#endif /* ! YYPARSE_PARAM */
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ if (yytable_value_is_error (yyn))
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
{
case 4:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 178 "libmemcached/csl/parser.yy"
- { ;}
+ { }
break;
case 5:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 180 "libmemcached/csl/parser.yy"
- { ;}
+ { }
break;
case 6:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 182 "libmemcached/csl/parser.yy"
- { ;}
+ { }
break;
case 7:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 184 "libmemcached/csl/parser.yy"
{
context->set_end();
YYACCEPT;
- ;}
+ }
break;
case 8:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 189 "libmemcached/csl/parser.yy"
{
context->rc= MEMCACHED_PARSE_USER_ERROR;
- parser_abort(context, NULL);
- ;}
+ parser_abort(context, "ERROR called directly");
+ }
break;
case 9:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 194 "libmemcached/csl/parser.yy"
{
memcached_reset(context->memc);
- ;}
+ }
break;
case 10:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 198 "libmemcached/csl/parser.yy"
{
yydebug= 1;
- ;}
+ }
break;
case 11:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 202 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_parse_configure_file(*context->memc, (yyvsp[(3) - (3)].string).c_str, (yyvsp[(3) - (3)].string).size)) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);
+ parser_abort(context, "Failed to parse configuration file");
}
- ;}
+ }
break;
case 12:
-/* Line 1464 of yacc.c */
+/* Line 1806 of yacc.c */
#line 213 "libmemcached/csl/parser.yy"
{
if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number))))
{
- parser_abort(context, NULL);
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", (yyvsp[(2) - (4)].server).c_str, uint32_t((yyvsp[(3) - (4)].number)));
+ parser_abort(context, buffer);
}
context->unset_server();
- ;}
+ }
break;
case 13:
-/* Line 1464 of yacc.c */
-#line 221 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 223 "libmemcached/csl/parser.yy"
{
if (memcached_failed(context->rc= memcached_server_add_with_weight(context->memc, (yyvsp[(2) - (4)].server).c_str, (yyvsp[(3) - (4)].number), (yyvsp[(4) - (4)].number))))
{
- parser_abort(context, NULL);
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Failed to add server: %s:%u", (yyvsp[(2) - (4)].server).c_str, uint32_t((yyvsp[(3) - (4)].number)));
+ parser_abort(context, buffer);
}
context->unset_server();
- ;}
+ }
break;
case 14:
-/* Line 1464 of yacc.c */
-#line 229 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 233 "libmemcached/csl/parser.yy"
{
if (memcached_failed(context->rc= memcached_server_add_unix_socket_with_weight(context->memc, (yyvsp[(2) - (3)].string).c_str, (yyvsp[(3) - (3)].number))))
{
- parser_abort(context, NULL);
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Failed to add server: %s", (yyvsp[(2) - (3)].string).c_str);
+ parser_abort(context, buffer);
}
- ;}
+ }
break;
case 15:
-/* Line 1464 of yacc.c */
-#line 236 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 242 "libmemcached/csl/parser.yy"
{
memcached_set_configuration_file(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size);
- ;}
+ }
break;
case 16:
-/* Line 1464 of yacc.c */
-#line 240 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 246 "libmemcached/csl/parser.yy"
{
context->memc->configure.initial_pool_size= (yyvsp[(2) - (2)].number);
- ;}
+ }
break;
case 17:
-/* Line 1464 of yacc.c */
-#line 244 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 250 "libmemcached/csl/parser.yy"
{
context->memc->configure.max_pool_size= (yyvsp[(2) - (2)].number);
- ;}
+ }
break;
case 19:
-/* Line 1464 of yacc.c */
-#line 252 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 258 "libmemcached/csl/parser.yy"
{
+ if (memcached_callback_get(context->memc, MEMCACHED_CALLBACK_PREFIX_KEY, NULL))
+ {
+ parser_abort(context, "--NAMESPACE can only be called once");
+ }
+
if ((context->rc= memcached_set_namespace(context->memc, (yyvsp[(2) - (2)].string).c_str, (yyvsp[(2) - (2)].string).size)) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);;
+ parser_abort(context, memcached_last_error_message(context->memc));
}
- ;}
+ }
break;
case 20:
-/* Line 1464 of yacc.c */
-#line 259 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 270 "libmemcached/csl/parser.yy"
{
+ // Check to see if DISTRIBUTION has already been set
+ if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS)
+ {
+ parser_abort(context, "--DISTRIBUTION can only be called once");
+ }
+
if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (2)].distribution))) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);;
+ parser_abort(context, memcached_last_error_message(context->memc));;
}
- ;}
+ }
break;
case 21:
-/* Line 1464 of yacc.c */
-#line 266 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 283 "libmemcached/csl/parser.yy"
{
+ // Check to see if DISTRIBUTION has already been set
if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, (yyvsp[(2) - (4)].distribution))) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);;
+ parser_abort(context, "--DISTRIBUTION can only be called once");
}
+
if ((context->rc= memcached_behavior_set_distribution_hash(context->memc, (yyvsp[(4) - (4)].hash))) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);;
+ parser_abort(context, "Unable to set the hash for the DISTRIBUTION requested");
}
- ;}
+ }
break;
case 22:
-/* Line 1464 of yacc.c */
-#line 277 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 296 "libmemcached/csl/parser.yy"
{
- if ((context->rc= memcached_behavior_set(context->memc, MEMCACHED_BEHAVIOR_HASH, (yyvsp[(2) - (2)].hash))) != MEMCACHED_SUCCESS)
+ if (context->set_hash((yyvsp[(2) - (2)].hash)) == false)
{
- parser_abort(context, NULL);;
+ parser_abort(context, "--HASH can only be set once");
}
- ;}
+ }
break;
case 23:
-/* Line 1464 of yacc.c */
-#line 284 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 303 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (2)].behavior), (yyvsp[(2) - (2)].number))) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);;
+ parser_abort(context, "Unable to set behavior");
}
- ;}
+ }
break;
case 24:
-/* Line 1464 of yacc.c */
-#line 291 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 310 "libmemcached/csl/parser.yy"
{
if ((context->rc= memcached_behavior_set(context->memc, (yyvsp[(1) - (1)].behavior), true)) != MEMCACHED_SUCCESS)
{
- parser_abort(context, NULL);;
+ char buffer[1024];
+ snprintf(buffer, sizeof(buffer), "Could not set: %s", libmemcached_string_behavior((yyvsp[(1) - (1)].behavior)));
+ parser_abort(context, buffer);
}
- ;}
+ }
break;
case 25:
-/* Line 1464 of yacc.c */
-#line 298 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 319 "libmemcached/csl/parser.yy"
{
- ;}
+ }
break;
case 26:
-/* Line 1464 of yacc.c */
-#line 304 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 325 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_REMOVE_FAILED_SERVERS;
- ;}
+ }
break;
case 27:
-/* Line 1464 of yacc.c */
-#line 308 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 329 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT;
- ;}
+ }
break;
case 28:
-/* Line 1464 of yacc.c */
-#line 312 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 333 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_MSG_WATERMARK;
- ;}
+ }
break;
case 29:
-/* Line 1464 of yacc.c */
-#line 316 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 337 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_BYTES_WATERMARK;
- ;}
+ }
break;
case 30:
-/* Line 1464 of yacc.c */
-#line 320 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 341 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_IO_KEY_PREFETCH;
- ;}
+ }
break;
case 31:
-/* Line 1464 of yacc.c */
-#line 324 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 345 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NUMBER_OF_REPLICAS;
- ;}
+ }
break;
case 32:
-/* Line 1464 of yacc.c */
-#line 328 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 349 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_POLL_TIMEOUT;
- ;}
+ }
break;
case 33:
-/* Line 1464 of yacc.c */
-#line 332 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 353 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RCV_TIMEOUT;
- ;}
+ }
break;
case 34:
-/* Line 1464 of yacc.c */
-#line 336 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 357 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RETRY_TIMEOUT;
- ;}
+ }
break;
case 35:
-/* Line 1464 of yacc.c */
-#line 340 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 361 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SND_TIMEOUT;
- ;}
+ }
break;
case 36:
-/* Line 1464 of yacc.c */
-#line 344 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 365 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE;
- ;}
+ }
break;
case 37:
-/* Line 1464 of yacc.c */
-#line 348 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 369 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE;
- ;}
+ }
break;
case 38:
-/* Line 1464 of yacc.c */
-#line 355 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 376 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BINARY_PROTOCOL;
- ;}
+ }
break;
case 39:
-/* Line 1464 of yacc.c */
-#line 359 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 380 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_BUFFER_REQUESTS;
- ;}
+ }
break;
case 40:
-/* Line 1464 of yacc.c */
-#line 363 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 384 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY;
- ;}
+ }
break;
case 41:
-/* Line 1464 of yacc.c */
-#line 367 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 388 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_NOREPLY;
- ;}
+ }
break;
case 42:
-/* Line 1464 of yacc.c */
-#line 371 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 392 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_RANDOMIZE_REPLICA_READ;
- ;}
+ }
break;
case 43:
-/* Line 1464 of yacc.c */
-#line 375 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 396 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SORT_HOSTS;
- ;}
+ }
break;
case 44:
-/* Line 1464 of yacc.c */
-#line 379 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 400 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_SUPPORT_CAS;
- ;}
+ }
break;
case 45:
-/* Line 1464 of yacc.c */
-#line 383 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 404 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_NODELAY;
- ;}
+ }
break;
case 46:
-/* Line 1464 of yacc.c */
-#line 387 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 408 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPALIVE;
- ;}
+ }
break;
case 47:
-/* Line 1464 of yacc.c */
-#line 391 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 412 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_TCP_KEEPIDLE;
- ;}
+ }
break;
case 48:
-/* Line 1464 of yacc.c */
-#line 395 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 416 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_USE_UDP;
- ;}
+ }
break;
case 49:
-/* Line 1464 of yacc.c */
-#line 399 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 420 "libmemcached/csl/parser.yy"
{
(yyval.behavior)= MEMCACHED_BEHAVIOR_VERIFY_KEY;
- ;}
+ }
break;
case 50:
-/* Line 1464 of yacc.c */
-#line 405 "libmemcached/csl/parser.yy"
- { (yyval.number)= MEMCACHED_DEFAULT_PORT;;}
+/* Line 1806 of yacc.c */
+#line 426 "libmemcached/csl/parser.yy"
+ { (yyval.number)= MEMCACHED_DEFAULT_PORT;}
break;
case 51:
-/* Line 1464 of yacc.c */
-#line 407 "libmemcached/csl/parser.yy"
- { ;}
+/* Line 1806 of yacc.c */
+#line 428 "libmemcached/csl/parser.yy"
+ { }
break;
case 52:
-/* Line 1464 of yacc.c */
-#line 411 "libmemcached/csl/parser.yy"
- { (yyval.number)= 1; ;}
+/* Line 1806 of yacc.c */
+#line 432 "libmemcached/csl/parser.yy"
+ { (yyval.number)= 1; }
break;
case 53:
-/* Line 1464 of yacc.c */
-#line 413 "libmemcached/csl/parser.yy"
- { ;}
+/* Line 1806 of yacc.c */
+#line 434 "libmemcached/csl/parser.yy"
+ { }
break;
case 54:
-/* Line 1464 of yacc.c */
-#line 418 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 439 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MD5;
- ;}
+ }
break;
case 55:
-/* Line 1464 of yacc.c */
-#line 422 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 443 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_CRC;
- ;}
+ }
break;
case 56:
-/* Line 1464 of yacc.c */
-#line 426 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 447 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_64;
- ;}
+ }
break;
case 57:
-/* Line 1464 of yacc.c */
-#line 430 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 451 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_64;
- ;}
+ }
break;
case 58:
-/* Line 1464 of yacc.c */
-#line 434 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 455 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1_32;
- ;}
+ }
break;
case 59:
-/* Line 1464 of yacc.c */
-#line 438 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 459 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_FNV1A_32;
- ;}
+ }
break;
case 60:
-/* Line 1464 of yacc.c */
-#line 442 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 463 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_HSIEH;
- ;}
+ }
break;
case 61:
-/* Line 1464 of yacc.c */
-#line 446 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 467 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_MURMUR;
- ;}
+ }
break;
case 62:
-/* Line 1464 of yacc.c */
-#line 450 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 471 "libmemcached/csl/parser.yy"
{
(yyval.hash)= MEMCACHED_HASH_JENKINS;
- ;}
+ }
break;
case 63:
-/* Line 1464 of yacc.c */
-#line 457 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 478 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
- ;}
+ }
break;
case 64:
-/* Line 1464 of yacc.c */
-#line 461 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 482 "libmemcached/csl/parser.yy"
{
(yyval.string)= (yyvsp[(1) - (1)].string);
- ;}
+ }
break;
case 65:
-/* Line 1464 of yacc.c */
-#line 468 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 489 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_CONSISTENT;
- ;}
+ }
break;
case 66:
-/* Line 1464 of yacc.c */
-#line 472 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 493 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_MODULA;
- ;}
+ }
break;
case 67:
-/* Line 1464 of yacc.c */
-#line 476 "libmemcached/csl/parser.yy"
+/* Line 1806 of yacc.c */
+#line 497 "libmemcached/csl/parser.yy"
{
(yyval.distribution)= MEMCACHED_DISTRIBUTION_RANDOM;
- ;}
+ }
break;
-/* Line 1464 of yacc.c */
-#line 2129 "libmemcached/csl/parser.cc"
+/* Line 1806 of yacc.c */
+#line 2172 "libmemcached/csl/parser.cc"
default: break;
}
+ /* User semantic actions sometimes alter yychar, and that requires
+ that yytoken be updated with the new translation. We take the
+ approach of translating immediately before every use of yytoken.
+ One alternative is translating here after every semantic action,
+ but that translation would be missed if the semantic action invokes
+ YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+ if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an
+ incorrect destructor might then be invoked immediately. In the
+ case of YYERROR or YYBACKUP, subsequent parser actions might lead
+ to an incorrect destructor call or verbose syntax error message
+ before the lookahead is translated. */
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen);
| yyerrlab -- here on detecting error |
`------------------------------------*/
yyerrlab:
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
/* If not already recovering from an error, report this error. */
if (!yyerrstatus)
{
#if ! YYERROR_VERBOSE
yyerror (context, scanner, YY_("syntax error"));
#else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+ yyssp, yytoken)
{
- YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
- if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
- {
- YYSIZE_T yyalloc = 2 * yysize;
- if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
- yyalloc = YYSTACK_ALLOC_MAXIMUM;
- if (yymsg != yymsgbuf)
- YYSTACK_FREE (yymsg);
- yymsg = (char *) YYSTACK_ALLOC (yyalloc);
- if (yymsg)
- yymsg_alloc = yyalloc;
- else
- {
- yymsg = yymsgbuf;
- yymsg_alloc = sizeof yymsgbuf;
- }
- }
-
- if (0 < yysize && yysize <= yymsg_alloc)
- {
- (void) yysyntax_error (yymsg, yystate, yychar);
- yyerror (context, scanner, yymsg);
- }
- else
- {
- yyerror (context, scanner, YY_("syntax error"));
- if (yysize != 0)
- goto yyexhaustedlab;
- }
+ char const *yymsgp = YY_("syntax error");
+ int yysyntax_error_status;
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ if (yysyntax_error_status == 0)
+ yymsgp = yymsg;
+ else if (yysyntax_error_status == 1)
+ {
+ if (yymsg != yymsgbuf)
+ YYSTACK_FREE (yymsg);
+ yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+ if (!yymsg)
+ {
+ yymsg = yymsgbuf;
+ yymsg_alloc = sizeof yymsgbuf;
+ yysyntax_error_status = 2;
+ }
+ else
+ {
+ yysyntax_error_status = YYSYNTAX_ERROR;
+ yymsgp = yymsg;
+ }
+ }
+ yyerror (context, scanner, yymsgp);
+ if (yysyntax_error_status == 2)
+ goto yyexhaustedlab;
}
+# undef YYSYNTAX_ERROR
#endif
}
for (;;)
{
yyn = yypact[yystate];
- if (yyn != YYPACT_NINF)
+ if (!yypact_value_is_default (yyn))
{
yyn += YYTERROR;
if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
yyreturn:
if (yychar != YYEMPTY)
- yydestruct ("Cleanup: discarding lookahead",
- yytoken, &yylval, context, scanner);
+ {
+ /* Make sure we have latest lookahead translation. See comments at
+ user semantic actions for why this is necessary. */
+ yytoken = YYTRANSLATE (yychar);
+ yydestruct ("Cleanup: discarding lookahead",
+ yytoken, &yylval, context, scanner);
+ }
/* Do not reclaim the symbols of the rule which action triggered
this YYABORT or YYACCEPT. */
YYPOPSTACK (yylen);
-/* Line 1684 of yacc.c */
-#line 481 "libmemcached/csl/parser.yy"
+/* Line 2067 of yacc.c */
+#line 502 "libmemcached/csl/parser.yy"
void Context::start()
4159057246U, 3425930182U, 2593724503U, 1868899624U,
1769812374U, 2302537950U, 1110330676U, 3365377466U,
1336171666U, 3021258493U, 2334992265U, 3861994737U,
- 3365377466U };
+ 3582734124, 3365377466U };
// You have updated the memcache_error messages but not updated docs/tests.
for (int rc= int(MEMCACHED_SUCCESS); rc < int(MEMCACHED_MAXIMUM_RETURN); ++rc)
}
test_compare(values[rc], hash_val);
}
- test_compare(48, int(MEMCACHED_MAXIMUM_RETURN));
+ test_compare(49, int(MEMCACHED_MAXIMUM_RETURN));
return TEST_SUCCESS;
}
memcached_callback_set(memc_clone, MEMCACHED_CALLBACK_NAMESPACE, NULL));
std::vector <char> longkey;
- longkey.reserve(MEMCACHED_MAX_KEY);
- longkey.insert(longkey.end(), MEMCACHED_MAX_KEY, 'a');
+ {
+ std::vector<char>::iterator it= longkey.begin();
+ longkey.insert(it, MEMCACHED_MAX_KEY, 'a');
+ }
+
test_compare(longkey.size(), size_t(MEMCACHED_MAX_KEY));
{
size_t string_length;
/* First add all of the items.. */
for (size_t x= 0; x < REGRESSION_BINARY_VS_BLOCK_COUNT; ++x)
{
- memcached_return_t rc;
char blob[1024] = {0};
- rc= memcached_add_by_key(memc, "bob", 3, global_pairs[x].key, global_pairs[x].key_length, blob, sizeof(blob), 0, 0);
- test_true(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_BUFFERED);
+ memcached_return_t rc= memcached_add_by_key(memc, "bob", 3, global_pairs[x].key, global_pairs[x].key_length, blob, sizeof(blob), 0, 0);
+ test_true_got(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE, memcached_strerror(NULL, rc));
}
return TEST_SUCCESS;
static test_return_t binary_add_regression(memcached_st *memc)
{
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
+ test_skip(MEMCACHED_SUCCESS, memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, true));
test_return_t rc= block_add_regression(memc);
- memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 0);
+
return rc;
}
getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE);
#endif
- size_t key_lengths[HALDENBRAND_KEY_COUNT];
- char **keys= static_cast<char **>(calloc(HALDENBRAND_KEY_COUNT, sizeof(char *)));
- test_true(keys);
- for (uint32_t x= 0; x < HALDENBRAND_KEY_COUNT; x++)
+ std::vector<size_t> key_lengths;
+ key_lengths.resize(HALDENBRAND_KEY_COUNT);
+ std::vector<char *> keys;
+ keys.resize(key_lengths.size());
+ for (uint32_t x= 0; x < key_lengths.size(); x++)
{
char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1];
int key_length= snprintf(key, sizeof(key), "%u", x);
- test_true(key_length);
+ test_true(key_length > 0 and key_length < MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1);
keys[x]= strdup(key);
- test_true(keys[x]);
key_lengths[x]= key_length;
- test_compare(size_t(key_length), strlen(keys[x]));
}
test_compare(MEMCACHED_SUCCESS,
- memcached_mget(memc, (const char **)keys, key_lengths, HALDENBRAND_KEY_COUNT));
+ memcached_mget(memc, &keys[0], &key_lengths[0], key_lengths.size()));
unsigned int keys_returned;
test_compare(TEST_SUCCESS, fetch_all_results(memc, keys_returned, MEMCACHED_SUCCESS));
test_compare(HALDENBRAND_KEY_COUNT, keys_returned);
- for (uint32_t x= 0; x < HALDENBRAND_KEY_COUNT; x++)
+ for (std::vector<char *>::iterator iter= keys.begin();
+ iter != keys.end();
+ iter++)
{
- free(keys[x]);
+ free(*iter);
}
- free(keys);
return TEST_SUCCESS;
}
memcached_flush(memc, 0);
flags= 245;
- memcached_return_t rc= memcached_set(memc, keys, key_length,
- insert_data, VALUE_SIZE_BUG5,
- (time_t)0, flags);
- test_compare(MEMCACHED_SUCCESS, rc);
+ test_compare(MEMCACHED_SUCCESS, memcached_set(memc, keys, key_length,
+ insert_data, VALUE_SIZE_BUG5,
+ (time_t)0, flags));
+ memcached_return_t rc;
flags= 0;
value= memcached_get(memc, keys, key_length,
&value_length, &flags, &rc);
value= memcached_get(memc, "autoincrement", strlen("autoincrement"),
&value_length, &flags, &rc);
- test_true(value == NULL);
+ test_null(value);
test_compare(MEMCACHED_NOTFOUND, rc);
rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"),
1, &number_value);
- test_true(value == NULL);
+ test_null(value);
/* The binary protocol will set the key if it doesn't exist */
if (memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL) == 1)
{
test_compare(MEMCACHED_NOTFOUND, rc);
}
- rc= memcached_set(memc, "autoincrement", strlen("autoincrement"), "1", 1, 0, 0);
+ test_compare(MEMCACHED_SUCCESS,
+ memcached_set(memc, "autoincrement", strlen("autoincrement"), "1", 1, 0, 0));
- value= memcached_get(memc, "autoincrement", strlen("autoincrement"),
- &value_length, &flags, &rc);
+ value= memcached_get(memc, "autoincrement", strlen("autoincrement"), &value_length, &flags, &rc);
test_true(value);
- test_compare(MEMCACHED_SUCCESS, rc);
free(value);
- rc= memcached_increment(memc, "autoincrement", strlen("autoincrement"),
- 1, &number_value);
- test_true(number_value == 2);
- test_compare(MEMCACHED_SUCCESS, rc);
+ test_compare(MEMCACHED_SUCCESS,
+ memcached_increment(memc, "autoincrement", strlen("autoincrement"), 1, &number_value));
+ test_compare(2UL, number_value);
return TEST_SUCCESS;
}
/* empty the cache to ensure misses (hence non-responses) */
test_compare(MEMCACHED_SUCCESS, memcached_flush(memc_clone, 0));
- size_t* key_lengths= new (std::nothrow) size_t[key_count];
- test_true(key_lengths);
- char **keys= static_cast<char **>(calloc(key_count, sizeof(char *)));
- test_true(keys);
- for (unsigned int x= 0; x < key_count; x++)
+ std::vector<size_t> key_lengths;
+ key_lengths.resize(key_count);
+ std::vector<char *> keys;
+ keys.resize(key_lengths.size());
+ for (unsigned int x= 0; x < key_lengths.size(); x++)
{
- char buffer[30];
-
- snprintf(buffer, 30, "%u", x);
- keys[x]= strdup(buffer);
- test_true(keys[x]);
- key_lengths[x]= strlen(keys[x]);
+ char key[MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1];
+ int key_length= snprintf(key, sizeof(key), "%u", x);
+ test_true(key_length > 0 and key_length < MEMCACHED_MAXIMUM_INTEGER_DISPLAY_LENGTH +1);
+ keys[x]= strdup(key);
+ key_lengths[x]= key_length;
}
oldalarm= signal(SIGALRM, fail);
alarm(5);
test_compare_got(MEMCACHED_SUCCESS,
- memcached_mget(memc_clone, (const char **)keys, key_lengths, key_count), memcached_last_error_message(memc_clone));
+ memcached_mget(memc_clone, &keys[0], &key_lengths[0], key_count), memcached_last_error_message(memc_clone));
alarm(0);
signal(SIGALRM, oldalarm);
test_false(return_key[0]);
test_false(return_value);
- for (unsigned int x= 0; x < key_count; x++)
+ for (std::vector<char *>::iterator iter= keys.begin();
+ iter != keys.end();
+ iter++)
{
- free(keys[x]);
+ free(*iter);
}
- free(keys);
- delete [] key_lengths;
memcached_free(memc_clone);
static test_return_t generate_data_with_stats(memcached_st *memc)
{
- uint32_t host_index= 0;
unsigned int check_execute= execute_set(memc, global_pairs, global_count);
- test_true(check_execute == global_count);
+ test_compare(check_execute, global_count);
// @todo hosts used size stats
memcached_return_t rc;
memcached_stat_st *stat_p= memcached_stat(memc, NULL, &rc);
test_true(stat_p);
- for (host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
+ for (uint32_t host_index= 0; host_index < SERVERS_TO_CREATE; host_index++)
{
/* This test was changes so that "make test" would work properlly */
if (DEBUG)
{
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_HASH, (uint64_t)MEMCACHED_HASH_JENKINS);
- return TEST_SUCCESS;
+ return TEST_SKIPPED;
}
{"analyzer", true, (test_callback_fn*)analyzer_test},
{"memcached_pool_st", true, (test_callback_fn*)connection_pool_test },
{"memcached_pool_st #2", true, (test_callback_fn*)connection_pool2_test },
+#if 0
{"memcached_pool_st #3", true, (test_callback_fn*)connection_pool3_test },
+#endif
{"memcached_pool_test", true, (test_callback_fn*)memcached_pool_test },
{"test_get_last_disconnect", true, (test_callback_fn*)test_get_last_disconnect},
{"verbosity", true, (test_callback_fn*)test_verbosity},
using namespace libtest;
#include <vector>
-#include <iostream>
#include <string>
#include <cerrno>
#include <cassert>
{ ARRAY, make_scanner_string("--HASH=CRC"), scanner_string_null, NULL },
{ ARRAY, make_scanner_string("--HASH=FNV1A_32"), scanner_string_null, NULL },
{ ARRAY, make_scanner_string("--HASH=FNV1_32"), scanner_string_null, NULL },
+#if 0
{ ARRAY, make_scanner_string("--HASH=JENKINS"), scanner_string_null, NULL },
+#endif
{ ARRAY, make_scanner_string("--HASH=MD5"), scanner_string_null, NULL },
{ NIL, scanner_string_null, scanner_string_null, NULL}
};
for (scanner_variable_t *ptr= scanner; ptr->type != NIL; ptr++)
{
memcached_st *memc= memcached(ptr->option.c_str, ptr->option.size);
-
- // The case that it should have parsed, but it didn't. We will inspect
- // for an error with libmemcached_check_configuration()
- if (not memc and test_true_opt)
+
+ // The case that it should have parsed, but it didn't. We will inspect for
+ // an error with libmemcached_check_configuration()
+ if (memc == NULL and test_true_opt)
{
char buffer[2048];
bool success= libmemcached_check_configuration(ptr->option.c_str, ptr->option.size, buffer, sizeof(buffer));
temp+= " with option string:";
temp+= ptr->option.c_str;
test_true_got(success, temp.c_str());
+ Error << "Failed for " << temp;
return TEST_FAILURE; // The line above should fail since memc should be null
}
test_return_t memcached_create_with_options_with_filename(memcached_st*)
{
- if (access(SUPPORT_EXAMPLE_CNF, R_OK))
- return TEST_SKIPPED;
+ test_skip(0, access(SUPPORT_EXAMPLE_CNF, R_OK));
- memcached_st *memc_ptr;
- memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""));
+ memcached_st *memc_ptr= memcached(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""));
test_true_got(memc_ptr, "memcached() failed");
memcached_free(memc_ptr);
test_return_t libmemcached_check_configuration_with_filename_test(memcached_st*)
{
- if (access(SUPPORT_EXAMPLE_CNF, R_OK))
- return TEST_SKIPPED;
+ test_skip(0, access(SUPPORT_EXAMPLE_CNF, R_OK));
- memcached_return_t rc;
char buffer[BUFSIZ];
- rc= libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer));
- test_true_got(rc == MEMCACHED_SUCCESS, (rc == MEMCACHED_ERRNO) ? strerror(errno) : memcached_strerror(NULL, rc));
+ test_compare_hint(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"support/example.cnf\""), buffer, sizeof(buffer)),
+ buffer);
- rc= libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer));
- test_false_with(rc == MEMCACHED_SUCCESS, memcached_strerror(NULL, rc));
+ test_compare_hint(MEMCACHED_SUCCESS,
+ libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=support/example.cnf"), buffer, sizeof(buffer)),
+ buffer);
- rc= libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"bad-path/example.cnf\""), buffer, sizeof(buffer));
- test_true_got(rc == MEMCACHED_ERRNO, memcached_strerror(NULL, rc));
+ test_compare_hint(MEMCACHED_ERRNO,
+ libmemcached_check_configuration(test_literal_param("--CONFIGURE-FILE=\"bad-path/example.cnf\""), buffer, sizeof(buffer)),
+ buffer) ;
return TEST_SUCCESS;
}
test_return_t libmemcached_check_configuration_test(memcached_st*)
{
- memcached_return_t rc;
char buffer[BUFSIZ];
-
test_compare(MEMCACHED_SUCCESS,
libmemcached_check_configuration(test_literal_param("--server=localhost"), buffer, sizeof(buffer)));
- rc= libmemcached_check_configuration(test_literal_param("--dude=localhost"), buffer, sizeof(buffer));
- test_false_with(rc == MEMCACHED_SUCCESS, buffer);
- test_true(rc == MEMCACHED_PARSE_ERROR);
+ test_compare_hint(MEMCACHED_PARSE_ERROR,
+ libmemcached_check_configuration(test_literal_param("--dude=localhost"), buffer, sizeof(buffer)),
+ buffer);
return TEST_SUCCESS;
}
test_return_t memcached_create_with_options_test(memcached_st*)
{
- memcached_st *memc_ptr;
- memc_ptr= memcached(test_literal_param("--server=localhost"));
- test_true_got(memc_ptr, memcached_last_error_message(memc_ptr));
- memcached_free(memc_ptr);
+ {
+ memcached_st *memc_ptr;
+ memc_ptr= memcached(test_literal_param("--server=localhost"));
+ test_true_got(memc_ptr, memcached_last_error_message(memc_ptr));
+ memcached_free(memc_ptr);
+ }
- memc_ptr= memcached(test_literal_param("--dude=localhost"));
- test_false_with(memc_ptr, memcached_last_error_message(memc_ptr));
+ {
+ memcached_st *memc_ptr= memcached(test_literal_param("--dude=localhost"));
+ test_false_with(memc_ptr, memcached_last_error_message(memc_ptr));
+ }
return TEST_SUCCESS;
}
test_return_t test_include_keyword(memcached_st*)
{
- if (access(SUPPORT_EXAMPLE_CNF, R_OK))
- return TEST_SKIPPED;
+ test_skip(0, access(SUPPORT_EXAMPLE_CNF, R_OK));
char buffer[BUFSIZ];
test_compare(MEMCACHED_SUCCESS,
return TEST_SUCCESS;
}
-#define RANDOM_STRINGS 100
+#define RANDOM_STRINGS 1000
test_return_t random_statement_build_test(memcached_st*)
{
std::vector<scanner_string_st *> option_list;
for (scanner_variable_t *ptr= hash_strings; ptr->type != NIL; ptr++)
option_list.push_back(&ptr->option);
+ std::vector<bool> used_list;
+ used_list.resize(option_list.size());
+
+ struct used_options_st {
+ bool has_hash;
+ bool has_namespace;
+ bool has_distribution;
+ bool has_buffer_requests;
+ bool has_udp;
+ bool has_binary;
+ bool has_verify_key;
+
+ used_options_st() :
+ has_hash(false),
+ has_namespace(false),
+ has_distribution(false),
+ has_buffer_requests(false),
+ has_udp(false),
+ has_binary(false),
+ has_verify_key(false)
+ {
+ }
+ } used_options;
+
for (uint32_t x= 0; x < RANDOM_STRINGS; x++)
{
std::string random_options;
uint32_t number_of= random() % option_list.size();
for (uint32_t options= 0; options < number_of; options++)
{
- random_options+= option_list[random() % option_list.size()]->c_str;
- random_options+= " ";
- }
+ size_t option_list_position= random() % option_list.size();
- memcached_st *memc_ptr= memcached(random_options.c_str(), random_options.size() -1);
- if (not memc_ptr)
- {
- switch (errno)
+ if (used_list[option_list_position])
{
- case EINVAL:
-#if 0 // Testing framework is not smart enough for this just yet.
+ continue;
+ }
+ used_list[option_list_position]= true;
+
+ std::string random_string= option_list[option_list_position]->c_str;
+
+ if (random_string.compare(0, test_literal_compare_param("--HASH")) == 0)
+ {
+ if (used_options.has_hash)
{
- // We will try to find the specific error
- char buffer[2048];
- memcached_return_t rc= libmemcached_check_configuration(random_options.c_str(), random_options.size(), buffer, sizeof(buffer));
- test_true_got(rc != MEMCACHED_SUCCESS, "memcached_create_with_options() failed whiled libmemcached_check_configuration() was successful");
- std::cerr << "Error occured on " << random_options.c_str() << " : " << buffer << std::endl;
- return TEST_FAILURE;
+ continue;
+ }
+
+ if (used_options.has_distribution)
+ {
+ continue;
+ }
+ used_options.has_hash= true;
+ }
+
+ if (random_string.compare(0, test_literal_compare_param("--NAMESPACE")) == 0)
+ {
+ if (used_options.has_namespace)
+ {
+ continue;
+ }
+ used_options.has_namespace= true;
+ }
+
+ if (random_string.compare(0, test_literal_compare_param("--USE-UDP")) == 0)
+ {
+ if (used_options.has_udp)
+ {
+ continue;
+ }
+ used_options.has_udp= true;
+
+ if (used_options.has_buffer_requests)
+ {
+ continue;
}
-#endif
- 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;
}
+
+ if (random_string.compare(0, test_literal_compare_param("--BUFFER-REQUESTS")) == 0)
+ {
+ if (used_options.has_buffer_requests)
+ {
+ continue;
+ }
+ used_options.has_buffer_requests= true;
+
+ if (used_options.has_udp)
+ {
+ continue;
+ }
+ }
+
+ if (random_string.compare(0, test_literal_compare_param("--BINARY-PROTOCOL")) == 0)
+ {
+ if (used_options.has_binary)
+ {
+ continue;
+ }
+ used_options.has_binary= true;
+
+ if (used_options.has_verify_key)
+ {
+ continue;
+ }
+ }
+
+ if (random_string.compare(0, test_literal_compare_param("--VERIFY-KEY")) == 0)
+ {
+ if (used_options.has_verify_key)
+ {
+ continue;
+ }
+ used_options.has_verify_key= true;
+
+ if (used_options.has_binary)
+ {
+ continue;
+ }
+ }
+
+ if (random_string.compare(0, test_literal_compare_param("--DISTRIBUTION")) == 0)
+ {
+ if (used_options.has_distribution)
+ {
+ continue;
+ }
+
+ if (used_options.has_hash)
+ {
+ continue;
+ }
+ used_options.has_distribution= true;
+ }
+
+ random_options+= random_string;
+ random_options+= " ";
+ }
+
+ if (random_options.size() <= 1)
+ {
+ continue;
+ }
+
+ random_options.resize(random_options.size() -1);
+
+ char buffer[BUFSIZ];
+ memcached_return_t rc= libmemcached_check_configuration(random_options.c_str(), random_options.size(), buffer, sizeof(buffer));
+ if (memcached_failed(rc))
+ {
+ Error << "libmemcached_check_configuration(" << random_options << ") : " << buffer;
+ return TEST_FAILURE;
}
- memcached_free(memc_ptr);
}
return TEST_SUCCESS;
if (strcmp(memcached_server_name(instance), check->socket))
{
- std::cerr << std::endl << __FILE__ << ":" << __LINE__ << " " << memcached_server_name(instance) << " != " << check->socket << std::endl;
+ Error << memcached_server_name(instance) << " != " << check->socket;
return MEMCACHED_FAILURE;
}
projects / m6w6 / libmemcached / commitdiff
